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 
119465 skopf: DOCS-1396 - Text review for installer
   Renamed "Sharepoint Masquerade" to "SharePoint Immitation"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119941 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jean-Pierre Huynh
2015-12-10 10:33:38 +00:00
parent fcb31b063b
commit e7ebb0d484
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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(postgresservice).selected" value="1"/>
<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"/>
<componentSelection select="libreofficecomponent,alfrescosharepointmasquerade,alfrescowmqs,alfrescogoogledocs"/> <componentSelection select="libreofficecomponent,alfrescosharepointimitation,alfrescowmqs,alfrescogoogledocs"/>
</actionList> </actionList>
<ruleList> <ruleList>
<componentTest logic="exists" name="postgres"/> <componentTest logic="exists" name="postgres"/>

22
src/main/resources/bitrock/alfresco-sharepoint-masquerade.xml → src/main/resources/bitrock/alfresco-sharepoint-imitation.xml
View File

@@ -1,18 +1,18 @@
<component> <component>
<name>alfrescosharepointmasquerade</name> <name>alfrescosharepointimitation</name>
<description>SharePoint Masquerade</description> <description>SharePoint Imitation</description>
<detailedDescription>Select this module to allow applications that can talk to a SharePoint server to talk to your Alfresco installation.</detailedDescription> <detailedDescription>Select this module to allow applications that can talk to a SharePoint server to talk to your Alfresco installation.</detailedDescription>
<canBeEdited>1</canBeEdited> <canBeEdited>1</canBeEdited>
<selected>1</selected> <selected>1</selected>
<show>1</show> <show>1</show>
<shouldPackRuleList> <shouldPackRuleList>
<isTrue value="${alfrescosharepointmasquerade_component_enabled}" /> <isTrue value="${alfrescosharepointimitation_component_enabled}" />
</shouldPackRuleList> </shouldPackRuleList>
<parameterList> <parameterList>
<booleanParameter name="alfrescosharepointmasquerade_component_enabled" ask="0" value="1" /> <booleanParameter name="alfrescosharepointimitation_component_enabled" ask="0" value="1" />
</parameterList> </parameterList>
<initializationActionList> <initializationActionList>
<setInstallerVariable name="component(alfrescosharepointmasquerade).detailedDescription" value="Select this module to allow applications that can talk to a SharePoint server to talk to your Alfresco installation.&#xa;(proprietary module licensed under the Alfresco Component License)"> <setInstallerVariable name="component(alfrescosharepointimitation).detailedDescription" value="Select this module to allow applications that can talk to a SharePoint server to talk to your Alfresco installation&#xa;(proprietary module licensed under the Alfresco Component License).">
<ruleList> <ruleList>
<compareText text="${alfresco_edition}" value="community"/> <compareText text="${alfresco_edition}" value="community"/>
</ruleList> </ruleList>
@@ -25,7 +25,7 @@
<destination>${alfresco_amps_directory}</destination> <destination>${alfresco_amps_directory}</destination>
<platforms>all</platforms> <platforms>all</platforms>
<distributionFileList> <distributionFileList>
<distributionFile origin="${sharepoint_masquerade_distribution_folder}/alfresco-sharepoint-masquerade-*.amp" allowWildcards="1" /> <distributionFile origin="${sharepoint_imitation_distribution_folder}/alfresco-sharepoint-imitation-*.amp" allowWildcards="1" />
</distributionFileList> </distributionFileList>
<actionList> <actionList>
<setInstallerVariable name="alfresco_apply_amps" value="1"/> <setInstallerVariable name="alfresco_apply_amps" value="1"/>
@@ -36,11 +36,11 @@
<description>//War Files</description> <description>//War Files</description>
<destination>${installdiralfresco}</destination> <destination>${installdiralfresco}</destination>
<distributionFileList> <distributionFileList>
<distributionFile origin="${sharepoint_masquerade_distribution_folder}/_vti_bin.war" allowWildcards="1" /> <distributionFile origin="${sharepoint_imitation_distribution_folder}/_vti_bin.war" allowWildcards="1" />
</distributionFileList> </distributionFileList>
</folder> </folder>
<folder> <folder>
<name>alfrescosharepointmasqueradecustomextensions</name> <name>alfrescosharepointimitationcustomextensions</name>
<description>Program Files</description> <description>Program Files</description>
<destination>${alfresco_shared_directory}/alfresco/extension</destination> <destination>${alfresco_shared_directory}/alfresco/extension</destination>
<platforms>all</platforms> <platforms>all</platforms>
@@ -48,15 +48,15 @@
<alfrescoConfigure alfrescoFiles="*/*"/> <alfrescoConfigure alfrescoFiles="*/*"/>
</actionList> </actionList>
<distributionFileList> <distributionFileList>
<distributionFile origin="${sharepoint_masquerade_distribution_folder}/extension/*" allowWildcards="1" /> <distributionFile origin="${sharepoint_imitation_distribution_folder}/extension/*" allowWildcards="1" />
</distributionFileList> </distributionFileList>
</folder> </folder>
<folder> <folder>
<name>alfrescosharepointmasqueradelicenses</name> <name>alfrescosharepointimitationlicenses</name>
<description>//Alfresco Licenses</description> <description>//Alfresco Licenses</description>
<destination>${alfresco_base_application_directory}/licenses</destination> <destination>${alfresco_base_application_directory}/licenses</destination>
<distributionFileList> <distributionFileList>
<distributionFile origin="${sharepoint_masquerade_distribution_folder}/*-license.txt" allowWildcards="1" /> <distributionFile origin="${sharepoint_imitation_distribution_folder}/*-license.txt" allowWildcards="1" />
</distributionFileList> </distributionFileList>
</folder> </folder>
</folderList> </folderList>

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

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

8
src/main/resources/build-installers.xml
View File

@@ -20,7 +20,7 @@
<arg value="--setvars" /> <arg value="--setvars" />
<arg line="${bitrock.arguments}" /> <arg line="${bitrock.arguments}" />
<arg value="alfresco_distribution_folder=${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}" /> <arg value="alfresco_distribution_folder=${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}" />
<arg value="sharepoint_masquerade_distribution_folder=${project.build.directory}/distribution/sharepoint-masquerade" /> <arg value="sharepoint_imitation_distribution_folder=${project.build.directory}/distribution/sharepoint-imitation" />
<arg value="binaries_folder=${binaries.folder}/bitrock/binaries-windows" /> <arg value="binaries_folder=${binaries.folder}/bitrock/binaries-windows" />
<arg value="local_binaries_folder=${project.build.directory}/binaries-windows" /> <arg value="local_binaries_folder=${project.build.directory}/binaries-windows" />
<arg value="alfresco_amps_source_directory=${project.build.directory}/dependency" /> <arg value="alfresco_amps_source_directory=${project.build.directory}/dependency" />
@@ -39,7 +39,7 @@
<arg value="--setvars" /> <arg value="--setvars" />
<arg line="${bitrock.arguments}" /> <arg line="${bitrock.arguments}" />
<arg value="alfresco_distribution_folder=${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}" /> <arg value="alfresco_distribution_folder=${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}" />
<arg value="sharepoint_masquerade_distribution_folder=${project.build.directory}/distribution/sharepoint-masquerade" /> <arg value="sharepoint_imitation_distribution_folder=${project.build.directory}/distribution/sharepoint-imitation" />
<arg value="binaries_folder=${binaries.folder}/bitrock/binaries-windows-x64" /> <arg value="binaries_folder=${binaries.folder}/bitrock/binaries-windows-x64" />
<arg value="local_binaries_folder=${project.build.directory}/binaries-windows-x64" /> <arg value="local_binaries_folder=${project.build.directory}/binaries-windows-x64" />
<arg value="alfresco_amps_source_directory=${project.build.directory}/dependency" /> <arg value="alfresco_amps_source_directory=${project.build.directory}/dependency" />
@@ -58,7 +58,7 @@
<arg value="--setvars" /> <arg value="--setvars" />
<arg line="${bitrock.arguments}" /> <arg line="${bitrock.arguments}" />
<arg value="alfresco_distribution_folder=${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}" /> <arg value="alfresco_distribution_folder=${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}" />
<arg value="sharepoint_masquerade_distribution_folder=${project.build.directory}/distribution/sharepoint-masquerade" /> <arg value="sharepoint_imitation_distribution_folder=${project.build.directory}/distribution/sharepoint-imitation" />
<arg value="binaries_folder=${binaries.folder}/bitrock/binaries-linux-x64" /> <arg value="binaries_folder=${binaries.folder}/bitrock/binaries-linux-x64" />
<arg value="local_binaries_folder=${project.build.directory}/binaries-linux-x64" /> <arg value="local_binaries_folder=${project.build.directory}/binaries-linux-x64" />
<arg value="alfresco_amps_source_directory=${project.build.directory}/dependency" /> <arg value="alfresco_amps_source_directory=${project.build.directory}/dependency" />
@@ -77,7 +77,7 @@
<arg value="--setvars" /> <arg value="--setvars" />
<arg line="${bitrock.arguments}" /> <arg line="${bitrock.arguments}" />
<arg value="alfresco_distribution_folder=${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}" /> <arg value="alfresco_distribution_folder=${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}" />
<arg value="sharepoint_masquerade_distribution_folder=${project.build.directory}/distribution/sharepoint-masquerade" /> <arg value="sharepoint_imitation_distribution_folder=${project.build.directory}/distribution/sharepoint-imitation" />
<arg value="binaries_folder=${binaries.folder}/bitrock/binaries-osx-x64" /> <arg value="binaries_folder=${binaries.folder}/bitrock/binaries-osx-x64" />
<arg value="local_binaries_folder=${project.build.directory}/binaries-osx-x64" /> <arg value="local_binaries_folder=${project.build.directory}/binaries-osx-x64" />
<arg value="alfresco_amps_source_directory=${project.build.directory}/dependency" /> <arg value="alfresco_amps_source_directory=${project.build.directory}/dependency" />