inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1-MC1 (5.1.0) to HEAD (5.1)

Browse Source 
119426 skopf: Merged AOS-SEPARATION (5.1.0) to 5.1-MC1 (5.1.0)
      115153 skopf: ALF-21405 - AOS should be an optional removable module:
      BDE-415 - Include AOS module in installer:
      Remove old "SharePoint" component


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119938 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jean-Pierre Huynh
2015-12-10 10:32:56 +00:00
parent ce1175fba6
commit 4fc1a5e0cd
7 changed files with 1 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,9 +19,6 @@
<setInstallerVariable name="alfresco_solr4_source_directory" value="${build_project_directory}/alfresco-solr4" />
<setInstallerVariable name="alfresco_keystore_source_directory" value="${build_project_directory}/keystore" />
<setInstallerVariable name="alfresco_mmt_source_file" value="${build_project_directory}/alfresco/bin/*.jar" />
<!-- SharePoint settings -->
<setInstallerVariable name="alfresco_sharepoint_source_file" value="${build_project_directory}/alfresco-${alfresco_edition}-spp-*.amp" />
<setInstallerVariable name="alfresco_sharepoint_on_install_settings_directory" value="${build_project_directory}/bitrock/alfrescosharepoint" />
<!-- Records Management and Quickr AMPs -->
<setInstallerVariable name="alfresco_quickr_source_file" value="${build_project_directory}/alfresco-${alfresco_edition}-quickr-*.amp" />
<setInstallerVariable name="alfresco_quickr_on_install_settings_directory" value="${build_project_directory}/bitrock/alfrescoquickr" />

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

@@ -22,7 +22,6 @@
<setInstallerVariable name="alfresco_solr_source_directory" value="${alfresco_distribution_folder.unix}/alf_data/solr"/>
<setInstallerVariable name="alfresco_solr4_source_directory" value="${alfresco_distribution_folder.unix}/solr4"/>
<setInstallerVariable name="alfresco_keystore_source_directory" value="${alfresco_distribution_folder.unix}/alf_data/keystore"/>
<setInstallerVariable name="alfresco_sharepoint_on_install_settings_directory" value="${build_project_directory.unix}/bitrock/alfrescosharepoint"/>
<setInstallerVariable name="alfresco_wcmqs_source_file" value="${wcmqs_folder.unix}/alfresco-wcmqs.amp"/>
<setInstallerVariable name="alfresco_wcmqs_share_source_file" value="${wcmqs_folder.unix}/alfresco-wcmqs-share.amp"/>
<setInstallerVariable name="alfresco_wcmqs_war_source_file" value="${wcmqs_folder.unix}/wcmqs.war"/>

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

@@ -252,7 +252,7 @@
<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,alfrescosharepointmasquerade,alfrescosharepoint,alfrescowmqs,alfrescogoogledocs"/>
<componentSelection select="libreofficecomponent,alfrescosharepointmasquerade,alfrescowmqs,alfrescogoogledocs"/>
</actionList>
<ruleList>
<componentTest logic="exists" name="postgres"/>

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

@@ -273,10 +273,6 @@ img.exe=${'${img.root}'}\\convert.exe</value>
<pattern>@@BITROCK_TOMCAT_HOST@@</pattern>
<value>${application_server_domain}</value>
</substitution>
<substitution>
<pattern>@@BITROCK_SHAREPOINT_PORT@@</pattern>
<value>${alfresco_sharepoint_port}</value>
</substitution>
<substitution>
<pattern>@@BITROCK_QUICKR_PORT@@</pattern>
<value>${alfresco_quickr_port}</value>

68
src/main/resources/bitrock/alfresco-sharepoint.xml
View File

@@ -1,68 +0,0 @@
<component>
<name>alfrescosharepoint</name>
<description>SharePoint</description>
<detailedDescription>SharePoint Protocol support.</detailedDescription>
<canBeEdited>1</canBeEdited>
<selected>1</selected>
<show>1</show>
<shouldPackRuleList>
<isTrue value="${alfrescosharepoint_component_enabled}"/>
</shouldPackRuleList>
<parameterList>
<booleanParameter name="alfrescosharepoint_component_enabled" ask="0" value="1" />
<stringParameter>
<name>alfresco_sharepoint_port</name>
<title>Alfresco SharePoint Port</title>
<explanation>Choose a port number for the SharePoint protocol.</explanation>
<default>7070</default>
<value/>
<ask>1</ask>
<description>Port:</description>
<ruleEvaluationLogic>or</ruleEvaluationLogic>
<ruleList>
<compareText text="${alfresco_show_ports}" value="yes"/>
<portTest condition="cannot_bind" port="${alfresco_sharepoint_port}"/>
</ruleList>
<validationActionList>
<throwError>
<text>Use numbers only the port configuration fields. Other characters are not permitted.</text>
<ruleList>
<stringTest text="${alfresco_sharepoint_port}" type="not_digit" />
</ruleList>
</throwError>
<throwError>
<text>Couldn’t bind to the given port number. Select another port for the SharePoint Protocol.</text>
<ruleList>
<portTest port="${alfresco_sharepoint_port}" condition="cannot_bind"/>
</ruleList>
</throwError>
</validationActionList>
</stringParameter>
</parameterList>
<folderList>
<folder>
<description>Program Files</description>
<destination>${alfresco_shared_directory}/alfresco/extension</destination>
<name>alfrescocustomextensions</name>
<platforms>all</platforms>
<actionList>
<alfrescoConfigure alfrescoFiles="*/*"/>
</actionList>
<distributionFileList>
<distributionFile origin="${alfresco_sharepoint_on_install_settings_directory}/shared/extension/*" allowWildcards="1" />
</distributionFileList>
</folder>
<folder>
<description>Program Files</description>
<destination>${alfresco_amps_directory}</destination>
<name>programfiles</name>
<platforms>all</platforms>
<distributionFileList>
<distributionFile origin="${alfresco_amps_source_directory}/alfresco-spp.amp" allowWildcards="1" />
</distributionFileList>
<actionList>
<setInstallerVariable name="alfresco_apply_amps" value="1"/>
</actionList>
</folder>
</folderList>
</component>

2
src/main/resources/bitrock/bitrock/alfrescosharepoint/shared/extension/custom-vti.properties
View File

@@ -1,2 +0,0 @@
vti.server.port=@@BITROCK_SHAREPOINT_PORT@@

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

@@ -187,7 +187,6 @@
<include file="alfrescodm-postgres-database.xml" />
<!-- AMP extensions -->
<include file="alfresco-sharepoint-masquerade.xml" />
<include file="alfresco-sharepoint.xml" />
<include file="alfresco-wcmqs.xml" />
<include file="alfresco-googledocs.xml" />
<include file="base-unix-service.xml" />