inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged RA-232-HEAD-PACKAGING (Bitrock Resources for Share Installer) to HEAD (5.1/Cloud)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109277 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jean-Pierre Huynh
2015-07-31 11:00:48 +00:00
parent ab7600f2b2
commit ec3351c012
19 changed files with 328 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/bitrock/alfresco-apply-amps.xml
View File

@@ -1,6 +1,6 @@
<component> <component>
<name>alfrescoapplyamps</name> <name>alfrescoapplyamps</name>
<description>//Alfresco Appy AMPs</description> <description>//Alfresco Apply AMPs</description>
<canBeEdited>1</canBeEdited> <canBeEdited>1</canBeEdited>
<selected>1</selected> <selected>1</selected>
<show>0</show> <show>0</show>

2
src/main/resources/bitrock/alfresco-componentselection-java.xml
View File

@@ -2,7 +2,7 @@
<name>javaalfresco</name> <name>javaalfresco</name>
<description>Java</description> <description>Java</description>
<canBeEdited>1</canBeEdited> <canBeEdited>1</canBeEdited>
<detailedDescription>Java Component required to run the Alfresco server.</detailedDescription> <detailedDescription>Java Component required to run ${product_fullname}.</detailedDescription>
<selected>1</selected> <selected>1</selected>
<show>1</show> <show>1</show>
</component> </component>

1
src/main/resources/bitrock/alfresco-customstack-build-settings.xml
View File

@@ -1,5 +1,6 @@
<component> <component>
<name>alfrescocustombuildsettings</name> <name>alfrescocustombuildsettings</name>
<description>//Alfresco Custom Build Settings</description>
<show>0</show> <show>0</show>
<preBuildActionList> <preBuildActionList>
<!-- ALFRESCO BUILD SYSTEM--> <!-- ALFRESCO BUILD SYSTEM-->

176
src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml
View File

@@ -1,10 +1,8 @@
<component> <component>
<name>alfrescocustomstacksettings</name> <name>alfrescocustomstacksettings</name>
<description>//Alfresco Custom Stack Settings</description>
<selected>1</selected> <selected>1</selected>
<show>0</show> <show>0</show>
<shouldPackRuleList>
<isTrue value="${alfrescocustomstacksettings_component_enabled}"/>
</shouldPackRuleList>
<preBuildActionList> <preBuildActionList>
<!-- Only OS X x64 supported --> <!-- Only OS X x64 supported -->
<setInstallerVariable name="component(javasettings).parameter(java_osx_arch).value" value="x64"> <setInstallerVariable name="component(javasettings).parameter(java_osx_arch).value" value="x64">
@@ -14,13 +12,11 @@
</setInstallerVariable> </setInstallerVariable>
<setInstallerVariable name="component(alfresco).parameter(alfresco_database_name).default" value="alfresco"/> <setInstallerVariable name="component(alfresco).parameter(alfresco_database_name).default" value="alfresco"/>
<setInstallerVariable name="component(script).parameter(ctlscript_unix).value" value="alfresco.sh"/> <setInstallerVariable name="component(script).parameter(ctlscript_unix).value" value="alfresco.sh"/>
<setInstallerVariable name="component(postgres).canBeEdited" value="0"/>
<setInstallerVariable name="component(postgres).parameter(postgres_root_password).ask" value="0"/>
<setInstallerVariable name="component(postgres).canBeEdited" value="1"/>
<setInstallerVariable name="component(java).show" value="0"/> <setInstallerVariable name="component(java).show" value="0"/>
<setInstallerVariable name="component(java).selected" value="1"/> <setInstallerVariable name="component(java).selected" value="1"/>
<setInstallerVariable name="component(java).canBeEdited" value="0"/> <setInstallerVariable name="component(java).canBeEdited" value="0"/>
<setInstallerVariable name="component(java).detailedDescription" value="Java Component required to run the Alfresco server."/> <setInstallerVariable name="component(java).detailedDescription" value="Java Component required to run ${product_fullname}"/>
<setInstallerVariable name="component(java).parameter(java_required_jdk).value" value="1"/> <setInstallerVariable name="component(java).parameter(java_required_jdk).value" value="1"/>
<setInstallerVariable name="component(java).parameter(java_min_version).value" value="1.7.0_25"/> <setInstallerVariable name="component(java).parameter(java_min_version).value" value="1.7.0_25"/>
<!-- Alfresco don't won't to abort the installation if proper JDK not found --> <!-- Alfresco don't won't to abort the installation if proper JDK not found -->
@@ -28,6 +24,31 @@
<setInstallerVariable name="component(tomcat).parameter(tomcat_dirname).value" value="tomcat"/> <setInstallerVariable name="component(tomcat).parameter(tomcat_dirname).value" value="tomcat"/>
<setInstallerVariable name="component(baseparamdir).parameter(installdir).title" value="Installation Folder"/> <setInstallerVariable name="component(baseparamdir).parameter(installdir).title" value="Installation Folder"/>
<setInstallerVariable name="component(baseparamdir).parameter(installdir).explanation" value="${'${tr('Please choose a folder to install ${product_fullname}')}'}"/> <setInstallerVariable name="component(baseparamdir).parameter(installdir).explanation" value="${'${tr('Please choose a folder to install ${product_fullname}')}'}"/>
<!-- PostgreSQL specifics -->
<actionGroup>
<actionList>
<setInstallerVariable name="component(postgres).canBeEdited" value="0"/>
<setInstallerVariable name="component(postgres).parameter(postgres_root_password).ask" value="0"/>
<setInstallerVariable name="component(postgres).canBeEdited" value="1"/>
</actionList>
<ruleList>
<componentTest logic="exists" name="postgres"/>
</ruleList>
</actionGroup>
<!-- Disable password prompt when PostgreSQL is not packaged -->
<setInstallerVariable name="component(alfresco).parameter(alfresco_admin_password).allowEmptyValue" value="1">
<ruleList>
<compareText text="${product_fullname}" logic="equals" value="Alfresco Share"/>
</ruleList>
</setInstallerVariable>
<setInstallerVariable name="component(alfresco).parameter(alfresco_admin_password).ask" value="0">
<ruleList>
<compareText text="${product_fullname}" logic="equals" value="Alfresco Share"/>
</ruleList>
</setInstallerVariable>
</preBuildActionList> </preBuildActionList>
<initializationActionList> <initializationActionList>
<setInstallerVariable name="alfresco_installer_bitness" value="64"/> <setInstallerVariable name="alfresco_installer_bitness" value="64"/>
@@ -37,28 +58,52 @@
<compareText text="${project.installerFilename}" logic="contains" value="windows"/> <compareText text="${project.installerFilename}" logic="contains" value="windows"/>
</ruleList> </ruleList>
</setInstallerVariable> </setInstallerVariable>
<setInstallerVariable name="component(libreofficecomponent).parameter(libreofficeservice_notstart).value" value="1"/>
<setInstallerVariable name="component(libreofficecomponent).parameter(libreoffice_installed_as_service).value" value="0"/> <!-- Libreoffice specifics -->
<actionGroup>
<actionList>
<setInstallerVariable name="component(libreofficecomponent).parameter(libreofficeservice_notstart).value" value="1"/>
<setInstallerVariable name="component(libreofficecomponent).parameter(libreoffice_installed_as_service).value" value="0"/>
</actionList>
<ruleList>
<componentTest logic="exists" name="libreofficecomponent"/>
</ruleList>
</actionGroup>
<setInstallerVariable name="component(tomcatservice).parameter(tomcatservice_notstart).value" value="1"/> <setInstallerVariable name="component(tomcatservice).parameter(tomcatservice_notstart).value" value="1"/>
<setInstallerVariable name="component(postgresinitdb).parameter(database_name).value" value="alfresco"/>
<setInstallerVariable name="component(postgresinitdb).parameter(database_user).value" value="alfresco"/> <!-- PostgreSQL specifics -->
<setInstallerVariable name="component(postgres).parameter(postgres_installation_type).ask" value="0"/> <actionGroup>
<setInstallerVariable name="component(postgres).parameter(postgres_installation_type).value" value="bundled"/> <actionList>
<setInstallerVariable name="component(postgres).parameter(postgres_logminmessage_level).value" value="fatal"/> <setInstallerVariable name="component(postgresinitdb).parameter(database_name).value" value="alfresco"/>
<setInstallerVariable name="component(postgres).parameter(postgres_logminerrorstatement_level).value" value="fatal"/> <setInstallerVariable name="component(postgresinitdb).parameter(database_user).value" value="alfresco"/>
<setInstallerVariable name="component(postgres).parameter(postgres_enable_silentmode).value" value="1"/> <setInstallerVariable name="component(postgres).parameter(postgres_installation_type).ask" value="0"/>
<setInstallerVariable name="component(postgres).parameter(postgres_max_connections).value" value="300"/> <setInstallerVariable name="component(postgres).parameter(postgres_installation_type).value" value="bundled"/>
<setInstallerVariable name="component(postgres).parameter(postgres_logminmessage_level).value" value="fatal"/>
<setInstallerVariable name="component(postgres).parameter(postgres_logminerrorstatement_level).value" value="fatal"/>
<setInstallerVariable name="component(postgres).parameter(postgres_enable_silentmode).value" value="1"/>
<setInstallerVariable name="component(postgres).parameter(postgres_max_connections).value" value="300"/>
</actionList>
<ruleList>
<componentTest logic="exists" name="postgres"/>
</ruleList>
</actionGroup>
<!-- Install dir adaptation if Windows -->
<setInstallerVariable name="installdir" value="${env(SYSTEMDRIVE)}\Alfresco"> <setInstallerVariable name="installdir" value="${env(SYSTEMDRIVE)}\Alfresco">
<ruleList> <ruleList>
<platformTest type="windows"/> <platformTest type="windows"/>
</ruleList> </ruleList>
</setInstallerVariable> </setInstallerVariable>
<setInstallerVariable name="component(baseparamdir).parameter(base_allow_spaces).value" value="0"/> <setInstallerVariable name="component(baseparamdir).parameter(base_allow_spaces).value" value="0"/>
<setInstallerVariable name="component(baseparamdir).parameter(base_allow_spaces).value" value="1"> <setInstallerVariable name="component(baseparamdir).parameter(base_allow_spaces).value" value="1">
<ruleList> <ruleList>
<compareText text="${installer_ui}" logic="equals" value="unattended"/> <compareText text="${installer_ui}" logic="equals" value="unattended"/>
</ruleList> </ruleList>
</setInstallerVariable> </setInstallerVariable>
<!-- JVM config -->
<!-- 50% in MB--> <!-- 50% in MB-->
<mathExpression text="int(ceil(${machine_total_memory}/2))" variable="java_xmx_setting"/> <mathExpression text="int(ceil(${machine_total_memory}/2))" variable="java_xmx_setting"/>
<setInstallerVariable name="java_xmx_setting" value="2048"> <setInstallerVariable name="java_xmx_setting" value="2048">
@@ -89,9 +134,15 @@
<setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="0"/> <setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="0"/>
<setInstallerVariable name="component(tomcatservice).parameter(tomcatservice_waittostart).value" value="0"/> <setInstallerVariable name="component(tomcatservice).parameter(tomcatservice_waittostart).value" value="0"/>
</actionList> </actionList>
<ruleEvaluationLogic>and</ruleEvaluationLogic>
<ruleList> <ruleList>
<compareText logic="equals" text="${installer_ui}" value="unattended"/> <componentTest logic="exists" name="postgres"/>
<isFalse value="${component(postgres).selected}"/> <ruleGroup>
<ruleList>
<compareText logic="equals" text="${installer_ui}" value="unattended"/>
<isFalse value="${component(postgres).selected}"/>
</ruleList>
</ruleGroup>
</ruleList> </ruleList>
</actionGroup> </actionGroup>
</preInstallationActionList> </preInstallationActionList>
@@ -111,8 +162,14 @@
<setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="1"/> <setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="1"/>
<setInstallerVariable name="component(tomcatservice).parameter(tomcatservice_waittostart).value" value="1"/> <setInstallerVariable name="component(tomcatservice).parameter(tomcatservice_waittostart).value" value="1"/>
</actionList> </actionList>
<ruleEvaluationLogic>and</ruleEvaluationLogic>
<ruleList> <ruleList>
<isTrue value="${component(postgres).selected}"/> <componentTest logic="exists" name="postgres"/>
<ruleGroup>
<ruleList>
<isTrue value="${component(postgres).selected}"/>
</ruleList>
</ruleGroup>
</ruleList> </ruleList>
</actionGroup> </actionGroup>
<actionGroup> <actionGroup>
@@ -122,13 +179,18 @@
<setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="0"/> <setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="0"/>
<setInstallerVariable name="component(tomcatservice).parameter(tomcatservice_waittostart).value" value="0"/> <setInstallerVariable name="component(tomcatservice).parameter(tomcatservice_waittostart).value" value="0"/>
</actionList> </actionList>
<ruleEvaluationLogic>and</ruleEvaluationLogic>
<ruleList> <ruleList>
<isFalse value="${component(postgres).selected}"/> <componentTest logic="exists" name="postgres"/>
<ruleGroup>
<ruleList>
<isFalse value="${component(postgres).selected}"/>
</ruleList>
</ruleGroup>
</ruleList> </ruleList>
</actionGroup> </actionGroup>
</componentSelectionValidationActionList> </componentSelectionValidationActionList>
<parameterList> <parameterList>
<booleanParameter ask="0" name="alfrescocustomstacksettings_component_enabled" value="1"/>
<choiceParameter> <choiceParameter>
<name>alfrescocustomstack_installation_type</name> <name>alfrescocustomstack_installation_type</name>
<title>Installation Type</title> <title>Installation Type</title>
@@ -142,17 +204,37 @@
<option description="Also choose optional components to install." text="Advanced - Configures server ports and service properties." value="advanced"/> <option description="Also choose optional components to install." text="Advanced - Configures server ports and service properties." value="advanced"/>
</optionList> </optionList>
<validationActionList> <validationActionList>
<setInstallerVariable name="component(postgres).selected" value="1"/>
<setInstallerVariable name="component(postgresinitdb).selected" value="1"/>
<setInstallerVariable name="component(postgresservice).selected" value="1"/>
<setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="1"/>
<setInstallerVariable name="component(tomcatservice).parameter(tomcatservice_waittostart).value" value="1"/>
<componentSelection select="libreofficecomponent,alfrescosharepoint,alfrescowmqs,alfrescogoogledocs"/>
<actionGroup> <actionGroup>
<actionList> <actionList>
<setInstallerVariable name="component(tomcat).parameter(tomcat_show_ports).value" value="1"/> <setInstallerVariable name="component(postgres).selected" value="1"/>
<setInstallerVariable name="component(libreofficecomponent).parameter(libreoffice_show_ports).value" value="1"/> <setInstallerVariable name="component(postgresinitdb).selected" value="1"/>
<setInstallerVariable name="component(postgres).parameter(postgres_show_ports).value" value="1"/> <setInstallerVariable name="component(postgresservice).selected" value="1"/>
<setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="1"/>
<setInstallerVariable name="component(tomcatservice).parameter(tomcatservice_waittostart).value" value="1"/>
<componentSelection select="libreofficecomponent,alfrescosharepoint,alfrescowmqs,alfrescogoogledocs"/>
</actionList>
<ruleList>
<componentTest logic="exists" name="postgres"/>
<componentTest logic="exists" name="postgresinitdb"/>
<componentTest logic="exists" name="postgresservice"/>
<componentTest logic="exists" name="alfrescopostgresdbcreation"/>
<componentTest logic="exists" name="libreofficecomponent"/>
</ruleList>
</actionGroup>
<!-- Advanced mode -->
<actionGroup>
<actionList>
<setInstallerVariable name="component(tomcat).parameter(tomcat_show_ports).value" value="1"/>
<setInstallerVariable name="component(libreofficecomponent).parameter(libreoffice_show_ports).value" value="1">
<ruleList>
<componentTest logic="exists" name="libreofficecomponent"/>
</ruleList>
</setInstallerVariable>
<setInstallerVariable name="component(postgres).parameter(postgres_show_ports).value" value="1">
<ruleList>
<componentTest logic="exists" name="postgres"/>
</ruleList>
</setInstallerVariable>
<setInstallerVariable name="alfresco_show_ports" value="yes"/> <setInstallerVariable name="alfresco_show_ports" value="yes"/>
<setInstallerVariable name="project.allowComponentSelection" value="1"/> <setInstallerVariable name="project.allowComponentSelection" value="1"/>
</actionList> </actionList>
@@ -160,11 +242,20 @@
<compareText logic="equals" text="${alfrescocustomstack_installation_type}" value="advanced"/> <compareText logic="equals" text="${alfrescocustomstack_installation_type}" value="advanced"/>
</ruleList> </ruleList>
</actionGroup> </actionGroup>
<!-- Easy mode -->
<actionGroup> <actionGroup>
<actionList> <actionList>
<setInstallerVariable name="component(tomcat).parameter(tomcat_show_ports).value" value="0"/> <setInstallerVariable name="component(tomcat).parameter(tomcat_show_ports).value" value="0"/>
<setInstallerVariable name="component(libreofficecomponent).parameter(libreoffice_show_ports).value" value="0"/> <setInstallerVariable name="component(libreofficecomponent).parameter(libreoffice_show_ports).value" value="0">
<setInstallerVariable name="component(postgres).parameter(postgres_show_ports).value" value="0"/> <ruleList>
<componentTest logic="exists" name="libreofficecomponent"/>
</ruleList>
</setInstallerVariable>
<setInstallerVariable name="component(postgres).parameter(postgres_show_ports).value" value="0">
<ruleList>
<componentTest logic="exists" name="postgres"/>
</ruleList>
</setInstallerVariable>
<setInstallerVariable name="alfresco_show_ports" value="no"/> <setInstallerVariable name="alfresco_show_ports" value="no"/>
<setInstallerVariable name="project.allowComponentSelection" value="0"/> <setInstallerVariable name="project.allowComponentSelection" value="0"/>
</actionList> </actionList>
@@ -174,6 +265,7 @@
</actionGroup> </actionGroup>
</validationActionList> </validationActionList>
</choiceParameter> </choiceParameter>
<!-- Service startup (Windows specifics) -->
<choiceParameter> <choiceParameter>
<name>alfrescocustomstack_services_startup</name> <name>alfrescocustomstack_services_startup</name>
<title>Service Startup Configuration</title> <title>Service Startup Configuration</title>
@@ -192,12 +284,24 @@
</choiceParameter> </choiceParameter>
</parameterList> </parameterList>
<readyToInstallActionList> <readyToInstallActionList>
<setInstallerVariable name="postgres_data_directory" value="${alfresco_data_directory}/postgresql"/> <setInstallerVariable name="postgres_data_directory" value="${alfresco_data_directory}/postgresql">
<ruleList>
<componentTest logic="exists" name="postgresservice"/>
</ruleList>
</setInstallerVariable>
<actionGroup> <actionGroup>
<actionList> <actionList>
<setInstallerVariable name="component(tomcatservice).parameter(tomcatservice_startup).value" value="${alfrescocustomstack_services_startup}"/> <setInstallerVariable name="component(tomcatservice).parameter(tomcatservice_startup).value" value="${alfrescocustomstack_services_startup}"/>
<setInstallerVariable name="component(postgresservice).parameter(postgres_service_startup).value" value="${alfrescocustomstack_services_startup}"/> <setInstallerVariable name="component(postgresservice).parameter(postgres_service_startup).value" value="${alfrescocustomstack_services_startup}">
<setInstallerVariable name="component(libreofficecomponent).parameter(libreofficeservice_startup).value" value="${alfrescocustomstack_services_startup}"/> <ruleList>
<componentTest logic="exists" name="postgresservice"/>
</ruleList>
</setInstallerVariable>
<setInstallerVariable name="component(libreofficecomponent).parameter(libreofficeservice_startup).value" value="${alfrescocustomstack_services_startup}">
<ruleList>
<componentTest logic="exists" name="libreofficecomponent"/>
</ruleList>
</setInstallerVariable>
</actionList> </actionList>
<ruleList> <ruleList>
<platformTest type="windows"/> <platformTest type="windows"/>

2
src/main/resources/bitrock/alfresco-customstack-shortcuts.xml
View File

@@ -1,6 +1,6 @@
<component> <component>
<name>shortcuts</name> <name>shortcuts</name>
<description>Alfresco Shortcuts</description> <description>//Alfresco Shortcuts</description>
<canBeEdited>0</canBeEdited> <canBeEdited>0</canBeEdited>
<selected>1</selected> <selected>1</selected>
<show>0</show> <show>0</show>

12
src/main/resources/bitrock/alfresco-customstack-validations.xml
View File

@@ -1,6 +1,6 @@
<component> <component>
<name>alfrescovalidations</name> <name>alfrescovalidations</name>
<description>Alfresco Validations</description> <description>//Alfresco Validations</description>
<detailedDescription/> <detailedDescription/>
<selected>1</selected> <selected>1</selected>
<show>0</show> <show>0</show>
@@ -10,8 +10,14 @@
<throwError> <throwError>
<text>You need to select at least one of the Solr components</text> <text>You need to select at least one of the Solr components</text>
<ruleList> <ruleList>
<componentTest name="alfrescosolr4" logic="not_selected"/> <ruleGroup ruleEvaluationLogic="and">
<componentTest name="alfrescosolr" logic="not_selected"/> <ruleList>
<componentTest name="alfrescosolr4" logic="exists"/>
<componentTest name="alfrescosolr" logic="exists"/>
<componentTest name="alfrescosolr4" logic="not_selected"/>
<componentTest name="alfrescosolr" logic="not_selected"/>
</ruleList>
</ruleGroup>
</ruleList> </ruleList>
</throwError> </throwError>
<alfrescoAutodetectJava javaRequiredOrAbort="1" javaRequiredJdk="1" alfrescoInstallerBitness="${alfresco_installer_bitness}"> <alfrescoAutodetectJava javaRequiredOrAbort="1" javaRequiredJdk="1" alfrescoInstallerBitness="${alfresco_installer_bitness}">

2
src/main/resources/bitrock/alfresco-functions.xml
View File

@@ -1,6 +1,6 @@
<component> <component>
<name>alfrescofunctions</name> <name>alfrescofunctions</name>
<description/> <description>//Alfresco Functions</description>
<canBeEdited>0</canBeEdited> <canBeEdited>0</canBeEdited>
<selected>1</selected> <selected>1</selected>
<show>0</show> <show>0</show>

8
src/main/resources/bitrock/alfresco-postgres-question.xml
View File

@@ -1,12 +1,12 @@
<component> <component>
<name>alfrescopostgresquestion</name> <name>alfrescopostgresquestion</name>
<description>//Alfresco PostgreSQL Question</description>
<selected>1</selected> <selected>1</selected>
<show>0</show> <show>0</show>
<shouldPackRuleList> <shouldPackRuleList>
<isTrue value="${alfrescopostgresquestion_component_enabled}"/> <isTrue value="${postgres_component_enabled}"/>
</shouldPackRuleList> </shouldPackRuleList>
<parameterList> <parameterList>
<booleanParameter ask="0" name="alfrescopostgresquestion_component_enabled" value="1"/>
<parameterGroup> <parameterGroup>
<name>alfrescopostgresquestion_existing</name> <name>alfrescopostgresquestion_existing</name>
<title>Database Configuration</title> <title>Database Configuration</title>
@@ -55,7 +55,6 @@
<setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="0"/> <setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="0"/>
</actionList> </actionList>
<ruleList> <ruleList>
<!--isFalse value="${alfrescopostgresquestion_bundled}" /-->
<isFalse value="${component(postgres).selected}" /> <isFalse value="${component(postgres).selected}" />
<compareText text="${installer_ui}" logic="equals" value="unattended"/> <compareText text="${installer_ui}" logic="equals" value="unattended"/>
</ruleList> </ruleList>
@@ -69,7 +68,6 @@
<setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="1"/> <setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="1"/>
</actionList> </actionList>
<ruleList> <ruleList>
<!--isTrue value="${alfrescopostgresquestion_bundled}" /-->
<isTrue value="${component(postgres).selected}"/> <isTrue value="${component(postgres).selected}"/>
<compareText logic="equals" text="${installer_ui}" value="unattended"/> <compareText logic="equals" text="${installer_ui}" value="unattended"/>
</ruleList> </ruleList>
@@ -82,7 +80,6 @@
<setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="0"/> <setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="0"/>
</actionList> </actionList>
<ruleList> <ruleList>
<!--isFalse value="${alfrescopostgresquestion_bundled}" /-->
<isFalse value="${component(postgres).selected}"/> <isFalse value="${component(postgres).selected}"/>
<compareText logic="equals" text="${installer_ui}" value="unattended"/> <compareText logic="equals" text="${installer_ui}" value="unattended"/>
</ruleList> </ruleList>
@@ -104,7 +101,6 @@
</substitute> </substitute>
</actionList> </actionList>
<ruleList> <ruleList>
<!--isFalse value="${alfrescopostgresquestion_bundled}" /-->
<isFalse value="${component(postgres).selected}"/> <isFalse value="${component(postgres).selected}"/>
</ruleList> </ruleList>
</actionGroup> </actionGroup>

2
src/main/resources/bitrock/alfresco-readme.xml
View File

@@ -1,6 +1,6 @@
<component> <component>
<name>readme</name> <name>readme</name>
<description>README Folder Component</description> <description>//README Folder Component</description>
<canBeEdited>1</canBeEdited> <canBeEdited>1</canBeEdited>
<show>0</show> <show>0</show>
<selected>1</selected> <selected>1</selected>

6
src/main/resources/bitrock/alfrescodm-postgres-database.xml
View File

@@ -1,13 +1,11 @@
<component> <component>
<name>alfrescopostgresdbcreation</name> <name>alfrescopostgresdbcreation</name>
<description>//Alfresco PostgreSQL DB Creation</description>
<selected>1</selected> <selected>1</selected>
<show>0</show> <show>0</show>
<shouldPackRuleList> <shouldPackRuleList>
<isTrue value="${alfrescopostgresdbcreation_component_enabled}"/> <isTrue value="${postgres_component_enabled}"/>
</shouldPackRuleList> </shouldPackRuleList>
<parameterList>
<booleanParameter ask="0" name="alfrescopostgresdbcreation_component_enabled" value="1"/>
</parameterList>
<postInstallationActionList> <postInstallationActionList>
<actionGroup> <actionGroup>
<actionList> <actionList>

6
src/main/resources/bitrock/alfrescodm.xml
View File

@@ -1,6 +1,6 @@
<component> <component>
<name>alfresco</name> <name>alfresco</name>
<description>Alfresco</description> <description>${product_fullname}</description>
<detailedDescription>Alfresco Enterprise Content Management (ECM) system featuring Document Management, Collaboration Management and Image Management.</detailedDescription> <detailedDescription>Alfresco Enterprise Content Management (ECM) system featuring Document Management, Collaboration Management and Image Management.</detailedDescription>
<canBeEdited>0</canBeEdited> <canBeEdited>0</canBeEdited>
<selected>1</selected> <selected>1</selected>
@@ -20,7 +20,7 @@
</deleteFile> </deleteFile>
</installationAbortedActionList> </installationAbortedActionList>
<parameterList> <parameterList>
<stringParameter name="alfresco_component_name" ask="0" value="Alfresco One" />
<directoryParameter name="alfresco_base_application_directory" value="${installdir}" ask="0"/> <directoryParameter name="alfresco_base_application_directory" value="${installdir}" ask="0"/>
<directoryParameter name="alfresco_commands_directory" value="${installdir}/bin" ask="0" description="Use to configure the destination of the content in commands folder"/> <directoryParameter name="alfresco_commands_directory" value="${installdir}/bin" ask="0" description="Use to configure the destination of the content in commands folder"/>
<directoryParameter name="alfresco_library_directory" value="${tomcat_server_directory}/lib" ask="0"/> <directoryParameter name="alfresco_library_directory" value="${tomcat_server_directory}/lib" ask="0"/>
@@ -368,7 +368,7 @@
<substitution> <substitution>
<pattern>&lt;Context&gt;</pattern> <pattern>&lt;Context&gt;</pattern>
<value>&lt;Context&gt; <value>&lt;Context&gt;
&lt;Valve className=&quot;org.apache.catalina.authenticator.SSLAuthenticator&quot; securePagesWithPragma=&quot;false&quot; /&gt;</value> &lt;Valve className="org.apache.catalina.authenticator.SSLAuthenticator" securePagesWithPragma="false" /&gt;</value>
</substitution> </substitution>
</substitutionList> </substitutionList>
</substitute> </substitute>

1
src/main/resources/bitrock/ctlscript.xml
View File

@@ -159,6 +159,5 @@ fi</value>
<platformTest type="unix"/> <platformTest type="unix"/>
</ruleList> </ruleList>
</actionGroup> </actionGroup>
<!--<actionGroup><actionList><runProgram><program>${installdir}/${ctlscript_unix}</program><programArguments>start tomcat &amp; &gt; /dev/null</programArguments></runProgram><waitForPort><port>${application_server_port}</port><timeout>30000</timeout></waitForPort></actionList><ruleList><platformTest type="unix" /></ruleList></actionGroup>-->
</postInstallationActionList> </postInstallationActionList>
</component> </component>

5
src/main/resources/bitrock/postgres-properties.xml
View File

@@ -5,11 +5,8 @@
<show>0</show> <show>0</show>
<selected>1</selected> <selected>1</selected>
<shouldPackRuleList> <shouldPackRuleList>
<isTrue value="${postgreswriteproperties_component_enabled}"/> <isTrue value="${postgres_component_enabled}"/>
</shouldPackRuleList> </shouldPackRuleList>
<parameterList>
<booleanParameter ask="0" name="postgreswriteproperties_component_enabled" value="1"/>
</parameterList>
<readyToInstallActionList> <readyToInstallActionList>
<actionGroup> <actionGroup>
<actionList> <actionList>

58
src/main/resources/bitrock/postgres-service.xml
View File

@@ -5,10 +5,9 @@
<selected>1</selected> <selected>1</selected>
<show>0</show> <show>0</show>
<shouldPackRuleList> <shouldPackRuleList>
<isTrue value="${postgresservice_component_enabled}"/> <isTrue value="${postgres_component_enabled}"/>
</shouldPackRuleList> </shouldPackRuleList>
<parameterList> <parameterList>
<booleanParameter ask="0" name="postgresservice_component_enabled" value="1"/>
<stringParameter ask="0" name="postgres_service_name" value="${product_shortname}PostgreSQL"/> <stringParameter ask="0" name="postgres_service_name" value="${product_shortname}PostgreSQL"/>
<stringParameter ask="0" name="postgres_displayName" value="${product_fullname} PostgreSQL Service"/> <stringParameter ask="0" name="postgres_displayName" value="${product_fullname} PostgreSQL Service"/>
<stringParameter ask="0" name="postgres_unique_service_name" value=""/> <stringParameter ask="0" name="postgres_unique_service_name" value=""/>
@@ -44,34 +43,32 @@ start /MIN /WAIT cmd /c "${postgres_root_directory.dos}\bin\pg_ctl.exe register
</ruleList> </ruleList>
</actionGroup> </actionGroup>
<setInstallerVariable name="postgres_service_installed" value="1"/> <setInstallerVariable name="postgres_service_installed" value="1"/>
<runProgram> <runProgram>
<program>sc</program> <program>sc</program>
<programArguments>config "${postgres_unique_service_name}" start= ${postgres_service_startup}</programArguments> <programArguments>config "${postgres_unique_service_name}" start= ${postgres_service_startup}</programArguments>
<ruleList> <ruleList>
<platformTest type="windows"/> <platformTest type="windows"/>
<compareText text="${postgres_service_startup}" logic="does_not_equal" value="auto" /> <compareText text="${postgres_service_startup}" logic="does_not_equal" value="auto" />
</ruleList> </ruleList>
</runProgram> </runProgram>
<substitute>
<substitute> <files>${postgres_root_directory}/scripts/servicerun.bat;${postgres_root_directory}/scripts/serviceinstall.bat</files>
<files>${postgres_root_directory}/scripts/servicerun.bat;${postgres_root_directory}/scripts/serviceinstall.bat</files> <type>regexp</type>
<type>regexp</type> <substitutionList>
<substitutionList> <substitution>
<substitution> <pattern>@@BITROCK_POSTGRESQL_SERVICE_NAME@@</pattern>
<pattern>@@BITROCK_POSTGRESQL_SERVICE_NAME@@</pattern> <value>${postgres_unique_service_name}</value>
<value>${postgres_unique_service_name}</value> </substitution>
</substitution> <substitution>
<substitution> <pattern>@@BITROCK_POSTGRESQL_DATADIR@@</pattern>
<pattern>@@BITROCK_POSTGRESQL_DATADIR@@</pattern> <value>${postgres_data_directory.dos.unix}</value>
<value>${postgres_data_directory.dos.unix}</value> </substitution>
</substitution> <substitution>
<substitution> <pattern>@@BITROCK_POSTGRESQL_ROOTDIR@@</pattern>
<pattern>@@BITROCK_POSTGRESQL_ROOTDIR@@</pattern> <value>${postgres_root_directory}</value>
<value>${postgres_root_directory}</value> </substitution>
</substitution> </substitutionList>
</substitutionList> </substitute>
</substitute>
<wait ms="7000"/> <wait ms="7000"/>
<runProgram> <runProgram>
<program>cmd</program> <program>cmd</program>
@@ -94,5 +91,4 @@ start /MIN /WAIT cmd /c "${postgres_root_directory.dos}\bin\pg_ctl.exe register
</ruleList> </ruleList>
</runProgram> </runProgram>
</preUninstallationActionList> </preUninstallationActionList>
<!--installationAbortedActionList><runProgram><program>${postgres_root_directory}\scripts\serviceinstall.bat</program><programArguments>REMOVE</programArguments><ruleList><platformTest type="windows"/><isTrue value="${postgres_service_installed}"/></ruleList></runProgram></installationAbortedActionList-->
</component> </component>

5
src/main/resources/bitrock/postgres.xml
View File

@@ -915,8 +915,6 @@ When installing bundled postgres on windows, add in <postUninstallationActionLis
<logMessage text="Initializing database"/> <logMessage text="Initializing database"/>
<showProgressDialog title="Initializing database"> <showProgressDialog title="Initializing database">
<actionList> <actionList>
<!--writeFile progressText="Initializing database"><path>${postgres_root_directory}/bin/runinitdb.bat</path><text>@echo off
start /MIN /WAIT cmd /c "${postgres_root_directory.dos}\bin\initdb.exe -U postgres -E UTF8 -D ${postgres_root_directory.dos.unix}/data"</text></writeFile><runProgram><program>${postgres_root_directory}/bin/runinitdb.bat</program><programArguments></programArguments><workingDirectory>${postgres_root_directory}/bin</workingDirectory></runProgram><deleteFile path="${postgres_root_directory}/bin/runinitdb.bat" /-->
<!-- Install vcruntime on Windows x64 --> <!-- Install vcruntime on Windows x64 -->
<runProgram> <runProgram>
<workingDirectory>${postgres_root_directory}/bin</workingDirectory> <workingDirectory>${postgres_root_directory}/bin</workingDirectory>
@@ -1081,7 +1079,6 @@ start /MIN /WAIT cmd /c "${postgres_root_directory.dos}\bin\initdb.exe -U postgr
<portTest port="${postgres_port}" condition="cannot_bind" /> <portTest port="${postgres_port}" condition="cannot_bind" />
</ruleList> </ruleList>
</logMessage> </logMessage>
<runProgram> <runProgram>
<program>${postgres_root_directory}/bin/psql.exe</program> <program>${postgres_root_directory}/bin/psql.exe</program>
<programArguments>-U SYSTEM -d postgres -p ${postgres_port} -h ${postgres_hostname} -c "CREATE USER postgres SUPERUSER PASSWORD '${postgres_root_password.password}'"</programArguments> <programArguments>-U SYSTEM -d postgres -p ${postgres_port} -h ${postgres_hostname} -c "CREATE USER postgres SUPERUSER PASSWORD '${postgres_root_password.password}'"</programArguments>
@@ -1128,8 +1125,6 @@ start /MIN /WAIT cmd /c "${postgres_root_directory.dos}\bin\initdb.exe -U postgr
<compareText text="${platform_name}" logic="equals" value="windows"/> <compareText text="${platform_name}" logic="equals" value="windows"/>
</ruleList> </ruleList>
</actionGroup> </actionGroup>
</actionList> </actionList>
<ruleList> <ruleList>
<compareText text="${postgres_installation_type}" logic="equals" value="bundled"/> <compareText text="${postgres_installation_type}" logic="equals" value="bundled"/>

3
src/main/resources/bitrock/postgres_initdb.xml
View File

@@ -28,10 +28,9 @@ System variables provided by this component:
<selected>1</selected> <selected>1</selected>
<show>0</show> <show>0</show>
<shouldPackRuleList> <shouldPackRuleList>
<isTrue value="${postgresinitdb_component_enabled}"/> <isTrue value="${postgres_component_enabled}"/>
</shouldPackRuleList> </shouldPackRuleList>
<parameterList> <parameterList>
<booleanParameter ask="0" name="postgresinitdb_component_enabled" value="1"/>
<stringParameter> <stringParameter>
<title>Database Configuration</title> <title>Database Configuration</title>
<name>database_name</name> <name>database_name</name>

242
src/main/resources/bitrock/project.xml
View File

@@ -33,22 +33,22 @@
<createOsxBundleDmg>1</createOsxBundleDmg> <createOsxBundleDmg>1</createOsxBundleDmg>
<platformOptionsList> <platformOptionsList>
<platformOptions> <platformOptions>
<platform>osx</platform> <platform>osx</platform>
<height>430</height> <height>430</height>
</platformOptions> </platformOptions>
<platformOptions> <platformOptions>
<platform>linux</platform> <platform>linux</platform>
<height>430</height> <height>430</height>
</platformOptions> </platformOptions>
<platformOptions> <platformOptions>
<platform>linux-x64</platform> <platform>linux-x64</platform>
<height>430</height> <height>430</height>
</platformOptions> </platformOptions>
<platformOptions> <platformOptions>
<platform>linux-ia64</platform> <platform>linux-ia64</platform>
<height>430</height> <height>430</height>
</platformOptions> </platformOptions>
</platformOptionsList> </platformOptionsList>
<customLanguageFileList> <customLanguageFileList>
@@ -231,6 +231,7 @@
<program>${installdir}/${ctlscript_unix}</program> <program>${installdir}/${ctlscript_unix}</program>
<programArguments>stop postgresql</programArguments> <programArguments>stop postgresql</programArguments>
<ruleList> <ruleList>
<componentTest logic="exists" name="postgres"/>
<platformTest type="unix" /> <platformTest type="unix" />
</ruleList> </ruleList>
</runProgram> </runProgram>
@@ -239,6 +240,7 @@
<program>${postgres_root_directory.dos}\scripts\servicerun.bat</program> <program>${postgres_root_directory.dos}\scripts\servicerun.bat</program>
<programArguments>STOP</programArguments> <programArguments>STOP</programArguments>
<ruleList> <ruleList>
<componentTest logic="exists" name="postgres"/>
<platformTest type="windows" /> <platformTest type="windows" />
</ruleList> </ruleList>
</runProgram> </runProgram>
@@ -246,128 +248,128 @@
</actionList> </actionList>
<ruleList> <ruleList>
<!--isTrue value="${alfrescopostgresquestion_bundled}" /--> <!--isTrue value="${alfrescopostgresquestion_bundled}" /-->
<componentTest logic="exists" name="postgres"/>
<isTrue value="${component(postgres).selected}" /> <isTrue value="${component(postgres).selected}" />
</ruleList> </ruleList>
</actionGroup> </actionGroup>
</postInstallationActionList> </postInstallationActionList>
<finalPageActionList> <finalPageActionList>
<setInstallerVariable name="finalpage_start_servers" value="0" show="0" /> <setInstallerVariable name="finalpage_start_servers" value="0" show="0" />
<setInstallerVariable name="finalpage_show_readme" value="0" show="0" /> <setInstallerVariable name="finalpage_show_readme" value="0" show="0" />
<actionGroup progressText="${msg(Installer.ReadmeFile.View)}"> <actionGroup progressText="${msg(Installer.ReadmeFile.View)}">
<actionList>
<setInstallerVariable name="finalpage_show_readme" value="1" />
</actionList>
</actionGroup>
<actionGroup>
<progressText>Launch ${product_fullname}</progressText>
<actionList>
<actionGroup>
<actionList>
<setInstallerVariable name="finalpage_start_servers" value="1" />
<runProgram>
<progressText>Starting servers. Please be patient.</progressText>
<program>${installdir}/${ctlscript_unix}</program>
<programArguments>start &amp;</programArguments>
<ruleList>
<platformTest type="unix" />
</ruleList>
</runProgram>
<runProgram>
<progressText>Starting servers. Please be patient.</progressText>
<program>${installdir}/servicerun.bat</program>
<programArguments>START</programArguments>
<ruleList>
<platformTest type="windows" />
</ruleList>
</runProgram>
</actionList>
</actionGroup>
</actionList>
</actionGroup>
<actionGroup show="0">
<actionList>
<readFile path="${installdir}/${alfresco_readme_filename}" name="readmeFileText" />
<showText text="${readmeFileText}" title="README"/>
</actionList>
<ruleList>
<compareValues value1="${finalpage_show_readme}" logic="equals" value2="1" />
</ruleList>
</actionGroup>
<actionGroup show="0">
<actionList>
<showProgressDialog title="Starting servers ..." >
<actionList> <actionList>
<waitForPort port="${application_server_port}" timeout="10000" /> <setInstallerVariable name="finalpage_show_readme" value="1" />
<findFile baseDirectory="${application_server_directory}/logs" variable="windowsTomcatLogFile" pattern="*stderr*" > </actionList>
<ruleList> </actionGroup>
<platformTest type="windows" />
</ruleList> <actionGroup>
</findFile> <progressText>Launch ${product_fullname}</progressText>
<logMessage text="Tomcat log file ${windowsTomcatLogFile}" /> <actionList>
<foreach values="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20" variables="iteration" progressText="Deploying Alfresco. Please be patient."> <actionGroup>
<actionList> <actionList>
<actionGroup> <setInstallerVariable name="finalpage_start_servers" value="1" />
<actionList> <runProgram>
<wait ms="10000" /> <progressText>Starting servers. Please be patient.</progressText>
<logMessage text="Waiting for 'Server startup' in ${application_server_directory}/logs/catalina.out" /> <program>${installdir}/${ctlscript_unix}</program>
</actionList> <programArguments>start &amp;</programArguments>
<ruleList> <ruleList>
<platformTest type="unix" /> <platformTest type="unix" />
<fileContentTest path="${application_server_directory}/logs/catalina.out" text="Server startup" logic="does_not_contain" /> </ruleList>
</ruleList> </runProgram>
</actionGroup> <runProgram>
<actionGroup> <progressText>Starting servers. Please be patient.</progressText>
<actionList> <program>${installdir}/servicerun.bat</program>
<wait ms="20000" /> <programArguments>START</programArguments>
<logMessage text="Waiting for 'Server startup' in ${windowsTomcatLogFile}" /> <ruleList>
</actionList> <platformTest type="windows" />
</ruleList>
</runProgram>
</actionList>
</actionGroup>
</actionList>
</actionGroup>
<actionGroup show="0">
<actionList>
<readFile path="${installdir}/${alfresco_readme_filename}" name="readmeFileText" />
<showText text="${readmeFileText}" title="README"/>
</actionList>
<ruleList>
<compareValues value1="${finalpage_show_readme}" logic="equals" value2="1" />
</ruleList>
</actionGroup>
<actionGroup show="0">
<actionList>
<showProgressDialog title="Starting servers ..." >
<actionList>
<waitForPort port="${application_server_port}" timeout="10000" />
<findFile baseDirectory="${application_server_directory}/logs" variable="windowsTomcatLogFile" pattern="*stderr*" >
<ruleList> <ruleList>
<platformTest type="windows" /> <platformTest type="windows" />
<fileContentTest path="${windowsTomcatLogFile}" text="Server startup" logic="does_not_contain" />
</ruleList> </ruleList>
</actionGroup> </findFile>
<logMessage text="Tomcat log file ${windowsTomcatLogFile}" />
<foreach values="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20" variables="iteration" progressText="Deploying Alfresco. Please be patient.">
<actionList>
<actionGroup>
<actionList>
<wait ms="10000" />
<logMessage text="Waiting for 'Server startup' in ${application_server_directory}/logs/catalina.out" />
</actionList>
<ruleList>
<platformTest type="unix" />
<fileContentTest path="${application_server_directory}/logs/catalina.out" text="Server startup" logic="does_not_contain" />
</ruleList>
</actionGroup>
<actionGroup>
<actionList>
<wait ms="20000" />
<logMessage text="Waiting for 'Server startup' in ${windowsTomcatLogFile}" />
</actionList>
<ruleList>
<platformTest type="windows" />
<fileContentTest path="${windowsTomcatLogFile}" text="Server startup" logic="does_not_contain" />
</ruleList>
</actionGroup>
</actionList>
</foreach>
</actionList> </actionList>
</foreach> </showProgressDialog>
<launchBrowser>
<url>http://${application_server_domain}:${application_server_port}/share</url>
<ruleList>
<compareText text="${installer_ui}" logic="equals" value="gui"/>
<fileExists path="${application_server_directory}/webapps/share.war" />
</ruleList>
</launchBrowser>
</actionList> </actionList>
</showProgressDialog>
<launchBrowser>
<url>http://${application_server_domain}:${application_server_port}/share</url>
<ruleList> <ruleList>
<isTrue value="${finalpage_start_servers}" />
<compareText text="${application_server_installation_type}" logic="equals" value="bundled" />
<compareText text="${installer_ui}" logic="equals" value="gui"/> <compareText text="${installer_ui}" logic="equals" value="gui"/>
<fileExists path="${application_server_directory}/webapps/share.war" />
</ruleList> </ruleList>
</launchBrowser> </actionGroup>
</actionList>
<ruleList>
<isTrue value="${finalpage_start_servers}" />
<compareText text="${application_server_installation_type}" logic="equals" value="bundled" />
<compareText text="${installer_ui}" logic="equals" value="gui"/>
<isTrue value="${component(postgres).selected}" />
</ruleList>
</actionGroup>
<actionGroup progressText="Show next steps" > <actionGroup progressText="Show next steps" >
<actionList> <actionList>
<launchBrowser> <launchBrowser>
<url>http://www.alfresco.com/resources/documentation/getting-started/${alfresco_edition}</url> <url>http://www.alfresco.com/resources/documentation/getting-started/${alfresco_edition}</url>
</launchBrowser> </launchBrowser>
</actionList> </actionList>
<ruleList> <ruleList>
<compareText text="${installer_ui}" logic="equals" value="gui"/> <compareText text="${installer_ui}" logic="equals" value="gui"/>
</ruleList> </ruleList>
</actionGroup> </actionGroup>
<showInfo> <showInfo>
<text>You have chosen Tomcat as the existing installation. To use new installed applications you must restart Tomcat.</text> <text>You have chosen Tomcat as the existing installation. To use new installed applications you must restart Tomcat.</text>
<ruleList> <ruleList>
<compareText text="${application_server_installation_type}" logic="equals" value="existing" /> <compareText text="${application_server_installation_type}" logic="equals" value="existing" />
</ruleList> </ruleList>
</showInfo> </showInfo>
</finalPageActionList> </finalPageActionList>
<installationAbortedActionList> <installationAbortedActionList>
@@ -418,6 +420,9 @@
<progressText>Stopping services</progressText> <progressText>Stopping services</progressText>
<program>${installdir}/postgresql/scripts/servicerun.bat</program> <program>${installdir}/postgresql/scripts/servicerun.bat</program>
<programArguments>STOP</programArguments> <programArguments>STOP</programArguments>
<ruleList>
<componentTest logic="exists" name="postgres"/>
</ruleList>
</runProgram> </runProgram>
<runProgram> <runProgram>
<progressText>Uninstalling services</progressText> <progressText>Uninstalling services</progressText>
@@ -459,6 +464,7 @@
<deleteFile path="${installdir}/postgresql" /> <deleteFile path="${installdir}/postgresql" />
</actionList> </actionList>
<ruleList> <ruleList>
<componentTest logic="exists" name="postgres"/>
<compareText text="${deleteConfirm}" logic="equals" value="yes" /> <compareText text="${deleteConfirm}" logic="equals" value="yes" />
<compareText text="${component(postgres).parameter(postgres_installation_type).value}" logic="equals" value="bundled" /> <compareText text="${component(postgres).parameter(postgres_installation_type).value}" logic="equals" value="bundled" />
</ruleList> </ruleList>

1
src/main/resources/bitrock/swftools.xml
View File

@@ -54,7 +54,6 @@
<distributionFileList> <distributionFileList>
<distributionDirectory origin="${swftools_distribution_folder}/bin"/> <distributionDirectory origin="${swftools_distribution_folder}/bin"/>
<distributionDirectory origin="${swftools_distribution_folder}/japanese"/> <distributionDirectory origin="${swftools_distribution_folder}/japanese"/>
<!-- <distributionDirectory origin="swftools/share"/>-->
</distributionFileList> </distributionFileList>
<actionList> <actionList>
<substitute> <substitute>

26
src/main/resources/bitrock/tomcat.xml
View File

@@ -42,7 +42,7 @@ System variables provided by this component:
<value>bundledAndExisting</value> <value>bundledAndExisting</value>
</stringParameter> </stringParameter>
<!-- insternal configuration switches --> <!-- Internal configuration switches -->
<booleanParameter name="tomcat_show_ports" value="0" ask="0" /> <booleanParameter name="tomcat_show_ports" value="0" ask="0" />
<booleanParameter name="tomcat_existing_required_running" value="1" ask="0" /> <booleanParameter name="tomcat_existing_required_running" value="1" ask="0" />
<booleanParameter name="tomcat_force_home_directory_validation" value="0" ask="0" /> <booleanParameter name="tomcat_force_home_directory_validation" value="0" ask="0" />
@@ -51,18 +51,18 @@ System variables provided by this component:
<booleanParameter name="java_is_jdk" value="0" ask="0"/> <booleanParameter name="java_is_jdk" value="0" ask="0"/>
<!-- Tomcat settings for bundled component --> <!-- Tomcat settings for bundled component -->
<stringParameter name="tomcat_memory_settings_unix" value="-XX:MaxPermSize=256M -Xms256M -Xmx512M" ask="0" /> <stringParameter name="tomcat_memory_settings_unix" value="-XX:MaxPermSize=256M -Xms256M -Xmx512M" ask="0" />
<stringParameter> <stringParameter>
<name>tomcat_memory_settings_windows</name> <name>tomcat_memory_settings_windows</name>
<value>--JvmMs 256 --JvmMx 512 ++JvmOptions="-XX:MaxPermSize=256M"</value> <value>--JvmMs 256 --JvmMx 512 ++JvmOptions="-XX:MaxPermSize=256M"</value>
<ask>0</ask> <ask>0</ask>
</stringParameter> </stringParameter>
<stringParameter name="tomcat_extra_opts_unix" value="-Djava.awt.headless=true -XX:+UseG1GC -Dfile.encoding=UTF-8" ask="0" /> <stringParameter name="tomcat_extra_opts_unix" value="-Djava.awt.headless=true -XX:+UseG1GC -Dfile.encoding=UTF-8" ask="0" />
<stringParameter> <stringParameter>
<name>tomcat_extra_opts_windows</name> <name>tomcat_extra_opts_windows</name>
<value>++JvmOptions="-Djava.awt.headless=true" ++JvmOptions="-XX:+UseG1GC" ++JvmOptions="-Dfile.encoding=UTF-8"</value> <value>++JvmOptions="-Djava.awt.headless=true" ++JvmOptions="-XX:+UseG1GC" ++JvmOptions="-Dfile.encoding=UTF-8"</value>
<ask>0</ask> <ask>0</ask>
</stringParameter> </stringParameter>
<booleanParameter name="tomcat_disable_juli_login" value="0" ask="0"/> <booleanParameter name="tomcat_disable_juli_login" value="0" ask="0"/>
<!-- directory to pack --> <!-- directory to pack -->