From 01bf33a37c5fa72f466427dad69907c8e5eb7e60 Mon Sep 17 00:00:00 2001 From: Samuel Langlois Date: Tue, 21 Jul 2015 11:00:36 +0000 Subject: [PATCH] Merged AIR-SPRINT1 (5.1.0) to HEAD (5.1/Cloud) 108200: RA-233 Turn the Full installer into a Platform only installer git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108641 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 83 ++++--------------- .../resources/bitrock/alfresco-googledocs.xml | 7 ++ src/main/resources/bitrock/alfresco-solr.xml | 7 ++ src/main/resources/bitrock/alfresco-wcmqs.xml | 4 + src/main/resources/sign.xml | 10 +-- 5 files changed, 37 insertions(+), 74 deletions(-) diff --git a/pom.xml b/pom.xml index c323d206e0..674cd662ec 100644 --- a/pom.xml +++ b/pom.xml @@ -6,25 +6,28 @@ alfresco-packaging 5.1-SNAPSHOT - alfresco-installer + alfresco-platform-installer jar - Alfresco Installers + Alfresco Platform Installers - 2015-a-EA ${user.home}/binaries ${project.build.directory}/installbuilder ${binaries.folder}/build-classpath/code-signing ${binaries.folder}/build-classpath/license.xml - project.outputDirectory=${project.build.directory} - project.version=${installer.version} - project.fullName='Alfresco Community ${installer.version}' - project.osxSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd-osx.p12 - project.osxSigningPkcs12Password=${p12Password} - project.windowsSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd.p12 - project.windowsSigningPkcs12Password=${p12Password} - alfresco_edition=community + project.outputDirectory=${project.build.directory} + project.version=${project.version} + project.fullName='Alfresco Platform Community' + project.osxSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd-osx.p12 + project.osxSigningPkcs12Password=${p12Password} + project.windowsSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd.p12 + project.windowsSigningPkcs12Password=${p12Password} + alfresco_edition=community + alfrescogoogledocs_component_enabled=0 + alfrescosharepoint_component_enabled=0 + alfrescosolr_component_enabled=0 + alfrescowcmqs_component_enabled=0 alfresco-community @@ -200,67 +203,11 @@ org.alfresco - alfresco-distribution + alfresco-platform-distribution ${project.version} zip ${project.build.directory}/distribution - - - org.alfresco - alfresco-wcmqs-distribution - ${project.version} - zip - ${project.build.directory}/wcmqs - - - - org.alfresco - alfresco-wcmqs-web - ${project.version} - classes - ${project.build.directory}/wcmqs - alfresco/web-extension/** - - - - org.alfresco - alfresco-wcmqs-client-api - ${project.version} - ${project.build.directory}/wcmqs - alfresco/extension/** - - - - org.alfresco - alfresco-solr1-distribution - ${project.version} - zip - ${project.build.directory}/distribution/alfresco-community-${project.version}/alf_data/solr - - - - - - get-amps - prepare-package - - copy - - - - - org.alfresco.integrations - alfresco-googledocs-repo - ${alfresco.googledocs.version} - amp - - - org.alfresco.integrations - alfresco-googledocs-share - ${alfresco.googledocs.version} - amp - diff --git a/src/main/resources/bitrock/alfresco-googledocs.xml b/src/main/resources/bitrock/alfresco-googledocs.xml index b6c6d811b1..8c9a6fd49a 100644 --- a/src/main/resources/bitrock/alfresco-googledocs.xml +++ b/src/main/resources/bitrock/alfresco-googledocs.xml @@ -5,6 +5,13 @@ 1 1 1 + + + + + + + diff --git a/src/main/resources/bitrock/alfresco-solr.xml b/src/main/resources/bitrock/alfresco-solr.xml index 09bb65d13f..7b697dc846 100644 --- a/src/main/resources/bitrock/alfresco-solr.xml +++ b/src/main/resources/bitrock/alfresco-solr.xml @@ -4,6 +4,13 @@ 1 0 1 + + + + + + + solr diff --git a/src/main/resources/bitrock/alfresco-wcmqs.xml b/src/main/resources/bitrock/alfresco-wcmqs.xml index a47876cf62..389d7c529c 100644 --- a/src/main/resources/bitrock/alfresco-wcmqs.xml +++ b/src/main/resources/bitrock/alfresco-wcmqs.xml @@ -5,8 +5,12 @@ 1 0 1 + + + + diff --git a/src/main/resources/sign.xml b/src/main/resources/sign.xml index 85b126886c..2f0f622fc3 100644 --- a/src/main/resources/sign.xml +++ b/src/main/resources/sign.xml @@ -29,21 +29,19 @@ - - - - + + - - +