From 98cc9ed85003576b3c6b5132e09fb5f6818329f5 Mon Sep 17 00:00:00 2001
From: herrtunante <Alfonso.SanchezPausDiaz@fao.org>
Date: Thu, 6 Jul 2023 15:36:08 +0200
Subject: [PATCH] Fix JAVA installation folder back to original java

---
 .../main/resources/CollectEarthUpdater.xml    |  2 +-
 .../src/main/resources/java.xml               | 32 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/collect-earth/collect-earth-installer/src/main/resources/CollectEarthUpdater.xml b/collect-earth/collect-earth-installer/src/main/resources/CollectEarthUpdater.xml
index 7749f3d1b0..53ed2e8a75 100644
--- a/collect-earth/collect-earth-installer/src/main/resources/CollectEarthUpdater.xml
+++ b/collect-earth/collect-earth-installer/src/main/resources/CollectEarthUpdater.xml
@@ -284,7 +284,7 @@
             </substitutionList>
         </substitute>
         <showInfo>
-            <text>Please QUIT THE COLLECT EARTH WINDOW before proceeding with the update! The update will fail if Collect Earth is running!</text>
+            <text>You need to quit Collect Earth and re-start it for the update to finalize!</text>
         </showInfo>
     </postInstallationActionList>
     <compressionAlgorithm>lzma</compressionAlgorithm>
diff --git a/collect-earth/collect-earth-installer/src/main/resources/java.xml b/collect-earth/collect-earth-installer/src/main/resources/java.xml
index fc9e644ffe..b411b6af01 100644
--- a/collect-earth/collect-earth-installer/src/main/resources/java.xml
+++ b/collect-earth/collect-earth-installer/src/main/resources/java.xml
@@ -9,7 +9,7 @@
     <folderList>
         <folder>
             <description>Java binaries - Microsoft Windows</description>
-            <destination>${installdir}/jre11</destination>
+            <destination>${installdir}/java</destination>
             <name>java_windows</name>
             <platforms>windows-x64 windows</platforms>
             <distributionFileList>
@@ -32,7 +32,7 @@
         </folder>
         <folder>
             <description>Java binaries - Linux</description>
-            <destination>${installdir}/jre11</destination>
+            <destination>${installdir}/java</destination>
             <name>java_linux</name>
             <platforms>linux</platforms>
             <distributionFileList>
@@ -47,7 +47,7 @@
         </folder>
         <folder>
             <description>Java binaries - Linux-x64</description>
-            <destination>${installdir}/jre11</destination>
+            <destination>${installdir}/java</destination>
             <name>java_linux_x64</name>
             <platforms>linux-x64</platforms>
             <distributionFileList>
@@ -62,7 +62,7 @@
         </folder>
         <folder>
             <description>Java binaries - Solaris Sparc</description>
-            <destination>${installdir}/jre11</destination>
+            <destination>${installdir}/java</destination>
             <name>java_solaris_sparc</name>
             <platforms>solaris-sparc</platforms>
             <distributionFileList>
@@ -77,7 +77,7 @@
         </folder>
         <folder>
             <description>Java binaries - Solaris Intel</description>
-            <destination>${installdir}/jre11</destination>
+            <destination>${installdir}/java</destination>
             <name>java_solaris_intel</name>
             <platforms>solaris-intel</platforms>
             <distributionFileList>
@@ -92,7 +92,7 @@
         </folder>
         <folder>
             <description>Java binaries - Mac OS X</description>
-            <destination>${installdir}/jre11</destination>
+            <destination>${installdir}/java</destination>
             <name>java_osx</name>
             <platforms>osx</platforms>
             <distributionFileList>
@@ -134,11 +134,11 @@
 				<!-- determine Java binary name - javaw.exe on Windows, java otherwise -->
 				<setInstallerVariable>
 				    <name>java_executable</name>
-				    <value>${installdir}/jre11/bin/java</value>
+				    <value>${installdir}/java/bin/java</value>
 				</setInstallerVariable>
 				<setInstallerVariable>
 				    <name>java_executable</name>
-				    <value>${installdir}/jre11/bin/javaw.exe</value>
+				    <value>${installdir}/java/bin/javaw.exe</value>
 				    <ruleList>
 					<platformTest type="windows" />
 				    </ruleList>
@@ -156,12 +156,12 @@
 		</if>
     </readyToInstallActionList>
 
-<!-- START - THIS IS ONLY NECESSARY WHEN MOVING FROM JRE8 to JRE11 -->
+<!-- START - THIS IS ONLY NECESSARY WHEN MOVING FROM JRE8 to java -->
 	<preInstallationActionList>
 	  <actionGroup>
 	    <actionList>
 	      <showWarning>
-	        <text>You must close the application ${project.fullName} before launching the updater otherwise the process will fail!</text>
+	        <text>Please QUIT THE COLLECT EARTH WINDOW before proceeding with the update! The update will fail if Collect Earth is running!</text>
 	      </showWarning>
 	    </actionList>
 	    <ruleList>
@@ -173,22 +173,22 @@
 
     <postInstallationActionList>
         <!-- change permissions of all binaries -->
-        <changePermissions files="${installdir}/jre11/bin/*" permissions="0755" abortOnError="0" showMessageOnError="0">
+        <changePermissions files="${installdir}/java/bin/*" permissions="0755" abortOnError="0" showMessageOnError="0">
             <ruleList>
-                <fileExists path="${installdir}/jre11/bin" />
+                <fileExists path="${installdir}/java/bin" />
                 <platformTest negate="1" type="windows" />
             </ruleList>
         </changePermissions>
-        <createSymLink target="../libjsig.so" linkName="${installdir}/jre11/lib/libjsig.so" abortOnError="false" showMessageOnError="false">
+        <createSymLink target="../libjsig.so" linkName="${installdir}/java/lib/libjsig.so" abortOnError="false" showMessageOnError="false">
             <ruleList>
                 <platformTest type="linux" />
-                <fileTest condition="exists" path="${installdir}/jre11/lib/libjsig.so" />
+                <fileTest condition="exists" path="${installdir}/java/lib/libjsig.so" />
             </ruleList>
         </createSymLink>
-        <createSymLink target="../libjsig.so" linkName="${installdir}/jre11/lib/server/libjsig.so" abortOnError="false" showMessageOnError="false">
+        <createSymLink target="../libjsig.so" linkName="${installdir}/java/lib/server/libjsig.so" abortOnError="false" showMessageOnError="false">
             <ruleList>
                 <platformTest type="linux" />
-                <fileTest condition="exists" path="${installdir}/jre11/lib/server/libjsig.so" />
+                <fileTest condition="exists" path="${installdir}/java/lib/server/libjsig.so" />
             </ruleList>
         </createSymLink>