Commit Graph

507 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Alan Davis
d5cb18903d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 124487,124523,124541


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@124769 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-04 08:59:17 +00:00
Alan Davis
4914011ffd 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.1.N@124768 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-04 08:58:50 +00:00
Alan Davis
7286b41cb9 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.1.N@124767 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-04 08:57:26 +00:00
Raluca Munteanu
63e3518a61 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 124682,124691


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-01 08:26:21 +00:00
Raluca Munteanu
0b7b14ce93 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 124618,124619


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-31 14:52:58 +00:00
Samuel Langlois
9c3af9fa24 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.1.N@124598 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-30 14:20:15 +00:00
Raluca Munteanu
eb801cf958 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 124539


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124541 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-29 08:10:07 +00:00
Raluca Munteanu
843019da41 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 124509,124510


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124523 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-28 08:09:32 +00:00
Alexandra Leahu
a07311e34e Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 124465,124466,124467,124468


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124487 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-25 13:11:19 +00:00
Alexandra Leahu
910a4882b5 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 124457


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@124482 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-25 13:08:13 +00:00
Alexandra Leahu
f4441c7cc2 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 124430,124431,124432,124446


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124457 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-24 14:39:48 +00:00
Alexandra Leahu
aa0c9d4a12 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 124422


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@124452 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-24 14:36:18 +00:00
Alexandra Leahu
bed1a78029 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 124409


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124422 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-23 14:47:53 +00:00
Alexandra Leahu
5cb4e03833 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 124373


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@124417 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-23 14:42:32 +00:00
Andreea Dragoi
3b3d9e49f6 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 124321


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124373 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-22 14:38:32 +00:00
Andreea Dragoi
49ab40e1cd Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 124296


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@124311 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 15:21:45 +00:00
Alan Davis
8aed2922da Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 124264


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124296 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 11:09:58 +00:00
Alan Davis
a8d3a56be7 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124276 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      124235 mrogers: Temp fix to work around MNT-15874 - test to ignore alfresco-global.properties for now.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@124287 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 11:07:41 +00:00
Alan Davis
c844058e90 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 124241,124245,124249


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@124286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 11:07:33 +00:00
Alan Davis
802d37ecfc Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
124235 mrogers: Temp fix to work around MNT-15874 - test to ignore alfresco-global.properties for now.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124276 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 11:05:05 +00:00
Ancuta Morarasu
914ba5d2d9 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 124246


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 15:02:01 +00:00
Alan Davis
7898a9aab3 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 124244


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124245 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 14:01:03 +00:00
Ancuta Morarasu
5b246a695c Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 124239


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124241 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 13:10:38 +00:00