Skip to content

Commit 649e628

Browse files
authored
Merge pull request eXist-db#5216 from reinhapa/izpack-definition-fix
[bugfix] Fixes missplaced izPack config tags
2 parents 9e59bb0 + 4fb5aa7 commit 649e628

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
terminal="false"
3939
programGroup="yes"
4040
iconFile="$INSTALL_PATH/lib/icon.png"
41-
desktop="yes"
42-
startupNotify="true"/>
41+
desktop="yes"/>
4342

4443
<shortcut name="Uninstall eXist-db"
4544
description="Uninstall eXist-db"

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

+7-9
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,9 @@
4040
<panel id="AdminPasswordPanel">
4141
<!-- field size="1.33" bold="false" txt="Set Admin Password and Configure Memory" align="left"
4242
type="title"/ -->
43-
<field size="1.33" bold="false" txt="Set Admin Password" align="left"
44-
type="title"/>
45-
<field align="left" variable="adminPasswd" type="password" omitFromAuto="false">
46-
<description txt="Please enter a password for user 'admin', the database administrator:"
47-
align="left"/>
43+
<field size="1.33" bold="false" txt="Set Admin Password" align="left" type="title"/>
44+
<field align="left" variable="adminPasswd" type="password">
45+
<description txt="Please enter a password for user 'admin', the database administrator:"/>
4846
<spec>
4947
<pwd set="" size="20" txt="Enter password: "/>
5048
<pwd set="" size="20" txt="Retype password: "/>
@@ -54,12 +52,12 @@
5452
</field>
5553
<!-- field align="bottom" type="divider"/>
5654
<field type="space"/>
57-
<field type="text" variable="MAX_MEMORY">
58-
<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."/>
55+
<field align="left" type="text" variable="MAX_MEMORY">
56+
<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."/>
5957
<spec txt="Maximum memory in MB:" size="5" set="2048"/>
6058
</field>
61-
<field type="text" variable="cacheSize">
62-
<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."/>
59+
<field align="left" type="text" variable="cacheSize">
60+
<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."/>
6361
<spec txt="Cache memory in MB:" size="5" set="256"/>
6462
</field -->
6563
</panel>

0 commit comments

Comments
 (0)