inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,344 Commits 325 Branches 2,188 Tags
9b51cf44c1c421748f42c6076a938765ff69e70c
Commit Graph

4344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ancuta Morarasu
387291cf76 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126573 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124623 jkaabimofrad: SFS-405, RA-778: Added tests and as the result did some minor modifications. Also, removed the ability to set or remove a client via JMX (Read only).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 12:11:01 +00:00
Ancuta Morarasu
543ec21b5f Merged HEAD (5.2) to 5.2.N (5.2.1) 
126475 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122422 gjames: RA-810: Adding api-explorer to the maven devenv.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126819 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:36:49 +00:00
Ancuta Morarasu
856e945c9b Merged HEAD (5.2) to 5.2.N (5.2.1) 
126436 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121917 jkaabimofrad: RA-778: Added support for QuickShare service to email users notifying them that a content has been shared with them.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126782 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:19:27 +00:00
Ancuta Morarasu
e182ae19a5 Merged HEAD (5.2) to 5.2.N (5.2.1) 
126409 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121471 jvonka: FileFolder API - add utf8Encoding=UTF-8 for tomcat7-maven-plugin when running repo
      - as per installer & old dev env (=> tomcat7 server.xml
      - this fixes "relativePath" for uri encoding of params (for utf-8 encoded characters in folder/file name)
      RA-755


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126755 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 11:10:40 +00:00
Ramona Neamtu
3c660b40a2 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 126309,126339


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126680 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 09:04:22 +00:00
Ramona Neamtu
a1d1df8aa7 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.1.N@126679 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 09:03:34 +00:00
Ramona Neamtu
ec0217b25f Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 126258


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 08:32:38 +00:00
Jamal Kaabi-Mofrad
268417aba2 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/HEAD/root@126634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 12:10:44 +00:00
Jamal Kaabi-Mofrad
e4fd297c55 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
124623 jkaabimofrad: SFS-405, RA-778: Added tests and as the result did some minor modifications. Also, removed the ability to set or remove a client via JMX (Read only).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 11:35:15 +00:00
Jamal Kaabi-Mofrad
f1f4f6ce15 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
122422 gjames: RA-810: Adding api-explorer to the maven devenv.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126475 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 11:07:53 +00:00
Jamal Kaabi-Mofrad
8276954fbc Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
121917 jkaabimofrad: RA-778: Added support for QuickShare service to email users notifying them that a content has been shared with them.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126436 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:54:46 +00:00
Jamal Kaabi-Mofrad
a702e4e08b Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
121471 jvonka: FileFolder API - add utf8Encoding=UTF-8 for tomcat7-maven-plugin when running repo
   - as per installer & old dev env (=> tomcat7 server.xml
   - this fixes "relativePath" for uri encoding of params (for utf-8 encoded characters in folder/file name)
   RA-755


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126409 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:48:46 +00:00
Alan Davis
4e55ad228c Merged 5.2.N (5.2.1) to HEAD (5.2) 
126146: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126144 jphuynh: MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         126142 jphuynh: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            126140 jphuynh: MNT-16253: ImageMagick
   126147: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126145 jphuynh: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         126143 jphuynh: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            126141 jphuynh: MNT-16253: ImageMagick
   126316: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126313 adavis: MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         126309 adavis: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            126287 jphuynh: MNT-16253: ImageMagick


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126322 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-09 15:06:08 +00:00
Alan Davis
93979d171c Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
126253 adragoi: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      126110 jphuynh: MNT-16202: Fix apostrophes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126317 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-09 14:57:46 +00:00
Alan Davis
f9508257c6 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
126313 adavis: MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      126309 adavis: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         126287 jphuynh: MNT-16253: Updated policy.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126316 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-09 14:56:53 +00:00
Alan Davis
d7b2706ef2 MNT-16256: Merged 5.1.N (5.1.2) to 5.1.1 (5.1.1) 
126313 adavis: MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      126309 adavis: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         126287 jphuynh: MNT-16253: Updated policy.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.1/root@126315 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-09 14:54:07 +00:00
Alan Davis
d1aa42c987 MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 
126309 adavis: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      126287 jphuynh: MNT-16253: Updated policy.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@126313 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-09 14:49:09 +00:00
Andreea Dragoi
056737fa98 Merged trunk (5.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 126230,126234,126235


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-06 13:36:09 +00:00
Andreea Dragoi
1c201e3d9a Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 126142,126143


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126258 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-06 13:26:22 +00:00
Andreea Dragoi
aabb026025 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 
126110 jphuynh: MNT-16202: Fix apostrophes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@126253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-06 13:21:44 +00:00
Andreea Dragoi
1ba54eeaef Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
126124 aleahu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      126103 jphuynh: MNT-16202: Fixed stupid double quotes formatting as the default setting for the file cannot have an encoding specified.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126243 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-06 13:11:11 +00:00
Alan Davis
07fb0f10c6 Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) : 
- 126133,126134,126135,126233


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@126235 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-06 10:32:27 +00:00
Alan Davis
071887105f Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) : 
- 126016,126033,126068


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@126234 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-06 10:32:17 +00:00
Alan Davis
7692cf7812 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 126125,126228,126231,126232


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-06 10:31:42 +00:00
Alan Davis
a0663cd1d1 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 126214


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126232 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-06 10:31:26 +00:00
Alan Davis
8affae7925 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 126185


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126231 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-06 10:31:23 +00:00
Alan Davis
b5dc191022 Merged 5.2.N (5.2.1) to trunk (5.2) 
126229 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126219 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (PARTIAL MERGE)
         126218 adavis: Merged 5.0.3 (5.0.3.5) to 5.0.N (5.0.4)
            126215 adavis: Removal of the Update Assistant


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@126230 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-06 10:30:06 +00:00
Alan Davis
618f2f1b3c Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
126219 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (PARTIAL MERGE)
      126218 adavis: Merged 5.0.3 (5.0.3.5) to 5.0.N (5.0.4)
         126215 adavis: Removal of the Update Assistant


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126229 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-06 10:28:37 +00:00
Alan Davis
7497e828c8 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 126227


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126228 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-06 10:24:41 +00:00
Alan Davis
e91a64d76e Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (PARTIAL MERGE) 
126218 adavis: Merged 5.0.3 (5.0.3.5) to 5.0.N (5.0.4)
      126215 adavis: Removal of the Update Assistant


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126219 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-06 10:17:23 +00:00
Alan Davis
72a23f814e MNT-16256: Merged 5.1.N (5.1.2) to 5.1.1 (5.1.1) 
126145 jphuynh: MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      126143 jphuynh: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         126141 jphuynh: MNT-16253: Fixed ImageMagick config folder path.
            - This commit will be merged to all HF branches so that it will be included in all future HFs.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.1/root@126182 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-05 15:43:36 +00:00
Alan Davis
cb460acb55 MNT-16256: Merged 5.1.N (5.1.2) to 5.1.1 (5.1.1) 
126144 jphuynh: MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      126142 jphuynh: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         126140 jphuynh: MNT-16253: Disable the vulnerable ImageMagick coders in policy.xml.
            - This commit will be merged to all HF branches so that it will be included in all future HFs.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.1/root@126181 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-05 15:43:19 +00:00
Jean-Pierre Huynh
79596fa59a Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
126145 jphuynh: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      126143 jphuynh: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         126141 jphuynh: MNT-16253: Fixed ImageMagick config folder path.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126147 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-05 14:36:33 +00:00
Jean-Pierre Huynh
db9e184025 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
126144 jphuynh: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      126142 jphuynh: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         126140 jphuynh: MNT-16253: Disable the vulnerable ImageMagick coders in policy.xml.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126146 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-05 14:36:28 +00:00
Jean-Pierre Huynh
bf8ff06b7a MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 
126143 jphuynh: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      126141 jphuynh: MNT-16253: Fixed ImageMagick config folder path.
         - This commit will be merged to all HF branches so that it will be included in all future HFs.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@126145 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-05 14:35:20 +00:00
Jean-Pierre Huynh
c1da4caeab MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 
126142 jphuynh: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      126140 jphuynh: MNT-16253: Disable the vulnerable ImageMagick coders in policy.xml.
         - This commit will be merged to all HF branches so that it will be included in all future HFs.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@126144 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-05 14:35:14 +00:00
Alexandra Leahu
6f48597a11 Merged trunk (5.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 126059


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126135 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-05 13:03:24 +00:00
Alexandra Leahu
ccc7465450 Merged trunk (5.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 126054


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126134 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-05 13:03:16 +00:00
Alexandra Leahu
b969ec8152 Merged trunk (5.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 125996


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126133 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-05 13:03:01 +00:00
Alexandra Leahu
a55c7eac74 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) : 
- 126091


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-05 12:57:34 +00:00
Alexandra Leahu
cd92327e8c Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 
126103 jphuynh: MNT-16202: Fixed stupid double quotes formatting as the default setting for the file cannot have an encoding specified.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@126124 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-05 12:52:14 +00:00
Alan Davis
5ba3e27672 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/branches/5.2.N@126118 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-05 11:54:50 +00:00
Alan Davis
3e81f606a3 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/branches/5.2.N@126117 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-05 11:54:32 +00:00
Alan Davis
a3b8522524 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/branches/5.1.N@126116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-05 11:53:05 +00:00
Jean-Pierre Huynh
e666572a1c MNT-16202: Fix apostrophes. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.1/root@126110 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-05 09:47:54 +00:00
Jean-Pierre Huynh
1b19dfc043 MNT-16202: Fixed stupid double quotes formatting as the default setting for the file cannot have an encoding specified. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.1/root@126103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-04 15:44:47 +00:00
Alexandra Leahu
ecf3e0dd1f 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/branches/5.1.N@126086 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-04 12:50:18 +00:00
Alexandra Leahu
3fca426254 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) : 
- 126024


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126068 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-04 12:40:23 +00:00
Alexandra Leahu
4f489f6e14 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
126021 aleahu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125993 jphuynh: MNT-15862: Removed too restrictive rule on error message displayed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126062 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-04 12:37:58 +00:00
Matt Ward
580f932885 Added maven profile "update-assistant-tests". 
The update assistant related unit and integration tests are now only run when explicitly activated, e.g:

    mvn clean integration-test -Pupdate-assistant-tests

or

    mvn clean test -Pupdate-assistant-tests
    
In addition the long running unpacking of the update package has been moved into a pre-integration-test phase which is where it should belong, so that it isn't run during unit testing.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@126059 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-04 10:59:05 +00:00