diff --git a/.gitignore b/.gitignore
index b9f13fb780f..2dde7225cb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,86 +1,87 @@
+# Extensions
+*.factorypath
 *.iml
-rebel.xml
-harvesters/harvester_*.log
-web/src/main/webapp/WEB-INF/data/config/schema_plugins/*/schematron/schematron*.xsl
-web/src/main/webapp/WEB-INF/data/config/schemaplugin-uri-catalog.xml
-web/src/main/webapp/WEB-INF/data/config/schema_plugins/csw-record
-web/src/main/webapp/WEB-INF/data/config/schema_plugins/dublin-core
-web/src/main/webapp/WEB-INF/data/config/schema_plugins/fgdc-std
-web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19*
-web/src/main/webapp/WEB-INF/data/wro4j-cache*
-web/src/main/webapp/scripts/lib/*
-web/src/main/webapp/images/logos/*
-web/src/main/webapp/images/statTmp
-web/src/main/webapp/WEB-INF/data/wro4j*.db
-web/src/main/webResources/WEB-INF/classes/git.properties
-web/logs/
-web/jcs_caching/
-web/*.db
+*.iml
+*.launch
+*.old
+.DS_Store
+.project
+git*.properties
+
+# Directories and paths
+*/*/.*
+*/*/target/
+*/.*
+*/target/
+.*/
 /geonetwork*
+camel-harvesters/wfsfeature-harvester/logs
 changes-*
-web/coverage.ec
-*/target/
-*/*/target/
-web/src/main/webapp/data/
-web/src/main/webapp/WEB-INF/lucene/
-web/src/main/webapp/WEB-INF/metadata_subversion/
-schematrons/.build
+chromedriver
+datadir/
+datadir_*
+datadir_node1/
 docs/*/users/build
 docs/schema-loc-*.rst
-web/src/main/webapp/WEB-INF/server.prop
-*.bak
-*.iml
-.*/
-*/.*
 eclipse/
-web/src/main/webapp/WEB-INF/data/data/metadata_data
-web/src/main/webapp/WEB-INF/data/data/metadata_subversion
-web/src/main/webapp/WEB-INF/data/data/resources/htmlcache
-web/src/main/webapp/WEB-INF/data/data/resources/xml
-web/src/main/webapp/WEB-INF/data/data/resources/images
-web/src/main/webapp/WEB-INF/data/index
-web/src/main/webapp/META-INF/MANIFEST.MF
-web-itest/jcs_caching
-datadir/
-*.factorypath
-web/src/main/webapp/WEB-INF/data/removed/
-web/.springBeans
-*/*/.*
-web/images/
-*.launch
+es/elasticsearch-*
+es/es-dashboards/kibana-*
+harvesters/harvester_*.log
 idea/
-web/src/main/webapp/WEB-INF/data/0*
 jcs_caching/
-web-ui/transifex-src
+node_modules
+out/
+package-lock.json
+rebel.xml
+release/jetty/*
+schemas/*/doc/*/*.rst
+schematrons/.build
+target/
+transifex/transifex-format/
+web-itest/jcs_caching
+web-ui-docs/node
+web-ui-docs/node_modules
+web-ui-docs/package-lock.json
 web-ui/src/main/resources/catalog/lib/gn*.min.js
 web-ui/src/main/resources/catalog/style/gn*.css
 web-ui/src/main/resources/catalog/style/gn.css
-datadir_node1/
-web/src/main/webapp/WEB-INF/data_*
-web-ui-docs/node
-web-ui-docs/node_modules
-out/
+web-ui/transifex-src
+web/*.db
+web/.springBeans
+web/coverage.ec
+web/images/
+web/jcs_caching/
+web/logs/
+web/src/main/webapp/META-INF/MANIFEST.MF
+web/src/main/webapp/WEB-INF/data/0*
+web/src/main/webapp/WEB-INF/data/config/schema_plugins/*/schematron/schematron*.xsl
+web/src/main/webapp/WEB-INF/data/config/schema_plugins/csw-record
+web/src/main/webapp/WEB-INF/data/config/schema_plugins/dublin-core
+web/src/main/webapp/WEB-INF/data/config/schema_plugins/fgdc-std
+web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19*
 web/src/main/webapp/WEB-INF/data/config/schema_plugins/schemaplugin-uri-catalog.xml
-web/geonetwork.trace.db.old
-target/
+web/src/main/webapp/WEB-INF/data/config/schemaplugin-uri-catalog.xml
+web/src/main/webapp/WEB-INF/data/data/backup
+web/src/main/webapp/WEB-INF/data/data/metadata_data
+web/src/main/webapp/WEB-INF/data/data/metadata_subversion
+web/src/main/webapp/WEB-INF/data/data/resources/htmlcache
+web/src/main/webapp/WEB-INF/data/data/resources/images
+web/src/main/webapp/WEB-INF/data/data/resources/xml
 web/src/main/webapp/WEB-INF/data/data/upload/
-transifex/transifex-format/
-datadir_*
-es/elasticsearch-*
-es/es-dashboards/kibana-*
 web/src/main/webapp/WEB-INF/data/harvester_*
-camel-harvesters/wfsfeature-harvester/logs
-web/src/main/webapp/doc/en
-web/src/main/webapp/doc/fr
-web/src/main/webapp/WEB-INF/data/data/backup
+web/src/main/webapp/WEB-INF/data/index
 web/src/main/webapp/WEB-INF/data/node_less_files
 web/src/main/webapp/WEB-INF/data/node_less_files/gn_dynamic_style.json
-schemas/*/doc/*/*.rst
-*.old
-web-ui-docs/package-lock.json
-release/jetty/*
-chromedriver
-node_modules
-package-lock.json
-.project
-.DS_Store
+web/src/main/webapp/WEB-INF/data/removed/
+web/src/main/webapp/WEB-INF/data/wro4j*.db
+web/src/main/webapp/WEB-INF/data/wro4j-cache*
+web/src/main/webapp/WEB-INF/data_*
+web/src/main/webapp/WEB-INF/lucene/
+web/src/main/webapp/WEB-INF/metadata_subversion/
+web/src/main/webapp/WEB-INF/server.prop
+web/src/main/webapp/data/
+web/src/main/webapp/doc/en
+web/src/main/webapp/doc/fr
+web/src/main/webapp/images/logos/*
+web/src/main/webapp/images/statTmp
+web/src/main/webapp/scripts/lib/*
diff --git a/bin/config_Jesse.ps1 b/bin/config_Jesse.ps1
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/installer/.gitignore b/installer/.gitignore
deleted file mode 100644
index 547097af89a..00000000000
--- a/installer/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-svn.properties
-/*.properties
diff --git a/installer/README.md b/installer/README.md
deleted file mode 100644
index cd7903018b6..00000000000
--- a/installer/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-installer
-=========
-
-Geonetwork installer project
\ No newline at end of file
diff --git a/installer/installer-config.xml b/installer/installer-config.xml
deleted file mode 100644
index b680b25ea01..00000000000
--- a/installer/installer-config.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?>
-
-<!--
-  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
-  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
-  ~ and United Nations Environment Programme (UNEP)
-  ~
-  ~ This program is free software; you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation; either version 2 of the License, or (at
-  ~ your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  ~
-  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
-  ~ Rome - Italy. email: geonetwork@osgeo.org
-  -->
-
-<installation version="1.0">
-
-  <!-- =================================================================================== -->
-
-  <info>
-    <appname>geonetwork</appname>
-    <appversion>@version@ @subVersion@</appversion>
-    <authors>
-      <author name="OSGeo" email="geonetwork@osgeo.org"/>
-      <author name="FAO GeoNetwork Team" email="geonetwork@osgeo.org"/>
-      <author name="VAM WFP" email="vamsie@wfp.org"/>
-      <author name="UNEP.net" email="info@unep.net"/>
-      <author name="OCHA" email="ochageodata@un.org"/>
-    </authors>
-    <url>http://geonetwork-opensource.org/</url>
-    <javaversion>@javaVersion@</javaversion>
-  </info>
-
-  <!-- =================================================================================== -->
-
-  <guiprefs width="800" height="600" resizable="yes">
-    <laf name="liquid">
-      <os family="unix"/>
-      <os family="windows"/>
-      <os family="mac"/>
-    </laf>
-    <modifier value="true" key="showDebugWindow"/>
-  </guiprefs>
-
-  <!-- =================================================================================== -->
-
-  <locale>
-    <langpack iso3="eng"/>
-    <langpack iso3="fra"/>
-    <langpack iso3="spa"/>
-  </locale>
-
-  <resources>
-    <res id="HTMLLicencePanel.licence" src="license.html"/>
-    <res id="HTMLLicencePanel.licence_fra" src="license_fra.html"/>
-    <res id="HTMLLicencePanel.licence_spa" src="license_spa.html"/>
-    <res id="HTMLInfoPanel.info" src="../.props/readme.html"/>
-    <res id="HTMLInfoPanel.info_fra" src="../.props/readme_fra.html"/>
-    <res id="HTMLInfoPanel.info_spa" src="../.props/readme_spa.html"/>
-    <res id="userInputLang.xml" src="userInputLang.xml"/>
-    <res id="userInputLang.xml_fra" src="userInputLang.xml_fra.xml"/>
-    <res id="userInputLang.xml_spa" src="userInputLang.xml_spa.xml"/>
-    <res id="Installer.image" src="installer.png"/>
-    <res id="shortcutSpec.xml" src="windows-shortcuts.xml"/>
-    <res id="Unix_shortcutSpec.xml" src="unix-shortcuts.xml"/>
-    <res id="Win_shortcutSpec.xml" src="windows-shortcuts.xml"/>
-    <res id="packsLang.xml" src="packsLang.xml"/>
-    <res id="packsLang.xml_fra" src="packsLang.xml_fra"/>
-    <res id="packsLang.xml_spa" src="packsLang.xml_spa"/>
-  </resources>
-
-  <!-- =================================================================================== -->
-
-  <panels>
-    <panel classname="HelloPanel" id="helloPanel"/>
-    <panel classname="HTMLLicencePanel" id="htmlLicensePanel"/>
-    <panel classname="TargetPanel" id="targetPanel"/>
-    <panel classname="PacksPanel" id="packsPanel"/>
-    <panel classname="InstallPanel" id="installPanel"/>
-    <panel classname="ShortcutPanel" id="shortcutPanel"/>
-    <panel classname="HTMLInfoPanel" id="htmlInfoPanel"/>
-    <panel classname="FinishPanel" id="finishPanel"/>
-  </panels>
-
-  <!-- =================================================================================== -->
-
-  <native type="izpack" name="ShellLink.dll"/>
-
-  <!-- =================================================================================== -->
-
-  <packs>
-    <pack id="core" name="Core" required="yes" preselected="yes">
-      <description/>
-
-      <fileset dir="../release/bin" targetdir="$INSTALL_PATH/bin"/>
-
-      <fileset dir="../release/jetty" targetdir="$INSTALL_PATH/jetty">
-        <exclude name="logs/*.log"/>
-        <exclude name="logs/archive/*.log"/>
-      </fileset>
-
-      <!--singlefile target="$INSTALL_PATH/web/geonetwork.war"
-            src="../web/target/geonetwork.war" override="true"/-->
-
-      <fileset dir="../web/target/geonetwork" targetdir="$INSTALL_PATH/web/geonetwork"/>
-
-      <fileset dir="../release/data" targetdir="$INSTALL_PATH/web/geonetwork/data"/>
-      <fileset dir="../release/schemaPlugins"
-               targetdir="$INSTALL_PATH/web/geonetwork/WEB-INF/data/config/schema_plugins"/>
-
-      <executable targetfile="$INSTALL_PATH/bin/startup.sh"/>
-      <executable targetfile="$INSTALL_PATH/bin/shutdown.sh"/>
-    </pack>
-
-
-    <pack id="inspire" name="European Union INSPIRE Directive configuration pack" required="no"
-          preselected="no">
-      <description/>
-
-      <!-- Enable schematron rules -->
-      <!-- Enable schematron rules -->
-      <singlefile
-        src="../web/target/geonetwork/WEB-INF/data/config/schema_plugins/iso19139/schematron/schematron-rules-inspire.sch"
-        target="$INSTALL_PATH/web/geonetwork/WEB-INF/data/config/schema_plugins/iso19139/schematron/schematron-rules-inspire.sch"
-        override="true"/>
-
-      <singlefile
-        src="../web/target/geonetwork/WEB-INF/data/config/schema_plugins/iso19139/schematron/schematron-rules-inspire-strict.sch"
-        target="$INSTALL_PATH/web/geonetwork/WEB-INF/data/config/schema_plugins/iso19139/schematron/schematron-rules-inspire-strict.sch"
-        override="true"/>
-
-      <!-- GEMET thesaurus files. For INSPIRE, user will use the admin and load them from INSPIRE Registry -->
-      <singlefile src="../web/target/thesauri/gemet.rdf"
-                  target="$INSTALL_PATH/web/geonetwork/WEB-INF/data/config/codelist/external/thesauri/theme/gemet.rdf"
-                  override="true"/>
-
-      <!-- SQL script with Inspire Settings enabled -->
-      <singlefile src="../web/target/inspire/data-db-default.sql"
-                  target="$INSTALL_PATH//web/geonetwork/WEB-INF/classes/setup/sql/data/data-db-default.sql"
-                  override="true"/>
-    </pack>
-
-  </packs>
-
-  <!-- =================================================================================== -->
-
-</installation>
diff --git a/installer/installer.ico b/installer/installer.ico
deleted file mode 100644
index 02ae83d5eda..00000000000
Binary files a/installer/installer.ico and /dev/null differ
diff --git a/installer/installer.png b/installer/installer.png
deleted file mode 100644
index 6c425d72495..00000000000
Binary files a/installer/installer.png and /dev/null differ
diff --git a/installer/launch4j/launch4jConfig-jre.xml b/installer/launch4j/launch4jConfig-jre.xml
deleted file mode 100644
index 512e105627e..00000000000
--- a/installer/launch4j/launch4jConfig-jre.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--
-  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
-  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
-  ~ and United Nations Environment Programme (UNEP)
-  ~
-  ~ This program is free software; you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation; either version 2 of the License, or (at
-  ~ your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  ~
-  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
-  ~ Rome - Italy. email: geonetwork@osgeo.org
-  -->
-
-<!-- The properties 'jar', 'outfile', 'fileVersion', 'txtFileVersion',
-     'productVersion' and 'txtProductVersion' are overruled by the
-     installer build.xml file -->
-
-<launch4jConfig>
-  <dontWrapJar>false</dontWrapJar>
-  <headerType>0</headerType>
-  <jar>../geonetwork-2.4.0/geonetwork-install.jar</jar>
-  <outfile>../geonetwork-2.4.0/geonetwork-install.exe</outfile>
-  <errTitle>GeoNetwork opensource Installation Error</errTitle>
-  <!--  <downloadUrl>http://java.sun.com/javase/downloads/index_jdk5.jsp</downloadUrl>
-    <supportURL>http://java.sun.com/j2se/1.5.0/jre/install-windows.html</supportURL> -->
-  <jarArgs></jarArgs>
-  <chdir></chdir>
-  <customProcName>false</customProcName>
-  <stayAlive>false</stayAlive>
-  <icon>../installer.ico</icon>
-  <jre>
-    <path>jre1.5.0_12</path>
-    <!-- The minimal version required by the IzPack installer is 1.4
-         The JRE for GeoNetwork is included in the installer -->
-    <minVersion>1.4.0</minVersion>
-    <!--    <maxVersion>1.5.0_12</maxVersion> -->
-    <initialHeapSize>256</initialHeapSize>
-    <maxHeapSize>512</maxHeapSize>
-    <args></args>
-  </jre>
-  <splash>
-    <file>../splash.bmp</file>
-    <waitForWindow>true</waitForWindow>
-    <timeout>60</timeout>
-    <timeoutErr>true</timeoutErr>
-  </splash>
-  <versionInfo>
-    <fileVersion>2.4.0.0</fileVersion>
-    <txtFileVersion>2.4.0 0</txtFileVersion>
-    <fileDescription>GeoNetwork opensource Windows Installer</fileDescription>
-    <copyright>OSGeo (http://www.osgeo.org)</copyright>
-    <productVersion>2.4.0.0</productVersion>
-    <txtProductVersion>2.4.0 0</txtProductVersion>
-    <productName>GeoNetwork opensource</productName>
-    <companyName></companyName>
-    <internalName>geonetwork-install.jar</internalName>
-    <originalFilename>geonetwork-install.exe</originalFilename>
-  </versionInfo>
-</launch4jConfig>
diff --git a/installer/launch4j/launch4jConfig.xml b/installer/launch4j/launch4jConfig.xml
deleted file mode 100644
index 5a5b440e5c9..00000000000
--- a/installer/launch4j/launch4jConfig.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
-  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
-  ~ and United Nations Environment Programme (UNEP)
-  ~
-  ~ This program is free software; you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation; either version 2 of the License, or (at
-  ~ your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  ~
-  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
-  ~ Rome - Italy. email: geonetwork@osgeo.org
-  -->
-
-<!-- The properties 'jar', 'outfile', 'fileVersion', 'txtFileVersion',
-     'productVersion' and 'txtProductVersion' are overruled by the
-     installer build.xml file -->
-
-<launch4jConfig>
-  <dontWrapJar>false</dontWrapJar>
-  <headerType>0</headerType>
-  <jar>../geonetwork-2.6.0/geonetwork-install.jar</jar>
-  <outfile>../geonetwork-2.6.0/geonetwork-install.exe</outfile>
-  <errTitle>GeoNetwork opensource Installation Error</errTitle>
-  <jarArgs></jarArgs>
-  <chdir></chdir>
-  <customProcName>false</customProcName>
-  <stayAlive>false</stayAlive>
-  <icon>../installer.ico</icon>
-  <jre>
-    <!--    <path>jre1.5.0_12</path> -->
-    <minVersion>1.5.0</minVersion>
-    <!--    <maxVersion>1.5.0_15</maxVersion> -->
-    <initialHeapSize>256</initialHeapSize>
-    <maxHeapSize>512</maxHeapSize>
-    <args></args>
-  </jre>
-  <splash>
-    <file>../splash.bmp</file>
-    <waitForWindow>true</waitForWindow>
-    <timeout>60</timeout>
-    <timeoutErr>true</timeoutErr>
-  </splash>
-  <versionInfo>
-    <fileVersion>2.6.0.0</fileVersion>
-    <txtFileVersion>2.6.0 0</txtFileVersion>
-    <fileDescription>GeoNetwork opensource Windows Installer</fileDescription>
-    <copyright>OSGeo (http://www.osgeo.org)</copyright>
-    <productVersion>2.6.0.0</productVersion>
-    <txtProductVersion>2.6.0 0</txtProductVersion>
-    <productName>GeoNetwork opensource</productName>
-    <companyName></companyName>
-    <internalName>geonetwork-install.jar</internalName>
-    <originalFilename>geonetwork-install.exe</originalFilename>
-  </versionInfo>
-</launch4jConfig>
diff --git a/installer/launch4j/licenses/JGoodies.Forms.LICENSE.txt b/installer/launch4j/licenses/JGoodies.Forms.LICENSE.txt
deleted file mode 100644
index e04618d9d1c..00000000000
--- a/installer/launch4j/licenses/JGoodies.Forms.LICENSE.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-
-              The BSD License for the JGoodies Forms
-              ======================================
-
-Copyright (c) 2002-2004 JGoodies Karsten Lentzsch. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
- o Redistributions of source code must retain the above copyright notice, 
-   this list of conditions and the following disclaimer. 
-    
- o Redistributions in binary form must reproduce the above copyright notice, 
-   this list of conditions and the following disclaimer in the documentation 
-   and/or other materials provided with the distribution. 
-    
- o Neither the name of JGoodies Karsten Lentzsch nor the names of 
-   its contributors may be used to endorse or promote products derived 
-   from this software without specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/installer/launch4j/licenses/JGoodies.Looks.LICENSE.txt b/installer/launch4j/licenses/JGoodies.Looks.LICENSE.txt
deleted file mode 100644
index d68e95c3055..00000000000
--- a/installer/launch4j/licenses/JGoodies.Looks.LICENSE.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-           The BSD License for the JGoodies Looks
-           ======================================
-
-Copyright (c) 2003 JGoodies Karsten Lentzsch. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
- o Redistributions of source code must retain the above copyright notice, 
-   this list of conditions and the following disclaimer. 
-    
- o Redistributions in binary form must reproduce the above copyright notice, 
-   this list of conditions and the following disclaimer in the documentation 
-   and/or other materials provided with the distribution. 
-    
- o Neither the name of JGoodies Karsten Lentzsch nor the names of 
-   its contributors may be used to endorse or promote products derived 
-   from this software without specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/installer/launch4j/licenses/MinGW.LICENSE.txt b/installer/launch4j/licenses/MinGW.LICENSE.txt
deleted file mode 100644
index aea85bd8dcd..00000000000
--- a/installer/launch4j/licenses/MinGW.LICENSE.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-MinGW - Licensing Terms
-
-Various pieces distributed with MinGW come with its own copyright and license:
-
-Basic MinGW runtime
-    MinGW base runtime package is uncopyrighted and placed in the public domain.
-    This basically means that you can do what you want with the code.
-
-w32api
-    You are free to use, modify and copy this package.
-    No restrictions are imposed on programs or object files compiled with this library.
-    You may not restrict the the usage of this library.
-    You may distribute this library as part of another package or as a modified package
-    if and only if you do not restrict the usage of the portions consisting
-    of this (optionally modified) library.
-    If distributed as a modified package then this file must be included.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty
-    of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-MinGW profiling code
-    MinGW profiling code is distributed under the GNU General Public License. 
-
-The development tools such as GCC, GDB, GNU Make, etc all covered by GNU General Public License.
diff --git a/installer/launch4j/licenses/Nuvola.Icon.Theme.LICENSE.txt b/installer/launch4j/licenses/Nuvola.Icon.Theme.LICENSE.txt
deleted file mode 100644
index b1e3f5a2638..00000000000
--- a/installer/launch4j/licenses/Nuvola.Icon.Theme.LICENSE.txt
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/installer/launch4j/licenses/XStream.LICENSE.txt b/installer/launch4j/licenses/XStream.LICENSE.txt
deleted file mode 100644
index 4848b3e4e5d..00000000000
--- a/installer/launch4j/licenses/XStream.LICENSE.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-(BSD Style License)
-
-Copyright (c) 2003-2004, Joe Walnes
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions and the following disclaimer. Redistributions in binary form must reproduce
-the above copyright notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the distribution.
-
-Neither the name of XStream nor the names of its contributors may be used to endorse
-or promote products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
diff --git a/installer/launch4j/licenses/commons.LICENSE.txt b/installer/launch4j/licenses/commons.LICENSE.txt
deleted file mode 100644
index e12244a4510..00000000000
--- a/installer/launch4j/licenses/commons.LICENSE.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-
- ============================================================================
-                   The Apache Software License, Version 1.1
- ============================================================================
- 
- Copyright (C) @year@ The Apache Software Foundation. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
- 
- 1. Redistributions of  source code must  retain the above copyright  notice,
-    this list of conditions and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
- 
- 3. The end-user documentation included with the redistribution, if any, must
-    include  the following  acknowledgment:  "This product includes  software
-    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
-    Alternately, this  acknowledgment may  appear in the software itself,  if
-    and wherever such third-party acknowledgments normally appear.
- 
- 4. The names "Apache Cocoon" and  "Apache Software Foundation" must  not  be
-    used to  endorse or promote  products derived from  this software without
-    prior written permission. For written permission, please contact
-    apache@apache.org.
- 
- 5. Products  derived from this software may not  be called "Apache", nor may
-    "Apache" appear  in their name,  without prior written permission  of the
-    Apache Software Foundation.
- 
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
- APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
- ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
- (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation and was  originally created by
- Stefano Mazzocchi  <stefano@apache.org>. For more  information on the Apache 
- Software Foundation, please see <http://www.apache.org/>.
- 
-*/
diff --git a/installer/launch4j/licenses/foxtrot.LICENSE.txt b/installer/launch4j/licenses/foxtrot.LICENSE.txt
deleted file mode 100644
index 49e0c5a5182..00000000000
--- a/installer/launch4j/licenses/foxtrot.LICENSE.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2002, Simone Bordet & Marco Cravero
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted 
-provided that the following conditions are met: 
-
-	- Redistributions of source code must retain the above copyright notice, 
-	  this list of conditions and the following disclaimer. 
-
-	- Redistributions in binary form must reproduce the above copyright notice, 
-	  this list of conditions and the following disclaimer in the documentation 
-	  and/or other materials provided with the distribution. 
-
-	- Neither the name of Foxtrot nor the names of the contributors may be used 
-	  to endorse or promote products derived from this software without specific prior 
-	  written permission.
-	  
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS 
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS 
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF 
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/installer/launch4j/licenses/launch4j-license.txt b/installer/launch4j/licenses/launch4j-license.txt
deleted file mode 100644
index 3912109b5cd..00000000000
--- a/installer/launch4j/licenses/launch4j-license.txt
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/installer/launch4j/licenses/launch4j-readme.txt b/installer/launch4j/licenses/launch4j-readme.txt
deleted file mode 100644
index 3c147abc26e..00000000000
--- a/installer/launch4j/licenses/launch4j-readme.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Launch4j (http://launch4j.sourceforge.net/)
-Cross-platform Java application wrapper for creating Windows native executables.
-
-Copyright (C) 2004, 2006 Grzegorz Kowal
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-The Head subproject (the code which is attached to the wrapped jars) is
-licensed under the GNU Lesser General Public License.
-
-Launch4j may be used for wrapping closed source, commercial applications.
-
-The following projects are used by Launch4j...
-	MinGW binutils (http://www.mingw.org/)
-	Commons BeanUtils (http://jakarta.apache.org/commons/beanutils/)
-	Commons Logging (http://jakarta.apache.org/commons/logging/)
-	XStream (http://xstream.codehaus.org/)
-	JGoodies Forms (http://www.jgoodies.com/freeware/forms/)
-	JGoodies Looks (http://www.jgoodies.com/freeware/looks/)
-	Foxtrot (http://foxtrot.sourceforge.net/)
-	Nuvola Icon Theme (http://www.icon-king.com)
-	Forms were created using Abeille Forms Designer (https://abeille.dev.java.net/)
-
-This product includes software developed by the Apache Software Foundation (http://www.apache.org/).
diff --git a/installer/launch4j/macosx/bin/ld b/installer/launch4j/macosx/bin/ld
deleted file mode 100644
index cce8b13cefb..00000000000
Binary files a/installer/launch4j/macosx/bin/ld and /dev/null differ
diff --git a/installer/launch4j/macosx/bin/readme.txt b/installer/launch4j/macosx/bin/readme.txt
deleted file mode 100644
index 76b7753e3cb..00000000000
--- a/installer/launch4j/macosx/bin/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-The MinGW binutils were built on Mac OS X 10.4 by Peter Centgraf
diff --git a/installer/launch4j/macosx/bin/windres b/installer/launch4j/macosx/bin/windres
deleted file mode 100644
index 6880d0e5162..00000000000
Binary files a/installer/launch4j/macosx/bin/windres and /dev/null differ
diff --git a/installer/launch4j/macosx/head/consolehead.o b/installer/launch4j/macosx/head/consolehead.o
deleted file mode 100644
index 61cea93b04f..00000000000
Binary files a/installer/launch4j/macosx/head/consolehead.o and /dev/null differ
diff --git a/installer/launch4j/macosx/head/guihead.o b/installer/launch4j/macosx/head/guihead.o
deleted file mode 100644
index 3c660435b78..00000000000
Binary files a/installer/launch4j/macosx/head/guihead.o and /dev/null differ
diff --git a/installer/launch4j/macosx/head/head.o b/installer/launch4j/macosx/head/head.o
deleted file mode 100644
index e12d95db548..00000000000
Binary files a/installer/launch4j/macosx/head/head.o and /dev/null differ
diff --git a/installer/launch4j/macosx/launch4j.jar b/installer/launch4j/macosx/launch4j.jar
deleted file mode 100644
index f5cf0d573ad..00000000000
Binary files a/installer/launch4j/macosx/launch4j.jar and /dev/null differ
diff --git a/installer/launch4j/macosx/launch4j.jfpr b/installer/launch4j/macosx/launch4j.jfpr
deleted file mode 100644
index a2e63ebc520..00000000000
Binary files a/installer/launch4j/macosx/launch4j.jfpr and /dev/null differ
diff --git a/installer/launch4j/macosx/lib/xstream.jar b/installer/launch4j/macosx/lib/xstream.jar
deleted file mode 100644
index 0245e057321..00000000000
Binary files a/installer/launch4j/macosx/lib/xstream.jar and /dev/null differ
diff --git a/installer/launch4j/macosx/w32api/crt2.o b/installer/launch4j/macosx/w32api/crt2.o
deleted file mode 100644
index f81f836cf00..00000000000
Binary files a/installer/launch4j/macosx/w32api/crt2.o and /dev/null differ
diff --git a/installer/launch4j/macosx/w32api/libadvapi32.a b/installer/launch4j/macosx/w32api/libadvapi32.a
deleted file mode 100644
index c471853c7d0..00000000000
Binary files a/installer/launch4j/macosx/w32api/libadvapi32.a and /dev/null differ
diff --git a/installer/launch4j/macosx/w32api/libgcc.a b/installer/launch4j/macosx/w32api/libgcc.a
deleted file mode 100644
index d3f89479ee9..00000000000
Binary files a/installer/launch4j/macosx/w32api/libgcc.a and /dev/null differ
diff --git a/installer/launch4j/macosx/w32api/libkernel32.a b/installer/launch4j/macosx/w32api/libkernel32.a
deleted file mode 100644
index 5d3eb074f50..00000000000
Binary files a/installer/launch4j/macosx/w32api/libkernel32.a and /dev/null differ
diff --git a/installer/launch4j/macosx/w32api/libmingw32.a b/installer/launch4j/macosx/w32api/libmingw32.a
deleted file mode 100644
index d1f7888d812..00000000000
Binary files a/installer/launch4j/macosx/w32api/libmingw32.a and /dev/null differ
diff --git a/installer/launch4j/macosx/w32api/libmsvcrt.a b/installer/launch4j/macosx/w32api/libmsvcrt.a
deleted file mode 100644
index 6714146b695..00000000000
Binary files a/installer/launch4j/macosx/w32api/libmsvcrt.a and /dev/null differ
diff --git a/installer/launch4j/macosx/w32api/libshell32.a b/installer/launch4j/macosx/w32api/libshell32.a
deleted file mode 100644
index d35fbdaf375..00000000000
Binary files a/installer/launch4j/macosx/w32api/libshell32.a and /dev/null differ
diff --git a/installer/launch4j/macosx/w32api/libuser32.a b/installer/launch4j/macosx/w32api/libuser32.a
deleted file mode 100644
index 387fb650d23..00000000000
Binary files a/installer/launch4j/macosx/w32api/libuser32.a and /dev/null differ
diff --git a/installer/launch4j/unix/bin/ld b/installer/launch4j/unix/bin/ld
deleted file mode 100644
index 1d3f4091d4a..00000000000
Binary files a/installer/launch4j/unix/bin/ld and /dev/null differ
diff --git a/installer/launch4j/unix/bin/windres b/installer/launch4j/unix/bin/windres
deleted file mode 100644
index a67a74be4b6..00000000000
Binary files a/installer/launch4j/unix/bin/windres and /dev/null differ
diff --git a/installer/launch4j/unix/head/consolehead.o b/installer/launch4j/unix/head/consolehead.o
deleted file mode 100644
index 61cea93b04f..00000000000
Binary files a/installer/launch4j/unix/head/consolehead.o and /dev/null differ
diff --git a/installer/launch4j/unix/head/guihead.o b/installer/launch4j/unix/head/guihead.o
deleted file mode 100644
index 3c660435b78..00000000000
Binary files a/installer/launch4j/unix/head/guihead.o and /dev/null differ
diff --git a/installer/launch4j/unix/head/head.o b/installer/launch4j/unix/head/head.o
deleted file mode 100644
index e12d95db548..00000000000
Binary files a/installer/launch4j/unix/head/head.o and /dev/null differ
diff --git a/installer/launch4j/unix/launch4j.jar b/installer/launch4j/unix/launch4j.jar
deleted file mode 100644
index f5cf0d573ad..00000000000
Binary files a/installer/launch4j/unix/launch4j.jar and /dev/null differ
diff --git a/installer/launch4j/unix/launch4j.jfpr b/installer/launch4j/unix/launch4j.jfpr
deleted file mode 100644
index a2e63ebc520..00000000000
Binary files a/installer/launch4j/unix/launch4j.jfpr and /dev/null differ
diff --git a/installer/launch4j/unix/lib/xstream.jar b/installer/launch4j/unix/lib/xstream.jar
deleted file mode 100644
index 0245e057321..00000000000
Binary files a/installer/launch4j/unix/lib/xstream.jar and /dev/null differ
diff --git a/installer/launch4j/unix/w32api/crt2.o b/installer/launch4j/unix/w32api/crt2.o
deleted file mode 100644
index f81f836cf00..00000000000
Binary files a/installer/launch4j/unix/w32api/crt2.o and /dev/null differ
diff --git a/installer/launch4j/unix/w32api/libadvapi32.a b/installer/launch4j/unix/w32api/libadvapi32.a
deleted file mode 100644
index c471853c7d0..00000000000
Binary files a/installer/launch4j/unix/w32api/libadvapi32.a and /dev/null differ
diff --git a/installer/launch4j/unix/w32api/libgcc.a b/installer/launch4j/unix/w32api/libgcc.a
deleted file mode 100644
index d3f89479ee9..00000000000
Binary files a/installer/launch4j/unix/w32api/libgcc.a and /dev/null differ
diff --git a/installer/launch4j/unix/w32api/libkernel32.a b/installer/launch4j/unix/w32api/libkernel32.a
deleted file mode 100644
index 5d3eb074f50..00000000000
Binary files a/installer/launch4j/unix/w32api/libkernel32.a and /dev/null differ
diff --git a/installer/launch4j/unix/w32api/libmingw32.a b/installer/launch4j/unix/w32api/libmingw32.a
deleted file mode 100644
index d1f7888d812..00000000000
Binary files a/installer/launch4j/unix/w32api/libmingw32.a and /dev/null differ
diff --git a/installer/launch4j/unix/w32api/libmsvcrt.a b/installer/launch4j/unix/w32api/libmsvcrt.a
deleted file mode 100644
index 6714146b695..00000000000
Binary files a/installer/launch4j/unix/w32api/libmsvcrt.a and /dev/null differ
diff --git a/installer/launch4j/unix/w32api/libshell32.a b/installer/launch4j/unix/w32api/libshell32.a
deleted file mode 100644
index d35fbdaf375..00000000000
Binary files a/installer/launch4j/unix/w32api/libshell32.a and /dev/null differ
diff --git a/installer/launch4j/unix/w32api/libuser32.a b/installer/launch4j/unix/w32api/libuser32.a
deleted file mode 100644
index 387fb650d23..00000000000
Binary files a/installer/launch4j/unix/w32api/libuser32.a and /dev/null differ
diff --git a/installer/launch4j/win/bin/ld.exe b/installer/launch4j/win/bin/ld.exe
deleted file mode 100644
index f388b95133a..00000000000
Binary files a/installer/launch4j/win/bin/ld.exe and /dev/null differ
diff --git a/installer/launch4j/win/bin/windres.exe b/installer/launch4j/win/bin/windres.exe
deleted file mode 100644
index 4ad2ae98a78..00000000000
Binary files a/installer/launch4j/win/bin/windres.exe and /dev/null differ
diff --git a/installer/launch4j/win/head/consolehead.o b/installer/launch4j/win/head/consolehead.o
deleted file mode 100644
index 61cea93b04f..00000000000
Binary files a/installer/launch4j/win/head/consolehead.o and /dev/null differ
diff --git a/installer/launch4j/win/head/guihead.o b/installer/launch4j/win/head/guihead.o
deleted file mode 100644
index 3c660435b78..00000000000
Binary files a/installer/launch4j/win/head/guihead.o and /dev/null differ
diff --git a/installer/launch4j/win/head/head.o b/installer/launch4j/win/head/head.o
deleted file mode 100644
index e12d95db548..00000000000
Binary files a/installer/launch4j/win/head/head.o and /dev/null differ
diff --git a/installer/launch4j/win/launch4j.jar b/installer/launch4j/win/launch4j.jar
deleted file mode 100644
index f5cf0d573ad..00000000000
Binary files a/installer/launch4j/win/launch4j.jar and /dev/null differ
diff --git a/installer/launch4j/win/launch4j.jfpr b/installer/launch4j/win/launch4j.jfpr
deleted file mode 100644
index a2e63ebc520..00000000000
Binary files a/installer/launch4j/win/launch4j.jfpr and /dev/null differ
diff --git a/installer/launch4j/win/lib/xstream.jar b/installer/launch4j/win/lib/xstream.jar
deleted file mode 100644
index 0245e057321..00000000000
Binary files a/installer/launch4j/win/lib/xstream.jar and /dev/null differ
diff --git a/installer/launch4j/win/w32api/crt2.o b/installer/launch4j/win/w32api/crt2.o
deleted file mode 100644
index f81f836cf00..00000000000
Binary files a/installer/launch4j/win/w32api/crt2.o and /dev/null differ
diff --git a/installer/launch4j/win/w32api/libadvapi32.a b/installer/launch4j/win/w32api/libadvapi32.a
deleted file mode 100644
index c471853c7d0..00000000000
Binary files a/installer/launch4j/win/w32api/libadvapi32.a and /dev/null differ
diff --git a/installer/launch4j/win/w32api/libgcc.a b/installer/launch4j/win/w32api/libgcc.a
deleted file mode 100644
index d3f89479ee9..00000000000
Binary files a/installer/launch4j/win/w32api/libgcc.a and /dev/null differ
diff --git a/installer/launch4j/win/w32api/libkernel32.a b/installer/launch4j/win/w32api/libkernel32.a
deleted file mode 100644
index 5d3eb074f50..00000000000
Binary files a/installer/launch4j/win/w32api/libkernel32.a and /dev/null differ
diff --git a/installer/launch4j/win/w32api/libmingw32.a b/installer/launch4j/win/w32api/libmingw32.a
deleted file mode 100644
index d1f7888d812..00000000000
Binary files a/installer/launch4j/win/w32api/libmingw32.a and /dev/null differ
diff --git a/installer/launch4j/win/w32api/libmsvcrt.a b/installer/launch4j/win/w32api/libmsvcrt.a
deleted file mode 100644
index 6714146b695..00000000000
Binary files a/installer/launch4j/win/w32api/libmsvcrt.a and /dev/null differ
diff --git a/installer/launch4j/win/w32api/libshell32.a b/installer/launch4j/win/w32api/libshell32.a
deleted file mode 100644
index d35fbdaf375..00000000000
Binary files a/installer/launch4j/win/w32api/libshell32.a and /dev/null differ
diff --git a/installer/launch4j/win/w32api/libuser32.a b/installer/launch4j/win/w32api/libuser32.a
deleted file mode 100644
index 387fb650d23..00000000000
Binary files a/installer/launch4j/win/w32api/libuser32.a and /dev/null differ
diff --git a/installer/lib/standalone-compiler.jar b/installer/lib/standalone-compiler.jar
deleted file mode 100644
index bbc08109dd5..00000000000
Binary files a/installer/lib/standalone-compiler.jar and /dev/null differ
diff --git a/installer/license_fra.html b/installer/license_fra.html
deleted file mode 100644
index 97af56f2c4c..00000000000
--- a/installer/license_fra.html
+++ /dev/null
@@ -1,412 +0,0 @@
-<HTML>
-<HEAD>
-  <TITLE>GNU General Public License - GNU Project - Free Software Foundation (FSF)</TITLE>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF" TEXT="#000000">
-<H1>GNU GENERAL PUBLIC LICENSE</H1>
-<P>
-  Version 2, June 1991
-
-</P>
-
-<PRE>
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-</PRE>
-
-
-<H2>Preamble</H2>
-
-<P>
-  The licenses for most software are designed to take away your
-  freedom to share and change it. By contrast, the GNU General Public
-  License is intended to guarantee your freedom to share and change free
-  software--to make sure the software is free for all its users. This
-  General Public License applies to most of the Free Software
-  Foundation's software and to any other program whose authors commit to
-  using it. (Some other Free Software Foundation software is covered by
-  the GNU Library General Public License instead.) You can apply it to
-  your programs, too.
-
-</P>
-<P>
-  When we speak of free software, we are referring to freedom, not
-  price. Our General Public Licenses are designed to make sure that you
-  have the freedom to distribute copies of free software (and charge for
-  this service if you wish), that you receive source code or can get it
-  if you want it, that you can change the software or use pieces of it
-  in new free programs; and that you know you can do these things.
-
-</P>
-<P>
-  To protect your rights, we need to make restrictions that forbid
-  anyone to deny you these rights or to ask you to surrender the rights.
-  These restrictions translate to certain responsibilities for you if you
-  distribute copies of the software, or if you modify it.
-
-</P>
-<P>
-  For example, if you distribute copies of such a program, whether
-  gratis or for a fee, you must give the recipients all the rights that
-  you have. You must make sure that they, too, receive or can get the
-  source code. And you must show them these terms so they know their
-  rights.
-
-</P>
-<P>
-  We protect your rights with two steps: (1) copyright the software, and
-  (2) offer you this license which gives you legal permission to copy,
-  distribute and/or modify the software.
-
-</P>
-<P>
-  Also, for each author's protection and ours, we want to make certain
-  that everyone understands that there is no warranty for this free
-  software. If the software is modified by someone else and passed on, we
-  want its recipients to know that what they have is not the original, so
-  that any problems introduced by others will not reflect on the original
-  authors' reputations.
-
-</P>
-<P>
-  Finally, any free program is threatened constantly by software
-  patents. We wish to avoid the danger that redistributors of a free
-  program will individually obtain patent licenses, in effect making the
-  program proprietary. To prevent this, we have made it clear that any
-  patent must be licensed for everyone's free use or not licensed at all.
-
-</P>
-<P>
-  The precise terms and conditions for copying, distribution and
-  modification follow.
-
-</P>
-
-
-<H2>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</H2>
-
-
-<P>
-
-  <STRONG>0.</STRONG>
-  This License applies to any program or other work which contains
-  a notice placed by the copyright holder saying it may be distributed
-  under the terms of this General Public License. The "Program", below,
-  refers to any such program or work, and a "work based on the Program"
-  means either the Program or any derivative work under copyright law:
-  that is to say, a work containing the Program or a portion of it,
-  either verbatim or with modifications and/or translated into another
-  language. (Hereinafter, translation is included without limitation in
-  the term "modification".) Each licensee is addressed as "you".
-<P>
-
-  Activities other than copying, distribution and modification are not
-  covered by this License; they are outside its scope. The act of
-  running the Program is not restricted, and the output from the Program
-  is covered only if its contents constitute a work based on the
-  Program (independent of having been made by running the Program).
-  Whether that is true depends on what the Program does.
-
-<P>
-
-  <STRONG>1.</STRONG>
-  You may copy and distribute verbatim copies of the Program's
-  source code as you receive it, in any medium, provided that you
-  conspicuously and appropriately publish on each copy an appropriate
-  copyright notice and disclaimer of warranty; keep intact all the
-  notices that refer to this License and to the absence of any warranty;
-  and give any other recipients of the Program a copy of this License
-  along with the Program.
-<P>
-
-  You may charge a fee for the physical act of transferring a copy, and
-  you may at your option offer warranty protection in exchange for a fee.
-<P>
-
-  <STRONG>2.</STRONG>
-  You may modify your copy or copies of the Program or any portion
-  of it, thus forming a work based on the Program, and copy and
-  distribute such modifications or work under the terms of Section 1
-  above, provided that you also meet all of these conditions:
-<P>
-
-<DL>
-  <DT>
-  <DD>
-    <STRONG>a)</STRONG>
-    You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-  </DD>
-  </DT>
-</DL>
-<P>
-<DL>
-  <DT>
-  <DD>
-    <STRONG>b)</STRONG>
-    You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-  </DD>
-  </DT>
-</DL>
-<P>
-<DL>
-  <DT>
-  <DD>
-    <STRONG>c)</STRONG>
-    If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License. (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-  </DD>
-  </DT>
-</DL>
-<P>
-
-  These requirements apply to the modified work as a whole. If
-  identifiable sections of that work are not derived from the Program,
-  and can be reasonably considered independent and separate works in
-  themselves, then this License, and its terms, do not apply to those
-  sections when you distribute them as separate works. But when you
-  distribute the same sections as part of a whole which is a work based
-  on the Program, the distribution of the whole must be on the terms of
-  this License, whose permissions for other licensees extend to the
-  entire whole, and thus to each and every part regardless of who wrote it.
-<P>
-
-  Thus, it is not the intent of this section to claim rights or contest
-  your rights to work written entirely by you; rather, the intent is to
-  exercise the right to control the distribution of derivative or
-  collective works based on the Program.
-<P>
-
-  In addition, mere aggregation of another work not based on the Program
-  with the Program (or with a work based on the Program) on a volume of
-  a storage or distribution medium does not bring the other work under
-  the scope of this License.
-
-<P>
-
-  <STRONG>3.</STRONG>
-  You may copy and distribute the Program (or a work based on it,
-  under Section 2) in object code or executable form under the terms of
-  Sections 1 and 2 above provided that you also do one of the following:
-
-
-  <!-- we use this doubled UL to get the sub-sections indented, -->
-  <!-- while making the bullets as unobvious as possible. -->
-
-<DL>
-  <DT>
-  <DD>
-    <STRONG>a)</STRONG>
-    Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-  </DD>
-  </DT>
-</DL>
-<P>
-<DL>
-  <DT>
-  <DD>
-    <STRONG>b)</STRONG>
-    Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-  </DD>
-  </DT>
-</DL>
-<P>
-<DL>
-  <DT>
-  <DD>
-    <STRONG>c)</STRONG>
-    Accompany it with the information you received as to the offer
-    to distribute corresponding source code. (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-  </DD>
-  </DT>
-</DL>
-<P>
-
-  The source code for a work means the preferred form of the work for
-  making modifications to it. For an executable work, complete source
-  code means all the source code for all modules it contains, plus any
-  associated interface definition files, plus the scripts used to
-  control compilation and installation of the executable. However, as a
-  special exception, the source code distributed need not include
-  anything that is normally distributed (in either source or binary
-  form) with the major components (compiler, kernel, and so on) of the
-  operating system on which the executable runs, unless that component
-  itself accompanies the executable.
-<P>
-
-  If distribution of executable or object code is made by offering
-  access to copy from a designated place, then offering equivalent
-  access to copy the source code from the same place counts as
-  distribution of the source code, even though third parties are not
-  compelled to copy the source along with the object code.
-<P>
-
-  <STRONG>4.</STRONG>
-  You may not copy, modify, sublicense, or distribute the Program
-  except as expressly provided under this License. Any attempt
-  otherwise to copy, modify, sublicense or distribute the Program is
-  void, and will automatically terminate your rights under this License.
-  However, parties who have received copies, or rights, from you under
-  this License will not have their licenses terminated so long as such
-  parties remain in full compliance.
-
-<P>
-
-  <STRONG>5.</STRONG>
-  You are not required to accept this License, since you have not
-  signed it. However, nothing else grants you permission to modify or
-  distribute the Program or its derivative works. These actions are
-  prohibited by law if you do not accept this License. Therefore, by
-  modifying or distributing the Program (or any work based on the
-  Program), you indicate your acceptance of this License to do so, and
-  all its terms and conditions for copying, distributing or modifying
-  the Program or works based on it.
-
-<P>
-
-  <STRONG>6.</STRONG>
-  Each time you redistribute the Program (or any work based on the
-  Program), the recipient automatically receives a license from the
-  original licensor to copy, distribute or modify the Program subject to
-  these terms and conditions. You may not impose any further
-  restrictions on the recipients' exercise of the rights granted herein.
-  You are not responsible for enforcing compliance by third parties to
-  this License.
-
-<P>
-
-  <STRONG>7.</STRONG>
-  If, as a consequence of a court judgment or allegation of patent
-  infringement or for any other reason (not limited to patent issues),
-  conditions are imposed on you (whether by court order, agreement or
-  otherwise) that contradict the conditions of this License, they do not
-  excuse you from the conditions of this License. If you cannot
-  distribute so as to satisfy simultaneously your obligations under this
-  License and any other pertinent obligations, then as a consequence you
-  may not distribute the Program at all. For example, if a patent
-  license would not permit royalty-free redistribution of the Program by
-  all those who receive copies directly or indirectly through you, then
-  the only way you could satisfy both it and this License would be to
-  refrain entirely from distribution of the Program.
-<P>
-
-  If any portion of this section is held invalid or unenforceable under
-  any particular circumstance, the balance of the section is intended to
-  apply and the section as a whole is intended to apply in other
-  circumstances.
-<P>
-
-  It is not the purpose of this section to induce you to infringe any
-  patents or other property right claims or to contest validity of any
-  such claims; this section has the sole purpose of protecting the
-  integrity of the free software distribution system, which is
-  implemented by public license practices. Many people have made
-  generous contributions to the wide range of software distributed
-  through that system in reliance on consistent application of that
-  system; it is up to the author/donor to decide if he or she is willing
-  to distribute software through any other system and a licensee cannot
-  impose that choice.
-<P>
-
-  This section is intended to make thoroughly clear what is believed to
-  be a consequence of the rest of this License.
-
-<P>
-
-  <STRONG>8.</STRONG>
-  If the distribution and/or use of the Program is restricted in
-  certain countries either by patents or by copyrighted interfaces, the
-  original copyright holder who places the Program under this License
-  may add an explicit geographical distribution limitation excluding
-  those countries, so that distribution is permitted only in or among
-  countries not thus excluded. In such case, this License incorporates
-  the limitation as if written in the body of this License.
-
-<P>
-
-  <STRONG>9.</STRONG>
-  The Free Software Foundation may publish revised and/or new versions
-  of the General Public License from time to time. Such new versions will
-  be similar in spirit to the present version, but may differ in detail to
-  address new problems or concerns.
-<P>
-
-  Each version is given a distinguishing version number. If the Program
-  specifies a version number of this License which applies to it and "any
-  later version", you have the option of following the terms and conditions
-  either of that version or of any later version published by the Free
-  Software Foundation. If the Program does not specify a version number of
-  this License, you may choose any version ever published by the Free Software
-  Foundation.
-
-<P>
-
-
-  <STRONG>10.</STRONG>
-  If you wish to incorporate parts of the Program into other free
-  programs whose distribution conditions are different, write to the author
-  to ask for permission. For software which is copyrighted by the Free
-  Software Foundation, write to the Free Software Foundation; we sometimes
-  make exceptions for this. Our decision will be guided by the two goals
-  of preserving the free status of all derivatives of our free software and
-  of promoting the sharing and reuse of software generally.
-
-
-<P><STRONG>NO WARRANTY</STRONG></P>
-
-<P>
-
-  <STRONG>11.</STRONG>
-  BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-  FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-  OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-  PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-  OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-  TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-  PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-  REPAIR OR CORRECTION.
-
-<P>
-
-  <STRONG>12.</STRONG>
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-  WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-  REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-  INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-  OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-  TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-  YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-  PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGES.
-
-<P>
-
-<H2>END OF TERMS AND CONDITIONS</H2>
-
-</body>
-</html>
diff --git a/installer/license_spa.html b/installer/license_spa.html
deleted file mode 100644
index 97af56f2c4c..00000000000
--- a/installer/license_spa.html
+++ /dev/null
@@ -1,412 +0,0 @@
-<HTML>
-<HEAD>
-  <TITLE>GNU General Public License - GNU Project - Free Software Foundation (FSF)</TITLE>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF" TEXT="#000000">
-<H1>GNU GENERAL PUBLIC LICENSE</H1>
-<P>
-  Version 2, June 1991
-
-</P>
-
-<PRE>
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-</PRE>
-
-
-<H2>Preamble</H2>
-
-<P>
-  The licenses for most software are designed to take away your
-  freedom to share and change it. By contrast, the GNU General Public
-  License is intended to guarantee your freedom to share and change free
-  software--to make sure the software is free for all its users. This
-  General Public License applies to most of the Free Software
-  Foundation's software and to any other program whose authors commit to
-  using it. (Some other Free Software Foundation software is covered by
-  the GNU Library General Public License instead.) You can apply it to
-  your programs, too.
-
-</P>
-<P>
-  When we speak of free software, we are referring to freedom, not
-  price. Our General Public Licenses are designed to make sure that you
-  have the freedom to distribute copies of free software (and charge for
-  this service if you wish), that you receive source code or can get it
-  if you want it, that you can change the software or use pieces of it
-  in new free programs; and that you know you can do these things.
-
-</P>
-<P>
-  To protect your rights, we need to make restrictions that forbid
-  anyone to deny you these rights or to ask you to surrender the rights.
-  These restrictions translate to certain responsibilities for you if you
-  distribute copies of the software, or if you modify it.
-
-</P>
-<P>
-  For example, if you distribute copies of such a program, whether
-  gratis or for a fee, you must give the recipients all the rights that
-  you have. You must make sure that they, too, receive or can get the
-  source code. And you must show them these terms so they know their
-  rights.
-
-</P>
-<P>
-  We protect your rights with two steps: (1) copyright the software, and
-  (2) offer you this license which gives you legal permission to copy,
-  distribute and/or modify the software.
-
-</P>
-<P>
-  Also, for each author's protection and ours, we want to make certain
-  that everyone understands that there is no warranty for this free
-  software. If the software is modified by someone else and passed on, we
-  want its recipients to know that what they have is not the original, so
-  that any problems introduced by others will not reflect on the original
-  authors' reputations.
-
-</P>
-<P>
-  Finally, any free program is threatened constantly by software
-  patents. We wish to avoid the danger that redistributors of a free
-  program will individually obtain patent licenses, in effect making the
-  program proprietary. To prevent this, we have made it clear that any
-  patent must be licensed for everyone's free use or not licensed at all.
-
-</P>
-<P>
-  The precise terms and conditions for copying, distribution and
-  modification follow.
-
-</P>
-
-
-<H2>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</H2>
-
-
-<P>
-
-  <STRONG>0.</STRONG>
-  This License applies to any program or other work which contains
-  a notice placed by the copyright holder saying it may be distributed
-  under the terms of this General Public License. The "Program", below,
-  refers to any such program or work, and a "work based on the Program"
-  means either the Program or any derivative work under copyright law:
-  that is to say, a work containing the Program or a portion of it,
-  either verbatim or with modifications and/or translated into another
-  language. (Hereinafter, translation is included without limitation in
-  the term "modification".) Each licensee is addressed as "you".
-<P>
-
-  Activities other than copying, distribution and modification are not
-  covered by this License; they are outside its scope. The act of
-  running the Program is not restricted, and the output from the Program
-  is covered only if its contents constitute a work based on the
-  Program (independent of having been made by running the Program).
-  Whether that is true depends on what the Program does.
-
-<P>
-
-  <STRONG>1.</STRONG>
-  You may copy and distribute verbatim copies of the Program's
-  source code as you receive it, in any medium, provided that you
-  conspicuously and appropriately publish on each copy an appropriate
-  copyright notice and disclaimer of warranty; keep intact all the
-  notices that refer to this License and to the absence of any warranty;
-  and give any other recipients of the Program a copy of this License
-  along with the Program.
-<P>
-
-  You may charge a fee for the physical act of transferring a copy, and
-  you may at your option offer warranty protection in exchange for a fee.
-<P>
-
-  <STRONG>2.</STRONG>
-  You may modify your copy or copies of the Program or any portion
-  of it, thus forming a work based on the Program, and copy and
-  distribute such modifications or work under the terms of Section 1
-  above, provided that you also meet all of these conditions:
-<P>
-
-<DL>
-  <DT>
-  <DD>
-    <STRONG>a)</STRONG>
-    You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-  </DD>
-  </DT>
-</DL>
-<P>
-<DL>
-  <DT>
-  <DD>
-    <STRONG>b)</STRONG>
-    You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-  </DD>
-  </DT>
-</DL>
-<P>
-<DL>
-  <DT>
-  <DD>
-    <STRONG>c)</STRONG>
-    If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License. (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-  </DD>
-  </DT>
-</DL>
-<P>
-
-  These requirements apply to the modified work as a whole. If
-  identifiable sections of that work are not derived from the Program,
-  and can be reasonably considered independent and separate works in
-  themselves, then this License, and its terms, do not apply to those
-  sections when you distribute them as separate works. But when you
-  distribute the same sections as part of a whole which is a work based
-  on the Program, the distribution of the whole must be on the terms of
-  this License, whose permissions for other licensees extend to the
-  entire whole, and thus to each and every part regardless of who wrote it.
-<P>
-
-  Thus, it is not the intent of this section to claim rights or contest
-  your rights to work written entirely by you; rather, the intent is to
-  exercise the right to control the distribution of derivative or
-  collective works based on the Program.
-<P>
-
-  In addition, mere aggregation of another work not based on the Program
-  with the Program (or with a work based on the Program) on a volume of
-  a storage or distribution medium does not bring the other work under
-  the scope of this License.
-
-<P>
-
-  <STRONG>3.</STRONG>
-  You may copy and distribute the Program (or a work based on it,
-  under Section 2) in object code or executable form under the terms of
-  Sections 1 and 2 above provided that you also do one of the following:
-
-
-  <!-- we use this doubled UL to get the sub-sections indented, -->
-  <!-- while making the bullets as unobvious as possible. -->
-
-<DL>
-  <DT>
-  <DD>
-    <STRONG>a)</STRONG>
-    Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-  </DD>
-  </DT>
-</DL>
-<P>
-<DL>
-  <DT>
-  <DD>
-    <STRONG>b)</STRONG>
-    Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-  </DD>
-  </DT>
-</DL>
-<P>
-<DL>
-  <DT>
-  <DD>
-    <STRONG>c)</STRONG>
-    Accompany it with the information you received as to the offer
-    to distribute corresponding source code. (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-  </DD>
-  </DT>
-</DL>
-<P>
-
-  The source code for a work means the preferred form of the work for
-  making modifications to it. For an executable work, complete source
-  code means all the source code for all modules it contains, plus any
-  associated interface definition files, plus the scripts used to
-  control compilation and installation of the executable. However, as a
-  special exception, the source code distributed need not include
-  anything that is normally distributed (in either source or binary
-  form) with the major components (compiler, kernel, and so on) of the
-  operating system on which the executable runs, unless that component
-  itself accompanies the executable.
-<P>
-
-  If distribution of executable or object code is made by offering
-  access to copy from a designated place, then offering equivalent
-  access to copy the source code from the same place counts as
-  distribution of the source code, even though third parties are not
-  compelled to copy the source along with the object code.
-<P>
-
-  <STRONG>4.</STRONG>
-  You may not copy, modify, sublicense, or distribute the Program
-  except as expressly provided under this License. Any attempt
-  otherwise to copy, modify, sublicense or distribute the Program is
-  void, and will automatically terminate your rights under this License.
-  However, parties who have received copies, or rights, from you under
-  this License will not have their licenses terminated so long as such
-  parties remain in full compliance.
-
-<P>
-
-  <STRONG>5.</STRONG>
-  You are not required to accept this License, since you have not
-  signed it. However, nothing else grants you permission to modify or
-  distribute the Program or its derivative works. These actions are
-  prohibited by law if you do not accept this License. Therefore, by
-  modifying or distributing the Program (or any work based on the
-  Program), you indicate your acceptance of this License to do so, and
-  all its terms and conditions for copying, distributing or modifying
-  the Program or works based on it.
-
-<P>
-
-  <STRONG>6.</STRONG>
-  Each time you redistribute the Program (or any work based on the
-  Program), the recipient automatically receives a license from the
-  original licensor to copy, distribute or modify the Program subject to
-  these terms and conditions. You may not impose any further
-  restrictions on the recipients' exercise of the rights granted herein.
-  You are not responsible for enforcing compliance by third parties to
-  this License.
-
-<P>
-
-  <STRONG>7.</STRONG>
-  If, as a consequence of a court judgment or allegation of patent
-  infringement or for any other reason (not limited to patent issues),
-  conditions are imposed on you (whether by court order, agreement or
-  otherwise) that contradict the conditions of this License, they do not
-  excuse you from the conditions of this License. If you cannot
-  distribute so as to satisfy simultaneously your obligations under this
-  License and any other pertinent obligations, then as a consequence you
-  may not distribute the Program at all. For example, if a patent
-  license would not permit royalty-free redistribution of the Program by
-  all those who receive copies directly or indirectly through you, then
-  the only way you could satisfy both it and this License would be to
-  refrain entirely from distribution of the Program.
-<P>
-
-  If any portion of this section is held invalid or unenforceable under
-  any particular circumstance, the balance of the section is intended to
-  apply and the section as a whole is intended to apply in other
-  circumstances.
-<P>
-
-  It is not the purpose of this section to induce you to infringe any
-  patents or other property right claims or to contest validity of any
-  such claims; this section has the sole purpose of protecting the
-  integrity of the free software distribution system, which is
-  implemented by public license practices. Many people have made
-  generous contributions to the wide range of software distributed
-  through that system in reliance on consistent application of that
-  system; it is up to the author/donor to decide if he or she is willing
-  to distribute software through any other system and a licensee cannot
-  impose that choice.
-<P>
-
-  This section is intended to make thoroughly clear what is believed to
-  be a consequence of the rest of this License.
-
-<P>
-
-  <STRONG>8.</STRONG>
-  If the distribution and/or use of the Program is restricted in
-  certain countries either by patents or by copyrighted interfaces, the
-  original copyright holder who places the Program under this License
-  may add an explicit geographical distribution limitation excluding
-  those countries, so that distribution is permitted only in or among
-  countries not thus excluded. In such case, this License incorporates
-  the limitation as if written in the body of this License.
-
-<P>
-
-  <STRONG>9.</STRONG>
-  The Free Software Foundation may publish revised and/or new versions
-  of the General Public License from time to time. Such new versions will
-  be similar in spirit to the present version, but may differ in detail to
-  address new problems or concerns.
-<P>
-
-  Each version is given a distinguishing version number. If the Program
-  specifies a version number of this License which applies to it and "any
-  later version", you have the option of following the terms and conditions
-  either of that version or of any later version published by the Free
-  Software Foundation. If the Program does not specify a version number of
-  this License, you may choose any version ever published by the Free Software
-  Foundation.
-
-<P>
-
-
-  <STRONG>10.</STRONG>
-  If you wish to incorporate parts of the Program into other free
-  programs whose distribution conditions are different, write to the author
-  to ask for permission. For software which is copyrighted by the Free
-  Software Foundation, write to the Free Software Foundation; we sometimes
-  make exceptions for this. Our decision will be guided by the two goals
-  of preserving the free status of all derivatives of our free software and
-  of promoting the sharing and reuse of software generally.
-
-
-<P><STRONG>NO WARRANTY</STRONG></P>
-
-<P>
-
-  <STRONG>11.</STRONG>
-  BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-  FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-  OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-  PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-  OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-  TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-  PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-  REPAIR OR CORRECTION.
-
-<P>
-
-  <STRONG>12.</STRONG>
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-  WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-  REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-  INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-  OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-  TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-  YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-  PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGES.
-
-<P>
-
-<H2>END OF TERMS AND CONDITIONS</H2>
-
-</body>
-</html>
diff --git a/installer/packsLang.xml b/installer/packsLang.xml
deleted file mode 100644
index c99d0048100..00000000000
--- a/installer/packsLang.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?>
-<!--
-  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
-  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
-  ~ and United Nations Environment Programme (UNEP)
-  ~
-  ~ This program is free software; you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation; either version 2 of the License, or (at
-  ~ your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  ~
-  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
-  ~ Rome - Italy. email: geonetwork@osgeo.org
-  -->
-
-<langpack>
-  <str id="core" txt="Core Package"/>
-  <str id="core.description"
-       txt="The GeoNetwork opensource application. This is the Spatial Data Catalog web application."/>
-  <str id="idSampleM" txt="Sample metadata"/>
-  <str id="idSampleM.description" txt="Import sample metadata for testing"/>
-  <str id="csw" txt="CSW test client"/>
-  <str id="csw.description"
-       txt="The GeoNetwork opensource provides Catalog Services for the Web 2.0.1 support. This is a separate test application that can be used to test the CSW 2.0.1 services."/>
-  <str id="src" txt="Source code"/>
-  <str id="src.description" txt="The GeoNetwork source code and the ant build script."/>
-  <str id="ibt" txt="Installer building tools"/>
-  <str id="ibt.description"
-       txt="The installer data files. Installing this package you will be able to create the installer."/>
-</langpack>
diff --git a/installer/packsLang.xml_fra b/installer/packsLang.xml_fra
deleted file mode 100644
index 3aa4cecc851..00000000000
--- a/installer/packsLang.xml_fra
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<langpack>
-    <str id="core" txt="GeoNetwork opensource"/>
-    <str id="core.description" txt="L'application GeoNetwork. Ce module correspond au catalogue de données géospatiales."/>
-    <str id="idSampleM" txt="Métadonnées exemples"/>
-    <str id="idSampleM.description" txt="Import de métadonnées pour les tests."/>
-    <str id="csw" txt="Client CSW de test"/>
-    <str id="csw.description" txt="GeoNetwork opensource fourni une application pour tester le support de la norme OGC Catalog Services for the Web 2.0."/>
-    <str id="src" txt="Code source"/>
-    <str id="src.description" txt="Le code source des applications GeoNetwork ainsi que les outils de compilation."/>
-    <str id="ibt" txt="Outils de création de l'installer"/>
-    <str id="ibt.description" txt="Les fichiers requis pour la création d'un nouvelle installeur."/>
-</langpack>
diff --git a/installer/packsLang.xml_spa b/installer/packsLang.xml_spa
deleted file mode 100644
index b540be6e566..00000000000
--- a/installer/packsLang.xml_spa
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<langpack>
-    <str id="core" txt="Geonetwork opensource"/>
-    <str id="core.description" txt="La aplicación GeoNetwork. Este módulo contiene el catálogo de datos geoespaciales."/>
-    <str id="idSampleM" txt="Metadatos de ejemplo"/>
-    <str id="idSampleM.description" txt="Importación de metadatos de ejemplo para testear."/>
-    <str id="csw" txt="Cliente CSW"/>
-    <str id="csw.description" txt="Aplicación independiente para testear servicios OGC CSW (Catalog Services for the Web) 2.0."/>
-    <str id="src" txt="Código fuente"/>
-    <str id="src.description" txt="El código fuente de GeoNetwork y los scripts de compilación."/>
-    <str id="ibt" txt="Herramientas para generar el instalador"/>
-    <str id="ibt.description" txt="Ficheros necesarios para generar una instalación de Geonetwork opensource."/>
-</langpack>
diff --git a/installer/readme-install.txt b/installer/readme-install.txt
deleted file mode 100644
index 783d4b4ca53..00000000000
--- a/installer/readme-install.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-==================================================================
-INSTALLATION README
-==================================================================
-
-Welcome to GeoNetwork opensource.
-
-To run GeoNetwork opensource, you need the Java Runtime Environment (JRE)
-version 1.5.0. You can download it from this url:
-
-http://java.sun.com/javase/downloads/index_jdk5.jsp
-
-Please refer to the changes.txt file for a list of known issues.
-Refer to the online documentation or mailing-lists if you need 
-more help at http://geonetwork-opensource.org
- 
-==================================================================
-WINDOWS USERS
-==================================================================
-
-Under Windows, you can use the provided Windows installer that
-will assist you even if you don't have Java VM installed.
-
-==================================================================
-OTHER USERS
-==================================================================
-
-Once you have downloaded the JRE, simply click on the .jar icon
-to launch the installer. If this does not work, open a console
-and issue:
-
-java -jar geonetwork-install.jar
-
-==================================================================
-
diff --git a/installer/readme.html b/installer/readme.html
deleted file mode 100644
index 5810b34b907..00000000000
--- a/installer/readme.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!--
-  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
-  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
-  ~ and United Nations Environment Programme (UNEP)
-  ~
-  ~ This program is free software; you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation; either version 2 of the License, or (at
-  ~ your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  ~
-  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
-  ~ Rome - Italy. email: geonetwork@osgeo.org
-  -->
-
-<html>
-<head>
-  <title>GeoNetwork opensource readme</title>
-  <style type="text/css">
-    <!--
-    .style1 {
-      font-size: 9px
-    }
-
-    -->
-  </style>
-</head>
-
-<body>
-<div align="right"><span class="style1">
-    GeoNetwork opensource V@version@ @subVersion@ Date: @day@</span></div>
-<h1>GeoNetwork opensource - Getting started</h1>
-
-<h2>Running the application</h2>
-
-<p>
-  GeoNetwork opensource is a web based Spatial Data Catalog.
-  To use it you first have to start the embedded web server.</p>
-
-<p><strong>On Windows</strong>, navigate to the <em>GeoNetwork opensource</em>
-  folder in the <em>start-menu</em> that was created during installation and
-  <strong>launch "Start server"</strong>. You can then open the GeoNetwork
-  application in your browser.
-</p>
-
-<p>
-  By default this should be at
-  <a href="http://localhost:8080/geonetwork">http://localhost:8080/geonetwork</a>
-</p>
-
-<p>
-  <font color="#FF0000"><strong>IMPORTANT!!</strong></font> After opening
-  the GeoNetwork homepage, log on as Administrator.
-  You should use the username <font
-  color="#FF0000"><code><b>admin</b></code></font> and
-  password <font color="#FF0000"><code><b>admin</b></code></font>.
-  In the Administration section you can then <strong>modify your
-  account</strong>.
-</p>
-
-<p>Online documentation is available
-  <a href="http://geonetwork-opensource.org/docs.html">here</a>.
-
-<p>You can also start the Jetty webserver of GeoNetwork using the scripts
-  located into the $INSTALL_PATH/bin directory.</p>
-
-<p>On a Windows platform they are:
-  <br>
-<ul>
-  <li><code>startup.bat</code></li>
-  <li><code>shutdown.bat</code></li>
-</ul>
-On a Linux or OSX platform they are:
-<br>
-<ul>
-  <li><code>startup.sh</code></li>
-  <li><code>shutdown.sh</code></li>
-</ul>
-</p>
-<p>
-  <cite>Note: A Java Runtime Environment (JRE)
-    <em>@javaVersion@ Standard Edition</em>
-    (download from <a href="@jre_url@">here</a>
-    is required to run GeoNetwork opensource.
-    See the Troubleshooting sections if normal
-    installation or start up fails.</cite>
-</p>
-
-<h2>More information at <a
-  href="http://geonetwork-opensource.org">http://geonetwork-opensource.org</a>
-</h2>
-
-<strong>Enjoy!</strong>
-</body>
-</html>
diff --git a/installer/readme_fra.html b/installer/readme_fra.html
deleted file mode 100644
index f8f260d2965..00000000000
--- a/installer/readme_fra.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!--
-  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
-  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
-  ~ and United Nations Environment Programme (UNEP)
-  ~
-  ~ This program is free software; you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation; either version 2 of the License, or (at
-  ~ your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  ~
-  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
-  ~ Rome - Italy. email: geonetwork@osgeo.org
-  -->
-
-<html>
-<head>
-  <title>GeoNetwork opensource</title>
-  <style type="text/css">
-    <!--
-    h2 {
-      color: #0082B6;
-    }
-
-    body,
-    .style1 {
-      font-size: 9px;
-      font-family: 'Lucida Sans Unicode', 'Lucida Grande', Verdana, Arial, Helvetica, sans-serif;
-    }
-
-    -->
-  </style>
-</head>
-
-<body>
-<h1>GeoNetwork V@version@ @subVersion@ / Date: @day@</h1>
-
-<h2>Documentation</h2>
-<p> Consulter <a href="http://geonetwork-opensource.org/docs.html">la documentation pour plus
-  d'information</a>. </p>
-
-<h2>Lancement de l'application</h2>
-<ul>
-  <li>aller dans le répertoire d'installation</li>
-  <li>puis dans le répertoire bin</li>
-  <li>utiliser startup.bat ou .sh pour lancer le catalogue</li>
-  <li>utiliser shutdown.bat ou .sh pour arrêter le catalogue</li>
-  <li>ouvrir la page http://localhost:8080/geonetwork dans un navigateur pour accèder au
-    catalogue
-  </li>
-</ul>
-
-<p> Sous Windows, le menu démarrer présente également les options pour lancer/arrêter le
-  catalogue.</p>
-<p>L'identifiant admin et le mot de passe admin sont les identifiants par défaut. </p>
-<p>Depuis la page d'administration il est possible de charger des modèles et exemples pour les
-  standards de métadonnées installés. </p>
-
-<h2>Listes de diffusion</h2>
-<p> Pour toutes questions, il est possible de consulter les archives de <a
-  href="http://osgeo-org.1803224.n2.nabble.com/GeoNetwork-users-f2013074.html">la liste
-  anglaise</a> ou <a
-  href="http://osgeo-org.1803224.n2.nabble.com/GeoNetwork-users-francophone-f3246912.html">la
-  liste francophone</a> ou d'y poser une question. </p>
-</body>
-</html>
diff --git a/installer/readme_spa.html b/installer/readme_spa.html
deleted file mode 100644
index e8d31662298..00000000000
--- a/installer/readme_spa.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!--
-  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
-  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
-  ~ and United Nations Environment Programme (UNEP)
-  ~
-  ~ This program is free software; you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation; either version 2 of the License, or (at
-  ~ your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  ~
-  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
-  ~ Rome - Italy. email: geonetwork@osgeo.org
-  -->
-
-<html>
-
-<head>
-  <title>GeoNetwork opensource leeme</title>
-  <style type="text/css">
-    <!--
-    .style1 {
-      font-size: 9px
-    }
-
-    -->
-  </style>
-</head>
-
-<body>
-<div align="right"><span class="style1">GeoNetwork V@version@ @subVersion@ / Date: @day@</span>
-</div>
-<h1>GeoNetwork - Comenzando </h1>
-
-<h2>Ejecutar la aplicaci&oacute;n</h2>
-
-<p>
-  GeoNetwork opensource es un Cat&aacute;logo de Datos Espaciales. Para
-  utilizarlo debe iniciar previamente el servidor web incluido.</p>
-
-<p><strong>En Windows</strong>, abrir a la carpeta <em>GeoNetwork
-  opensource</em>, en el <em>men&uacute; de inicio</em>, que se crea durante la
-  instalaci&oacute;n y <strong>ejecutar "Start server"</strong>. Entonces puede
-  abrir GeoNetwork en su navegador web.
-</p>
-
-<p>
-  Por defecto, ha de acceder a <a href="http://localhost:8080/geonetwork">http://localhost:8080/geonetwork</a>
-</p>
-
-<p>
-  <font color="#FF0000"><strong>IMPORTANTE!!</strong></font> Despu&eacute;s de
-  abrir la p&aacute;gina de inicio de GeoNetwork, validese como Administrador.
-  Debe de usar el nombre de usuario <font
-  color="#FF0000"><code><b>admin</b></code></font> y la clave de acceso
-  <font color="#FF0000"><code><b>admin</b></code></font>.
-  En el m&oacute;dulo de administraci&oacute;n puede <strong>modificar su cuenta
-  de usuario</strong>.
-</p>
-
-<p>Puede iniciar/parar el servidor web Jetty de GeoNetwork usando los scripts
-  ubicados en el directorio $INSTALL_PATH/bin.</p>
-
-<p>En Windows:
-  <br>
-<ul>
-  <li><code>startup.bat</code></li>
-  <li><code>shutdown.bat</code></li>
-</ul>
-En Linux o OSX:
-<br>
-<ul>
-  <li><code>startup.sh</code></li>
-  <li><code>shutdown.sh</code></li>
-</ul>
-</p>
-<p>
-  <cite>Nota: El entorno de ejecuci�n de Java (JRE)
-    <em>@javaVersion@ Standard Edition</em> (descargar de
-    <a href="@jre_url@">@jre_url@</a>) se requiere para poder ejecutar
-    GeoNetwork opensource. Vea las secciones de resoluci&oacute;n de problemas
-    si la instalaci&oacute;n
-    o el inicio de GeoNetwork falla.</cite>
-</p>
-
-<h2>Puede encontrar m&aacute;s informaci&oacute;n en <a
-  href="http://geonetwork-opensource.org">http://geonetwork-opensource.org</a>
-</h2>
-
-<strong>Disfrutelo!</strong>
-</body>
-</html>
diff --git a/installer/splash.bmp b/installer/splash.bmp
deleted file mode 100644
index 8a92c5ddbc6..00000000000
Binary files a/installer/splash.bmp and /dev/null differ
diff --git a/installer/unix-shortcuts.xml b/installer/unix-shortcuts.xml
deleted file mode 100644
index 2035920d396..00000000000
--- a/installer/unix-shortcuts.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-
-<!--
-  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
-  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
-  ~ and United Nations Environment Programme (UNEP)
-  ~
-  ~ This program is free software; you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation; either version 2 of the License, or (at
-  ~ your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  ~
-  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
-  ~ Rome - Italy. email: geonetwork@osgeo.org
-  -->
-
-<shortcuts>
-
-  <!-- =================================================================================== -->
-
-  <skipIfNotSupported/>
-  <programGroup defaultName="GeoNetwork opensource" location="applications"/>
-
-  <!-- =================================================================================== -->
-  <!-- GN open homepage -->
-
-  <shortcut
-    name="Open GeoNetwork opensource"
-    description="This opens the GeoNetwork homepage in a web browser"
-    target="$INSTALL_PATH/bin/win/start-stdln.html"
-    commandLine=""
-    workingDirectory="$INSTALL_PATH"
-    iconFile="$INSTALL_PATH/bin/ico/gn.ico"
-    iconIndex="0"
-    initialState="normal"
-    programGroup="yes"
-    startup="no">
-    <createForPack name="Core"/>
-  </shortcut>
-
-  <!-- =================================================================================== -->
-  <!-- GN start -->
-
-  <shortcut
-    name="Start server"
-    description="This starts the GeoNetwork server"
-    programGroup="yes"
-    desktop="no"
-    startup="no"
-    target="$INSTALL_PATH/bin/startup.sh"
-    initialState="noShow"
-    workingDirectory="$INSTALL_PATH/bin"
-    type="Application"
-    iconFile="$INSTALL_PATH/bin/ico/gnstart.ico"
-    iconIndex="0"
-    encoding="UTF-8">
-    <createForPack name="Core"/>
-  </shortcut>
-
-  <!-- =================================================================================== -->
-  <!-- GN stop -->
-
-  <shortcut
-    name="Stop server"
-    description="This stops the GeoNetwork server"
-    programGroup="yes"
-    desktop="no"
-    target="$INSTALL_PATH/bin/shutdown.sh"
-    initialState="noShow"
-    workingDirectory="$INSTALL_PATH/bin"
-    type="Application"
-    iconFile="$INSTALL_PATH/bin/ico/gnstop.ico"
-    iconIndex="0"
-    encoding="UTF-8">
-    <createForPack name="Core"/>
-  </shortcut>
-
-
-  <!-- =================================================================================== -->
-  <!-- Documentation -->
-
-  <shortcut
-    name="Documentation"
-    description="GeoNetwork opensource documentation"
-    target="$INSTALL_PATH/web/geonetwork/docs/eng/users"
-    commandLine=""
-    workingDirectory="$INSTALL_PATH"
-    iconFile="$INSTALL_PATH/bin/ico/docs.ico"
-    iconIndex="0"
-    initialState="normal"
-    programGroup="yes"
-    startup="no">
-  </shortcut>
-
-  <!-- =================================================================================== -->
-  <!-- GN readme -->
-
-  <shortcut
-    name="Release notes "
-    description="GeoNetwork desktop release notes "
-    target="$INSTALL_PATH/web/geonetwork/docs/readme.html"
-    commandLine=""
-    workingDirectory="$INSTALL_PATH"
-    iconFile="$INSTALL_PATH/bin/ico/text.ico"
-    iconIndex="0"
-    initialState="normal"
-    programGroup="yes"
-    startup="no">
-    <createForPack name="Core"/>
-  </shortcut>
-
-  <!-- =================================================================================== -->
-  <!-- License -->
-
-  <shortcut
-    name="GPL License"
-    description="GeoNetwork opensource GNU-GPL license "
-    target="$INSTALL_PATH/web/geonetwork/docs/license.html"
-    commandLine=""
-    workingDirectory="$INSTALL_PATH"
-    iconFile="$INSTALL_PATH/bin/ico/text.ico"
-    iconIndex="0"
-    initialState="normal"
-    programGroup="yes"
-    startup="no">
-  </shortcut>
-
-  <!-- =================================================================================== -->
-  <!-- Uninstall -->
-
-  <shortcut
-    name="Uninstaller"
-    programGroup="yes"
-    target="java"
-    commandLine="-jar &quot;$INSTALL_PATH/Uninstaller/uninstaller.jar&quot;"
-    initialState="noShow"
-    iconFile="trashcan_full"
-    iconIndex="0"
-    type="Application"
-    encoding="UTF-8">
-  </shortcut>
-
-  <!-- =================================================================================== -->
-
-</shortcuts>
diff --git a/installer/userInputLang.xml b/installer/userInputLang.xml
deleted file mode 100644
index a1cf9e97c03..00000000000
--- a/installer/userInputLang.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
-  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
-  ~ and United Nations Environment Programme (UNEP)
-  ~
-  ~ This program is free software; you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation; either version 2 of the License, or (at
-  ~ your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  ~
-  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
-  ~ Rome - Italy. email: geonetwork@osgeo.org
-  -->
-
-<langpack>
-  <str id="panel.title" txt="English:Graphical User Interface"/>
-  <str id="description.radio" txt="English:Which user interface do you want to use?"/>
-  <str id="radio.label.1" txt="English:The Default user interface"/>
-  <str id="radio.label.2" txt="English:The Tabbed Widgets based user interface"/>
-  <str id="staticText.text"
-       txt="English:The default user interface can be changed again by a system adminstrator. See the documentation for details."/>
-</langpack>
diff --git a/installer/userInputLang.xml_fra.xml b/installer/userInputLang.xml_fra.xml
deleted file mode 100644
index a1cf9e97c03..00000000000
--- a/installer/userInputLang.xml_fra.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
-  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
-  ~ and United Nations Environment Programme (UNEP)
-  ~
-  ~ This program is free software; you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation; either version 2 of the License, or (at
-  ~ your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  ~
-  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
-  ~ Rome - Italy. email: geonetwork@osgeo.org
-  -->
-
-<langpack>
-  <str id="panel.title" txt="English:Graphical User Interface"/>
-  <str id="description.radio" txt="English:Which user interface do you want to use?"/>
-  <str id="radio.label.1" txt="English:The Default user interface"/>
-  <str id="radio.label.2" txt="English:The Tabbed Widgets based user interface"/>
-  <str id="staticText.text"
-       txt="English:The default user interface can be changed again by a system adminstrator. See the documentation for details."/>
-</langpack>
diff --git a/installer/userInputLang.xml_spa.xml b/installer/userInputLang.xml_spa.xml
deleted file mode 100644
index a1cf9e97c03..00000000000
--- a/installer/userInputLang.xml_spa.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
-  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
-  ~ and United Nations Environment Programme (UNEP)
-  ~
-  ~ This program is free software; you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation; either version 2 of the License, or (at
-  ~ your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  ~
-  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
-  ~ Rome - Italy. email: geonetwork@osgeo.org
-  -->
-
-<langpack>
-  <str id="panel.title" txt="English:Graphical User Interface"/>
-  <str id="description.radio" txt="English:Which user interface do you want to use?"/>
-  <str id="radio.label.1" txt="English:The Default user interface"/>
-  <str id="radio.label.2" txt="English:The Tabbed Widgets based user interface"/>
-  <str id="staticText.text"
-       txt="English:The default user interface can be changed again by a system adminstrator. See the documentation for details."/>
-</langpack>
diff --git a/installer/windows-shortcuts.xml b/installer/windows-shortcuts.xml
deleted file mode 100644
index 23f83a6fb7e..00000000000
--- a/installer/windows-shortcuts.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-
-<!--
-  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
-  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
-  ~ and United Nations Environment Programme (UNEP)
-  ~
-  ~ This program is free software; you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation; either version 2 of the License, or (at
-  ~ your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  ~
-  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
-  ~ Rome - Italy. email: geonetwork@osgeo.org
-  -->
-
-<shortcuts>
-
-  <!-- =================================================================================== -->
-  <skipIfNotSupported/>
-  <programGroup defaultName="GeoNetwork opensource" location="applications"/>
-
-  <!-- =================================================================================== -->
-  <!-- GN open homepage -->
-
-  <shortcut
-    os="windows"
-    name="Open GeoNetwork opensource"
-    description="This opens the GeoNetwork homepage in a web browser"
-    target="$INSTALL_PATH\bin\win\start-stdln.html"
-    commandLine=""
-    workingDirectory="$INSTALL_PATH"
-    iconFile="$INSTALL_PATH/bin/ico/gn.ico"
-    iconIndex="0"
-    initialState="normal"
-    programGroup="yes"
-    startup="no">
-    <createForPack name="Core"/>
-  </shortcut>
-
-  <!-- =================================================================================== -->
-  <!-- GN start -->
-
-  <shortcut
-    os="windows"
-    name="Start server"
-    description="This starts the GeoNetwork server"
-    programGroup="yes"
-    desktop="no"
-    startup="no"
-    target="$INSTALL_PATH/bin/startup.bat"
-    initialState="noShow"
-    workingDirectory="$INSTALL_PATH/bin"
-    type="Application"
-    iconFile="$INSTALL_PATH/bin/ico/gnstart.ico"
-    iconIndex="0"
-    encoding="UTF-8">
-    <createForPack name="Core"/>
-  </shortcut>
-
-  <!-- =================================================================================== -->
-  <!-- GN stop -->
-
-  <shortcut
-    os="windows"
-    name="Stop server"
-    description="This stops the GeoNetwork server"
-    programGroup="yes"
-    desktop="no"
-    target="$INSTALL_PATH/bin/shutdown.bat"
-    initialState="noShow"
-    workingDirectory="$INSTALL_PATH/bin"
-    type="Application"
-    iconFile="$INSTALL_PATH/bin/ico/gnstop.ico"
-    iconIndex="0"
-    encoding="UTF-8">
-    <createForPack name="Core"/>
-  </shortcut>
-
-
-  <!-- =================================================================================== -->
-  <!-- Documentation -->
-
-  <shortcut
-    os="windows"
-    name="Documentation"
-    description="GeoNetwork opensource documentation"
-    target="$INSTALL_PATH\web\geonetwork\docs\eng\users"
-    commandLine=""
-    workingDirectory="$INSTALL_PATH"
-    iconFile="$INSTALL_PATH/bin/ico/docs.ico"
-    iconIndex="0"
-    initialState="normal"
-    programGroup="yes"
-    startup="no">
-  </shortcut>
-
-  <!-- =================================================================================== -->
-  <!-- GN readme -->
-
-  <shortcut
-    os="windows"
-    name="Release notes "
-    description="GeoNetwork desktop release notes "
-    target="$INSTALL_PATH\web\geonetwork\docs\readme.html"
-    commandLine=""
-    workingDirectory="$INSTALL_PATH"
-    iconFile="$INSTALL_PATH/bin/ico/text.ico"
-    iconIndex="0"
-    initialState="normal"
-    programGroup="yes"
-    startup="no">
-    <createForPack name="Core"/>
-  </shortcut>
-
-  <!-- =================================================================================== -->
-  <!-- License -->
-
-  <shortcut
-    os="windows"
-    name="GPL License"
-    description="GeoNetwork opensource GNU-GPL license "
-    target="$INSTALL_PATH\web\geonetwork\docs\license.html"
-    commandLine=""
-    workingDirectory="$INSTALL_PATH"
-    iconFile="$INSTALL_PATH/bin/ico/text.ico"
-    iconIndex="0"
-    initialState="normal"
-    programGroup="yes"
-    startup="no">
-  </shortcut>
-
-  <!-- =================================================================================== -->
-  <!-- Uninstall -->
-
-  <shortcut
-    os="windows"
-    name="Uninstaller"
-    programGroup="yes"
-    desktop="no"
-    target="java"
-    commandLine="-jar &quot;$INSTALL_PATH/Uninstaller/uninstaller.jar&quot;"
-    initialState="noShow"
-    iconFile="$INSTALL_PATH/bin/ico/uninst.ico"
-    iconIndex="0"
-    type="Application"
-    encoding="UTF-8">
-  </shortcut>
-
-  <!-- =================================================================================== -->
-
-</shortcuts>
diff --git a/pom.xml b/pom.xml
index f0010bd95e0..1704d650946 100644
--- a/pom.xml
+++ b/pom.xml
@@ -270,19 +270,7 @@
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
-
-      <!-- artifact assembly -->
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>release/zip-war.xml</descriptor>
-            <descriptor>release/bin.xml</descriptor>
-          </descriptors>
-          <finalName>geonetwork-${project.version}</finalName>
-          <outputDirectory>${project.build.directory}/release</outputDirectory>
-        </configuration>
-      </plugin>
+   
       <!-- run integration tests after unit tests -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/release/README.md b/release/README.md
index 94e4ab11788..b21f5b6cbdf 100644
--- a/release/README.md
+++ b/release/README.md
@@ -1,18 +1,20 @@
-release
+Release
 =======
 
-The release module for Geonetwork
+The release module for GeoNetwork.
 
-* Download Jetty
+Open a terminal window and execute the following steps from within the ``release`` folder.
 
-`
-mvn clean install -Djetty-download
-`
 
-* Build installer
+* Once GeoNetwork has been built (run Maven in the repository root), download Jetty:
 
-`
-cd ../installer
-ant
-`
+    `
+    mvn clean install -Djetty-download
+    `
+
+* Next, create the ZIP distributions and copy the WAR:
+
+    `
+    ant
+    `
 
diff --git a/release/bin.xml b/release/bin.xml
deleted file mode 100644
index aed71b4f330..00000000000
--- a/release/bin.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<assembly>
-  <id>bin</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <!-- the main webapp -->
-      <directory>web/target/geonetwork</directory>
-      <outputDirectory>geonetwork/web/geonetwork</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <!-- the geoserver webapp -->
-      <directory>geoserver/target</directory>
-      <outputDirectory>geonetwork/web</outputDirectory>
-      <includes>
-        <include>*.war</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <!-- the data directory -->
-      <directory>release/data</directory>
-      <outputDirectory>geonetwork/data</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <!-- windows batch files -->
-      <directory>release/bin</directory>
-      <outputDirectory>geonetwork/bin</outputDirectory>
-      <lineEnding>keep</lineEnding>
-      <includes>
-        <include>**/*</include>
-      </includes>
-      <excludes>
-        <exclude>*.sh</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <!-- unix shell scripts -->
-      <directory>release/bin</directory>
-      <lineEnding>unix</lineEnding>
-      <outputDirectory>geonetwork/bin</outputDirectory>
-      <fileMode>0755</fileMode>
-      <directoryMode>0755</directoryMode>
-      <includes>
-        <include>*.sh</include>
-      </includes>
-    </fileSet>
-    <!-- TODO docs:
-      <fileSet>
-       <directory>release</directory>
-       <outputDirectory>geoserver-2.0-SNAPSHOT</outputDirectory>
-       <includes>
-        <include>LICENSE.txt</include>
-        <include>GPL.txt</include>
-        <include>RUNNING.txt</include>
-        <include>README.txt</include>
-       </includes>
-      </fileSet>-->
-    <fileSet>
-      <!-- Dependency configuration
-      <directory>web/target/dependency/jetty</directory>
-      <outputDirectory>geonetwork/jetty</outputDirectory>
-      <includes>
-       <include>**/*</include>
-      </includes>
-     </fileSet>
-     <fileSet>-->
-      <!-- jetty configuration -->
-      <directory>release/jetty</directory>
-      <outputDirectory>geonetwork/jetty</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/installer/build.xml b/release/build.xml
similarity index 51%
rename from installer/build.xml
rename to release/build.xml
index 98f78023532..03a97a52bfc 100644
--- a/installer/build.xml
+++ b/release/build.xml
@@ -24,14 +24,14 @@
 
 <!--
 ==============================================================================
-=== This Ant build file is used to build the GeoNetwork opensource installers
+=== This Ant build file is used to create the GeoNetwork opensource distro's
 ===
 === Authors : Jeroen Ticheler <ticheler@users.sourceforge.net>
 ===           Andrea Carboni <acarboni@users.sourceforge.net>
 ==============================================================================
 -->
 
-<project name="geonetwork" default="installer" basedir=".">
+<project name="geonetwork" default="distributions" basedir=".">
 
   <condition property="osys" value="macosx">
     <os family="mac"/>
@@ -43,61 +43,32 @@
     <os family="unix"/>
   </condition>
 
-  <property name="appName" value="geonetwork"/>
+  <!-- Project build properties -->
+  <property name="appName" value="GeoNetwork"/>
+  <property name="displayName" value="GeoNetwork opensource"/>
+  <property name="homepage" value="https://geonetwork-opensource.org"/>
   <property name="version" value="3.11.0"/>
   <property name="subVersion" value="SNAPSHOT"/>
   <property name="javaVersion" value="1.8.0"/>
-  <!-- Minimum version required -->
-  <property name="jre_url" value="http://openjdk.java.net/"/>
+  <property name="jreUrl" value="http://openjdk.java.net/"/>
   <property name="OS" value="Compiled on ${os.name} (${osys})"/>
   <property name="propsdir" value="../.props"/>
   <property name="ant.build.javac.target" value="1.8"/>
   <property name="debugOn" value="on"/>
-  <!-- on off true false yes no -->
-  <property name="thesaurusUrl"
-            value="https://raw.githubusercontent.com/geonetwork/util-gemet/master/thesauri"/>
 
-  <!-- =================================================================================== -->
-
-  <taskdef name="izpack"
-           classpath="lib/standalone-compiler.jar"
-           classname="com.izforge.izpack.ant.IzPackTask"/>
-
-  <taskdef name="launch4j"
-           classname="net.sf.launch4j.ant.Launch4jTask"
-           classpath="launch4j/${osys}/launch4j.jar:launch4j/${osys}/lib/xstream.jar"/>
+  <!-- Used for copyright year -->
+  <tstamp>
+    <format property="year" pattern="yyyy"/>
+  </tstamp>
 
   <!-- =================================================================================== -->
 
-  <target name="thesaurusDownload">
-    <mkdir dir="../web/target/thesauri"/>
-
-    <get src="${thesaurusUrl}/gemet.rdf"
-         dest="../web/target/thesauri/gemet.rdf" usetimestamp="true"/>
-  </target>
-
-  <target name="inspireDbSettings">
-    <mkdir dir="../web/target/inspire"/>
-
-    <copy file="../web/target/geonetwork/WEB-INF/classes/setup/sql/data/data-db-default.sql"
-          tofile="../web/target/inspire/data-db-default.sql" overwrite="true"/>
-    <replace file="../web/target/inspire/data-db-default.sql">
-      <replacefilter>
-        <replacetoken>
-          <![CDATA[INSERT INTO Settings VALUES (721,720,'enable','false');]]></replacetoken>
-        <replacevalue>
-          <![CDATA[INSERT INTO Settings VALUES (721,720,'enable','true');]]></replacevalue>
-      </replacefilter>
-    </replace>
-  </target>
-
-  <target name="inspireTarget" depends="thesaurusDownload,inspireDbSettings"/>
-
   <target name="setProperties">
 
     <delete dir="${propsdir}"/>
     <mkdir dir="${propsdir}"/>
 
+    <!-- Extract Git properties -->
     <exec executable="git" dir=".." output="git.properties">
       <arg value="remote"/>
       <arg value="-v"/>
@@ -115,13 +86,13 @@
       file="../web/src/main/webapp/WEB-INF/server.prop"
       comment="GeoNetwork opensource properties. These are also used by geonetwork at runtime">
       <!-- These are used by geonetwork at runtime -->
-      <!-- Do not remove !! -->
+      <!-- DO NOT REMOVE!! -->
       <entry key="version" value="${version}"/>
       <entry key="subVersion" value="${subVersion}"/>
       <entry key="release" value="${version}"/>
 
       <entry key="javaVersion" value="${javaVersion}"/>
-      <entry key="jre_url" value="${jre_url}"/>
+      <entry key="jre_url" value="${jreUrl}"/>
       <entry key="ant.build.javac.target" value="1.8"/>
       <entry key="buildDate" type="date" value="now"
              pattern="yyyy-MM-dd'T'HH:mm:ssZ"/>
@@ -136,78 +107,73 @@
 
     </propertyfile>
 
-    <!-- make sure all files that need have version numbers etc updated -->
-
-    <!-- Windows installer build -->
-    <copy file="../installer/installer-config.xml"
-          tofile="${propsdir}/installer-config.xml"
-          filtering="on" overwrite="yes"/>
-
-    <replace file="${propsdir}/installer-config.xml"
-             propertyFile="../web/src/main/webapp/WEB-INF/server.prop">
-      <replacefilter token="@version@" property="version"/>
-      <replacefilter token="@subVersion@" property="subVersion"/>
-      <replacefilter token="@javaVersion@" property="javaVersion"/>
-    </replace>
+    <!-- Make sure all files that we need have their version numbers etc. updated -->
 
     <!-- help file -->
     <copy file="readme.html"
           tofile="${propsdir}/readme.html"
           filtering="on" overwrite="yes"/>
-    <copy file="readme_fra.html"
-          tofile="${propsdir}/readme_fra.html"
-          filtering="on" overwrite="yes"/>
-    <copy file="readme_spa.html"
-          tofile="${propsdir}/readme_spa.html"
-          filtering="on" overwrite="yes"/>
+    
+    <!-- license file -->
+    <copy file="license.html"
+          tofile="${propsdir}/license.html"
+          filtering="on" overwrite="yes"/>    
 
+    <echo message="Replacing template variables in readme files..."/>
     <replace file="${propsdir}/readme.html"
              propertyFile="../web/src/main/webapp/WEB-INF/server.prop">
       <replacefilter token="@version@" property="version"/>
       <replacefilter token="@subVersion@" property="subVersion"/>
       <replacefilter token="@day@" property="day"/>
+      <replacefilter token="@jreUrl@" property="jre_url"/>
       <replacefilter token="@javaVersion@" property="javaVersion"/>
-      <replacefilter token="@jre_url@" property="jre_url"/>
-    </replace>
-    <replace file="${propsdir}/readme_fra.html"
-             propertyFile="../web/src/main/webapp/WEB-INF/server.prop">
-      <replacefilter token="@version@" property="version"/>
-      <replacefilter token="@subVersion@" property="subVersion"/>
-      <replacefilter token="@day@" property="day"/>
-      <replacefilter token="@javaVersion@" property="javaVersion"/>
-      <replacefilter token="@jre_url@" property="jre_url"/>
-    </replace>
-    <replace file="${propsdir}/readme_spa.html"
-             propertyFile="../web/src/main/webapp/WEB-INF/server.prop">
-      <replacefilter token="@version@" property="version"/>
-      <replacefilter token="@subVersion@" property="subVersion"/>
-      <replacefilter token="@day@" property="day"/>
-      <replacefilter token="@javaVersion@" property="javaVersion"/>
-      <replacefilter token="@jre_url@" property="jre_url"/>
     </replace>
+    <!-- Replace variables in ReadMe file that are not in server.prop -->
+    <replace file="${propsdir}/readme.html" token="@appName@" value="${appName}"/>
+    <replace file="${propsdir}/readme.html" token="@displayName@" value="${displayName}"/>
+    <replace file="${propsdir}/readme.html" token="@homepage@" value="${homepage}"/>
+    <replace file="${propsdir}/readme.html" token="@year@" value="${year}"/> 
+    <echo message="Done"/>
   </target>
 
-
-  <target name="installer" depends="setProperties,inspireTarget">
-    <ant dir="." target="jarinstall"/>
+  <target name="distributions" depends="setProperties">
+    <echo message="Preconditions OK"/>
+    <ant dir="." target="war"/>
   </target>
 
-
-  <target name="jarinstall" depends="setProperties,inspireTarget">
+  <!-- Create ZIP distribution for GeoNetwork + Jetty + shell scripts -->
+  <target name="zip">
     <property file="../web/src/main/webapp/WEB-INF/server.prop"/>
 
     <delete dir="../${appName}-${release}"/>
     <mkdir dir="../${appName}-${release}"/>
 
-    <echo message="Building platform independent installer on ${osys} using IzPack"/>
+    <echo message="Creating ZIP file for ${appName} ${release}..."/>
 
-    <izpack input="${propsdir}/installer-config.xml"
-            output="../${appName}-${release}/${appName}-install-${release}-${subVersion}.jar"
-            installerType="standard"
-            basedir="${basedir}"/>
+    <zip destfile="../${appName}-${release}/${appName}-${release}-${subVersion}.zip">
+      <zipfileset dir="./bin" prefix="bin" />
+      <zipfileset dir="../.props" includes="readme.html, license.html" />
+      <zipfileset dir="./jetty" prefix="jetty" excludes="logs/*.log, logs/archive/*.log" />
+      <zipfileset dir="../web/target/geonetwork" prefix="web/geonetwork" />
+      <zipfileset dir="./data" prefix="web/geonetwork/data" />
+      <zipfileset dir="./schemaPlugins" prefix="web/geonetwork/WEB-INF/data/config/schema_plugins" />
+    </zip>
 
     <checksum
-      file="../${appName}-${release}/${appName}-install-${release}-${subVersion}.jar"
+      file="../${appName}-${release}/${appName}-${release}-${subVersion}.zip"
       forceOverwrite="yes"/>
+
+  </target>
+
+  <!-- Copy and rename WAR file and calculate checksum -->
+  <target name="war" depends="zip">
+
+    <copy file="../web/target/geonetwork.war" 
+          tofile="../${appName}-${release}/${appName}-${release}-${subVersion}.war" />    
+
+    <checksum file="../${appName}-${release}/${appName}-${release}-${subVersion}.war"
+              forceOverwrite="yes"/> 
+
   </target>
+
 </project>
diff --git a/installer/license.html b/release/license.html
similarity index 100%
rename from installer/license.html
rename to release/license.html
diff --git a/release/readme.html b/release/readme.html
new file mode 100644
index 00000000000..f8869a0fe43
--- /dev/null
+++ b/release/readme.html
@@ -0,0 +1,159 @@
+<!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" lang="en-US" xml:lang="en-US">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+  <title>ReadMe | @displayName@</title>
+  <link rel="stylesheet" href="@homepage@/_static/blueprint/screen.css" type="text/css"
+    media="screen, projection" />
+  <link rel="stylesheet" href="@homepage@/_static/blueprint/print.css" type="text/css"
+    media="print" />
+  <!--[if IE]>
+  <link rel="stylesheet" href="@homepage@/_static/blueprint/ie.css" type="text/css" media="screen, projection" />
+  <![endif]-->
+  <link rel="stylesheet" href="@homepage@/_static/default.css" type="text/css" />
+  <link rel="stylesheet" href="@homepage@/_static/pygments.css" type="text/css" />
+  <style>
+    /* Use .index #acknowledgements for doc */
+    .doc #acknowledgements {
+      background-color: #efefef;
+    }
+
+    .important {
+      background: #efefef;
+      padding: 10px;
+      margin-top: 1.5em;
+      margin-bottom: 1.5em;
+    }
+  </style>
+
+</head>
+
+<body class="doc">
+  <div id="header" class="selfclear">
+    <div class="wrap selfclear">
+      <div id="logo"><a href="@homepage@">@appName@</a></div>
+
+      <ul id="top-nav">
+        <li>@displayName@ v@version@-@subVersion@ | install date: @day@ | <a href="license.html">license</a></li>
+      </ul>
+
+      <div id="osgeo"><a href="https://osgeo.org" target="_blank"><img
+            src="@homepage@/_static/OSGeo_project.svg"></a></div>
+    </div>
+  </div>
+
+  <div id="main">
+    <div class="wrap selfclear">
+      <div id="content">
+        <h1>Getting Started</h1>
+        <h2>Running the application</h2>
+        <p>
+          @displayName@ is a web based Spatial Data Catalog written in Java.
+          To use it, you first have to start the included servlet container (Jetty).
+          However, you can also download the @appName@ WAR file and run that on your own container. 
+        </p>
+        <p>
+          You can start the @appName@ webserver using the shell scripts located in the <code>bin</code> directory.     
+          These require administrative privileges and have been named:
+          <ul>
+            <li><code>startup.sh</code> (use <code>startup.bat</code> on Windows)</li>
+            <li><code>shutdown.sh</code> (use <code>shutdown.bat</code> on Windows)</li>
+          </ul>
+        </p>
+        <p>
+          By default, the @appName@ web interface should be available at <a href="http://localhost:8080/geonetwork">http://localhost:8080/geonetwork</a>. 
+          If you wish to run the application on a different port, please edit the startup shell script.
+          For example, if you are using the provided Jetty server and you wish to run @appName@ on port 1234, you can add the following Java configuration option:
+          <code>-Djetty.port=1234</code>
+        </p>
+        <div class="important">
+          <p><strong>IMPORTANT</strong></p>
+          <p>
+            After opening the @appName@ web interface, log on as Administrator.
+            By default, you should use the username <code>admin</code> and password <code>admin</code>.
+            Please modify the password for this account in the Administration section.
+          </p>
+        </div>
+        <h2>Notes</h2>
+        <ul>
+          <li>
+            When @appName@ runs for the first time, it could take a little longer to start. 
+            By default, @appName@ will use a local database (H2), which takes a while to set up if it doesn't exist yet. 
+          </li>
+          <li>
+            By default, H2 will create 3 <code>gn.*.db</code> files in the Jetty folder. 
+            You can change the location of the database by setting the <code>-Djdbc.database="path\to\gn"</code> 
+            Java option (do <b>not</b> include the <code>.db</code> extension) in the startup shell script.
+            Alternatively, you can also set up @appName@ to work with a remote database (e.g. Oracle).
+          </li>
+          <li>
+            If you plan to remove @appName@ but wish to keep the database, please backup the <code>gn.*.db</code> files. 
+            When you (re-)install @appName@ again and put the database files back at the original location, @appName@ should pick it up.
+           </li>
+        </ul>
+        <p><strong>Enjoy!</strong></p>
+        <div class="section" id="support">
+          <h1>Support</h1>
+          <h2>Documentation</h2>
+            <p>For more information and advanced setup instructions, please refer to the online <a href="@homepage@/docs.html">@appName@ documentation</a>.</p>
+          <div class="section" id="community-and-osgeo">
+            <h2>Community and OSGeo</h2>
+            <p>The @appName@ community has been expanding quickly over the last years.
+              The current release has been possible because of all those that contributed
+              to the project through code contributions, testing, bug reports and fixes as
+              well as many suggestions.</p>
+            <p>@appName@ is part of the <em>Open Source Geospatial Foundation</em>
+              (OSGeo, <a class="reference external" href="https://www.osgeo.org">https://www.osgeo.org</a>) software
+              stack, providing software you can trust to be free, open and sustainable. Voluntary support is provided through
+              <a class="reference internal" href="@homepage@/community.html">mailing lists, websites and online forums</a>.
+            </p>
+          </div>
+          <div class="section" id="professional-support">
+            <h2>Professional Support</h2>
+            <p>Several companies also provide commercial support to help organizations
+              to implement, integrate and maintain the software. You can find them
+              in the <a class="reference external" href="https://www.osgeo.org/search_profile">
+              Service Provider directory</a> on the OSGeo website.</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div id="acknowledgements">
+    <div class="wrap selfclear">
+      <div id="ack-content" class="selfclear">
+        <h2>
+          <a href="@homepage@/acknowledgements/acknowledgements.html">Acknowledgements</a>
+        </h2>
+        <div class="section">
+          <a href="http://camptocamp.com" alt="Camptocamp - Innovative Solutions by Open Source Experts"
+            target="_blank">
+            <img src="@homepage@/_static/camptocamp.svg" height="60" />
+          </a>
+        </div>
+        <div class="section">
+          <a href="http://geocat.net" alt="GeoCat BV - Government Geographic Data Publishing" target="_blank">
+            <img src="@homepage@/_static/geocat-logo.png" height="60" />
+          </a>
+        </div>
+        <div class="section">
+          <a href="http://titellus.net" alt="titellus" target="_blank">
+            <img src="@homepage@/_static/titellus.png" height="80" />
+          </a>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div id="bottombar">
+    <div class="wrap">
+      &copy; Copyright @year@, Open Source Geospatial Foundation.
+    </div>
+  </div>
+
+</body>
+</html>
diff --git a/release/zip-war.xml b/release/zip-war.xml
deleted file mode 100644
index 18c3ea16630..00000000000
--- a/release/zip-war.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<assembly>
-  <id>war</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <!-- the war files -->
-    <fileSet>
-      <directory>web/target</directory>
-      <outputDirectory/>
-      <includes>
-        <include>geonetwork.war</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>geoserver/target</directory>
-      <outputDirectory/>
-      <includes>
-        <include>geoserver.war</include>
-      </includes>
-    </fileSet>
-    <!-- licenses -->
-    <fileSet>
-      <directory>release</directory>
-      <outputDirectory/>
-      <includes>
-        <include>license.html</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-  <moduleSets>
-    <moduleSet>
-      <includes>
-        <include>web</include>
-      </includes>
-    </moduleSet>
-  </moduleSets>
-</assembly>
diff --git a/resetReleaseVersions.sh b/resetReleaseVersions.sh
index 0d8862c46b8..a6188ea6ef2 100644
--- a/resetReleaseVersions.sh
+++ b/resetReleaseVersions.sh
@@ -66,8 +66,8 @@ echo
 sed $sedopt "s/${version}/${new_version}/g" docs/eng/users/source/conf.py 
 sed $sedopt "s/${version}/${new_version}/g" docs/eng/developer/source/conf.py
 
-# Update installer
-sed $sedopt "s/\<property name=\"version\" value=\"${version}\" \/\>/\<property name=\"version\" value=\"${new_version}\" \/\>/g" installer/build.xml
+# Update ZIP distribution
+sed $sedopt "s/\<property name=\"version\" value=\"${version}\" \/\>/\<property name=\"version\" value=\"${new_version}\" \/\>/g" release/build.xml
 
 # Update version pom files
-find . -name pom.xml -exec sed $sedopt "s/${version}/${new_version}/g" {} \;
\ No newline at end of file
+find . -name pom.xml -exec sed $sedopt "s/${version}/${new_version}/g" {} \;
diff --git a/update-version.sh b/update-version.sh
index 5bedfb60305..89f48bf0a0a 100755
--- a/update-version.sh
+++ b/update-version.sh
@@ -100,14 +100,13 @@ echo ' * updating docs/manuals/source/conf.py'
 sed $sedopt "s/${version}/${new_version_main}/g" docs/manuals/source/conf.py
 echo
 
-# Update installer
-echo 'Installer'
-echo '  * updating installer/build.xml'
-sed $sedopt "s/property name=\"version\" value=\".*\"/property name=\"version\" value=\"${new_version_main}\"/g" installer/build.xml
-sed $sedopt "s/property name=\"subVersion\" value=\".*\"/property name=\"subVersion\" value=\"${sub_version}\"/g" installer/build.xml
+# Update ZIP distro
+echo 'ZIP distribution'
+echo '  * updating release/build.xml'
+sed $sedopt "s/property name=\"version\" value=\".*\"/property name=\"version\" value=\"${new_version_main}\"/g" release/build.xml
+sed $sedopt "s/property name=\"subVersion\" value=\".*\"/property name=\"subVersion\" value=\"${sub_version}\"/g" release/build.xml
 echo
 
-
 # Update SQL - needs improvements
 echo 'SQL script'
 sed $sedopt "s/'system\/platform\/version', '.*', 0/'system\/platform\/version', '${new_version_main}', 0/g" web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
diff --git a/updateBranchVersions.sh b/updateBranchVersions.sh
index 14cfd5fe12b..90164dc8037 100755
--- a/updateBranchVersions.sh
+++ b/updateBranchVersions.sh
@@ -65,9 +65,9 @@ new_version="$2"
 sed $sedopt "s/${version}/${new_version}-SNAPSHOT/g" docs/eng/users/source/conf.py 
 sed $sedopt "s/${version}/${new_version}-SNAPSHOT/g" docs/eng/developer/source/conf.py
 
-# Update installer
-sed $sedopt "s/\<property name=\"version\" value=\"${version}\" \/\>/\<property name=\"version\" value=\"${new_version}\" \/\>/g" installer/build.xml
-sed $sedopt "s/\<property name=\"subVersion\" value=\"0\" \/\>/\<property name=\"subVersion\" value=\"SNAPSHOT\" \/\>/g" installer/build.xml
+# Update ZIP distribution
+sed $sedopt "s/\<property name=\"version\" value=\"${version}\" \/\>/\<property name=\"version\" value=\"${new_version}\" \/\>/g" release/build.xml
+sed $sedopt "s/\<property name=\"subVersion\" value=\"0\" \/\>/\<property name=\"subVersion\" value=\"SNAPSHOT\" \/\>/g" release/build.xml
 
 # Update version pom files
 find . -name pom.xml -exec sed $sedopt "s/${version}/${new_version}-SNAPSHOT/g" {} \;
\ No newline at end of file
diff --git a/updateReleaseVersions.sh b/updateReleaseVersions.sh
index 79f73432521..e314733d983 100755
--- a/updateReleaseVersions.sh
+++ b/updateReleaseVersions.sh
@@ -54,8 +54,8 @@ version="$1"
 sed $sedopt "s/${version}-SNAPSHOT/${version}/g" docs/eng/users/source/conf.py 
 sed $sedopt "s/${version}-SNAPSHOT/${version}/g" docs/eng/developer/source/conf.py
 
-# Update installer
-sed $sedopt "s/\<property name=\"subVersion\" value=\"SNAPSHOT\" \/\>/\<property name=\"subVersion\" value=\"0\" \/\>/g" installer/build.xml
+# Update ZIP distribution
+sed $sedopt "s/\<property name=\"subVersion\" value=\"SNAPSHOT\" \/\>/\<property name=\"subVersion\" value=\"0\" \/\>/g" release/build.xml
 
 # Update version pom files
 find . -name pom.xml -exec sed $sedopt "s/${version}-SNAPSHOT/${version}/g" {} \;
\ No newline at end of file