Merged HEAD (5.1) to 5.1.N (5.1.1)

121375 jphuynh: Merged AOS-Module (5.1.0) to HEAD (5.1)
      121223 jphuynh: ACE-5033: Rebranded Sharepoint Imitation to AOS Module in the bitrock installer files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

src/main/resources/bitrock/alfresco-aos-module.xml

@@ -1,18 +1,18 @@
 <component>
-    <name>alfrescosharepointimitation</name>
-    <description>SharePoint Imitation</description>
+    <name>aosmodule</name>
+    <description>Alfresco Office Services Module</description>
     <detailedDescription>Select this module to allow applications that can talk to a SharePoint server to talk to your Alfresco installation.</detailedDescription>
     <canBeEdited>1</canBeEdited>
     <selected>1</selected>
     <show>1</show>
     <shouldPackRuleList>
-        <isTrue value="${alfrescosharepointimitation_component_enabled}" />
+        <isTrue value="${aosmodule_component_enabled}" />
     </shouldPackRuleList>
     <parameterList>
-        <booleanParameter name="alfrescosharepointimitation_component_enabled" ask="0" value="1" />
+        <booleanParameter name="aosmodule_component_enabled" ask="0" value="1" />
     </parameterList>
     <initializationActionList>
-		<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).">
+		<setInstallerVariable name="component(aosmodule).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>
                 <compareText text="${alfresco_edition}" value="community"/>
 			</ruleList>
@@ -25,7 +25,7 @@
             <destination>${alfresco_amps_directory}</destination>
             <platforms>all</platforms>
             <distributionFileList>
-              <distributionFile origin="${sharepoint_imitation_distribution_folder}/alfresco-sharepoint-imitation-*.amp" allowWildcards="1" />
+              <distributionFile origin="${aos_module_distribution_folder}/alfresco-aos-module-*.amp" allowWildcards="1" />
             </distributionFileList>
             <actionList>
                 <setInstallerVariable name="alfresco_apply_amps" value="1"/>
@@ -36,11 +36,11 @@
             <description>//War Files</description>
             <destination>${installdiralfresco}</destination>
             <distributionFileList>
-                <distributionFile origin="${sharepoint_imitation_distribution_folder}/_vti_bin.war" allowWildcards="1" />
+                <distributionFile origin="${aos_module_distribution_folder}/_vti_bin.war" allowWildcards="1" />
             </distributionFileList>
         </folder>
         <folder>
-            <name>alfrescosharepointimitationcustomextensions</name>
+            <name>aosmodulecustomextensions</name>
             <description>Program Files</description>
             <destination>${alfresco_shared_directory}/alfresco/extension</destination>
             <platforms>all</platforms>
@@ -48,15 +48,15 @@
                 <alfrescoConfigure alfrescoFiles="*/*"/>
             </actionList>
             <distributionFileList>
-                <distributionFile origin="${sharepoint_imitation_distribution_folder}/extension/*" allowWildcards="1" />
+                <distributionFile origin="${aos_module_distribution_folder}/extension/*" allowWildcards="1" />
             </distributionFileList>
         </folder>
         <folder>
-            <name>alfrescosharepointimitationlicenses</name>
+            <name>aosmodulelicenses</name>
             <description>//Alfresco Licenses</description>
             <destination>${alfresco_base_application_directory}/licenses</destination>
             <distributionFileList>
-                <distributionFile origin="${sharepoint_imitation_distribution_folder}/*-license.txt" allowWildcards="1" />
+                <distributionFile origin="${aos_module_distribution_folder}/*-license.txt" allowWildcards="1" />
             </distributionFileList>
         </folder>
     </folderList>

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

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

src/main/resources/bitrock/lang/alf-de.po

@@ -394,8 +394,8 @@ msgstr "Bestimmen Sie den Datenbankbenutzer."
 msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?"
 msgstr "Setup wird die neuen Datenbanken installieren und überschreibt dabei bereits bestehende identische Datenbanken. Möchten Sie fortfahren?"
 
-msgid "SharePoint Imitation"
-msgstr "SharePoint Imitation"
+msgid "Alfresco Office Services Module"
+msgstr "Alfresco Office Services Module"
 
 msgid "Shortcuts Images"
 msgstr "Shortcut-Symbole"

src/main/resources/bitrock/lang/alf-en.po

@@ -394,8 +394,8 @@ msgstr "Set the database user."
 msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?"
 msgstr "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?"
 
-msgid "SharePoint Imitation"
-msgstr "SharePoint Imitation"
+msgid "Alfresco Office Services Module"
+msgstr "Alfresco Office Services Module"
 
 msgid "Shortcuts Images"
 msgstr "Shortcuts Images"

src/main/resources/bitrock/lang/alf-es.po

@@ -394,8 +394,8 @@ msgstr "Establezca el usuario de la base de datos."
 msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?"
 msgstr "El programa de instalación intentará instalar nuevas bases de datos y sobrescribirá cualquier datos duplicado.  ¿Desea continuar?"
 
-msgid "SharePoint Imitation"
-msgstr "SharePoint Imitation"
+msgid "Alfresco Office Services Module"
+msgstr "Alfresco Office Services Module"
 
 msgid "Shortcuts Images"
 msgstr "Imágenes de accesos directos"

src/main/resources/bitrock/lang/alf-fr.po

@@ -394,8 +394,8 @@ msgstr "Définissez l'utilisateur de la base de données."
 msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?"
 msgstr "Le processus d'installation va tenter d'installer de nouvelles bases de données et écraser les éventuels doublons. Souhaitez-vous continuer ?"
 
-msgid "SharePoint Imitation"
-msgstr "SharePoint Imitation"
+msgid "Alfresco Office Services Module"
+msgstr "Alfresco Office Services Module"
 
 msgid "Shortcuts Images"
 msgstr "Images des raccourcis"

src/main/resources/bitrock/lang/alf-it.po

@@ -394,8 +394,8 @@ msgstr "Impostare l'utente del database."
 msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?"
 msgstr "Il programma di installazione tenterà di installare nuovi database e sovrascriverà eventuali duplicati. Continuare?"
 
-msgid "SharePoint Imitation"
-msgstr "SharePoint Imitation"
+msgid "Alfresco Office Services Module"
+msgstr "Alfresco Office Services Module"
 
 msgid "Shortcuts Images"
 msgstr "Immagini delle scorciatoie"

src/main/resources/bitrock/lang/alf-ja.po

@@ -394,8 +394,8 @@ msgstr "データベースユーザーを設定してください。"
 msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?"
 msgstr "新しいデータベースがインストールされ、同じ名前の既存のデータベースは上書きされます。操作を続けますか?"
 
-msgid "SharePoint Imitation"
-msgstr "SharePoint Imitation"
+msgid "Alfresco Office Services Module"
+msgstr "Alfresco Office Services Module"
 
 msgid "Shortcuts Images"
 msgstr "ショートカット画像"

src/main/resources/bitrock/lang/alf-nb_NO.po

@@ -394,8 +394,8 @@ msgstr "Velg databasebruker."
 msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?"
 msgstr "Installasjonen vil forsøke å installere nye databaser og vil overskrive duplikater. Ønsker du å fortsette?"
 
-msgid "SharePoint Imitation"
-msgstr "SharePoint Imitation"
+msgid "Alfresco Office Services Module"
+msgstr "Alfresco Office Services Module"
 
 msgid "Shortcuts Images"
 msgstr "Bilder av snarveier"

src/main/resources/bitrock/lang/alf-nl.po

@@ -394,8 +394,8 @@ msgstr "Stel de gebruiker van de database in."
 msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?"
 msgstr "Setup probeert nieuwe databases te installeren en duplicaten te overschrijven. Wilt u doorgaan?"
 
-msgid "SharePoint Imitation"
-msgstr "SharePoint Imitation"
+msgid "Alfresco Office Services Module"
+msgstr "Alfresco Office Services Module"
 
 msgid "Shortcuts Images"
 msgstr "Snelkoppelingen afbeeldingen "

src/main/resources/bitrock/lang/alf-pt_BR.po

@@ -394,8 +394,8 @@ msgstr "Defina o usuário do banco de dados."
 msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?"
 msgstr "A configuração tentará instalar novos bancos de dados e substituirá todas as cópias. Deseja continuar?"
 
-msgid "SharePoint Imitation"
-msgstr "SharePoint Imitation"
+msgid "Alfresco Office Services Module"
+msgstr "Alfresco Office Services Module"
 
 msgid "Shortcuts Images"
 msgstr "Imagens de atalhos"

src/main/resources/bitrock/lang/alf-ru.po

@@ -394,8 +394,8 @@ msgstr "Задайте пользователя базы данных."
 msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?"
 msgstr "Программа установки попытается установить новые базы данных и перезапишет любые копии. Продолжить?"
 
-msgid "SharePoint Imitation"
-msgstr "SharePoint Imitation"
+msgid "Alfresco Office Services Module"
+msgstr "Alfresco Office Services Module"
 
 msgid "Shortcuts Images"
 msgstr "Изображения ярлыков"

src/main/resources/bitrock/lang/alf-zh_CN.po

@@ -394,8 +394,8 @@ msgstr "设置数据库用户。"
 msgid "Setup will attempt to install new databases and will overwrite any duplicates. Do you want you continue?"
 msgstr "安装程序将尝试安装新数据库，并覆盖任何重复。是否继续？"
 
-msgid "SharePoint Imitation"
-msgstr "SharePoint Imitation"
+msgid "Alfresco Office Services Module"
+msgstr "Alfresco Office Services Module"
 
 msgid "Shortcuts Images"
 msgstr "快捷方式图像"

src/main/resources/bitrock/project.xml

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