Commit Graph

147 Commits

Author SHA1 Message Date
Jean-Pierre Huynh
8c05da9bf7 Merged COMMUNITY/5.1.a (5.1.a) to HEAD (5.1/Cloud)
Bitrock fix (Case 17580) ImageMagick not working on Windows

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111145 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-28 18:36:34 +00:00
Jean-Pierre Huynh
c7756ff4cc Use a pretty name for installdir on Windows
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111080 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-28 09:56:23 +00:00
Jean-Pierre Huynh
ab0d7e5185 Testing on the alfresco_package parameter should work better.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111069 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-28 08:04:29 +00:00
Jean-Pierre Huynh
fb85377fd2 BDE-400: Updated naming convention after feedback from Richard.
- Fixed ghostscript on windows platforms
- Added new string for install dir (For some reason it doesn’t work on windows yet)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111054 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-27 17:10:48 +00:00
Jean-Pierre Huynh
b64f9542ac BDE-405: Prevent the Share installer from trying to install the alfresco-share-services.amp
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111021 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-27 11:30:35 +00:00
Jean-Pierre Huynh
13b3588fa5 BDE-404: Removed the apps/alfresco folder when we are using our custom stack.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-27 11:00:20 +00:00
Jean-Pierre Huynh
e37e45932d Fixed alfresco-share-services.amp source folder!
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110972 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-26 19:23:40 +00:00
Jean-Pierre Huynh
e20ef6d54d BDE-402: Integrated patch from Bitrock to fix LibreOffice substitution issue.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110957 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-26 14:54:41 +00:00
Jean-Pierre Huynh
1fa3610ad2 BDE-400: Fixed distribution folder name
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110953 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-26 14:46:35 +00:00
Tatyana Valkevych
8fc11dece3 Merged 5.0.N (5.0.3) to HEAD (5.1)
110807: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110609: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110353: MNT-10629 / DOCS-1198: Updated the localisation files with ASCII characters message.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-26 13:13:58 +00:00
Jean-Pierre Huynh
b984382530 BDE-400: New installer naming. (See JIRA issue for more information)
- Note: It doesn’t impact Platform installer (Just changed the variable)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110893 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-26 11:19:40 +00:00
Jean-Pierre Huynh
24ebc30f9e BDE-402: Upgraded ImageMagick to 6.9.1 and now pulling from Nexus instead of BINARIES
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110877 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-26 09:50:50 +00:00
Jean-Pierre Huynh
7ce370016f Reverted to product_shortname because of whitespaces in path…
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 15:49:32 +00:00
Jean-Pierre Huynh
575d9f625e BDE-402: Fixed Ghostscript version variable and extraction for platform only
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110834 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 15:30:10 +00:00
Jean-Pierre Huynh
61329e7a3f Default installation path should be consistent between UNIX and Windows. Also using the fullname as directory name (ie: alfresco-platform, alfresco-share, alfresco-one)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110825 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 15:14:30 +00:00
Jean-Pierre Huynh
31fa623035 BDE-402: Added ghostscript distribution folder variable.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 10:49:17 +00:00
Jean-Pierre Huynh
825ea338f5 BDE-402: Added ghostscript extraction from Nexus
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110752 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 10:25:25 +00:00
Jean-Pierre Huynh
61e05d7a43 BDE-402: Synced Bitrock installbuilder files.
- Platform installer should now end with opening …/alfresco on the browser.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 09:53:32 +00:00
Jean-Pierre Huynh
c654d7601c Fixed libGLU.so.1 paths on different Linux distro.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110606 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-21 14:50:59 +00:00
Jean-Pierre Huynh
b9f0e85079 BDE-402: Upgraded 3rd party (PostgreSQL, LibreOffice, Common and JRE)
- Upgraded PostgreSQL to version 9.4.4
- Upgraded Common to version 5.1-20150819
- Upgraded JRE to version 1.8.0_51
- Upgraded LibreOffice to version 4.4.5-alfresco

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110535 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-20 11:00:21 +00:00
Jean-Pierre Huynh
97a2275fac RA-562: Removed the FTP panel from the Share installer + some refactoring.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110320 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-18 11:26:31 +00:00
Jean-Pierre Huynh
bc4e8e43f0 RA-558: Fixed Platform URL substitution in Advanced mode.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-17 16:51:38 +00:00
Jean-Pierre Huynh
8efa6bb1a3 RA-559: Do not pack alfresco-global.properties with the Share installer.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-17 13:08:29 +00:00
Jean-Pierre Huynh
1976c7b502 RA-560: Disable the RMI panel for Share installer.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-17 12:35:06 +00:00
Alan Davis
37137e8ed1 Merged 5.0.N (5.0.3) to HEAD (5.1)
110101: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110094: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110064: MNT-10629: Added the ASCII characters message for localisation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110102 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-14 09:00:09 +00:00
Jean-Pierre Huynh
d96be7408b RA-548: First implementation of Alfresco Platform url prompt in Share installer.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109978 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-12 13:12:47 +00:00
Jean-Pierre Huynh
d7dc1518e3 RA-543: Fix dll file error for Share installer on windows.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109752 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-07 10:01:10 +00:00
Samuel Langlois
b78cf51aec RA-407 Add modules/platform folder in distribution + alfresco.xml in Tomcat config, to add this folder in Platform classpath
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109428 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-03 12:39:49 +00:00
Jean-Pierre Huynh
ec3351c012 Merged RA-232-HEAD-PACKAGING (Bitrock Resources for Share Installer) to HEAD (5.1/Cloud)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109277 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-31 11:00:48 +00:00
Samuel Langlois
ab7600f2b2 Reduce number of threads to build installers from 4 to 2 - otherwise disk space is eaten too quickly for autocleanup
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-30 12:27:05 +00:00
Jean-Pierre Huynh
cdc0f3648c RA-232: Fixed JAVA env variables formatting
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109207 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-30 11:21:17 +00:00
Jean-Pierre Huynh
96ac5a4bbd RA-232: Re-indent project.xml for better readability
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109144 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-29 10:48:02 +00:00
Jean-Pierre Huynh
edbbe28da8 RA-232: Added unpack flags for the Share installer build
- Change the extract-binaries ant script to separate common binaries from platform specific binaries
- Re-indent most of the xml files for better readability

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109135 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-29 10:17:08 +00:00
Jean-Pierre Huynh
651bd46b5f Removed unused sign.xml file since Installbuilder 15.1.0 upgrade
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-28 09:44:07 +00:00
Samuel Langlois
1bc20ada1f RA-400 At the end of the installation, launch Share in a browser only if it was installed
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109045 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-27 17:24:37 +00:00
Jean-Pierre Huynh
d201c444ee RA-482: Prevent the build from failing when alfresco-share-services.amp is not present. (Alfresco Platform installer doesn’t need to package it).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109010 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-27 09:23:39 +00:00
Samuel Langlois
0e4991dccf RA-482 Install Share Services AMP to Alfresco war, not Share war....
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108954 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-24 14:56:41 +00:00
Samuel Langlois
88050ae1c5 RA-482 Install Share Services AMP to Alfresco war, not Share war...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108949 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-24 14:22:38 +00:00
Samuel Langlois
241450b0a5 RA-482 Fix syntax in Bitrock file
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108944 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-24 13:48:25 +00:00
Samuel Langlois
76ca0c6efb RA-482 Ensure share-services AMP is applied by Full Installer
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108943 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-24 13:36:03 +00:00
Jean-Pierre Huynh
a6430782e4 RA-482: Separated alfresco.distribution.name from alfresco.package.name
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108930 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-24 10:25:29 +00:00
Samuel Langlois
c4c4772cc4 Fix property containing name of installer
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108670 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-21 14:13:47 +00:00
Samuel Langlois
c1f444343a Merged AIR-SPRINT1 (5.1.0) to HEAD (5.1/Cloud)
108250: RA-233/RA-432 Switch Full installer to Platform-only installer, and only on Enterprise


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108643 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-21 11:09:00 +00:00
Samuel Langlois
01bf33a37c 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
2015-07-21 11:00:36 +00:00
Jean-Pierre Huynh
6466f317da ACE-4051 Googledrive is not installed
- Moved and fixed alfresco_amps_source_directory from pom,xml to build-installer.xml (For some reason the variable wasn’t passed properly from Maven to ANT. Hence the issue with the AMPs)
- Moved wcmqs_folder for same reasons and consistency.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108584 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-20 12:49:06 +00:00
Samuel Langlois
43fb48d3d4 Reverse-merge on HEAD: this commit had been reverted by 89409 and should not have been brought back
94570: Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
      88177: ACE-3110: Alfresco fails to install into folder with spaces in folder name in headless mode
         - making '--base_allow_spaces 1' default option to allow installation into folder with spaces in headless mode


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-17 09:32:51 +00:00
Alan Davis
a8330a2415 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108279: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      108237:       Reverse merged 5.0.N (5.0.3)
               << Code was already on 5.0.N >>
               108216: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
                  108201: MNT-14374: Updated tomcat-service.xml file to substitute the JAVA_HOME env variable correctly on windows.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108411 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-15 17:12:54 +00:00
Alan Davis
83e51ac20e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108278: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      108216:       108216: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
               108201: MNT-14374: Updated tomcat-service.xml file to substitute the JAVA_HOME env variable correctly on windows.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108410 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-15 17:12:48 +00:00
Alan Davis
534f9e1645 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108168: BDE-376: Fixed Enterprise Packaging build
   - Resolved all path issues.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-14 07:02:30 +00:00
Alan Davis
7cd0f45bcf Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108122: BDE-376: Fixed typo in license path property


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108145 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-11 05:50:50 +00:00