SAK-45642 - job scheduler jsf upgrade (sakaiproject#9371)

ottenhoff · Jun 15, 2021 · 48ec01f · 48ec01f
1 parent b4e5264
commit 48ec01f
Show file tree

Hide file tree

Showing 19 changed files with 80 additions and 61 deletions.
diff --git a/jobscheduler/scheduler-tool/pom.xml b/jobscheduler/scheduler-tool/pom.xml
@@ -51,16 +51,16 @@
             <artifactId>jstl</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.jsf</groupId>
-            <artifactId>jsf-tool</artifactId>
+            <groupId>org.sakaiproject.jsf2</groupId>
+            <artifactId>jsf2-tool</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.jsf</groupId>
-            <artifactId>jsf-app</artifactId>
+            <groupId>org.sakaiproject.jsf2</groupId>
+            <artifactId>jsf2-app</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sakaiproject.jsf</groupId>
-            <artifactId>jsf-widgets-sun-depend</artifactId>
+            <groupId>org.sakaiproject.jsf2</groupId>
+            <artifactId>jsf2-widgets-sun-depend</artifactId>
             <type>pom</type>
         </dependency>
         <dependency>
@@ -88,6 +88,11 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.weld.servlet</groupId>
+            <artifactId>weld-servlet-shaded</artifactId>
+            <version>${sakai.weld.shaded.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/jobscheduler/scheduler-tool/src/webapp/META-INF/context.xml b/jobscheduler/scheduler-tool/src/webapp/META-INF/context.xml
@@ -0,0 +1,6 @@
+<Context>
+    <Resource name="BeanManager"
+              auth="Container"
+              type="javax.enterprise.inject.spi.BeanManager"
+              factory="org.jboss.weld.resources.ManagerObjectFactory" />
+</Context>
diff --git a/jobscheduler/scheduler-tool/src/webapp/WEB-INF/beans.xml b/jobscheduler/scheduler-tool/src/webapp/WEB-INF/beans.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+       bean-discovery-mode="all" version="2.0">
+</beans>
diff --git a/jobscheduler/scheduler-tool/src/webapp/WEB-INF/faces-config.xml b/jobscheduler/scheduler-tool/src/webapp/WEB-INF/faces-config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE faces-config PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
-  "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-
-<faces-config>
+<faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+        	        http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_3.xsd"
+			  version="2.3">
 
 	<application>
 		<message-bundle>

diff --git a/jobscheduler/scheduler-tool/src/webapp/WEB-INF/web.xml b/jobscheduler/scheduler-tool/src/webapp/WEB-INF/web.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0"?>
 
-<web-app id="WebApp_9" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://java.sun.com/xml/ns/javaee"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
     <display-name>sakai-scheduler</display-name>
     <description>Scheduler Tool</description>
 
@@ -58,7 +60,7 @@
 	<!-- Sakai JSF Tool Servlet, for the help tool -->
     <servlet>
         <servlet-name>sakai.scheduler</servlet-name>
-        <servlet-class>org.sakaiproject.jsf.util.JsfTool</servlet-class>
+        <servlet-class>org.sakaiproject.jsf2.util.JsfTool</servlet-class>
         <init-param>
             <param-name>default</param-name>
             <param-value>main</param-value>

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/create_job.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/create_job.jsp
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%@ include file="security_static_include.jsp"%>
 <f:view>
 	<sakai:view_container title="#{msgs.title_job}">
@@ -31,10 +31,10 @@
 				</sakai:group_box>
 
 				<sakai:button_bar>
-					<sakai:button_bar_item
+					<h:commandButton
 						action="#{schedulerTool.processCreateJob}"
 						value="#{msgs.bar_post}" />					
-					<sakai:button_bar_item immediate="true"
+					<h:commandButton immediate="true"
 						action="jobs"
 						value="#{msgs.cancel}" />
 				</sakai:button_bar>

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/create_trigger.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/create_trigger.jsp
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%@ include file="security_static_include.jsp"%>
 
 
@@ -36,10 +36,10 @@
 				</sakai:group_box>
 
 				<sakai:button_bar>
-					<sakai:button_bar_item
+					<h:commandButton
 						action="#{schedulerTool.processCreateTrigger}"
 						value="#{msgs.bar_post}" />					
-					<sakai:button_bar_item immediate="true"
+					<h:commandButton immediate="true"
 						action="edit_triggers"
 						value="#{msgs.cancel}" />
 				</sakai:button_bar>

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/delete_jobs.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/delete_jobs.jsp
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%@ include file="security_static_include.jsp"%>
 
 
@@ -19,10 +19,10 @@
     	    </h:column>  	      
         </h:dataTable>        
    		  <sakai:button_bar>
-  				<sakai:button_bar_item
+  				<h:commandButton
 						action="#{schedulerTool.processDeleteJobs}"
 						value="#{msgs.ok}" />					
-					<sakai:button_bar_item
+					<h:commandButton
 					  rendered="#{!empty schedulerTool.filteredJobDetailWrapperList}"
 						action="jobs"
 						value="#{msgs.cancel}" />

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/delete_triggers.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/delete_triggers.jsp
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%@ include file="security_static_include.jsp"%>
 
 
@@ -22,10 +22,10 @@
     	    </h:column>  	     
         </h:dataTable>        
    		  <sakai:button_bar>
-  				<sakai:button_bar_item
+  				<h:commandButton
 						action="#{schedulerTool.processDeleteTriggers}"
 						value="#{msgs.ok}" />					
-					<sakai:button_bar_item
+					<h:commandButton
 					  rendered="#{!empty schedulerTool.filteredTriggersWrapperList}"
 						action="edit_triggers"
 						value="#{msgs.cancel}" />

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/edit_properties.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/edit_properties.jsp
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%@ include file="security_static_include.jsp"%>
 
 
@@ -47,10 +47,10 @@
                     </sakai:panel_edit>
                 </sakai:group_box>
                 <sakai:button_bar>
-                    <sakai:button_bar_item
+                    <h:commandButton
                         action="#{schedulerTool.processSetProperties}"
                         value="#{msgs.bar_post}" />
-                    <sakai:button_bar_item immediate="true"
+                    <h:commandButton immediate="true"
                         action="jobs"
                         value="#{msgs.cancel}" />
                 </sakai:button_bar>

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/edit_runnow_properties.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/edit_runnow_properties.jsp
@@ -4,7 +4,7 @@
 <%@ page import="javax.faces.component.UIComponent" %>
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%@ include file="security_static_include.jsp"%>
 
 
@@ -52,10 +52,10 @@
                     </sakai:panel_edit>
                 </sakai:group_box>
                 <sakai:button_bar>
-                    <sakai:button_bar_item
+                    <h:commandButton
                         action="#{schedulerTool.processSetRunNowProperties}"
                         value="#{msgs.bar_post}" />
-                    <sakai:button_bar_item immediate="true"
+                    <h:commandButton immediate="true"
                         action="cancel"
                         value="#{msgs.cancel}" />
                 </sakai:button_bar>

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/edit_trigger_properties.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/edit_trigger_properties.jsp
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%@ include file="security_static_include.jsp"%>
 
 
@@ -47,10 +47,10 @@
                     </sakai:panel_edit>
                 </sakai:group_box>
                 <sakai:button_bar>
-                    <sakai:button_bar_item
+                    <h:commandButton
                         action="#{schedulerTool.processSetTriggerProperties}"
                         value="#{msgs.bar_post}" />
-                    <sakai:button_bar_item immediate="true"
+                    <h:commandButton immediate="true"
                         action="edit_triggers"
                         value="#{msgs.cancel}" />
                 </sakai:button_bar>

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/edit_triggers.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/edit_triggers.jsp
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%@ include file="security_static_include.jsp"%>
 
 
@@ -10,17 +10,17 @@
   	  <h:graphicImage value="/images/quartz.jpg" alt="#{msgs.powered_by} Quartz"/>
   	  <sakai:tool_bar_message value="#{msgs.edit_trigger_for_job} #{schedulerTool.selectedJobDetailWrapper.jobDetail.name}"/>
   	  <sakai:tool_bar>
-		   <sakai:tool_bar_item
+		   <h:commandLink
 		     action="create_trigger"
 			   value="#{msgs.bar_create_trigger}" />
-		   <sakai:tool_bar_item
+		   <h:commandLink
   		   rendered="#{!empty schedulerTool.selectedJobDetailWrapper.triggerWrapperList}"
 		     action="#{schedulerTool.processRefreshFilteredTriggers}"
 			   value="#{msgs.bar_delete_triggers}" />
-		   <sakai:tool_bar_item
+		   <h:commandLink
 		     action="#{schedulerTool.processPrepRunJobNow}"
 			   value="#{msgs.bar_run_job_now}"  />
-			 <sakai:tool_bar_item 
+			 <h:commandLink
 		     action="#{schedulerTool.processRefreshJobs}"
 			   value="#{msgs.bar_return_jobs}" />
    	  </sakai:tool_bar>
@@ -29,7 +29,7 @@
   	    <h:dataTable rendered="#{!empty schedulerTool.selectedJobDetailWrapper.triggerWrapperList}" value="#{schedulerTool.selectedJobDetailWrapper.triggerWrapperList}" var="wrapper" styleClass="table table-hover table-striped table-bordered">
   	      <h:column>
     	      <f:facet name="header">    	      
-    	        <h:commandButton alt="SelectAll" image="/scheduler-tool/images/checkbox.gif" action="#{schedulerTool.processSelectAllTriggers}"/>    	        
+    	        <h:commandButton alt="SelectAll" image="images/checkbox.gif" action="#{schedulerTool.processSelectAllTriggers}"/>
     	      </f:facet>
     	      <h:selectBooleanCheckbox value="#{wrapper.isSelected}"/>
     	    </h:column>

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/error.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/error.jsp
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%@ page isErrorPage="true" %>
 
 

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/filter_events.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/filter_events.jsp
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%@ include file="security_static_include.jsp"%>
 
 
@@ -56,11 +56,11 @@
         </sakai:panel_titled>
 
         <sakai:button_bar>
-            <sakai:button_bar_item
+            <h:commandButton
                 id="submitButton"
                 action="#{schedulerTool.processSetFilters}"
                 value="#{msgs.setFilters}" />
-            <sakai:button_bar_item
+            <h:commandButton
                 action="#{schedulerTool.processClearFilters}"
                 value="#{msgs.clearFilters}" />
         </sakai:button_bar>

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/jobs.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/jobs.jsp
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%@ include file="security_static_include.jsp"%>
 
 
@@ -11,16 +11,16 @@
 			<h:graphicImage value="/images/quartz.jpg" alt="#{msgs.powered_by} Quartz"/>
 		</div>
   	  <sakai:tool_bar>
-		   <sakai:tool_bar_item
+		   <h:commandLink
 		     action="create_job"
 			   value="#{msgs.bar_create_job}"/>
-		   <sakai:tool_bar_item
+		   <h:commandLink
 		     action="#{schedulerTool.processRefreshFilteredJobs}"
 			   value="#{msgs.bar_delete_jobs}"/>
-		   <sakai:tool_bar_item
+		   <h:commandLink
 		     action="main"
 			   value="#{msgs.bar_event_log}"/>
-		<sakai:tool_bar_item
+		<h:commandLink
 		     action="runningJobs"
 			   value="#{msgs.running_jobs}"/>
    	  </sakai:tool_bar>

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/main.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/main.jsp
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%@ include file="security_static_include.jsp"%>
 
 <f:view>
@@ -9,13 +9,13 @@
     	<h:graphicImage value="/images/quartz.jpg" alt="#{msgs.powered_by} Quartz"/>
 	    <h:form>
   	    <sakai:tool_bar>
- 			    <sakai:tool_bar_item
+ 			    <h:commandLink
 		        action="#{schedulerTool.eventPager.processSelect}"
 			      value="#{schedulerTool.eventPager.isViewAllSelected ? msgs.select_today : msgs.select_all}"/>
-		      <sakai:tool_bar_item
+		      <h:commandLink
 		        action="#{schedulerTool.processRefreshJobs}"
 			      value="#{msgs.bar_jobs}"/>		   
-			  <sakai:tool_bar_item
+			  <h:commandLink
 		     	action="runningJobs"
 			   	value="#{msgs.running_jobs}"/>
      	  </sakai:tool_bar>

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/run_job_confirm.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/run_job_confirm.jsp
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%@ include file="security_static_include.jsp"%>
 
 
@@ -24,10 +24,10 @@
 				</sakai:group_box>
 
 				<sakai:button_bar>
-					<sakai:button_bar_item
+					<h:commandButton
 						action="#{schedulerTool.processRunJobNow}"
 						value="#{msgs.bar_run_now}" />
-					<sakai:button_bar_item immediate="true"
+					<h:commandButton immediate="true"
 						action="cancel"
 						value="#{msgs.cancel}" />
 				</sakai:button_bar>