Restore xmlns references + upgrades

2019-06-04 10:40:41 -04:00
parent 5985366945
commit 2e9b7b4987
26 changed files with 48 additions and 48 deletions
--- a/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml
+++ b/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">
 <ui:define name="notes">
 	<p>
--- a/booking-faces/src/main/webapp/WEB-INF/flows/booking/reviewBooking.xhtml
+++ b/booking-faces/src/main/webapp/WEB-INF/flows/booking/reviewBooking.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">
 <ui:define name="notes">
 	<p>
--- a/booking-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml
+++ b/booking-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="notes">
--- a/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml
+++ b/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">
 <ui:define name="notes">
 	<p>
--- a/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml
+++ b/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">
 <ui:define name="notes">
 	<p>
--- a/booking-faces/src/main/webapp/WEB-INF/intro.xhtml
+++ b/booking-faces/src/main/webapp/WEB-INF/intro.xhtml
@@ -2,7 +2,7 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
+	  			xmlns:f="http://java.sun.com/jsf/core"
                xmlns:sf="http://www.springframework.org/tags/faces"
 				template="layouts/standard.xhtml">

--- a/booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml
+++ b/booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "https://www.w3.org/TR/html4/loose.dtd"> 
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="https://java.sun.com/jsf/core"
+	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:c="http://java.sun.com/jsp/jstl/core"
 	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:p="https://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui">

 <f:view contentType="text/html">

--- a/pom.xml
+++ b/pom.xml
@@ -28,9 +28,9 @@
 		<myfaces.version>2.2.12</myfaces.version>
 		<primefaces.version>6.1</primefaces.version>
 		<servlet.version>3.1.0</servlet.version>
-		<spring-security.version>5.0.1.RELEASE</spring-security.version>
+		<spring-security.version>5.1.5.RELEASE</spring-security.version>
 		<tiles.version>3.0.8</tiles.version>
-		<webflow.version>2.5.0.RELEASE</webflow.version>
+		<webflow.version>2.5.1.RELEASE</webflow.version>
 	</properties>

 	<dependencyManagement>
@@ -38,7 +38,7 @@
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-framework-bom</artifactId>
-				<version>5.0.3.RELEASE</version>
+				<version>5.1.7.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/ajax-jsf/view.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/ajax-jsf/view.xhtml
@@ -2,7 +2,7 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
+	  			xmlns:f="http://java.sun.com/jsf/core"
 				template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="title">JSF 2 ajax with commandButton and f:ajax</ui:define>
--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/ajax-primefaces/view.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/ajax-primefaces/view.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="title">Ajax With PrimeFaces CommandButton</ui:define>
--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/ajax-render-action/view.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/ajax-render-action/view.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="title">Ajax with Server-Side Render Action</ui:define>
--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/autocomplete/view.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/autocomplete/view.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="title">Auto-complete</ui:define>
--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/file-upload/view.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/file-upload/view.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="title">Ajax With PrimeFaces CommandButton</ui:define>
--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/modal-dialog-in-view/view.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/modal-dialog-in-view/view.xhtml
@@ -2,7 +2,7 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="title">Modal Dialog In View</ui:define>
--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/poller/view.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/poller/view.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="title">Polling</ui:define>
--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/spring-security-taglib/view.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/spring-security-taglib/view.xhtml
@@ -3,7 +3,7 @@
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 				xmlns:c="http://java.sun.com/jsp/jstl/core"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:p="http://primefaces.org/ui"
 	  			xmlns:sec="http://www.springframework.org/security/tags"
 				template="/WEB-INF/layouts/standard.xhtml">

--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/top-flow-with-embedded-subflow/embedded-flow/confirmation.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/top-flow-with-embedded-subflow/embedded-flow/confirmation.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="title">Embedded Flow: Confirmation</ui:define>
--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/top-flow-with-embedded-subflow/embedded-flow/main.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/top-flow-with-embedded-subflow/embedded-flow/main.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="title">Embedded Flow: User Details</ui:define>
--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/top-flow-with-embedded-subflow/main.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/top-flow-with-embedded-subflow/main.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="title">Top Flow Container</ui:define>
--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/validation-bean/edit.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/validation-bean/edit.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="title">Standard JSR-303 Bean Validation</ui:define>
--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/validation-bean/review.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/validation-bean/review.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="title">Standard JSR-303 Bean Validation</ui:define>
--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/validation-model/edit.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/validation-model/edit.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="title">Model Validation</ui:define>
--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/validation-model/review.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/validation-model/review.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="https://java.sun.com/jsf/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="title">Model Validation</ui:define>
--- a/primefaces-showcase/src/main/webapp/WEB-INF/layouts/standard.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/layouts/standard.xhtml
@@ -2,9 +2,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="https://java.sun.com/jsf/core"
+	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:p="https://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui">
 <f:view contentType="text/html">
 <h:head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
--- a/primefaces-showcase/src/main/webapp/WEB-INF/views/home.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/views/home.xhtml
@@ -2,8 +2,8 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:ui="http://java.sun.com/jsf/facelets"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="https://java.sun.com/jsf/core"
-	xmlns:p="https://primefaces.org/ui"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:p="http://primefaces.org/ui"
 	template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="title"></ui:define>
--- a/primefaces-showcase/src/main/webapp/WEB-INF/views/login.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/views/login.xhtml
@@ -2,7 +2,7 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
 				xmlns:c="http://java.sun.com/jsp/jstl/core"
-	  			xmlns:p="https://primefaces.org/ui"
+	  			xmlns:p="http://primefaces.org/ui"
 				template="/WEB-INF/layouts/standard.xhtml">

 <ui:define name="title">Login</ui:define>