[bugfix] Backport IzPack validation fixes

Signed-off-by: Patrick Reinhart <[email protected]>

Author: reinhapa

exist-installer/src/main/izpack/UnixShortcutSpec.xml

@@ -22,12 +22,14 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 -->
-<izpack:shortcuts xmlns:izpack="http://izpack.org/schema/shortcuts" version="5.0">
+<izpack:shortcuts version="5.0"
+                  xmlns:izpack="http://izpack.org/schema/shortcuts"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://izpack.org/schema/shortcuts http://izpack.org/schema/5.0/izpack-shortcuts-5.0.xsd">
     <programGroup defaultName="eXist-db XML Database" location="applications"/>
 
     <shortcut
             name="eXist-db Database"
-            genericName="eXist-db"
             description="eXist-db XML Database Launcher"
             type="Application"
             encoding="UTF-8"
@@ -36,8 +38,7 @@
             terminal="false"
             programGroup="yes"
             iconFile="$INSTALL_PATH/lib/icon.png"
-            desktop="yes"
-            startupNotify="true"/>
+            desktop="yes"/>
 
     <shortcut name="Uninstall eXist-db"
               description="Uninstall eXist-db"

exist-installer/src/main/izpack/custom.eng.xml

@@ -25,7 +25,10 @@
 
 <!-- The English langpack -->
 
-<izpack:langpack xmlns:izpack="http://izpack.org/schema/langpack" version="5.0">
+<izpack:langpack version="5.0"
+                 xmlns:izpack="http://izpack.org/schema/langpack"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:schemaLocation="http://izpack.org/schema/langpack http://izpack.org/schema/5.0/izpack-langpack-5.0.xsd">
 
     <!-- Heading messages START -->
     <str id="CheckedHelloPanel.headline" txt="Welcome"/>

exist-installer/src/main/izpack/install.xml

@@ -22,8 +22,10 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 -->
-<izpack:installation xmlns:izpack="http://izpack.org/schema/installation"
-        version="5.0">
+<izpack:installation version="5.0"
+                     xmlns:izpack="http://izpack.org/schema/installation"
+                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                     xsi:schemaLocation="http://izpack.org/schema/installation http://izpack.org/schema/5.0/izpack-installation-5.0.xsd">
 
     <logging>
         <log-file mkdirs="true" pattern="$INSTALL_PATH/logs/izpack-install-%u.log"/>

exist-installer/src/main/izpack/shortcutSpec.xml

@@ -22,11 +22,13 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 -->
-<izpack:shortcuts xmlns:izpack="http://izpack.org/schema/shortcuts" version="5.0">
+<izpack:shortcuts version="5.0"
+                  xmlns:izpack="http://izpack.org/schema/shortcuts"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://izpack.org/schema/shortcuts http://izpack.org/schema/5.0/izpack-shortcuts-5.0.xsd">
     <programGroup defaultName="eXist-db XML Database" location="applications"/>
     <shortcut
             name="eXist-db Database"
-            genericName="eXist-db"
             description="eXist-db XML Database Launcher"
             type="Application"
             encoding="UTF-8"

exist-installer/src/main/izpack/userInput.xml

@@ -22,7 +22,10 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 -->
-<izpack:userinput xmlns:izpack="http://izpack.org/schema/userinput" version="5.0">
+<izpack:userinput version="5.0"
+                  xmlns:izpack="http://izpack.org/schema/userinput"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://izpack.org/schema/userinput http://izpack.org/schema/5.0/izpack-userinput-5.0.xsd">
     <panel id="DataDirPanel">
         <field size="1.33" bold="false" txt="Set Data Directory" align="left"
             type="title"/>
@@ -37,11 +40,9 @@
     <panel id="AdminPasswordPanel">
         <!-- field size="1.33" bold="false" txt="Set Admin Password and Configure Memory" align="left"
             type="title"/ -->
-        <field size="1.33" bold="false" txt="Set Admin Password" align="left"
-            type="title"/>
-        <field align="left" variable="adminPasswd" type="password" omitFromAuto="false">
-            <description txt="Please enter a password for user 'admin', the database administrator:"
-                align="left"/>
+        <field size="1.33" bold="false" txt="Set Admin Password" align="left" type="title"/>
+        <field align="left" variable="adminPasswd" type="password">
+            <description txt="Please enter a password for user 'admin', the database administrator:"/>
             <spec>
                 <pwd set="" size="20" txt="Enter password: "/>
                 <pwd set="" size="20" txt="Retype password: "/>
@@ -51,12 +52,12 @@
         </field>
         <!-- field align="bottom" type="divider"/>
         <field type="space"/>
-        <field type="text" variable="MAX_MEMORY">
-          <description align="left" txt="Configure the maximum amount of memory to be used by eXist-db. The recommended minimum memory setting is 1024m. If your machine has enough memory, using 2048m should be sufficient for most data sets. Note: 1200m is usually the limit on 32-bit systems."/>
+        <field align="left" type="text" variable="MAX_MEMORY">
+          <description txt="Configure the maximum amount of memory to be used by eXist-db. The recommended minimum memory setting is 1024m. If your machine has enough memory, using 2048m should be sufficient for most data sets. Note: 1200m is usually the limit on 32-bit systems."/>
           <spec txt="Maximum memory in MB:" size="5" set="2048"/>
         </field>
-        <field type="text" variable="cacheSize">
-            <description align="left" txt="Configure the amount of memory to be reserved for internal caches. If the maximum memory is set above to 1024m, 128m is a good value; for 2048m, use 256m; for 512m, not more than 64mb. Too small settings may lead to bad upload/indexing performance."/>
+        <field align="left" type="text" variable="cacheSize">
+            <description txt="Configure the amount of memory to be reserved for internal caches. If the maximum memory is set above to 1024m, 128m is a good value; for 2048m, use 256m; for 512m, not more than 64mb. Too small settings may lead to bad upload/indexing performance."/>
           <spec txt="Cache memory in MB:" size="5" set="256"/>
         </field -->
     </panel>