Merge branch 'release_5.2.3' into GP-1540_Fix-version-number

docs/geedocs/5.2.3/answer/7160003.html

@@ -36,17 +36,18 @@
 <h1><a href="../index.html">Google Earth Enterprise Documentation Home</a> | Release notes</h1>
 <h2>Release notes: Open GEE 5.2.3</h2>
 
-<p>Open GEE 5.2.3 is currently in development</p>
+<p>Open GEE 5.2.3 is currently in beta testing</p>
 
   <h5>
     <p id="overview_5.2.3">New Features</p>
   </h5>
     <p><strong>C++11 support</strong>. With release 5.2.3 Open GEE C++ code now supports and defaults to compiling using the <code>-std=gnu++11</code> compile flag.  This default can be overridden and the C++ code can be compiled using the <code>-std=gnu++98</code> flag instead.  However, Open GEE 5.2.3 will be the last release to support compiling C++ code using the <code>-std=gnu++98</code> flag.  The subsequent releases after Open GEE 5.2.3 will require the use of the <code>-std=gnu++11</code> flag when compiling C++ code.</p>
-    <p><strong>Remove TCP/IP connections to PostgreSQL</strong>. With release 5.2.3 Open GEE code will now connect to PostgreSQL exclusively using Unix domain sockets. This will make it easier to secure PostgreSQL for security sensitive installations </p>
+    <p><strong>Remove TCP/IP connections to PostgreSQL</strong>. With release 5.2.3 Open GEE code will now connect to PostgreSQL exclusively using Unix domain sockets. This will make it easier to secure PostgreSQL for security sensitive installations.</p>
     <p><strong>Volume deletion</strong>. <code>geconfigureassetroot</code> now supports the option <code>--removevolume</code> for volume deletion.</p>
     <p><strong>Performance tuning for gecombineterrain</strong>. <code>gecombineterrain</code> now supports the option <code>--numCompressThreads</code> which allows configuration of the threads used for operation.  If not specified <code>gecombineterrain</code> defaults this option to match the number of available CPUs.</p>
     <p><strong>Package name customization at build time</strong>. Scons build now accepts a custom label argument which is appended to the version in RPM file names.</p>
     <p><strong>Rewrite KML URLs</strong>. Users can rewrite the URLs for KML resorces included in databases at publish time.</p>
+    <p><strong>Maps API Javascript Files</strong>. Maps API Javascript files are now available and installed at <code>/opt/google/gehttpd/htdocs/maps/mapfiles</code>.</p> 
   <h5>
     <p id="supported_5.2.3">Supported Platforms</p>
   </h5>
@@ -85,6 +86,11 @@ <h5>
             <td>Add a compiler version check to scons scripts</td>
             <td>Scons scripts ensure gcc version 4.8+ is installed before continuing with builds</td>
           </tr>
+          <tr>
+            <td>342</td>
+            <td>Fusion UI crashes when opening non supported type of file</td>
+            <td>Added check to kiasset, ktasset, xml file load to handle invalid files</td>
+          </tr>          
           <tr>
             <td>535</td>
             <td>DownloadTutorial.sh often is not staged properly for install</td>
@@ -100,11 +106,6 @@ <h5>
             <td>Error in publish of SSL-enabled database</td>
             <td>Temporary fix from 5.2.2 was found to be the best solution</td>
           </tr>
-          <tr>
-            <td>762</td>
-            <td>Package libraries and utilities common to Fusion and Server for Ubuntu 16</td>
-            <td>opengee-common deb packages can be created for Ubuntu 16</td>
-          </tr>
           <tr>
             <td>806</td>
             <td>gecombineterrain defaulted to only 1 cpu to process data and ignored arguments</td>
@@ -119,11 +120,6 @@ <h5>
             <td>835</td>
             <td>GE Server gets its URL from the client instead of itself</td>
             <td>Fixed code so that when you publish DB, GEServer's URL will be used and not the URL which we get from the Publish request message</td>
-          </tr>
-          <tr>
-            <td>342</td>
-            <td>Fusion UI crashes when opening non supported type of file</td>
-            <td>Added check to kiasset, ktasset, xml file load to handle invalid files</td>
           </tr>	  
         </tbody>
       </table>  

docs/geedocs/answer

@@ -1 +1 @@
-5.2.2/answer
+5.2.3/answer

docs/geedocs/art

@@ -1 +1 @@
-5.2.2/art
+5.2.3/art

docs/geedocs/css

@@ -1 +1 @@
-5.2.2/css
+5.2.3/css

earth_enterprise/BUILD.md

@@ -6,7 +6,7 @@ __NOTE:__ If you want to build, install, or run Portable server, see the
 Building is currently supported for 64-bit versions of Ubuntu 14.04 LTS,
 Ubuntu 16.04 LTS, RHEL 6, RHEL 7, CentOS 6, and CentOS 7.
 
-## GEE 5.2.2 Build Prerequisites (all platforms)
+## GEE 5.2.3 Build Prerequisites (all platforms)
 
 1. Setup required Tools and Dependencies:
 

earth_enterprise/Upgrade.md

@@ -1,8 +1,8 @@
-# Upgrading Earth Enterprise Fusion and Server to version 5.2.2
+# Upgrading Earth Enterprise Fusion and Server to version 5.2.3
 
-Upgrading to GEE 5.2.2 is supported from Earth Enterprise 5.2.0 or 5.2.1 version.
+Upgrading to GEE 5.2.3 is supported from Earth Enterprise versions 5.2.0, 5.2.1, and 5.2.2.
 
-Do NOT uninstall GEE 5.2.x. We recommend that you upgrade GEE 5.2.x by simply installing GEE 5.2.2. Installing GEE 5.2.2 on top of GEE 5.2.x will ensure that your PostgreSQL databases are backed up and upgraded correctly to the new PostgreSQL version used by GEE 5.2.2. 
+Do NOT uninstall GEE 5.2.x. We recommend that you upgrade GEE 5.2.x by simply installing GEE 5.2.3. Installing GEE 5.2.3 on top of GEE 5.2.x will ensure that your PostgreSQL databases are backed up and upgraded correctly to the new PostgreSQL version introduced in GEE 5.2.1 (now part of 5.2.2 and 5.2.3). 
 
 Upgrade is supported using either scripts or RPMs:
 
@@ -19,7 +19,7 @@ Upgrade is supported using either scripts or RPMs:
     ```
 
 ## Upgrading with RPM packages (Redhat and CentOS only)
-Alternatively, instead of using scripts, on Redhat and Centos, you can upgrade GEE 5.2.0 or 5.2.1 to GEE 5.2.2 using [RPM packages](https://github.com/google/earthenterprise/blob/master/earth_enterprise/BUILD_RPMS.md).
+Alternatively, instead of using scripts, on Redhat and Centos, you can upgrade GEE 5.2.0, 5.2.1, or 5.2.2 to GEE 5.2.3 using [RPM packages](https://github.com/google/earthenterprise/blob/master/earth_enterprise/BUILD_RPMS.md).
 
 Upgrading from any previous version installed via RPM:
 1. Install the RPM like normal (e.g. `sudo yum install opengee-*.rpm`) and the RPM will take care of the upgrade for you.
@@ -42,7 +42,7 @@ Upgrading from any previous version installed via RPM:
 ## Uninstall notes
 Uninstall is NOT recommended before upgrading.
 
-If you decide that you want to uninstall GEE 5.2.0 before installing GEE 5.2.2, first make sure to backup your PostgreSQL databases. Please keep in mind that the database backup, made by 5.2.0, would not be compatible with GEE 5.2.2 PostgreSQL databases.
+If you decide that you want to uninstall GEE 5.2.0 before installing GEE 5.2.3, first make sure to backup your PostgreSQL databases. Please keep in mind that the database backup, made by 5.2.0, would not be compatible with GEE 5.2.3 PostgreSQL databases.
 
     * Create a backup folder: `mkdir -p /tmp/MyBackupFolder`
     * Make gepguser owner of the created folder: `chown gepguser /tmp/MyBackupFolder`
@@ -51,4 +51,4 @@ If you decide that you want to uninstall GEE 5.2.0 before installing GEE 5.2.2,
 
 ## Database push compatibility between versions
 
-GEE Server versions 5.2.x are compatible, meaning you can push databases from any 5.2.x version of GEE Fusion to any 5.2.x version of GEE Server.  This compatibility extends to the disconnected send feature (see gedisconnectedsend command documentation for more information).
+GEE Server versions 5.2.x are compatible, meaning you can push databases from any 5.2.x version of GEE Fusion to any 5.2.x version of GEE Server.  This compatibility extends to the disconnected send feature (see gedisconnectedsend command documentation for more information).

earth_enterprise/src/fusion/portableglobe/cutter/cgi-bin/geecheck_tests/common.py

@@ -20,7 +20,7 @@
 import platform
 import socket
 
-LATEST_VERSION = '5.2.2'
+LATEST_VERSION = '5.2.3'
 
 SUPPORTED_OS_LIST = {
     'redhat': {'min_release': '6.0',

earth_enterprise/src/fusion/portableglobe/cutter/cgi-bin/geecheck_tests/user_tests/disk_space_test.py

@@ -17,6 +17,7 @@
 
 import os
 import xml.etree.ElementTree as ET
+from geecheck_tests import common
 
 # Need to use unittest2 for Python 2.6.
 try:
@@ -69,6 +70,7 @@ def getFsFreespace(pathname):
 
 class TestDiskSpace(unittest.TestCase):
 
+    @unittest.skipUnless(common.IsFusionInstalled(), 'Fusion is not installed')
     def testAdequateDiskSpace(self):
       """Check that the remaining disk space is at least 20%."""
       self.assertLessEqual(20, getDiskInfo())

earth_enterprise/src/fusion_version.txt

@@ -19,4 +19,4 @@
 #  earth_enterprise/installer/
 # Format is 1 line (comment lines ignored):
 #   full version number: e.g., 3.1.2.3, 5.2.4, etc
-5.2.2
+5.2.3

earth_enterprise/src/support/geecheck/geecheck.pl

@@ -68,7 +68,7 @@ BEGIN
 EOF
 
 # Parse the command line arguments.
-my $version = "5.2.2";
+my $version = "5.2.3";
 my $server = 0;
 my $show_logs = 0;
 my $show_cpu = 0;
@@ -125,7 +125,8 @@ BEGIN
                       "5.1.3" => ["1", 0],
                       "5.2.0" => ["1", 0],
                       "5.2.1" => ["1", 0],
-                      "5.2.2" => ["1", 0],                      
+                      "5.2.2" => ["1", 0],
+                      "5.2.3" => ["1", 0],
                       );
 my @known_versions = keys(%version_table);
 

earth_enterprise/src/version.txt

@@ -1 +1 @@
-5.2.3
+5.2.3