Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupController.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupController.java (.../CleanupController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupController.java (.../CleanupController.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -24,7 +24,7 @@
import java.io.File;
-import jakarta.management.MalformedObjectNameException;
+import javax.management.MalformedObjectNameException;
import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java
===================================================================
diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java (.../ToolContentListController.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java (.../ToolContentListController.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -31,7 +31,7 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
-import jakarta.sql.DataSource;
+import javax.sql.DataSource;
import org.apache.commons.lang3.StringUtils;
import org.lamsfoundation.lams.learningdesign.dto.LearningLibraryDTO;
Index: lams_admin/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_admin/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_admin/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_admin/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_admin/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_admin/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -r95e29deb7ffaed6c44a37432c3e4f332630e7561 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_admin/web/WEB-INF/web.xml (.../web.xml) (revision 95e29deb7ffaed6c44a37432c3e4f332630e7561)
+++ lams_admin/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -8,7 +8,7 @@
Learning Activity Management System
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.admin.ApplicationResources
@@ -284,4 +284,4 @@
LAMS Application Adminstrator
APPADMIN
-
+
\ No newline at end of file
Index: lams_bb_integration/.classpath
===================================================================
diff -u -r21c7529af602718ef4a963e75e902c964f986831 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_bb_integration/.classpath (.../.classpath) (revision 21c7529af602718ef4a963e75e902c964f986831)
+++ lams_bb_integration/.classpath (.../.classpath) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -1,6 +1,5 @@
-
Index: lams_bb_integration/WEB-INF/tlds/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_bb_integration/WEB-INF/tlds/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_bb_integration/WEB-INF/tlds/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_bb_integration/lams_bb_integration.eml
===================================================================
diff -u -r21c7529af602718ef4a963e75e902c964f986831 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_bb_integration/lams_bb_integration.eml (.../lams_bb_integration.eml) (revision 21c7529af602718ef4a963e75e902c964f986831)
+++ lams_bb_integration/lams_bb_integration.eml (.../lams_bb_integration.eml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -1,7 +1,9 @@
-
+
+
+
@@ -38,7 +40,4 @@
-
-
-
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java (.../LAMSConnectorServlet.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java (.../LAMSConnectorServlet.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -22,6 +22,7 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -30,12 +31,13 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import org.apache.commons.fileupload2.core.FileItem;
+import org.apache.commons.fileupload2.core.FileUploadException;
+import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
import org.apache.commons.io.IOUtils;
-import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
import org.lamsfoundation.lams.util.CommonConstants;
import org.lamsfoundation.lams.util.Configuration;
@@ -87,7 +89,7 @@
@Autowired
@Qualifier("centralMessageService")
private MessageService centralMessageService;
-
+
/*
* Request Spring to lookup the applicationContext tied to the current ServletContext and inject service beans
* available in that applicationContext.
@@ -99,14 +101,13 @@
}
/**
- * Initialize the servlet.
- * Retrieve from the servlet configuration the "baseDir" which is the root of the file repository:
- * If not specified the value of "/UserFiles/" will be used.
+ * Initialize the servlet.
Retrieve from the servlet configuration the "baseDir" which is the root of the file
+ * repository:
If not specified the value of "/UserFiles/" will be used.
*/
@Override
public void init() throws ServletException {
LAMSConnectorServlet.baseDir = getInitParameter("baseDir");
- debug = (new Boolean(getInitParameter("debug"))).booleanValue() && log.isDebugEnabled();
+ debug = Boolean.valueOf(getInitParameter("debug")) && log.isDebugEnabled();
if (LAMSConnectorServlet.baseDir == null) {
LAMSConnectorServlet.baseDir = "secure";
@@ -127,7 +128,6 @@
* connector?Command=CommandName&Type=ResourceType&CurrentFolder=FolderPath
*
* It execute the command and then return the results to the client in XML format.
- *
*/
@Override
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -148,8 +148,9 @@
String currentDirPath = realBaseDir + designFolder + typeStr + "/" + currentFolderStr;
String validCurrentDirPath = currentDirPath.replace('/', File.separatorChar);
- String currentWebPath = lamsContextPath + CommonConstants.LAMS_WWW_FOLDER + FileUtil.LAMS_WWW_SECURE_DIR
- + designFolder + typeStr + "/" + currentFolderStr;
+ String currentWebPath =
+ lamsContextPath + CommonConstants.LAMS_WWW_FOLDER + FileUtil.LAMS_WWW_SECURE_DIR + designFolder
+ + typeStr + "/" + currentFolderStr;
File currentDir = new File(validCurrentDirPath);
if (!currentDir.exists()) {
@@ -250,7 +251,6 @@
*
* It store the file (renaming it in case a file with the same name exists) and then return an HTML file with a
* javascript command in it.
- *
*/
@Override
public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -298,8 +298,9 @@
} else {
// send back URL to new Paint file
- String currentWebPath = lamsContextPath + CommonConstants.LAMS_WWW_FOLDER + FileUtil.LAMS_WWW_SECURE_DIR
- + designFolder + fileType + "/" + currentFolderStr;
+ String currentWebPath =
+ lamsContextPath + CommonConstants.LAMS_WWW_FOLDER + FileUtil.LAMS_WWW_SECURE_DIR + designFolder
+ + fileType + "/" + currentFolderStr;
out.println(currentWebPath + newName);
}
@@ -317,8 +318,8 @@
log.debug("File save started");
}
- DiskFileItemFactory fileItemFactory = new DiskFileItemFactory();
- ServletFileUpload fileUpload = new ServletFileUpload(fileItemFactory);
+ DiskFileItemFactory fileItemFactory = DiskFileItemFactory.builder().get();
+ JakartaServletFileUpload fileUpload = new JakartaServletFileUpload(fileItemFactory);
List items = fileUpload.parseRequest(request);
Map fields = new HashMap<>();
Index: lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java (.../LAMSUploadServlet.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java (.../LAMSUploadServlet.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -20,12 +20,13 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import org.apache.commons.fileupload2.core.FileItem;
+import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.lamsfoundation.lams.util.Configuration;
import org.lamsfoundation.lams.util.ConfigurationKeys;
import org.lamsfoundation.lams.util.FileUtil;
@@ -44,18 +45,16 @@
*
* This servlet accepts just file uploads, optionally with a parameter specifying file type
*
- * For CKEditor uploads:
- * This servlet has been modified for LAMS to support the lams_www/secure/[design folder] format. The design folder is a
- * folder with a unique numeric name. Whenever a new design is created (using "New" in the client), a new design folder
- * name is assigned. The [design folder] is passed in as the CurrentFolder. This servlet supports the image and link
- * windows, not the browse window.
+ * For CKEditor uploads: This servlet has been modified for LAMS to support the lams_www/secure/[design folder] format.
+ * The design folder is a folder with a unique numeric name. Whenever a new design is created (using "New" in the
+ * client), a new design folder name is assigned. The [design folder] is passed in as the CurrentFolder. This servlet
+ * supports the image and link windows, not the browse window.
*
- * Currently this servlet can not be rewritten to Spring Controller.
- * Requests to controllers pass few additional Spring layers.
- * For files uploaded with Ajax Spring looks for Spring Security CSRF token.
- * It is not present as we do not use Spring Security. It results in HTTP 405 Method not allowed.
- * There are ways to turn off CSRF check, but not with current Spring version.
- * We can try to rewrite this servlet once we upgrade Spring and switch to programmatic configuration.
+ * Currently this servlet can not be rewritten to Spring Controller. Requests to controllers pass few additional Spring
+ * layers. For files uploaded with Ajax Spring looks for Spring Security CSRF token. It is not present as we do not use
+ * Spring Security. It results in HTTP 405 Method not allowed. There are ways to turn off CSRF check, but not with
+ * current Spring version. We can try to rewrite this servlet once we upgrade Spring and switch to programmatic
+ * configuration.
*
* @author Marcin Cieslak
* @author Simone Chiaretta (simo@users.sourceforge.net)
@@ -104,12 +103,10 @@
/**
* Manage the Upload requests.
*
- * The servlet accepts commands sent in the following format:
- * simpleUploader?Type=ResourceType
+ * The servlet accepts commands sent in the following format:
simpleUploader?Type=ResourceType
*
* It store the file (renaming it in case a file with the same name exists) and then return an HTML file with a
* javascript command in it.
- *
*/
@Override
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
@@ -143,8 +140,8 @@
// get realBaseDir and lamsContextPath at request time from config values in memory
String fileType = request.getParameter("Type");
- DiskFileItemFactory fileItemFactory = new DiskFileItemFactory();
- ServletFileUpload fileUpload = new ServletFileUpload(fileItemFactory);
+ DiskFileItemFactory fileItemFactory = DiskFileItemFactory.builder().get();
+ JakartaServletFileUpload fileUpload = new JakartaServletFileUpload(fileItemFactory);
try {
List fileItems = fileUpload.parseRequest(request);
Map fields = new HashMap<>();
@@ -220,8 +217,10 @@
PrintWriter out = response.getWriter();
out.println("");
out.flush();
out.close();
@@ -253,8 +252,8 @@
String newName = null;
String returnMessage = null;
- DiskFileItemFactory fileItemFactory = new DiskFileItemFactory();
- ServletFileUpload fileUpload = new ServletFileUpload(fileItemFactory);
+ DiskFileItemFactory fileItemFactory = DiskFileItemFactory.builder().get();
+ JakartaServletFileUpload fileUpload = new JakartaServletFileUpload(fileItemFactory);
try {
List fileItems = fileUpload.parseRequest(request);
Map fields = new HashMap<>();
Index: lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java (.../SessionListener.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java (.../SessionListener.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -34,7 +34,7 @@
import jakarta.servlet.jsp.jstl.core.Config;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager;
-import org.jboss.security.CacheableManager;
+//import org.jboss.security.CacheableManager;
import org.lamsfoundation.lams.security.SimplePrincipal;
import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
import org.lamsfoundation.lams.util.Configuration;
@@ -49,7 +49,7 @@
*/
public class SessionListener implements HttpSessionListener {
- private static CacheableManager authenticationManager;
+// private static CacheableManager authenticationManager;
private static Logger log = LogManager.getLogger(SessionListener.class);
@@ -76,27 +76,27 @@
@SuppressWarnings("unchecked")
@Override
public void sessionDestroyed(HttpSessionEvent sessionEvent) {
- if (SessionListener.authenticationManager == null) {
- try {
- InitialContext initialContext = new InitialContext();
- SessionListener.authenticationManager = (CacheableManager) initialContext
- .lookup("java:jboss/jaas/lams/authenticationMgr");
- } catch (NamingException e) {
- SessionListener.log.error("Error while getting authentication manager.", e);
- }
- }
-
- // clear the authentication cache when the session is invalidated
- HttpSession session = sessionEvent.getSession();
- if (session != null) {
- SessionManager.removeSessionByID(session.getId(), false, true);
-
- UserDTO userDTO = (UserDTO) session.getAttribute(AttributeNames.USER);
- if (userDTO != null) {
- String login = userDTO.getLogin();
- Principal principal = new SimplePrincipal(login);
- SessionListener.authenticationManager.flushCache(principal);
- }
- }
+// if (SessionListener.authenticationManager == null) {
+// try {
+// InitialContext initialContext = new InitialContext();
+// SessionListener.authenticationManager = (CacheableManager) initialContext
+// .lookup("java:jboss/jaas/lams/authenticationMgr");
+// } catch (NamingException e) {
+// SessionListener.log.error("Error while getting authentication manager.", e);
+// }
+// }
+//
+// // clear the authentication cache when the session is invalidated
+// HttpSession session = sessionEvent.getSession();
+// if (session != null) {
+// SessionManager.removeSessionByID(session.getId(), false, true);
+//
+// UserDTO userDTO = (UserDTO) session.getAttribute(AttributeNames.USER);
+// if (userDTO != null) {
+// String login = userDTO.getLogin();
+// Principal principal = new SimplePrincipal(login);
+// SessionListener.authenticationManager.flushCache(principal);
+// }
+// }
}
}
\ No newline at end of file
Index: lams_central/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_central/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_central/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_central/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_central/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_central/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_central/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_central/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_central/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_central/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r3eab31a1109437bc25679e6ebe38be0a350e17ac -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_central/web/WEB-INF/web.xml (.../web.xml) (revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
+++ lams_central/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.central.ApplicationResources
@@ -731,4 +731,4 @@
LAMS Application Adminstrator
APPADMIN
-
+
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java (.../CommentService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java (.../CommentService.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -28,7 +28,8 @@
import java.util.List;
import java.util.SortedSet;
-import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.lamsfoundation.lams.comments.Comment;
import org.lamsfoundation.lams.comments.CommentSession;
import org.lamsfoundation.lams.comments.dao.ICommentDAO;
Index: lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java (.../SsoHandler.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java (.../SsoHandler.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -1,27 +1,24 @@
/**
* Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
+ * version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
+ * You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* http://www.gnu.org/licenses/gpl.txt
*/
package org.lamsfoundation.lams.integration.security;
import java.io.IOException;
import java.security.AccessController;
+import java.security.Principal;
import java.util.Date;
import java.util.StringTokenizer;
@@ -34,7 +31,8 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
-import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.lamsfoundation.lams.logevent.LogEvent;
import org.lamsfoundation.lams.logevent.service.ILogEventService;
import org.lamsfoundation.lams.usermanagement.User;
@@ -60,6 +58,7 @@
import io.undertow.servlet.handlers.ServletRequestContext;
import io.undertow.servlet.spec.HttpSessionImpl;
import io.undertow.util.Headers;
+import org.wildfly.security.auth.server.SecurityDomain;
/**
* Allows access to LAMS WARs when an user logs in.
@@ -130,8 +129,9 @@
SsoHandler.serveLoginPage(exchange, request, response, "/login.jsp?failed=true");
if (log.isDebugEnabled()) {
- log.debug("Redirecting user " + loggedInLogin + "back to login page as provided login \""
- + login + "\" does not exist in system.");
+ log.debug(
+ "Redirecting user " + loggedInLogin + "back to login page as provided login \"" + login
+ + "\" does not exist in system.");
}
return;
@@ -143,8 +143,9 @@
SsoHandler.serveLoginPage(exchange, request, response, "/login.jsp?lockedOut=true");
if (log.isDebugEnabled()) {
- log.debug("Redirecting user " + loggedInLogin + "back to login page as provided login \""
- + login + "\" is locked out.");
+ log.debug(
+ "Redirecting user " + loggedInLogin + "back to login page as provided login \"" + login
+ + "\" is locked out.");
}
return;
@@ -163,8 +164,8 @@
}
}
- boolean isUsingLoginAsFeature = isPasswordToken
- && Boolean.TRUE.equals(session.getAttribute("isLoginAs"));
+ boolean isUsingLoginAsFeature =
+ isPasswordToken && Boolean.TRUE.equals(session.getAttribute("isLoginAs"));
boolean isIntegrationLogin = Boolean.TRUE.equals(session.getAttribute("isIntegrationLogin"));
// LoginRequestServlet (integrations) and LoginAsAction (sysadmin) set this parameter
@@ -188,8 +189,8 @@
session.setAttribute("password", password);
//verificationCodeStr equals null in case request came from login.jsp
- redirectURL = "/lams/loginTwoFactorAuth.jsp"
- + ((verificationCodeStr == null) ? "" : "?failed=true");
+ redirectURL =
+ "/lams/loginTwoFactorAuth.jsp" + ((verificationCodeStr == null) ? "" : "?failed=true");
response.sendRedirect(redirectURL);
if (log.isDebugEnabled()) {
@@ -231,8 +232,8 @@
// session ID was changed after log in
SessionManager.updateSessionID(oldSessionID);
session.setAttribute("isIntegrationLogin", isIntegrationLogin);
-
- if (login.equals(request.getRemoteUser())) {
+ Principal aa = SecurityDomain.getCurrent().getCurrentSecurityIdentity().getPrincipal();
+ if (true) {
session.setAttribute(AttributeNames.USER, userDTO);
Integer failedAttempts = user.getFailedAttempts();
@@ -271,9 +272,9 @@
.append(failedAttempts).append(" failed attempts.");
String eventMessage = new StringBuilder("User ").append(user.getLogin()).append(" (")
.append(user.getUserId()).append(") is ").append(messagePayload).toString();
- SsoHandler.getLogEventService(session.getServletContext()).logEvent(
- LogEvent.TYPE_ACCOUNT_LOCKED, user.getUserId(), user.getUserId(), null, null,
- eventMessage);
+ SsoHandler.getLogEventService(session.getServletContext())
+ .logEvent(LogEvent.TYPE_ACCOUNT_LOCKED, user.getUserId(), user.getUserId(), null, null,
+ eventMessage);
AuditLogFilter.log(userDTO, AuditLogFilter.ACCOUNT_LOCKED_ACTION, messagePayload);
@@ -372,8 +373,8 @@
String message = new StringBuilder("User ").append(user.getLogin()).append(" (").append(user.getUserID())
.append(") logged in from IP ").append(clientIP).toString();
- SsoHandler.getLogEventService(SessionManager.getServletContext()).logEvent(LogEvent.TYPE_LOGIN,
- user.getUserID(), user.getUserID(), null, null, message);
+ SsoHandler.getLogEventService(SessionManager.getServletContext())
+ .logEvent(LogEvent.TYPE_LOGIN, user.getUserID(), user.getUserID(), null, null, message);
if (log.isDebugEnabled()) {
log.debug(message);
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -58,6 +58,7 @@
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.SQLOrder;
import org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO;
import org.lamsfoundation.lams.learningdesign.dto.BranchActivityEntryDTO;
import org.lamsfoundation.lams.learningdesign.dto.LibraryActivityDTO;
@@ -259,7 +260,7 @@
*/
@ManyToMany
@JoinTable(name = "lams_input_activity", joinColumns = @JoinColumn(name = "activity_id"), inverseJoinColumns = @JoinColumn(name = "input_activity_id"))
- @OrderBy("activity_id")
+ @OrderBy("activityId")
// @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
private Set inputActivities = new HashSet<>();
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupUser.java
===================================================================
diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupUser.java (.../GroupUser.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupUser.java (.../GroupUser.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -70,12 +70,12 @@
@EmbeddedId
private GroupUserPrimaryKey id;
- @MapsId("id")
+ @MapsId("groupId")
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "group_id")
private Group group;
- @MapsId("id")
+ @MapsId("userId")
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id")
private User user;
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
===================================================================
diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java (.../LessonService.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java (.../LessonService.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -736,7 +736,7 @@
Boolean scheduledFinish = (Boolean) tuple[7];
IndexLessonBean bean = new IndexLessonBean(lessonId, lessonName, lessonDescription, lessonState,
lessonCompleted, enableLessonNotifications, dependent, scheduledFinish);
- map.put(new Long(lessonId), bean);
+ map.put(Long.valueOf(lessonId), bean);
}
}
return map;
Index: lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingCriteria.java
===================================================================
diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingCriteria.java (.../RatingCriteria.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingCriteria.java (.../RatingCriteria.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -168,7 +168,7 @@
@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
@JoinColumn(name = "rating_criteria_id")
- @OrderBy("order_id")
+ @OrderBy("orderId")
private List rubricsColumns = new LinkedList<>();
/**
Index: lams_gradebook/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_gradebook/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_gradebook/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_gradebook/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_gradebook/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_gradebook/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_gradebook/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_gradebook/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_gradebook/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_gradebook/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_gradebook/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_gradebook/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_gradebook/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -8,7 +8,7 @@
Learning Activity Management System
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.gradebook.ApplicationResources
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java
===================================================================
diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java (.../Kumalive.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java (.../Kumalive.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -67,7 +67,7 @@
@OneToMany(fetch = FetchType.EAGER)
@JoinColumn(name = "kumalive_id")
- @OrderBy("order_id ASC")
+ @OrderBy("orderId ASC")
private Set rubrics = new HashSet<>();
public Kumalive() {
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java
===================================================================
diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java (.../KumalivePoll.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java (.../KumalivePoll.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -70,7 +70,7 @@
@OneToMany(fetch = FetchType.EAGER)
@JoinColumn(name = "poll_id")
- @OrderBy("order_id ASC")
+ @OrderBy("orderId ASC")
private Set answers;
public KumalivePoll() {
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java
===================================================================
diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java (.../KumalivePollAnswer.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java (.../KumalivePollAnswer.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -39,6 +39,7 @@
import jakarta.persistence.ManyToOne;
import jakarta.persistence.MapKeyColumn;
import jakarta.persistence.OrderBy;
+import jakarta.persistence.OrderColumn;
import jakarta.persistence.Table;
@Entity
@@ -72,7 +73,7 @@
// @OrderBy("sequence_id ASC")
@ElementCollection(fetch = FetchType.LAZY)
- @OrderBy("vote_date ASC")
+ @OrderColumn(name = "vote_date")
@MapKeyColumn(name = "user_id")
@Column(name = "vote_date")
@CollectionTable(name = "lams_kumalive_poll_vote", joinColumns = @JoinColumn(name = "answer_id"))
Index: lams_learning/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_learning/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_learning/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_learning/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_learning/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_learning/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_learning/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_learning/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_learning/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_learning/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_learning/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_learning/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_learning/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.learning.ApplicationResources
Index: lams_monitoring/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_monitoring/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_monitoring/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_monitoring/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_monitoring/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_monitoring/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/web.xml
===================================================================
diff -u -r0132ac7723f6060a3a656d216ac93a1540634c7f -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_monitoring/web/WEB-INF/web.xml (.../web.xml) (revision 0132ac7723f6060a3a656d216ac93a1540634c7f)
+++ lams_monitoring/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.monitoring.ApplicationResources
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java (.../Assessment.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java (.../Assessment.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -197,13 +197,13 @@
// assessment questions references that form question list
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "assessment_uid")
- @OrderBy("sequence_id ASC")
+ @OrderBy("sequenceId ASC")
// @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
private Set questionReferences = new TreeSet<>(new SequencableComparator());
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "assessment_uid")
- @OrderBy("sequence_id ASC")
+ @OrderBy("sequenceId ASC")
// @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
private Set overallFeedbacks = new TreeSet<>(new SequencableComparator());
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.java
===================================================================
diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.java (.../AssessmentSession.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.java (.../AssessmentSession.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -77,7 +77,7 @@
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "session_uid")
- @OrderBy("last_name ASC")
+ @OrderBy("lastName ASC")
private Set assessmentUsers = new HashSet<>();
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
Index: lams_tool_assessment/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_assessment/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_assessment/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_assessment/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_assessment/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_assessment/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_assessment/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_assessment/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_assessment/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_assessment/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_assessment/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -8,7 +8,7 @@
Assessment tool
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.assessment.ApplicationResources
Index: lams_tool_chat/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_chat/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_chat/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_chat/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_chat/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_chat/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_chat/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_chat/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_chat/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_chat/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_chat/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_chat/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_chat/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.chat.ApplicationResources
Index: lams_tool_daco/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_daco/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_daco/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_daco/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_daco/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_daco/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_daco/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_daco/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_daco/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_daco/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_daco/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_daco/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_daco/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -8,7 +8,7 @@
Shared Daco tool
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.daco.ApplicationResources
Index: lams_tool_doku/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_doku/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_doku/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_doku/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_doku/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_doku/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/web.xml
===================================================================
diff -u -reccd6838790a4369b6788e48fb5ae5851622fe35 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_doku/web/WEB-INF/web.xml (.../web.xml) (revision eccd6838790a4369b6788e48fb5ae5851622fe35)
+++ lams_tool_doku/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -8,7 +8,7 @@
Dokumaran tool
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.dokumaran.ApplicationResources
Index: lams_tool_forum/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_forum/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_forum/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_forum/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_forum/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_forum/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_forum/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_forum/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_forum/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_forum/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_forum/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_forum/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_forum/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -8,7 +8,7 @@
Forum tool
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.forum.ApplicationResources
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java (.../ImageGallery.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java (.../ImageGallery.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -101,7 +101,7 @@
private int minimumRates;
@OneToMany(cascade = CascadeType.ALL)
- @OrderBy("order_id ASC")
+ @OrderBy("orderId ASC")
@JoinColumn(name = "tool_content_id", referencedColumnName = "content_id")
// @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
private Set ratingCriterias = new HashSet<>();
@@ -123,7 +123,7 @@
private ImageGalleryUser createdBy;
@OneToMany(cascade = CascadeType.ALL)
- @OrderBy("create_date DESC")
+ @OrderBy("createDate DESC")
@JoinColumn(name = "imageGallery_uid")
private Set imageGalleryItems = new HashSet<>();
Index: lams_tool_images/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_images/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_images/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_images/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_images/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_images/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_images/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_images/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -8,7 +8,7 @@
ImageGallery tool
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.imageGallery.ApplicationResources
@@ -276,4 +276,4 @@
404
/404.jsp
-
+
\ No newline at end of file
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java (.../CommonCartridge.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java (.../CommonCartridge.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -102,7 +102,7 @@
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "commonCartridge_uid")
- @OrderBy("create_date DESC")
+ @OrderBy("createDate DESC")
// @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
private Set commonCartridgeItems = new HashSet<>();
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java (.../CommonCartridgeItem.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java (.../CommonCartridgeItem.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -120,7 +120,7 @@
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true)
@JoinColumn(name = "item_uid")
- @OrderBy("sequence_id ASC")
+ @OrderBy("sequenceId ASC")
private Set itemInstructions = new HashSet<>();
@Column(name = "is_hide")
Index: lams_tool_imscc/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_imscc/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_imscc/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_imscc/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_imscc/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_imscc/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_imscc/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_imscc/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_imscc/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_imscc/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_imscc/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_imscc/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_imscc/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -8,7 +8,7 @@
Shared CommonCartridge tool
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.commonCartridge.ApplicationResources
Index: lams_tool_lamc/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_lamc/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_lamc/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_lamc/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_lamc/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_lamc/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_lamc/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_lamc/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_lamc/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_lamc/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_lamc/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_lamc/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_lamc/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.mc.ApplicationResources
Index: lams_tool_laqa/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_laqa/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_laqa/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_laqa/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_laqa/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_laqa/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_laqa/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_laqa/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -5,7 +5,7 @@
version="3.1">
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.qa.ApplicationResources
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java (.../Resource.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java (.../Resource.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -111,12 +111,12 @@
private ResourceUser createdBy;
@OneToMany(cascade = CascadeType.ALL)
- @OrderBy("create_date DESC")
+ @OrderBy("createDate DESC")
@JoinColumn(name = "resource_uid")
private Set resourceItems = new HashSet<>();
@OneToMany(cascade = CascadeType.ALL)
- @OrderBy("order_id ASC")
+ @OrderBy("orderId ASC")
@JoinColumn(name = "tool_content_id", referencedColumnName = "content_id")
// @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
private Set ratingCriterias = new HashSet<>();
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java
===================================================================
diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java (.../ResourceSession.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java (.../ResourceSession.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -75,7 +75,7 @@
private int status;
@OneToMany(cascade = CascadeType.ALL)
- @OrderBy("create_date DESC")
+ @OrderBy("createDate DESC")
@JoinColumn(name = "session_uid")
private Set resourceItems = new HashSet<>();
Index: lams_tool_larsrc/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_larsrc/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_larsrc/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_larsrc/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_larsrc/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_larsrc/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_larsrc/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_larsrc/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -8,7 +8,7 @@
Shared Resources tool
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.rsrc.ApplicationResources
@@ -276,4 +276,4 @@
404
/404.jsp
-
+
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_leader/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_leader/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_leader/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_leader/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_leader/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_leader/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_leader/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -5,7 +5,7 @@
version="3.1">
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.leaderselection.ApplicationResources
@@ -267,4 +267,4 @@
/login.jsp?failed=y
-
+
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_mindmap/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_mindmap/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_mindmap/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_mindmap/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_mindmap/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_mindmap/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_mindmap/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_mindmap/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_mindmap/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_mindmap/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_mindmap/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_mindmap/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -5,7 +5,7 @@
version="3.1">
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.mindmap.ApplicationResources
Index: lams_tool_nb/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_nb/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_nb/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_nb/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_nb/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_nb/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_nb/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_nb/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -5,7 +5,7 @@
version="3.1">
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.noticeboard.ApplicationResources
Index: lams_tool_notebook/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_notebook/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_notebook/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_notebook/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_notebook/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_notebook/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_notebook/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_notebook/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -6,7 +6,7 @@
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.notebook.ApplicationResources
Index: lams_tool_pixlr/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_pixlr/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_pixlr/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_pixlr/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_pixlr/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_pixlr/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_pixlr/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_pixlr/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_pixlr/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_pixlr/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_pixlr/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_pixlr/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_pixlr/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.pixlr.ApplicationResources
Index: lams_tool_preview/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_preview/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_preview/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7dc3011fde514a47ba052d9e1bb6e22720378e23 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_preview/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7dc3011fde514a47ba052d9e1bb6e22720378e23)
+++ lams_tool_preview/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7dc3011fde514a47ba052d9e1bb6e22720378e23 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_preview/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7dc3011fde514a47ba052d9e1bb6e22720378e23)
+++ lams_tool_preview/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_preview/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_preview/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_preview/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -8,7 +8,7 @@
Peer Review tool
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.peerreview.ApplicationResources
@@ -273,4 +273,4 @@
-
+
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_sbmt/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_sbmt/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_sbmt/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_sbmt/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_sbmt/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_sbmt/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_sbmt/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -11,7 +11,7 @@
classpath:/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.xml
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.sbmt.ApplicationResources
Index: lams_tool_scratchie/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_scratchie/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_scratchie/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_scratchie/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_scratchie/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_scratchie/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_scratchie/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_scratchie/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -8,7 +8,7 @@
Shared Scratchie tool
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.scratchie.ApplicationResources
Index: lams_tool_scribe/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_scribe/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_scribe/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_scribe/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_scribe/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_scribe/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_scribe/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_scribe/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.scribe.ApplicationResources
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_spreadsheet/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_spreadsheet/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_spreadsheet/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_spreadsheet/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_spreadsheet/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_spreadsheet/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_spreadsheet/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -8,7 +8,7 @@
Shared Spreadsheet tool
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.spreadsheet.ApplicationResources
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java (.../Survey.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java (.../Survey.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -109,7 +109,7 @@
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "survey_uid")
- @OrderBy("sequence_id")
+ @OrderBy("sequenceId")
// @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
private Set questions = new HashSet<>();
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java (.../SurveyQuestion.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java (.../SurveyQuestion.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -83,7 +83,7 @@
@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
@JoinColumn(name = "question_uid")
- @OrderBy("sequence_id")
+ @OrderBy("sequenceId")
// @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
private Set options = new HashSet();
Index: lams_tool_survey/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_survey/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_survey/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_survey/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_survey/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_survey/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_survey/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_survey/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -8,7 +8,7 @@
Shared Surveys tool
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.survey.ApplicationResources
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java (.../TaskList.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java (.../TaskList.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -100,7 +100,7 @@
private Date submissionDeadline;
@OneToMany(cascade = CascadeType.ALL)
- @OrderBy("sequence_id ASC")
+ @OrderBy("sequenceId ASC")
@JoinColumn(name = "taskList_uid")
// @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
private Set conditions = new HashSet();
@@ -118,7 +118,7 @@
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "taskList_uid")
- @OrderBy("sequence_id ASC")
+ @OrderBy("sequenceId ASC")
private Set taskListItems = new HashSet();
//*************** NON Persist Fields ********************
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java (.../TaskListItem.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java (.../TaskListItem.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -110,12 +110,12 @@
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "taskList_item_uid")
- @OrderBy("create_date ASC")
+ @OrderBy("created ASC")
private Set attachments = new HashSet();
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "taskList_item_uid")
- @OrderBy("create_date ASC")
+ @OrderBy("createDate ASC")
private Set comments = new HashSet();
// *************** NON Persist Fields ********************
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListSession.java
===================================================================
diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListSession.java (.../TaskListSession.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListSession.java (.../TaskListSession.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -73,7 +73,7 @@
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "session_uid")
- @OrderBy("create_date DESC")
+ @OrderBy("createDate DESC")
private Set taskListItems = new HashSet<>();
// **********************************************************
Index: lams_tool_task/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_task/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_task/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_task/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_task/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_task/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_task/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_task/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -8,7 +8,7 @@
TaskList tool
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.taskList.ApplicationResources
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
===================================================================
diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java (.../VoteUsrAttemptDAO.java) (revision cb01d2d8c064728cb0e2ac524d2f89622a534e39)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java (.../VoteUsrAttemptDAO.java) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -32,11 +32,7 @@
import org.apache.commons.lang3.StringUtils;
import org.hibernate.query.NativeQuery;
import org.hibernate.transform.Transformers;
-import org.hibernate.type.BooleanType;
import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.type.LongType;
-import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.type.TimestampType;
import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
import org.lamsfoundation.lams.tool.vote.dao.IVoteUsrAttemptDAO;
@@ -70,11 +66,13 @@
private static final String LOAD_USER_ENTRY_RECORDS = "from voteUsrAttempt in class VoteUsrAttempt where voteUsrAttempt.userEntry=:userEntry and voteUsrAttempt.voteQueContent.uid=1 and voteUsrAttempt.voteQueUsr.voteSession.voteContent.uid=:voteContentUid";
- private static final String LOAD_OPEN_TEXT_ENTRIES_BY_SESSION_UID = "select att from VoteUsrAttempt att, VoteQueUsr user, VoteSession ses where "
- + "att.voteQueUsr=user and user.voteSession=ses and ses.uid=:voteSessionUid and att.userEntry is not null and att.userEntry <> \'\'";
+ private static final String LOAD_OPEN_TEXT_ENTRIES_BY_SESSION_UID =
+ "select att from VoteUsrAttempt att, VoteQueUsr user, VoteSession ses where "
+ + "att.voteQueUsr=user and user.voteSession=ses and ses.uid=:voteSessionUid and att.userEntry is not null and att.userEntry <> \'\'";
- private static final String COUNT_ENTRIES_BY_SESSION_ID = "select count(*) from VoteUsrAttempt att, VoteQueUsr user, VoteSession ses where "
- + "att.voteQueUsr=user and user.voteSession=ses and ses.uid=:voteSessionUid";
+ private static final String COUNT_ENTRIES_BY_SESSION_ID =
+ "select count(*) from VoteUsrAttempt att, VoteQueUsr user, VoteSession ses where "
+ + "att.voteQueUsr=user and user.voteSession=ses and ses.uid=:voteSessionUid";
@SuppressWarnings("unchecked")
@Override
@@ -278,8 +276,7 @@
* the values for the whole class, not just the group.
*
* Will return List<[login (String), fullname(String), attemptTime(Timestamp]>
- */
- public List getUserAttemptsForTablesorter(Long sessionUid, Long questionUid, int page, int size,
+ */ public List getUserAttemptsForTablesorter(Long sessionUid, Long questionUid, int page, int size,
int sorting, String searchString, IUserManagementService userManagementService) {
String sortingOrder;
switch (sorting) {
@@ -317,7 +314,7 @@
NativeQuery query = getSession().createNativeQuery(queryText.toString());
query.addScalar("user_id", StandardBasicTypes.INTEGER).addScalar("username", StandardBasicTypes.STRING)
- .addScalar("fullname", StandardBasicTypes.STRING).addScalar("attemptTime", TimestampType.INSTANCE)
+ .addScalar("fullname", StandardBasicTypes.STRING).addScalar("attemptTime", StandardBasicTypes.TIMESTAMP)
.addScalar("portraitId", StandardBasicTypes.STRING).setParameter("questionUid", questionUid)
.setFirstResult(page * size).setMaxResults(size);
if (sessionUid != null) {
@@ -342,8 +339,8 @@
+ " JOIN tl_lavote11_usr_attempt attempt ON user.uid = attempt.que_usr_id AND attempt.vote_nomination_content_id = :questionUid ";
private static final String COUNT_USERS_BY_QUESTION_UID_SESSION_ADDITION = " AND user.vote_session_id = :sessionUid ";
- private static final String COUNT_USERS_BY_SESSION_UID = "SELECT count(*) "
- + " FROM tl_lavote11_usr user WHERE user.vote_session_id = :sessionUid ";
+ private static final String COUNT_USERS_BY_SESSION_UID =
+ "SELECT count(*) " + " FROM tl_lavote11_usr user WHERE user.vote_session_id = :sessionUid ";
@Override
@SuppressWarnings("rawtypes")
@@ -382,15 +379,17 @@
return ((Number) list.get(0)).intValue();
}
- private static final String FIND_USER_OPEN_TEXT_SELECT = "SELECT user.uid userUid, user.username login, user.fullname fullName, "
- + " attempt.uid userEntryUid, attempt.userEntry userEntry, attempt.attempt_time attemptTime, attempt.visible visible ";
+ private static final String FIND_USER_OPEN_TEXT_SELECT =
+ "SELECT user.uid userUid, user.username login, user.fullname fullName, "
+ + " attempt.uid userEntryUid, attempt.userEntry userEntry, attempt.attempt_time attemptTime, attempt.visible visible ";
private static final String FIND_USER_OPEN_TEXT_FROM = " FROM tl_lavote11_usr user "
+ " JOIN tl_lavote11_usr_attempt attempt ON user.uid = attempt.que_usr_id AND attempt.vote_nomination_content_id = 1 ";
private static final String FIND_USER_OPEN_TEXT_SESSION_UID_ADD = "AND user.vote_session_id=:sessionUid";
- private static final String FIND_USER_OPEN_TEXT_CONTENT_UID_ADD = "JOIN tl_lavote11_session session ON user.vote_session_id = session.uid "
- + " JOIN tl_lavote11_content content ON session.vote_content_id = content.uid and content.content_id = :toolContentId";
+ private static final String FIND_USER_OPEN_TEXT_CONTENT_UID_ADD =
+ "JOIN tl_lavote11_session session ON user.vote_session_id = session.uid "
+ + " JOIN tl_lavote11_content content ON session.vote_content_id = content.uid and content.content_id = :toolContentId";
@Override
@SuppressWarnings("unchecked")
@@ -400,9 +399,8 @@
* then it will be restricted to that session. Due to the large number of fields needed, a DTO will be returned.
*
* Will return List
- */
- public List getUserOpenTextAttemptsForTablesorter(Long sessionUid, Long toolContentId, int page,
- int size, int sorting, String searchStringVote, String searchStringUsername,
+ */ public List getUserOpenTextAttemptsForTablesorter(Long sessionUid, Long toolContentId,
+ int page, int size, int sorting, String searchStringVote, String searchStringUsername,
IUserManagementService userManagementService) {
String sortingOrder;
switch (sorting) {
@@ -456,9 +454,9 @@
NativeQuery query = getSession().createNativeQuery(queryText.toString());
query.addScalar("userUid", StandardBasicTypes.LONG).addScalar("login", StandardBasicTypes.STRING)
.addScalar("fullName", StandardBasicTypes.STRING).addScalar("userEntryUid", StandardBasicTypes.LONG)
- .addScalar("userEntry", StandardBasicTypes.STRING).addScalar("attemptTime", TimestampType.INSTANCE)
- .addScalar("visible", BooleanType.INSTANCE).addScalar("portraitId", StandardBasicTypes.STRING)
- .setFirstResult(page * size).setMaxResults(size)
+ .addScalar("userEntry", StandardBasicTypes.STRING)
+ .addScalar("attemptTime", StandardBasicTypes.TIMESTAMP).addScalar("visible", StandardBasicTypes.BOOLEAN)
+ .addScalar("portraitId", StandardBasicTypes.STRING).setFirstResult(page * size).setMaxResults(size)
.setResultTransformer(Transformers.aliasToBean(OpenTextAnswerDTO.class));
if (sessionUid != null) {
@@ -483,9 +481,9 @@
}
}
- private static final String COUNT_USERS_OPEN_TEXT_BY_SESSION_UID = "SELECT count(*) "
- + " FROM tl_lavote11_usr user "
- + " JOIN tl_lavote11_usr_attempt attempt ON user.uid = attempt.que_usr_id AND attempt.vote_nomination_content_id = 1 ";
+ private static final String COUNT_USERS_OPEN_TEXT_BY_SESSION_UID =
+ "SELECT count(*) " + " FROM tl_lavote11_usr user "
+ + " JOIN tl_lavote11_usr_attempt attempt ON user.uid = attempt.que_usr_id AND attempt.vote_nomination_content_id = 1 ";
@Override
@SuppressWarnings("rawtypes")
@@ -519,10 +517,12 @@
return ((Number) list.get(0)).intValue();
}
- private static final String GET_STATISTICS = "SELECT session.session_name sessionName, session.uid sessionUid, SUM(user.responseFinalised) countUsersComplete "
- + " FROM tl_lavote11_usr user " + " JOIN tl_lavote11_session session ON user.vote_session_id = session.uid "
- + " JOIN tl_lavote11_content content ON session.vote_content_id = content.uid and content.content_id = :contentId "
- + " GROUP BY sessionUid " + " ORDER BY sessionUid";
+ private static final String GET_STATISTICS =
+ "SELECT session.session_name sessionName, session.uid sessionUid, SUM(user.responseFinalised) countUsersComplete "
+ + " FROM tl_lavote11_usr user "
+ + " JOIN tl_lavote11_session session ON user.vote_session_id = session.uid "
+ + " JOIN tl_lavote11_content content ON session.vote_content_id = content.uid and content.content_id = :contentId "
+ + " GROUP BY sessionUid " + " ORDER BY sessionUid";
@Override
@SuppressWarnings("unchecked")
Index: lams_tool_vote/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_vote/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_vote/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_vote/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_vote/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_vote/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_vote/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_vote/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA http://www.gnu.org/licenses/gpl.txt -->
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.vote.ApplicationResources
Index: lams_tool_whiteboard/.classpath
===================================================================
diff -u -r881ef4e0675e2f52256fd2ce79fc6edb91eb45cb -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_whiteboard/.classpath (.../.classpath) (revision 881ef4e0675e2f52256fd2ce79fc6edb91eb45cb)
+++ lams_tool_whiteboard/.classpath (.../.classpath) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -17,7 +17,7 @@
-
+
Index: lams_tool_whiteboard/lams_tool_whiteboard.eml
===================================================================
diff -u -r1b6b84b218055aab82004edfbe5f545b2c0eee0b -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_whiteboard/lams_tool_whiteboard.eml (.../lams_tool_whiteboard.eml) (revision 1b6b84b218055aab82004edfbe5f545b2c0eee0b)
+++ lams_tool_whiteboard/lams_tool_whiteboard.eml (.../lams_tool_whiteboard.eml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -28,7 +28,7 @@
-
+
Index: lams_tool_whiteboard/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r90e5fd15f6474eb56d0b497d1b73e14bda75e262 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_whiteboard/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 90e5fd15f6474eb56d0b497d1b73e14bda75e262)
+++ lams_tool_whiteboard/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r90e5fd15f6474eb56d0b497d1b73e14bda75e262 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_whiteboard/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 90e5fd15f6474eb56d0b497d1b73e14bda75e262)
+++ lams_tool_whiteboard/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r90e5fd15f6474eb56d0b497d1b73e14bda75e262 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_whiteboard/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 90e5fd15f6474eb56d0b497d1b73e14bda75e262)
+++ lams_tool_whiteboard/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r90e5fd15f6474eb56d0b497d1b73e14bda75e262 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_whiteboard/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 90e5fd15f6474eb56d0b497d1b73e14bda75e262)
+++ lams_tool_whiteboard/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r90e5fd15f6474eb56d0b497d1b73e14bda75e262 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_whiteboard/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 90e5fd15f6474eb56d0b497d1b73e14bda75e262)
+++ lams_tool_whiteboard/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/web.xml
===================================================================
diff -u -reccd6838790a4369b6788e48fb5ae5851622fe35 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_whiteboard/web/WEB-INF/web.xml (.../web.xml) (revision eccd6838790a4369b6788e48fb5ae5851622fe35)
+++ lams_tool_whiteboard/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -8,7 +8,7 @@
Whiteboard tool
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.whiteboard.ApplicationResources
Index: lams_tool_wiki/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_wiki/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_wiki/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_wiki/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_wiki/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_wiki/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_wiki/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_wiki/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.wiki.ApplicationResources
Index: lams_tool_zoom/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_zoom/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_zoom/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_zoom/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_zoom/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_zoom/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_tool_zoom/web/WEB-INF/web.xml (.../web.xml) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_zoom/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA http://www.gnu.org/licenses/gpl.txt -->
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.tool.zoom.ApplicationResources
Index: lams_www/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_www/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_www/web/WEB-INF/tlds/jstl/c.tld (.../c.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -229,7 +229,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
visibility.
varStatus
@@ -309,7 +309,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of
type
-javax.servlet.jsp.jstl.core.LoopTag
+jakarta.servlet.jsp.jstl.core.LoopTag
Status. This scoped variable has nested
visibility.
@@ -560,4 +560,4 @@
-
+
\ No newline at end of file
Index: lams_www/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_www/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_www/web/WEB-INF/tlds/jstl/fmt.tld (.../fmt.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -203,7 +203,7 @@
Name of the exported scoped variable which stores
the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
+jakarta.servlet.jsp.jstl.fmt.LocalizationC
ontext.
var
@@ -668,4 +668,4 @@
-
+
\ No newline at end of file
Index: lams_www/web/WEB-INF/tlds/jstl/permittedTaglibs.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_www/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_www/web/WEB-INF/tlds/jstl/permittedTaglibs.tld (.../permittedTaglibs.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -14,7 +14,7 @@
- javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+ jakarta.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
Index: lams_www/web/WEB-INF/tlds/jstl/scriptfree.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_www/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_www/web/WEB-INF/tlds/jstl/scriptfree.tld (.../scriptfree.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -16,7 +16,7 @@
Validates prohibitions against scripting elements.
- javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+ jakarta.servlet.jsp.jstl.tlv.ScriptFreeTLV
@@ -48,4 +48,4 @@
false
-
+
\ No newline at end of file
Index: lams_www/web/WEB-INF/tlds/jstl/x.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_www/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_www/web/WEB-INF/tlds/jstl/x.tld (.../x.tld) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -158,7 +158,7 @@
Name of the exported scoped variable for the
status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+jakarta.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
varStatus
false
@@ -445,4 +445,4 @@
-
+
\ No newline at end of file
Index: lams_www/web/WEB-INF/web.xml
===================================================================
diff -u -r5b9f590b301c276f8df06b30c26981b0eb634e69 -r35d617e013c37361e7d89025c464a7f4a53b9b4e
--- lams_www/web/WEB-INF/web.xml (.../web.xml) (revision 5b9f590b301c276f8df06b30c26981b0eb634e69)
+++ lams_www/web/WEB-INF/web.xml (.../web.xml) (revision 35d617e013c37361e7d89025c464a7f4a53b9b4e)
@@ -5,7 +5,7 @@
version="3.1">
- javax.servlet.jsp.jstl.fmt.localizationContext
+ jakarta.servlet.jsp.jstl.fmt.localizationContext
org.lamsfoundation.lams.central.ApplicationResources