More dependency updates and cleanups.

ipb-halle · Oct 24, 2024 · b6d848e · b6d848e
1 parent c0945a1
commit b6d848e
Show file tree

Hide file tree

Showing 44 changed files with 270 additions and 255 deletions.
diff --git a/MetFragLib/pom.xml b/MetFragLib/pom.xml
@@ -43,8 +43,8 @@
 			<artifactId>postgresql</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
+			<groupId>com.mysql</groupId>
+			<artifactId>mysql-connector-j</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jexcelapi</groupId>

diff --git a/MetFragRest/pom.xml b/MetFragRest/pom.xml
@@ -44,15 +44,20 @@
 	<groupId>org.springframework.boot</groupId>
 	<artifactId>spring-boot-starter-hateoas</artifactId>
 </dependency>
-
-<!--		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-api</artifactId>
-		</dependency>
 		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-		</dependency>-->
+			<groupId>jakarta.platform</groupId>
+			<artifactId>jakarta.jakartaee-api</artifactId>
+			<scope>compile</scope>
+		</dependency>
+
+		<!--		<dependency>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-api</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-core</artifactId>
+                </dependency>-->
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>

diff --git a/MetFragRest/src/main/java/de/ipbhalle/metfragrest/MetFragRestController.java b/MetFragRest/src/main/java/de/ipbhalle/metfragrest/MetFragRestController.java
@@ -13,7 +13,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
 import org.apache.tomcat.util.http.fileupload.FileUtils;

diff --git a/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/controller/MetFragWebBean.java b/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/controller/MetFragWebBean.java
@@ -232,7 +232,6 @@ private void generateFolders() {
 		catch(Exception e) {
 			e.printStackTrace();
 			System.err.println("error generating session folders");
-			return;
 		}
 	}
 
@@ -339,7 +338,6 @@ else if(!PositiveDoubleValueValidator.check(this.beanSettingsContainer.getMeasur
 		} catch(Exception e) {
 			e.printStackTrace();
 			this.errorMessages.setMessage("inputMeasuredMassError", "Error: Error calculating mass value.");
-			return;
 		}
 	}
 
@@ -3157,7 +3155,7 @@ public void submitFeedbackListener(ActionEvent actionEvent) {
 			FileStorer fileStorer = new FileStorer();
 			try {
 				StreamedContent zipContent = this.beanSettingsContainer.getUserOutputDataHandler().getDownloadParameters(this.errorMessages, null);
-				zipFileToAttach = fileStorer.saveUploadedFile(zipContent.getStream(), feedbackFolder.getAbsoluteFile(), "MetFragWeb_Parameters.zip");
+				zipFileToAttach = fileStorer.saveUploadedFile(zipContent.getStream().get(), feedbackFolder.getAbsoluteFile(), "MetFragWeb_Parameters.zip");
 				addMsg += "Zip: yes" + ls;
 			}
 			catch(Exception e) {
@@ -3242,7 +3240,7 @@ public void submitFeedbackListener(ActionEvent actionEvent) {
 	}
 
 	public String getServerName() {
-        String hostname = "";
+        String hostname;
         try {
                 hostname = InetAddress.getLocalHost().getHostName();
         } catch (UnknownHostException e) {

diff --git a/MetFragWeb/src/main/webapp/WEB-INF/faces-config.xml b/MetFragWeb/src/main/webapp/WEB-INF/faces-config.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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_2.xsd"
-    version="2.2">
+<?xml version="1.0" encoding='UTF-8'?>
+<faces-config version="3.0" xmlns="https://jakarta.ee/xml/ns/jakartaee"
+			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+              https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd">
 	<managed-bean>
 		<managed-bean-name>metFragBean</managed-bean-name>
 		<managed-bean-class>de.ipbhalle.metfragweb.controller.MetFragWebBean</managed-bean-class>

diff --git a/MetFragWeb/src/main/webapp/WEB-INF/web.xml b/MetFragWeb/src/main/webapp/WEB-INF/web.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://java.sun.com/xml/ns/javaee"
-	xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	id="WebApp_ID" version="3.0">
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+		 version="5.0">
 	<display-name>MetFragWeb</display-name>
 	<welcome-file-list>
 		<welcome-file>index.xhtml</welcome-file>

diff --git a/MetFragWeb/src/main/webapp/comparespectrad3js.xhtml b/MetFragWeb/src/main/webapp/comparespectrad3js.xhtml
@@ -1,12 +1,12 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:h="http://java.sun.com/jsf/html">
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html">
 <h:head>
 	<title><ui:insert name="title">MetFrag</ui:insert></title>
-	<h:outputStylesheet type='text/css'
-		name='https://fonts.googleapis.com/css?family=Lato:300,400' />
+	<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Lato:wght@300;400&amp;display=swap" />
 	<h:outputStylesheet name='css/style.css' rel='stylesheet'
 		type='text/css' />
 	<h:outputStylesheet name='css/d3js.css' rel='stylesheet'

diff --git a/MetFragWeb/src/main/webapp/includes/candiateScoreDistribution.xhtml b/MetFragWeb/src/main/webapp/includes/candiateScoreDistribution.xhtml
@@ -1,15 +1,16 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+		"http://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:ui="http://java.sun.com/jsf/facelets">
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html">
 
 <h:body>
 
 	<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-		xmlns:h="http://java.sun.com/jsf/html"
-		xmlns:f="http://java.sun.com/jsf/core"
-		xmlns:c="http://java.sun.com/jsp/jstl/core"
+		xmlns:h="http://xmlns.jcp.org/jsf/html"
+		xmlns:f="http://xmlns.jcp.org/jsf/core"
+		xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
 		xmlns:p="http://primefaces.org/ui">
 		<h:panelGrid style="width: 100%;" columns="1"
 			rendered="#{metFragWebBean.scoreDistributionModelAvailable}">

diff --git a/MetFragWeb/src/main/webapp/includes/candidateFiltersPrime.xhtml b/MetFragWeb/src/main/webapp/includes/candidateFiltersPrime.xhtml
@@ -1,13 +1,14 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+		"http://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:ui="http://java.sun.com/jsf/facelets">
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html">
 
 <h:body>
 	<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-		xmlns:h="http://java.sun.com/jsf/html"
-		xmlns:f="http://java.sun.com/jsf/core"
+		xmlns:h="http://xmlns.jcp.org/jsf/html"
+		xmlns:f="http://xmlns.jcp.org/jsf/core"
 		xmlns:p="http://primefaces.org/ui">
 
 		<h:panelGroup id="filterSettingsPanel"

diff --git a/MetFragWeb/src/main/webapp/includes/candidateFiltersScoresPrime.xhtml b/MetFragWeb/src/main/webapp/includes/candidateFiltersScoresPrime.xhtml
@@ -1,13 +1,14 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+		"http://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:ui="http://java.sun.com/jsf/facelets">
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html">
 
 <h:body>
 	<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-		xmlns:h="http://java.sun.com/jsf/html"
-		xmlns:f="http://java.sun.com/jsf/core"
+		xmlns:h="http://xmlns.jcp.org/jsf/html"
+		xmlns:f="http://xmlns.jcp.org/jsf/core"
 		xmlns:p="http://primefaces.org/ui">
 		<div class="ui-grid">
 			<div class="ui-grid-row">

diff --git a/MetFragWeb/src/main/webapp/includes/candidateScoresPrime.xhtml b/MetFragWeb/src/main/webapp/includes/candidateScoresPrime.xhtml
@@ -1,14 +1,15 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+		"http://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:ui="http://java.sun.com/jsf/facelets">
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html">
 
 <h:body>
 	<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-		xmlns:h="http://java.sun.com/jsf/html"
-		xmlns:f="http://java.sun.com/jsf/core"
-		xmlns:c="http://java.sun.com/jsp/jstl/core"
+		xmlns:h="http://xmlns.jcp.org/jsf/html"
+		xmlns:f="http://xmlns.jcp.org/jsf/core"
+		xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
 		xmlns:p="http://primefaces.org/ui">
 		<h:panelGroup id="scoreSettingsPanel"
 			rendered="#{metFragWebBean.numberCompoundsRetrieved > 0}">

diff --git a/MetFragWeb/src/main/webapp/includes/comparespectraD3JSInclude.xhtml b/MetFragWeb/src/main/webapp/includes/comparespectraD3JSInclude.xhtml
@@ -1,15 +1,16 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+		"http://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:ui="http://java.sun.com/jsf/facelets">
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html">
 
 <h:body>
 
 	<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-		xmlns:h="http://java.sun.com/jsf/html"
-		xmlns:f="http://java.sun.com/jsf/core"
-		xmlns:c="http://java.sun.com/jsp/jstl/core"
+		xmlns:h="http://xmlns.jcp.org/jsf/html"
+		xmlns:f="http://xmlns.jcp.org/jsf/core"
+		xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
 		xmlns:p="http://primefaces.org/ui" xmlns:pe="http://primefaces.org/ui">
 		<script type="text/javascript" src="https://d3js.org/d3.v3.min.js"></script>
 		<script type="text/javascript"

diff --git a/MetFragWeb/src/main/webapp/includes/databasePrime.xhtml b/MetFragWeb/src/main/webapp/includes/databasePrime.xhtml
@@ -1,15 +1,16 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+		"http://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:ui="http://java.sun.com/jsf/facelets">
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html">
 
 <h:body>
 
 	<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-		xmlns:h="http://java.sun.com/jsf/html"
-		xmlns:f="http://java.sun.com/jsf/core"
-		xmlns:c="http://java.sun.com/jsp/jstl/core"
+		xmlns:h="http://xmlns.jcp.org/jsf/html"
+		xmlns:f="http://xmlns.jcp.org/jsf/core"
+		xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
 		xmlns:p="http://primefaces.org/ui">
 		<div class="ui-grid">
 			<div class="ui-grid-row">

diff --git a/MetFragWeb/src/main/webapp/includes/dialogs/aboutDialog.xhtml b/MetFragWeb/src/main/webapp/includes/dialogs/aboutDialog.xhtml
@@ -1,10 +1,11 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html 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="http://primefaces.org/ui"
-	xmlns:f="http://java.sun.com/jsf/core">
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  xmlns:p="http://primefaces.org/ui">
 
 <h:body>
 	<h:form id="aboutDialogForm">

diff --git a/MetFragWeb/src/main/webapp/includes/dialogs/downloadCandidatesDialog.xhtml b/MetFragWeb/src/main/webapp/includes/dialogs/downloadCandidatesDialog.xhtml
@@ -1,9 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html 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="http://primefaces.org/ui">
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:p="http://primefaces.org/ui">
 
 <h:body>
 	<p:dialog id="downloadCandidatesDialog" header="Select format" widgetVar="downloadCandidatesDialog"

diff --git a/MetFragWeb/src/main/webapp/includes/dialogs/downloadParametersDialog.xhtml b/MetFragWeb/src/main/webapp/includes/dialogs/downloadParametersDialog.xhtml
@@ -1,9 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html 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="http://primefaces.org/ui">
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:p="http://primefaces.org/ui">
 
 <h:body>
 	<ui:composition>

diff --git a/MetFragWeb/src/main/webapp/includes/dialogs/downloadResultsDialog.xhtml b/MetFragWeb/src/main/webapp/includes/dialogs/downloadResultsDialog.xhtml
@@ -1,9 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html 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="http://primefaces.org/ui">
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:p="http://primefaces.org/ui">
 
 <h:body>
 	<p:dialog id="downloadResultsDialog" header="Select format" widgetVar="downloadResultsDialog"

diff --git a/MetFragWeb/src/main/webapp/includes/dialogs/expiredSessionDialog.xhtml b/MetFragWeb/src/main/webapp/includes/dialogs/expiredSessionDialog.xhtml
@@ -1,9 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html 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="http://primefaces.org/ui">
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:p="http://primefaces.org/ui">
 
 <h:body>
 

diff --git a/MetFragWeb/src/main/webapp/includes/dialogs/feedbackButtonDialog.xhtml b/MetFragWeb/src/main/webapp/includes/dialogs/feedbackButtonDialog.xhtml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html 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="http://primefaces.org/ui"
-	xmlns:f="http://java.sun.com/jsf/core">
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:p="http://primefaces.org/ui"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core">
 
 <h:body>
 	<h:panelGroup styleClass="feedback" layout="block">

diff --git a/MetFragWeb/src/main/webapp/includes/dialogs/feedbackDialog.xhtml b/MetFragWeb/src/main/webapp/includes/dialogs/feedbackDialog.xhtml
@@ -1,10 +1,10 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:p="http://primefaces.org/ui"
-	xmlns:f="http://java.sun.com/jsf/core">
+	xmlns:f="http://xmlns.jcp.org/jsf/core">
 
 <h:body>
 	<h:form id="feedbackDialogForm">

diff --git a/MetFragWeb/src/main/webapp/includes/dialogs/fragmentsViewDialog.xhtml b/MetFragWeb/src/main/webapp/includes/dialogs/fragmentsViewDialog.xhtml
@@ -1,10 +1,11 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html 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="http://primefaces.org/ui"
-	xmlns:f="http://java.sun.com/jsf/core">
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:p="http://primefaces.org/ui"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core">
 
 <h:body>
 	<h:outputScript library="primefaces" name="jquery/jquery.js"