Commit Graph

4344 Commits

Author SHA1 Message Date
Alan Davis
22512d8c9e Merged 5.2.N (5.2.1) to HEAD (5.2)
125783 rmunteanu: 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/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:45:04 +00:00
Alan Davis
4818f7ccf5 Merged 5.2.N (5.2.1) to HEAD (5.2)
125781 rmunteanu: 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/HEAD/root@127808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:40:56 +00:00
Alan Davis
42e5e41b3c Merged 5.2.N (5.2.1) to HEAD (5.2)
125444 amorarasu: 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/HEAD/root@127788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:10:08 +00:00
Alan Davis
ac61b30062 Merged 5.2.N (5.2.1) to HEAD (5.2)
124281 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124275 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         124171 jphuynh: MNT-15874: Fix missing Remote Solr configuration properties.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:03:12 +00:00
Alexandra Leahu
244f0c6c1e Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127507


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:04:37 +00:00
Alan Davis
4a3b8f27f8 Merged 5.2.N (5.2.1) to trunk (5.2)
127197 jphuynh: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127192 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127635 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:14:27 +00:00
Alan Davis
f8c3e48467 Merged 5.2.N (5.2.1) to trunk (5.2)
127016 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126679 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         126277 skopf: MNT-16223 - Different AOS versions on Alfresco one and Alfresco one Platform using the same build	
          


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:13:46 +00:00
Alan Davis
19faa7b63a Merged 5.2.N (5.2.1) to trunk (5.2)
126118 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126116 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         126106 slanglois: MNT-16094 Apply alfresco-aos-module to alfresco.war in EAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:13:17 +00:00
Alan Davis
27b8ab4f99 Merged 5.2.N (5.2.1) to trunk (5.2)
126117 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126086 aleahu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         126048 jphuynh: MNT-16233: Use AOS 1.1.1. (Incomplete version bump from ACE-5133 done in Platform)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:12:51 +00:00
Alan Davis
342bcf34cb Merged 5.2.N (5.2.1) to trunk (5.2)
125810 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125617 rmunteanu: 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/trunk@127631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:12:09 +00:00
Alan Davis
d0ba492e3f Merged 5.2.N (5.2.1) to trunk (5.2)
125451 amorarasu: 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/trunk@127630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:11:22 +00:00
Alan Davis
9157daf317 Merged 5.2.N (5.2.1) to trunk (5.2)
125450 amorarasu: 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/trunk@127629 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:05:27 +00:00
Alan Davis
4083350641 Merged 5.2.N (5.2.1) to trunk (5.2)
124773 adavis: 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/trunk@127628 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:05:07 +00:00
Alan Davis
66c2fbf73e Merged 5.2.N (5.2.1) to trunk (5.2)
124772 adavis: 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/trunk@127627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:03:59 +00:00
Alan Davis
3e0bce08ab Merged 5.2.N (5.2.1) to trunk (5.2)
124770 adavis: 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/trunk@127626 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 12:58:58 +00:00
Alan Davis
c5445b1f15 Merged 5.2.N (5.2.2) to trunk (5.2) (RECORD ONLY)
- Commits from trunk: 126267
   - record only commits from 5.1.N:
     126666,127017,127070,127127,127164,127196,127211,
     127255,127291,127364,127401,127515

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 14:55:50 +00:00
Alan Davis
fd402e08cf Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127467


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 14:46:07 +00:00
Alexandra Leahu
3319b6469f Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127458


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-01 13:29:36 +00:00
Raluca Munteanu
a94b7c3f02 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127375


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127401 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-25 14:42:00 +00:00
Raluca Munteanu
e63e2e6a09 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127305,127306,127355


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-24 14:50:43 +00:00
Raluca Munteanu
4aa15a7a30 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127296


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127364 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-24 14:38:04 +00:00
Cristian Turlica
3cc104e553 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127277,127278


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127296 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-20 13:24:24 +00:00
Cristian Turlica
c84d6ca771 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127260


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-20 13:18:34 +00:00
Jean-Pierre Huynh
89691f5370 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127274 jphuynh: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      127273 jphuynh: MNT-16290: Prevent an existing folder from being deleted when aborting the installation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127275 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-19 15:40:43 +00:00
Jean-Pierre Huynh
9469c60054 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
127273 jphuynh: MNT-16290: Prevent an existing folder from being deleted when aborting the installation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127274 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-19 15:40:04 +00:00
Andrei Rebegea
529bd49464 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127225,127234,127236


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-19 14:57:21 +00:00
Andrei Rebegea
650dafe018 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127216


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-19 14:54:58 +00:00
Andrei Rebegea
aa5260d711 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127179,127187


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 14:29:03 +00:00
Andrei Rebegea
231967da7c Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127171


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127211 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 14:25:48 +00:00
Jean-Pierre Huynh
bd07ff387a Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127199 jphuynh: BDE-674: Fix conflict tags.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 11:48:52 +00:00
Jean-Pierre Huynh
06f78b84d3 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127190 jphuynh: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127158 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 11:48:38 +00:00
Jean-Pierre Huynh
1931851a1d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127190 jphuynh: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127158 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 11:48:38 +00:00
Jean-Pierre Huynh
c1cc0d0ee8 BDE-674: Fix conflict tags.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 11:47:35 +00:00
Jean-Pierre Huynh
3c81cdfd0c BDE-674: Fix conflict tags.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 11:47:35 +00:00
Jean-Pierre Huynh
768f0f4bb3 BDE-674: Fix conflict tags.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 11:47:35 +00:00
Jean-Pierre Huynh
749f0f61df Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127192 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 11:39:02 +00:00
Jean-Pierre Huynh
1f30ab0b13 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 125527


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 11:37:10 +00:00
Jean-Pierre Huynh
45c68e396b BDE-674: Pull Manager from Nexus instead of BINARIES.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 11:29:09 +00:00
Jean-Pierre Huynh
879181aac4 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
127158 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127190 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 11:22:34 +00:00
Jean-Pierre Huynh
cd260074d2 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
127158 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127190 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 11:22:34 +00:00
Cristian Turlica
0de711de96 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127142,127158


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127171 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-17 14:19:00 +00:00
Cristian Turlica
32799a4e57 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127132


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127164 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-17 14:15:10 +00:00
Cristian Turlica
40624d7fe9 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127085,127102


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127132 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-16 14:52:52 +00:00
Cristian Turlica
e9000f0612 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127077


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-16 14:47:38 +00:00
Ramona Neamtu
d3b51d6a4e Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127046,127063


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127077 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-13 13:34:29 +00:00
Ramona Neamtu
1f265a4c9d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127026


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-13 13:28:10 +00:00
Ancuta Morarasu
a2de2b3975 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 126687


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127026 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-12 08:49:38 +00:00
Ancuta Morarasu
887d69ddb7 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 126680


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-12 08:45:28 +00:00
Ancuta Morarasu
8087d4e458 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
126679 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      126277 skopf: MNT-16223 - Different AOS versions on Alfresco one and Alfresco one Platform using the same build	
       


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127016 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-12 08:45:23 +00:00
Ancuta Morarasu
d7f6480a4b Merged HEAD (5.2) to 5.2.N (5.2.1)
126634 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      125740 jvonka: Merged API-STRIKES-BACK (5.2.0) to FILE-FOLDER-API (5.2.0)
         125736: ALF-21420: cors-filter - bump version (from 1.9.3 to 2.5)
         - ACE-4055


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126985 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:41:21 +00:00