Update examples for changed libraries/packages

OpenNTF · May 22, 2024 · 3d9c23f · 3d9c23f
1 parent d694bbf
commit 3d9c23f
Show file tree

Hide file tree

Showing 38 changed files with 111 additions and 203 deletions.
diff --git a/examples/code-first-rest/odp/AppProperties/xspdesign.properties b/examples/code-first-rest/odp/AppProperties/xspdesign.properties
@@ -1 +1 @@
-#Fri Aug 26 09:39:19 EDT 2022
+#Wed May 22 08:06:29 PDT 2024
diff --git a/examples/code-first-rest/odp/Code/Java/model/Employee.java b/examples/code-first-rest/odp/Code/Java/model/Employee.java
@@ -3,20 +3,20 @@
 import java.util.stream.Stream;
 
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
-import org.openntf.xsp.nosql.mapping.extension.DominoRepository;
+import org.openntf.xsp.jakarta.nosql.mapping.extension.DominoRepository;
 
-import jakarta.nosql.mapping.Column;
-import jakarta.nosql.mapping.Entity;
-import jakarta.nosql.mapping.Id;
-import jakarta.nosql.mapping.Sorts;
+import jakarta.nosql.Column;
+import jakarta.nosql.Entity;
+import jakarta.nosql.Id;
+import jakarta.data.Sort;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotEmpty;
 
 @Schema(description = "Represents an individual employee within the system")
 @Entity
 public class Employee {
 	public interface Repository extends DominoRepository<Employee, String> {
-		Stream<Employee> findAll(Sorts sorts);
+		Stream<Employee> findAll(Sort<?> sorts);
 	}
 
 	private @Id String id;

diff --git a/examples/code-first-rest/odp/Code/Java/rest/EmployeeResource.java b/examples/code-first-rest/odp/Code/Java/rest/EmployeeResource.java
@@ -7,7 +7,7 @@
 import org.eclipse.microprofile.openapi.annotations.Operation;
 
 import jakarta.inject.Inject;
-import jakarta.nosql.mapping.Sorts;
+import jakarta.data.Sort;
 import jakarta.validation.Valid;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.DELETE;
@@ -31,7 +31,7 @@ public class EmployeeResource {
 	@Produces(MediaType.APPLICATION_JSON)
 	@Operation(description="Retrieves a list of all employee entities in the data store")
 	public List<Employee> get() {
-		return employees.findAll(Sorts.sorts().asc("name")).collect(Collectors.toList());
+		return employees.findAll(Sort.asc("name")).collect(Collectors.toList());
 	}
 
 	@POST

diff --git a/examples/code-first-rest/odp/WebContent/WEB-INF/xsp.properties b/examples/code-first-rest/odp/WebContent/WEB-INF/xsp.properties
@@ -3,4 +3,4 @@ xsp.client.script.radioCheckbox.ie.onchange.trigger=early-onclick
 xsp.csrf.protection=true
 xsp.persistence.mode=file
 xsp.resources.aggregate=true
-xsp.library.depends=org.openntf.xsp.nosql,org.openntf.xsp.beanvalidation,org.openntf.xsp.jakarta.servlet,org.openntf.xsp.cdi,org.openntf.xsp.microprofile.health,org.openntf.xsp.jaxrs,org.openntf.xsp.mvc,org.openntf.xsp.jsp,org.openntf.xsp.microprofile.fault.tolerance,org.openntf.xsp.jsonapi,org.openntf.xsp.jsf,org.openntf.xsp.el,org.openntf.xsp.microprofile.rest.client,org.openntf.xsp.microprofile.config
+xsp.library.depends=org.openntf.xsp.jakartaee.core,org.openntf.xsp.microprofile
diff --git a/examples/code-first-rest/odp/plugin.xml b/examples/code-first-rest/odp/plugin.xml
@@ -17,20 +17,8 @@
     <import optional="true" plugin="com.ibm.xsp.domino"/>
     <import optional="true" plugin="com.ibm.notes.java.api"/>
     <import optional="true" plugin="com.ibm.xsp.rcp"/>
-    <import optional="true" plugin="org.openntf.xsp.nosql"/>
-    <import optional="true" plugin="org.openntf.xsp.beanvalidation"/>
-    <import optional="true" plugin="org.openntf.xsp.jakarta.servlet"/>
-    <import optional="true" plugin="org.openntf.xsp.cdi"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.health"/>
-    <import optional="true" plugin="org.openntf.xsp.jaxrs"/>
-    <import optional="true" plugin="org.openntf.xsp.mvc"/>
-    <import optional="true" plugin="org.openntf.xsp.jsp"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.fault.tolerance"/>
-    <import optional="true" plugin="org.openntf.xsp.jsonapi"/>
-    <import optional="true" plugin="org.openntf.xsp.jsf"/>
-    <import optional="true" plugin="org.openntf.xsp.el"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.rest.client"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.config"/>
+    <import optional="true" plugin="org.openntf.xsp.jakartaee.core.library"/>
+    <import optional="true" plugin="org.openntf.xsp.microprofile.library"/>
     <!--AUTOGEN-END-BUILDER: End of automatically generated section-->
   </requires>
 </plugin>

diff --git a/examples/restclient-github/odp/AppProperties/xspdesign.properties b/examples/restclient-github/odp/AppProperties/xspdesign.properties
@@ -0,0 +1 @@
+#Wed May 22 08:10:45 PDT 2024
diff --git a/examples/restclient-github/odp/WebContent/WEB-INF/xsp.properties b/examples/restclient-github/odp/WebContent/WEB-INF/xsp.properties
@@ -2,7 +2,4 @@ xsp.ajax.renderwholetree=false
 xsp.client.script.radioCheckbox.ie.onchange.trigger=early-onclick
 xsp.csrf.protection=true
 xsp.error.page.default=true
-xsp.library.depends=com.ibm.xsp.extlib.library,org.openntf.xsp.beanvalidation,org.openntf.xsp.microprofile.config,org.openntf.xsp.jakarta.servlet,org.openntf.xsp.cdi,org.openntf.xsp.jaxrs,org.openntf.xsp.microprofile.health,org.openntf.xsp.jsp,org.openntf.xsp.mvc,org.openntf.xsp.nosql,org.openntf.xsp.microprofile.fault.tolerance,org.openntf.xsp.jsonapi,org.openntf.xsp.jsf,org.openntf.xsp.el,org.openntf.xsp.microprofile.rest.client
-xsp.persistence.mode=file
-xsp.resources.aggregate=true
-xsp.theme=App.theme
+xsp.library.depends=com.ibm.xsp.extlib.library,org.openntf.xsp.microprofile,org.openntf.xsp.jakartaee.core
diff --git a/examples/restclient-github/odp/plugin.xml b/examples/restclient-github/odp/plugin.xml
@@ -18,20 +18,8 @@
     <import optional="true" plugin="com.ibm.notes.java.api"/>
     <import optional="true" plugin="com.ibm.xsp.rcp"/>
     <import optional="true" plugin="com.ibm.xsp.extlib"/>
-    <import optional="true" plugin="org.openntf.xsp.beanvalidation"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.config"/>
-    <import optional="true" plugin="org.openntf.xsp.jakarta.servlet"/>
-    <import optional="true" plugin="org.openntf.xsp.cdi"/>
-    <import optional="true" plugin="org.openntf.xsp.jaxrs"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.health"/>
-    <import optional="true" plugin="org.openntf.xsp.jsp"/>
-    <import optional="true" plugin="org.openntf.xsp.mvc"/>
-    <import optional="true" plugin="org.openntf.xsp.nosql"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.fault.tolerance"/>
-    <import optional="true" plugin="org.openntf.xsp.jsonapi"/>
-    <import optional="true" plugin="org.openntf.xsp.jsf"/>
-    <import optional="true" plugin="org.openntf.xsp.el"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.rest.client"/>
+    <import optional="true" plugin="org.openntf.xsp.microprofile.library"/>
+    <import optional="true" plugin="org.openntf.xsp.jakartaee.core.library"/>
     <!--AUTOGEN-END-BUILDER: End of automatically generated section-->
   </requires>
 </plugin>

diff --git a/examples/rieckpil-nice-looking-jsf/odp/AppProperties/xspdesign.properties b/examples/rieckpil-nice-looking-jsf/odp/AppProperties/xspdesign.properties
@@ -1 +1 @@
-#Tue May 16 14:44:16 EDT 2023
+#Wed May 22 08:11:54 PDT 2024
diff --git a/examples/rieckpil-nice-looking-jsf/odp/WebContent/WEB-INF/xsp.properties b/examples/rieckpil-nice-looking-jsf/odp/WebContent/WEB-INF/xsp.properties
@@ -3,6 +3,4 @@ xsp.client.script.radioCheckbox.ie.onchange.trigger=early-onclick
 xsp.csrf.protection=true
 xsp.persistence.mode=file
 xsp.resources.aggregate=true
-xsp.library.depends=org.openntf.xsp.beanvalidation,org.openntf.xsp.microprofile.config,org.openntf.xsp.jakarta.servlet,org.openntf.xsp.cdi,org.openntf.xsp.jaxrs,org.openntf.xsp.microprofile.health,org.openntf.xsp.mvc,org.openntf.xsp.jsp,org.openntf.xsp.jakarta.persistence,org.openntf.xsp.nosql,org.openntf.xsp.microprofile.fault.tolerance,org.openntf.xsp.jsonapi,org.openntf.xsp.el,org.openntf.xsp.jsf,org.openntf.xsp.microprofile.rest.client
-jakarta.faces.PROJECT_STAGE=Development
-xsp.application.forcefullrefresh=true
+xsp.library.depends=org.openntf.xsp.jakartaee.core,org.openntf.xsp.jakartaee.ui
diff --git a/examples/rieckpil-nice-looking-jsf/odp/plugin.xml b/examples/rieckpil-nice-looking-jsf/odp/plugin.xml
@@ -17,21 +17,8 @@
     <import optional="true" plugin="com.ibm.xsp.domino"/>
     <import optional="true" plugin="com.ibm.notes.java.api"/>
     <import optional="true" plugin="com.ibm.xsp.rcp"/>
-    <import optional="true" plugin="org.openntf.xsp.beanvalidation"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.config"/>
-    <import optional="true" plugin="org.openntf.xsp.jakarta.servlet"/>
-    <import optional="true" plugin="org.openntf.xsp.cdi"/>
-    <import optional="true" plugin="org.openntf.xsp.jaxrs"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.health"/>
-    <import optional="true" plugin="org.openntf.xsp.mvc"/>
-    <import optional="true" plugin="org.openntf.xsp.jsp"/>
-    <import optional="true" plugin="org.openntf.xsp.jakarta.persistence"/>
-    <import optional="true" plugin="org.openntf.xsp.nosql"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.fault.tolerance"/>
-    <import optional="true" plugin="org.openntf.xsp.jsonapi"/>
-    <import optional="true" plugin="org.openntf.xsp.el"/>
-    <import optional="true" plugin="org.openntf.xsp.jsf"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.rest.client"/>
+    <import optional="true" plugin="org.openntf.xsp.jakartaee.core.library"/>
+    <import optional="true" plugin="org.openntf.xsp.jakartaee.ui.library"/>
     <!--AUTOGEN-END-BUILDER: End of automatically generated section-->
   </requires>
 </plugin>

diff --git a/examples/todo/faces/odp/AppProperties/xspdesign.properties b/examples/todo/faces/odp/AppProperties/xspdesign.properties
@@ -1 +1 @@
-#Wed Aug 23 15:51:46 EDT 2023
+#Wed May 22 08:13:34 PDT 2024
diff --git a/examples/todo/faces/odp/Code/Java/controller/ToDosController.java b/examples/todo/faces/odp/Code/Java/controller/ToDosController.java
@@ -12,7 +12,7 @@
 import jakarta.faces.event.AjaxBehaviorEvent;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
-import jakarta.nosql.mapping.Sorts;
+import jakarta.data.Sort;
 import model.ToDo;
 
 @RequestScoped
@@ -28,9 +28,9 @@ public class ToDosController {
 
 	public List<ToDo> list(ToDo.State status) {
 		if(status == null) {
-			return repository.findAll(Sorts.sorts().asc("created")).collect(Collectors.toList());
+			return repository.findAll(Sort.asc("created")).collect(Collectors.toList());
 		} else {
-			return repository.findByStatus(status, Sorts.sorts().asc("created")).collect(Collectors.toList());
+			return repository.findByStatus(status, Sort.asc("created")).collect(Collectors.toList());
 		}
 	}
 

diff --git a/examples/todo/faces/odp/Code/Java/model/CurrentRepositoryProvider.java b/examples/todo/faces/odp/Code/Java/model/CurrentRepositoryProvider.java
@@ -1,14 +1,14 @@
 package model;
 
-import org.openntf.xsp.nosql.communication.driver.DominoDocumentCollectionManager;
-import org.openntf.xsp.nosql.communication.driver.lsxbe.impl.DefaultDominoDocumentCollectionManager;
+import org.eclipse.jnosql.mapping.Database;
+import org.eclipse.jnosql.mapping.DatabaseType;
+import org.openntf.xsp.jakarta.nosql.communication.driver.DominoDocumentManager;
+import org.openntf.xsp.jakarta.nosql.communication.driver.lsxbe.impl.DefaultDominoDocumentCollectionManager;
 
 import com.ibm.domino.xsp.module.nsf.NotesContext;
 
 import jakarta.enterprise.context.RequestScoped;
 import jakarta.enterprise.inject.Produces;
-import jakarta.nosql.mapping.Database;
-import jakarta.nosql.mapping.DatabaseType;
 
 /**
  * Workaround for present lack of sessionAsSigner in JSF for
@@ -19,7 +19,7 @@
 public class CurrentRepositoryProvider {
 	@Produces
 	@Database(value = DatabaseType.DOCUMENT, provider = "current")
-	public DominoDocumentCollectionManager getCurrentManager() {
+	public DominoDocumentManager getCurrentManager() {
 		return new DefaultDominoDocumentCollectionManager(
 			() -> NotesContext.getCurrent().getCurrentDatabase(),
 			() -> NotesContext.getCurrent().getCurrentSession()

diff --git a/examples/todo/faces/odp/Code/Java/model/ToDo.java b/examples/todo/faces/odp/Code/Java/model/ToDo.java
@@ -4,13 +4,13 @@
 import java.time.OffsetDateTime;
 import java.util.stream.Stream;
 
-import org.openntf.xsp.nosql.mapping.extension.DominoRepository;
-import org.openntf.xsp.nosql.mapping.extension.RepositoryProvider;
+import org.openntf.xsp.jakarta.nosql.mapping.extension.DominoRepository;
+import org.openntf.xsp.jakarta.nosql.mapping.extension.RepositoryProvider;
 
-import jakarta.nosql.mapping.Column;
-import jakarta.nosql.mapping.Entity;
-import jakarta.nosql.mapping.Id;
-import jakarta.nosql.mapping.Sorts;
+import jakarta.nosql.Column;
+import jakarta.nosql.Entity;
+import jakarta.nosql.Id;
+import jakarta.data.Sort;
 import jakarta.validation.constraints.NotEmpty;
 
 @Entity("To-Do")
@@ -19,9 +19,9 @@ public class ToDo implements Serializable {
 
 	@RepositoryProvider("current")
 	public interface Repository extends DominoRepository<ToDo, String> {
-		Stream<ToDo> findAll(Sorts sorts);
+		Stream<ToDo> findAll(Sort<?> sorts);
 
-		Stream<ToDo> findByStatus(State status, Sorts sorts);
+		Stream<ToDo> findByStatus(State status, Sort<?> sorts);
 	}
 
 	public enum State {

diff --git a/examples/todo/faces/odp/WebContent/WEB-INF/xsp.properties b/examples/todo/faces/odp/WebContent/WEB-INF/xsp.properties
@@ -3,5 +3,4 @@ xsp.persistence.mode=file
 xsp.theme=Lists.theme
 xsp.application.forcefullrefresh=true
 xsp.html.page.encoding=utf-8
-xsp.library.depends=org.openntf.xsp.beanvalidation,org.openntf.xsp.microprofile.config,org.openntf.xsp.jakarta.servlet,org.openntf.xsp.cdi,org.openntf.xsp.microprofile.health,org.openntf.xsp.jaxrs,org.openntf.xsp.nosql,org.openntf.xsp.microprofile.fault.tolerance,org.openntf.xsp.jsonapi,org.openntf.xsp.el,org.openntf.xsp.microprofile.rest.client,com.ibm.xsp.extlib.library,org.openntf.xsp.jsf
-jakarta.faces.PROJECT_STAGE=Development
+xsp.library.depends=com.ibm.xsp.extlib.library,org.openntf.xsp.jakartaee.core,org.openntf.xsp.jakartaee.ui
diff --git a/examples/todo/faces/odp/plugin.xml b/examples/todo/faces/odp/plugin.xml
@@ -17,19 +17,9 @@
     <import optional="true" plugin="com.ibm.xsp.domino"/>
     <import optional="true" plugin="com.ibm.notes.java.api"/>
     <import optional="true" plugin="com.ibm.xsp.rcp"/>
-    <import optional="true" plugin="org.openntf.xsp.beanvalidation"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.config"/>
-    <import optional="true" plugin="org.openntf.xsp.jakarta.servlet"/>
-    <import optional="true" plugin="org.openntf.xsp.cdi"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.health"/>
-    <import optional="true" plugin="org.openntf.xsp.jaxrs"/>
-    <import optional="true" plugin="org.openntf.xsp.nosql"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.fault.tolerance"/>
-    <import optional="true" plugin="org.openntf.xsp.jsonapi"/>
-    <import optional="true" plugin="org.openntf.xsp.el"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.rest.client"/>
     <import optional="true" plugin="com.ibm.xsp.extlib"/>
-    <import optional="true" plugin="org.openntf.xsp.jsf"/>
+    <import optional="true" plugin="org.openntf.xsp.jakartaee.core.library"/>
+    <import optional="true" plugin="org.openntf.xsp.jakartaee.ui.library"/>
     <!--AUTOGEN-END-BUILDER: End of automatically generated section-->
   </requires>
 </plugin>

diff --git a/examples/todo/mvc/odp/AppProperties/xspdesign.properties b/examples/todo/mvc/odp/AppProperties/xspdesign.properties
@@ -0,0 +1 @@
+#Wed May 22 08:15:54 PDT 2024
diff --git a/examples/todo/mvc/odp/Code/Java/controller/ToDosController.java b/examples/todo/mvc/odp/Code/Java/controller/ToDosController.java
@@ -8,7 +8,7 @@
 import jakarta.inject.Inject;
 import jakarta.mvc.Controller;
 import jakarta.mvc.Models;
-import jakarta.nosql.mapping.Sorts;
+import jakarta.data.Sort;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.FormParam;
@@ -35,9 +35,9 @@ public class ToDosController {
 	@Produces(MediaType.TEXT_HTML)
 	public String get(@QueryParam("status") ToDo.State status) {
 		if(status == null) {
-			models.put("todos", repository.findAll(Sorts.sorts().asc("created")).collect(Collectors.toList()));
+			models.put("todos", repository.findAll(Sort.asc("created")).collect(Collectors.toList()));
 		} else {
-			models.put("todos", repository.findByStatus(status, Sorts.sorts().asc("created")).collect(Collectors.toList()));
+			models.put("todos", repository.findByStatus(status, Sort.asc("created")).collect(Collectors.toList()));
 		}
 		return "todos.jsp";
 	}

diff --git a/examples/todo/mvc/odp/Code/Java/model/ToDo.java b/examples/todo/mvc/odp/Code/Java/model/ToDo.java
@@ -4,22 +4,22 @@
 import java.time.OffsetDateTime;
 import java.util.stream.Stream;
 
-import org.openntf.xsp.nosql.mapping.extension.DominoRepository;
+import org.openntf.xsp.jakarta.nosql.mapping.extension.DominoRepository;
 
-import jakarta.nosql.mapping.Column;
-import jakarta.nosql.mapping.Entity;
-import jakarta.nosql.mapping.Id;
-import jakarta.nosql.mapping.Sorts;
+import jakarta.nosql.Column;
+import jakarta.nosql.Entity;
+import jakarta.nosql.Id;
+import jakarta.data.Sort;
 import jakarta.validation.constraints.NotEmpty;
 
 @Entity("To-Do")
 public class ToDo implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	public interface Repository extends DominoRepository<ToDo, String> {
-		Stream<ToDo> findAll(Sorts sorts);
+		Stream<ToDo> findAll(Sort<?> sorts);
 
-		Stream<ToDo> findByStatus(State status, Sorts sorts);
+		Stream<ToDo> findByStatus(State status, Sort<?> sorts);
 	}
 
 	public enum State {

diff --git a/examples/todo/mvc/odp/Resources/Files/WEB-INF_2ftags_2flayout.tag b/examples/todo/mvc/odp/Resources/Files/WEB-INF_2ftags_2flayout.tag
@@ -1,6 +1,6 @@
 <%@tag description="Overall Page template" pageEncoding="UTF-8" trimDirectiveWhitespaces="true"%>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="c" uri="jakarta.tags.core"%>
+<%@taglib prefix="fn" uri="jakarta.tags.functions"%>
 <!DOCTYPE html>
 <html dir="ltr" lang="en">
 	<head>

diff --git a/examples/todo/mvc/odp/Resources/Files/WEB-INF_2fviews_2fhome.jsp b/examples/todo/mvc/odp/Resources/Files/WEB-INF_2fviews_2fhome.jsp
@@ -1,6 +1,6 @@
 <%@page contentType="text/html" pageEncoding="UTF-8" trimDirectiveWhitespaces="true" %>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="c" uri="jakarta.tags.core"%>
 <t:layout>
 	<p>
 		Welcome to the To-Do MVC app!

diff --git a/examples/todo/mvc/odp/Resources/Files/WEB-INF_2fviews_2ftodo.jsp b/examples/todo/mvc/odp/Resources/Files/WEB-INF_2fviews_2ftodo.jsp
@@ -1,7 +1,7 @@
 <%@page contentType="text/html" pageEncoding="UTF-8" trimDirectiveWhitespaces="true" %>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@taglib prefix="c" uri="jakarta.tags.core"%>
+<%@taglib prefix="fn" uri="jakarta.tags.functions" %>
 <t:layout>
 	<form action="${mvc.basePath}/todos/${todo.documentId}" method="POST" enctype="application/x-www-form-urlencoded">
 		<dl>

diff --git a/examples/todo/mvc/odp/Resources/Files/WEB-INF_2fviews_2ftodos.jsp b/examples/todo/mvc/odp/Resources/Files/WEB-INF_2fviews_2ftodos.jsp
@@ -1,6 +1,6 @@
 <%@page contentType="text/html" pageEncoding="UTF-8" trimDirectiveWhitespaces="true" %>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="c" uri="jakarta.tags.core"%>
 <t:layout>
 	<div id="todos">
 		<table>

diff --git a/examples/todo/mvc/odp/WebContent/WEB-INF/xsp.properties b/examples/todo/mvc/odp/WebContent/WEB-INF/xsp.properties
@@ -3,4 +3,4 @@ xsp.persistence.mode=file
 xsp.theme=Lists.theme
 xsp.application.forcefullrefresh=true
 xsp.html.page.encoding=utf-8
-xsp.library.depends=org.openntf.xsp.beanvalidation,org.openntf.xsp.microprofile.config,org.openntf.xsp.jakarta.servlet,org.openntf.xsp.cdi,org.openntf.xsp.microprofile.health,org.openntf.xsp.jaxrs,org.openntf.xsp.nosql,org.openntf.xsp.microprofile.fault.tolerance,org.openntf.xsp.jsonapi,org.openntf.xsp.el,org.openntf.xsp.microprofile.rest.client,com.ibm.xsp.extlib.library,org.openntf.xsp.jsp,org.openntf.xsp.mvc
+xsp.library.depends=com.ibm.xsp.extlib.library,org.openntf.xsp.jakartaee.core,org.openntf.xsp.jakartaee.ui
diff --git a/examples/todo/mvc/odp/plugin.xml b/examples/todo/mvc/odp/plugin.xml
@@ -17,20 +17,9 @@
     <import optional="true" plugin="com.ibm.xsp.domino"/>
     <import optional="true" plugin="com.ibm.notes.java.api"/>
     <import optional="true" plugin="com.ibm.xsp.rcp"/>
-    <import optional="true" plugin="org.openntf.xsp.beanvalidation"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.config"/>
-    <import optional="true" plugin="org.openntf.xsp.jakarta.servlet"/>
-    <import optional="true" plugin="org.openntf.xsp.cdi"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.health"/>
-    <import optional="true" plugin="org.openntf.xsp.jaxrs"/>
-    <import optional="true" plugin="org.openntf.xsp.nosql"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.fault.tolerance"/>
-    <import optional="true" plugin="org.openntf.xsp.jsonapi"/>
-    <import optional="true" plugin="org.openntf.xsp.el"/>
-    <import optional="true" plugin="org.openntf.xsp.microprofile.rest.client"/>
     <import optional="true" plugin="com.ibm.xsp.extlib"/>
-    <import optional="true" plugin="org.openntf.xsp.jsp"/>
-    <import optional="true" plugin="org.openntf.xsp.mvc"/>
+    <import optional="true" plugin="org.openntf.xsp.jakartaee.core.library"/>
+    <import optional="true" plugin="org.openntf.xsp.jakartaee.ui.library"/>
     <!--AUTOGEN-END-BUILDER: End of automatically generated section-->
   </requires>
 </plugin>

diff --git a/examples/todo/rest/odp/AppProperties/xspdesign.properties b/examples/todo/rest/odp/AppProperties/xspdesign.properties
@@ -0,0 +1 @@
+#Wed May 22 08:18:52 PDT 2024