From 4fc1a5e0cd52aa7f9123f53a9e173886457f0e9f Mon Sep 17 00:00:00 2001
From: Jean-Pierre Huynh <jean-pierre.huynh@alfresco.com>
Date: Thu, 10 Dec 2015 10:32:56 +0000
Subject: [PATCH] Merged 5.1-MC1 (5.1.0) to HEAD (5.1)    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
---
 .../bitrock/alfresco-build-settings.xml       |  3 -
 .../alfresco-customstack-build-settings.xml   |  1 -
 ...alfresco-customstack-postgres-settings.xml |  2 +-
 .../resources/bitrock/alfresco-functions.xml  |  4 --
 .../resources/bitrock/alfresco-sharepoint.xml | 68 -------------------
 .../shared/extension/custom-vti.properties    |  2 -
 src/main/resources/bitrock/project.xml        |  1 -
 7 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 src/main/resources/bitrock/alfresco-sharepoint.xml
 delete mode 100644 src/main/resources/bitrock/bitrock/alfrescosharepoint/shared/extension/custom-vti.properties

diff --git a/src/main/resources/bitrock/alfresco-build-settings.xml b/src/main/resources/bitrock/alfresco-build-settings.xml
index 528b870f5d..d14425d266 100644
--- a/src/main/resources/bitrock/alfresco-build-settings.xml
+++ b/src/main/resources/bitrock/alfresco-build-settings.xml
@@ -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" />
diff --git a/src/main/resources/bitrock/alfresco-customstack-build-settings.xml b/src/main/resources/bitrock/alfresco-customstack-build-settings.xml
index 8667d2eb18..8b84c7113a 100644
--- a/src/main/resources/bitrock/alfresco-customstack-build-settings.xml
+++ b/src/main/resources/bitrock/alfresco-customstack-build-settings.xml
@@ -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"/>
diff --git a/src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml b/src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml
index 8b400a7908..e9cebbf02c 100644
--- a/src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml
+++ b/src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml
@@ -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"/>
diff --git a/src/main/resources/bitrock/alfresco-functions.xml b/src/main/resources/bitrock/alfresco-functions.xml
index f25808b76f..39a3ea9b75 100644
--- a/src/main/resources/bitrock/alfresco-functions.xml
+++ b/src/main/resources/bitrock/alfresco-functions.xml
@@ -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>
diff --git a/src/main/resources/bitrock/alfresco-sharepoint.xml b/src/main/resources/bitrock/alfresco-sharepoint.xml
deleted file mode 100644
index 8e821028ce..0000000000
--- a/src/main/resources/bitrock/alfresco-sharepoint.xml
+++ /dev/null
@@ -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>
diff --git a/src/main/resources/bitrock/bitrock/alfrescosharepoint/shared/extension/custom-vti.properties b/src/main/resources/bitrock/bitrock/alfrescosharepoint/shared/extension/custom-vti.properties
deleted file mode 100644
index aea72d0b9c..0000000000
--- a/src/main/resources/bitrock/bitrock/alfrescosharepoint/shared/extension/custom-vti.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-
-vti.server.port=@@BITROCK_SHAREPOINT_PORT@@
diff --git a/src/main/resources/bitrock/project.xml b/src/main/resources/bitrock/project.xml
index d858dbceb8..51e407d626 100644
--- a/src/main/resources/bitrock/project.xml
+++ b/src/main/resources/bitrock/project.xml
@@ -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" />