SAK-44849 - upgrade stuff to jsf2 (sakaiproject#8932)

axxter99 · Jan 6, 2021 · d16f497 · d16f497
1 parent 37bd428
commit d16f497
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 24 deletions.
diff --git a/admin-su/pom.xml b/admin-su/pom.xml
@@ -24,28 +24,23 @@
     </dependency>
     <!-- Generic Sakai JSF Tool Dependencies -->
     <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>
     <!-- updated so that the jstl library is packed into the tool for now -->
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>jstl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>taglibs</groupId>
-      <artifactId>standard</artifactId>
-      <version>1.0.4</version>
-    </dependency>
     <dependency>
       <groupId>commons-digester</groupId>
       <artifactId>commons-digester</artifactId>
@@ -59,6 +54,11 @@
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.weld.servlet</groupId>
+      <artifactId>weld-servlet-shaded</artifactId>
+      <version>${sakai.weld.shaded.version}</version>
+    </dependency>
   </dependencies>
   <build>
     <resources>

diff --git a/admin-su/src/webapp/META-INF/context.xml b/admin-su/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/admin-su/src/webapp/WEB-INF/beans.xml b/admin-su/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/admin-su/src/webapp/WEB-INF/faces-config.xml b/admin-su/src/webapp/WEB-INF/faces-config.xml
@@ -1,12 +1,12 @@
 <?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 CONFIGURATION FILE ================================== -->
 
-<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>tool-tool-su</message-bundle>

diff --git a/admin-su/src/webapp/WEB-INF/web.xml b/admin-su/src/webapp/WEB-INF/web.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app id="sakai.admin.su" 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 id="sakai.admin.su"
+        xmlns="http://java.sun.com/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        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>tool-tool-su</display-name>
     <description>tool-tool-su</description>
 
@@ -49,7 +51,7 @@
 	<!-- Sakai JSF Tool Servlet, for the su tool -->
     <servlet>
         <servlet-name>sakai.su</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/admin-su/src/webapp/su/main.jsp b/admin-su/src/webapp/su/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" %>
 
 <%
 	response.setContentType("text/html; charset=UTF-8");

diff --git a/admin-su/src/webapp/su/redirect.jsp b/admin-su/src/webapp/su/redirect.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" %>
 
 <%
 	response.setContentType("text/html; charset=UTF-8");

diff --git a/admin-su/src/webapp/su/title.jsp b/admin-su/src/webapp/su/title.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" %>
 
 <f:view>
 <sakai:view_container title="#{msgs.tool_title}">

diff --git a/admin-su/src/webapp/su/unauthorized.jsp b/admin-su/src/webapp/su/unauthorized.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" %>
 
 <%
 	response.setContentType("text/html; charset=UTF-8");