From f13fafd23f5d69017642292155a85dc6f36ea6a5 Mon Sep 17 00:00:00 2001
From: lumc <lumc@ROBUCWS10168.enea.se>
Date: Tue, 27 Oct 2020 14:43:01 +0200
Subject: ELCCR-893: JAVA_HOME incorrectly set after OpenJdk 11 upgrade

Change-Id: Id6f05e61f8b7496ba7193136b53192236ea084cf
---
 .../doc/getting_started_ucpe_manager.xml           | 65 ++++++++++++----------
 1 file changed, 37 insertions(+), 28 deletions(-)

diff --git a/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml b/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
index e2a8a97..211de99 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
@@ -109,24 +109,33 @@
 openjdk version "11.0.3" 2019-04-16 LTS
 OpenJDK Runtime Environment 18.9 (build 11.0.3+7-LTS)
 OpenJDK 64-Bit Server VM 18.9 (build 11.0.3+7-LTS, mixed mode, sharing)</programlisting>
+
+              <note>
+                <para>If there are multiple java versions installed, switch
+                between them using the following command:</para>
+
+                <programlisting>alternatives --config java</programlisting>
+
+                <para>Optionally, the user can switch between the javac versions using:
+                <literal>alternatives --config javac</literal>.</para>
+              </note>
             </listitem>
 
             <listitem>
               <para>The following system variables need to point to the
               OpenJDK 11 installation:</para>
 
-              <programlisting>export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which javac)))))
+              <programlisting>export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which java)))))
 export PATH=$PATH:$JAVA_HOME/bin
 export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar</programlisting>
+
+              <note>
+                <para>In order to make these system variables persistent, the commands given above
+                  should be added to a script in the <literal>/etc/profile.d/</literal> folder.
+                  <emphasis role="bold">Sudo</emphasis> access is needed for this operation.</para>
+              </note>
             </listitem>
           </orderedlist>
-
-          <note>
-            <para>If there are multiple java versions installed, switch
-            between them using the following command:</para>
-
-            <programlisting>alternatives --config java</programlisting>
-          </note>
         </listitem>
 
         <listitem>
@@ -162,39 +171,39 @@ userdel postgres</programlisting>
           <literal>/opt/ems</literal>. Everything will be installed under a
           folder called <literal>ucpemanager</literal> within the target
           installation folder.</para>
+
+          <para>The application files will be installed in the 
+            <literal>/opt/ems/ucpemanager/application</literal> folder, while the database 
+            will be installed in the <literal>/opt/ems/ucpemanager/database</literal> folder.</para>
         </listitem>
       </orderedlist>
 
-      <para>The application files will be installed in
-      <literal>/opt/ems/ucpemanager/application</literal>. The database will
-      be installed in <literal>/opt/ems/ucpemanager/database</literal>.</para>
-
       <note>
         <para>If you have multiple spindles, it is recommended to let the
         application run off one and the database off the other. This will
         result in optimum performance. It is also recommended that the swap
         disk be the same as the one used for the application.</para>
-      </note>
 
-      <para>Assuming another spindle is used (<literal>/drive2</literal>) do
-      the following:</para>
+        <para>Assuming another spindle is used (<literal>/drive2</literal>) do
+        the following:</para>
 
-      <itemizedlist>
-        <listitem>
-          <para>Create a folder which will host the database (e.g.
-          <literal>emsDatabase</literal>).</para>
-        </listitem>
+        <orderedlist>
+          <listitem>
+            <para>Create a folder which will host the database (e.g.
+            <literal>emsDatabase</literal>).</para>
+          </listitem>
 
-        <listitem>
-          <para>Create a soft-link that will point to this folder:</para>
+          <listitem>
+            <para>Create a soft-link that will point to this folder:</para>
 
-          <programlisting>ln -s /opt/ems/elementcenter/database /drive2/emsDatabase</programlisting>
-        </listitem>
+            <programlisting>ln -s /opt/ems/elementcenter/database /drive2/emsDatabase</programlisting>
+          </listitem>
 
-        <listitem>
-          <para>Follow the installation process as described below.</para>
-        </listitem>
-      </itemizedlist>
+          <listitem>
+            <para>Follow the installation process as described below.</para>
+          </listitem>
+        </orderedlist>
+      </note>
     </section>
 
     <section id="installing_ucpe_mg">
-- 
cgit v1.2.3-54-g00ecf