Commit Graph

4344 Commits

Author SHA1 Message Date
Raluca Munteanu
49caa2b792 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125615 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125546 mrogers: Integration test javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 14:51:09 +00:00
Raluca Munteanu
cc8cba4a78 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125614 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125544 mrogers: Integration test javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 14:50:48 +00:00
Raluca Munteanu
c964ae6d32 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 125526


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125806 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 14:48:01 +00:00
Raluca Munteanu
b5327e29a1 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
dead3c3825 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:03:25 +00:00
Raluca Munteanu
d6f9f50c39 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Jean-Pierre Huynh
626e644032 MNT-16202: UA Review. Removed “Please”
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.1/root@125759 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 09:25:40 +00:00
Jean-Pierre Huynh
3a586d43b6 MNT-16202: Completed english localisation file.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.1/root@125746 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-25 16:34:15 +00:00
Jean-Pierre Huynh
0af0fcb028 MNT-16202: Added license agreement panel in the installer.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.1/root@125745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-25 16:23:35 +00:00
Martin Bergljung
041e25924e MNT-16200: updated share-config-custom.xml comments for aspect and type i18n config
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.1/root@125735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-25 10:00:03 +00:00
Raluca Munteanu
fe543d4bb6 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 125628,125641


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-21 14:37:41 +00:00
Raluca Munteanu
2afc69a10b Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 125533,125577


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 12:38:39 +00:00
Raluca Munteanu
2d49886699 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125598 slanglois: ACE-5253 Bring AOS (ROOT.war and _vti_bin.war) back into the EAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 12:28:48 +00:00
Raluca Munteanu
cfdb9ce0d3 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125581 mrogers: Build fix - correction to r125544


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125616 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 12:26:20 +00:00
Raluca Munteanu
7d8d6122fc Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125546 mrogers: Integration test javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 12:25:07 +00:00
Raluca Munteanu
5cc17a36cd Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125544 mrogers: Integration test javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125614 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 12:24:48 +00:00
Raluca Munteanu
16834edbd2 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125606 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 10:55:49 +00:00
Raluca Munteanu
73ffa91a49 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125605 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 10:30:21 +00:00
Raluca Munteanu
1ce8e6fa1d Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 10:21:07 +00:00
Raluca Munteanu
e325ad6abd Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 125507


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125526 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-18 09:16:12 +00:00
Samuel Langlois
e678020e7d MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.1/root@125515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-15 17:31:22 +00:00
Samuel Langlois
f7e766c149 MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.1/root@125484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-15 14:11:11 +00:00
Ancuta Morarasu
a75ddc6fdb Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125344 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125267 slanglois: MNT-16094 Remove ROOT.war from the Alfresco One EAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125451 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-15 12:23:32 +00:00
Ancuta Morarasu
12985d347e Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125343 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125254 amukha: ACE-5130: [SUSE 12.0, Web Logic] - Admin Console - Install Application Assistant - Install Alfresco Failed
         - removed _vti_bin.war from the configuration as it is no longer shipped in the ear.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125450 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-15 12:22:49 +00:00
Ancuta Morarasu
ccba94ce81 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125337 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125248 jphuynh: MNT-15842: Force the reset of Solr Sharding settings values when switching from Advanced to Easy mode in the installer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125444 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-15 12:17:01 +00:00
Alan Davis
dd8665daf1 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 125374


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125394 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-14 15:36:10 +00:00
Alan Davis
39f418e8d8 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 125253,125257,125274,125284,125288,125300,125311,125312,
     125320,125345,125346,125351,125368,125373


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-14 15:29:12 +00:00
Ramona Neamtu
890273fcb5 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125267 slanglois: MNT-16094 Remove ROOT.war from the Alfresco One EAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125344 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-14 11:41:02 +00:00
Ramona Neamtu
9a73aa4649 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125254 amukha: ACE-5130: [SUSE 12.0, Web Logic] - Admin Console - Install Application Assistant - Install Alfresco Failed
      - removed _vti_bin.war from the configuration as it is no longer shipped in the ear.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125343 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-14 11:40:43 +00:00
Ramona Neamtu
7bc3469152 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125248 jphuynh: MNT-15842: Force the reset of Solr Sharding settings values when switching from Advanced to Easy mode in the installer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125337 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-14 11:35:07 +00:00
Ramona Neamtu
b39743adde Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 125252


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125332 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-14 11:29:03 +00:00
Ramona Neamtu
d6c49670cb Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 125157,125166,125167,125168,125171,125211,125229


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-13 13:39:13 +00:00
Jean-Pierre Huynh
44330a12be MNT-15842: Force the reset of Solr Sharding settings values when switching from Advanced to Easy mode in the installer.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.1/root@125248 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-13 13:35:38 +00:00
Ramona Neamtu
22f0c8af62 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 125183


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125243 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-13 13:31:30 +00:00
Mark Rogers
0529a928a1 correcting regex
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-13 09:15:50 +00:00
Mark Rogers
9b11630a6c Temp fix - remove test of postgres lib
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-12 15:18:49 +00:00
Alan Davis
38a7c75768 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 125165,125169


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125183 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-12 14:00:36 +00:00
Mark Rogers
6c6fd4c966 Added new test for SNAPSHOT and nightly builds
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125179 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-12 13:55:56 +00:00
Ramona Neamtu
b8fced15aa Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 125152


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125155 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-12 12:32:59 +00:00
Ramona Neamtu
c7d85465a5 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 125051,125052,125053,125055,125060,125067,125111,125116


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125152 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-12 12:30:37 +00:00
Alan Davis
5d476bfd88 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 124777,124801,124861,124934,125042


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125091 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-09 07:57:52 +00:00
Cristian Turlica
46b54f737e Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 125001,125004,125007


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125042 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-08 14:43:10 +00:00
Andrei Rebegea
1fc2053fd0 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 124871,124872,124877,124888,124889,124908,124914,124915,
     124916,124917,124918


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-06 14:48:06 +00:00
Cristian Turlica
a29e70256e Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 124782,124783,124795,124809


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124861 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-05 13:00:10 +00:00
Alan Davis
0e2bc317dd Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 124794


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124801 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-04 13:12:30 +00:00
Alan Davis
121f4d2e29 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 124710


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124777 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-04 09:51:22 +00:00
Alan Davis
fccf9b5f22 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124768 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      124408 jphuynh: ACE-5135: Fixed alfresco-full-installation version


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@124773 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-04 09:00:54 +00:00
Alan Davis
3ebff40bc3 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124767 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      124406 jphuynh: ACE-5135: Pre-apply share-services AMP in alfresco.war packaged in EAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@124772 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-04 09:00:14 +00:00
Alan Davis
048b7ef6ac Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 124662,124702


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@124771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-04 09:00:04 +00:00
Alan Davis
01e1ae3ed0 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124598 slanglois: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      124596 slanglois: ACE-5135 Add aspecjrt jar to myfaces1_1-websphere-shared-lib


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@124770 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-04 09:00:00 +00:00