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>
<name>alfrescoapplyamps</name>
<description>//Alfresco Appy AMPs</description>
<description>//Alfresco Apply AMPs</description>
<canBeEdited>1</canBeEdited>
<selected>1</selected>
<show>0</show>

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

@@ -2,7 +2,7 @@
<name>javaalfresco</name>
<description>Java</description>
<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>
<show>1</show>
</component>

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

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

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

@@ -1,10 +1,8 @@
<component>
<name>alfrescocustomstacksettings</name>
<description>//Alfresco Custom Stack Settings</description>
<selected>1</selected>
<show>0</show>
<shouldPackRuleList>
<isTrue value="${alfrescocustomstacksettings_component_enabled}"/>
</shouldPackRuleList>
<preBuildActionList>
<!-- Only OS X x64 supported -->
<setInstallerVariable name="component(javasettings).parameter(java_osx_arch).value" value="x64">
@@ -14,13 +12,11 @@
</setInstallerVariable>
<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(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).selected" value="1"/>
<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_min_version).value" value="1.7.0_25"/>
<!-- 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(baseparamdir).parameter(installdir).title" value="Installation Folder"/>
<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>
<initializationActionList>
<setInstallerVariable name="alfresco_installer_bitness" value="64"/>
@@ -37,9 +58,23 @@
<compareText text="${project.installerFilename}" logic="contains" value="windows"/>
</ruleList>
</setInstallerVariable>
<!-- 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"/>
<!-- PostgreSQL specifics -->
<actionGroup>
<actionList>
<setInstallerVariable name="component(postgresinitdb).parameter(database_name).value" value="alfresco"/>
<setInstallerVariable name="component(postgresinitdb).parameter(database_user).value" value="alfresco"/>
<setInstallerVariable name="component(postgres).parameter(postgres_installation_type).ask" value="0"/>
@@ -48,17 +83,27 @@
<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">
<ruleList>
<platformTest type="windows"/>
</ruleList>
</setInstallerVariable>
<setInstallerVariable name="component(baseparamdir).parameter(base_allow_spaces).value" value="0"/>
<setInstallerVariable name="component(baseparamdir).parameter(base_allow_spaces).value" value="1">
<ruleList>
<compareText text="${installer_ui}" logic="equals" value="unattended"/>
</ruleList>
</setInstallerVariable>
<!-- JVM config -->
<!-- 50% in MB-->
<mathExpression text="int(ceil(${machine_total_memory}/2))" variable="java_xmx_setting"/>
<setInstallerVariable name="java_xmx_setting" value="2048">
@@ -89,10 +134,16 @@
<setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="0"/>
<setInstallerVariable name="component(tomcatservice).parameter(tomcatservice_waittostart).value" value="0"/>
</actionList>
<ruleEvaluationLogic>and</ruleEvaluationLogic>
<ruleList>
<componentTest logic="exists" name="postgres"/>
<ruleGroup>
<ruleList>
<compareText logic="equals" text="${installer_ui}" value="unattended"/>
<isFalse value="${component(postgres).selected}"/>
</ruleList>
</ruleGroup>
</ruleList>
</actionGroup>
</preInstallationActionList>
<componentSelectionValidationActionList>
@@ -111,9 +162,15 @@
<setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="1"/>
<setInstallerVariable name="component(tomcatservice).parameter(tomcatservice_waittostart).value" value="1"/>
</actionList>
<ruleEvaluationLogic>and</ruleEvaluationLogic>
<ruleList>
<componentTest logic="exists" name="postgres"/>
<ruleGroup>
<ruleList>
<isTrue value="${component(postgres).selected}"/>
</ruleList>
</ruleGroup>
</ruleList>
</actionGroup>
<actionGroup>
<actionList>
@@ -122,13 +179,18 @@
<setInstallerVariable name="component(alfrescopostgresdbcreation).selected" value="0"/>
<setInstallerVariable name="component(tomcatservice).parameter(tomcatservice_waittostart).value" value="0"/>
</actionList>
<ruleEvaluationLogic>and</ruleEvaluationLogic>
<ruleList>
<componentTest logic="exists" name="postgres"/>
<ruleGroup>
<ruleList>
<isFalse value="${component(postgres).selected}"/>
</ruleList>
</ruleGroup>
</ruleList>
</actionGroup>
</componentSelectionValidationActionList>
<parameterList>
<booleanParameter ask="0" name="alfrescocustomstacksettings_component_enabled" value="1"/>
<choiceParameter>
<name>alfrescocustomstack_installation_type</name>
<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"/>
</optionList>
<validationActionList>
<actionGroup>
<actionList>
<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"/>
</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"/>
<setInstallerVariable name="component(postgres).parameter(postgres_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="project.allowComponentSelection" value="1"/>
</actionList>
@@ -160,11 +242,20 @@
<compareText logic="equals" text="${alfrescocustomstack_installation_type}" value="advanced"/>
</ruleList>
</actionGroup>
<!-- Easy mode -->
<actionGroup>
<actionList>
<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(postgres).parameter(postgres_show_ports).value" value="0"/>
<setInstallerVariable name="component(libreofficecomponent).parameter(libreoffice_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="project.allowComponentSelection" value="0"/>
</actionList>
@@ -174,6 +265,7 @@
</actionGroup>
</validationActionList>
</choiceParameter>
<!-- Service startup (Windows specifics) -->
<choiceParameter>
<name>alfrescocustomstack_services_startup</name>
<title>Service Startup Configuration</title>
@@ -192,12 +284,24 @@
</choiceParameter>
</parameterList>
<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>
<actionList>
<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(libreofficecomponent).parameter(libreofficeservice_startup).value" value="${alfrescocustomstack_services_startup}"/>
<setInstallerVariable name="component(postgresservice).parameter(postgres_service_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>
<ruleList>
<platformTest type="windows"/>

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

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

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

@@ -1,6 +1,6 @@
<component>
<name>alfrescovalidations</name>
<description>Alfresco Validations</description>
<description>//Alfresco Validations</description>
<detailedDescription/>
<selected>1</selected>
<show>0</show>
@@ -10,9 +10,15 @@
<throwError>
<text>You need to select at least one of the Solr components</text>
<ruleList>
<ruleGroup ruleEvaluationLogic="and">
<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>
</throwError>
<alfrescoAutodetectJava javaRequiredOrAbort="1" javaRequiredJdk="1" alfrescoInstallerBitness="${alfresco_installer_bitness}">
<ruleList>

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
<component>
<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>
<canBeEdited>0</canBeEdited>
<selected>1</selected>
@@ -20,7 +20,7 @@
</deleteFile>
</installationAbortedActionList>
<parameterList>
<stringParameter name="alfresco_component_name" ask="0" value="Alfresco One" />
<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_library_directory" value="${tomcat_server_directory}/lib" ask="0"/>
@@ -368,7 +368,7 @@
<substitution>
<pattern>&lt;Context&gt;</pattern>
<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>
</substitutionList>
</substitute>

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

@@ -159,6 +159,5 @@ fi</value>
<platformTest type="unix"/>
</ruleList>
</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>
</component>

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

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

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

@@ -5,10 +5,9 @@
<selected>1</selected>
<show>0</show>
<shouldPackRuleList>
<isTrue value="${postgresservice_component_enabled}"/>
<isTrue value="${postgres_component_enabled}"/>
</shouldPackRuleList>
<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_displayName" value="${product_fullname} PostgreSQL Service"/>
<stringParameter ask="0" name="postgres_unique_service_name" value=""/>
@@ -52,7 +51,6 @@ start /MIN /WAIT cmd /c "${postgres_root_directory.dos}\bin\pg_ctl.exe register
<compareText text="${postgres_service_startup}" logic="does_not_equal" value="auto" />
</ruleList>
</runProgram>
<substitute>
<files>${postgres_root_directory}/scripts/servicerun.bat;${postgres_root_directory}/scripts/serviceinstall.bat</files>
<type>regexp</type>
@@ -71,7 +69,6 @@ start /MIN /WAIT cmd /c "${postgres_root_directory.dos}\bin\pg_ctl.exe register
</substitution>
</substitutionList>
</substitute>
<wait ms="7000"/>
<runProgram>
<program>cmd</program>
@@ -94,5 +91,4 @@ start /MIN /WAIT cmd /c "${postgres_root_directory.dos}\bin\pg_ctl.exe register
</ruleList>
</runProgram>
</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>

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"/>
<showProgressDialog title="Initializing database">
<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 -->
<runProgram>
<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" />
</ruleList>
</logMessage>
<runProgram>
<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>
@@ -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"/>
</ruleList>
</actionGroup>
</actionList>
<ruleList>
<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>
<show>0</show>
<shouldPackRuleList>
<isTrue value="${postgresinitdb_component_enabled}"/>
<isTrue value="${postgres_component_enabled}"/>
</shouldPackRuleList>
<parameterList>
<booleanParameter ask="0" name="postgresinitdb_component_enabled" value="1"/>
<stringParameter>
<title>Database Configuration</title>
<name>database_name</name>

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

@@ -231,6 +231,7 @@
<program>${installdir}/${ctlscript_unix}</program>
<programArguments>stop postgresql</programArguments>
<ruleList>
<componentTest logic="exists" name="postgres"/>
<platformTest type="unix" />
</ruleList>
</runProgram>
@@ -239,6 +240,7 @@
<program>${postgres_root_directory.dos}\scripts\servicerun.bat</program>
<programArguments>STOP</programArguments>
<ruleList>
<componentTest logic="exists" name="postgres"/>
<platformTest type="windows" />
</ruleList>
</runProgram>
@@ -246,6 +248,7 @@
</actionList>
<ruleList>
<!--isTrue value="${alfrescopostgresquestion_bundled}" /-->
<componentTest logic="exists" name="postgres"/>
<isTrue value="${component(postgres).selected}" />
</ruleList>
</actionGroup>
@@ -347,7 +350,6 @@
<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>
@@ -418,6 +420,9 @@
<progressText>Stopping services</progressText>
<program>${installdir}/postgresql/scripts/servicerun.bat</program>
<programArguments>STOP</programArguments>
<ruleList>
<componentTest logic="exists" name="postgres"/>
</ruleList>
</runProgram>
<runProgram>
<progressText>Uninstalling services</progressText>
@@ -459,6 +464,7 @@
<deleteFile path="${installdir}/postgresql" />
</actionList>
<ruleList>
<componentTest logic="exists" name="postgres"/>
<compareText text="${deleteConfirm}" logic="equals" value="yes" />
<compareText text="${component(postgres).parameter(postgres_installation_type).value}" logic="equals" value="bundled" />
</ruleList>

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

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

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

@@ -42,7 +42,7 @@ System variables provided by this component:
<value>bundledAndExisting</value>
</stringParameter>
<!-- insternal configuration switches -->
<!-- Internal configuration switches -->
<booleanParameter name="tomcat_show_ports" value="0" ask="0" />
<booleanParameter name="tomcat_existing_required_running" value="1" ask="0" />
<booleanParameter name="tomcat_force_home_directory_validation" value="0" ask="0" />