Commit Graph

60 Commits

Author SHA1 Message Date
Jamal Kaabi-Mofrad
6cfc6a74d3 Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
135227 jkaabimofrad: APPSREPO-132: Make ClientAppConfig generic so it could be used by other V1 APIs.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-03-03 11:41:47 +00:00
Stefan Kopf
2a37b4e180 REPO-1110 - Apply patch provided in ALF-21632 (FreeMarker performance improvement)
ALF-21632 - FreeMarker API node.childByNamePath can be very slow
- Added test cases

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132561 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-08 13:29:33 +00:00
Joel Bernstein
5efe89b616 SEARCH-175: Support Solr4 and Solr6 spellcheck response formats
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131184 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-04 21:42:20 +00:00
Steven Glover
6088467c2d Merged https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/AMUKHA/5.2.N-MNT-15135 to 5.2.N
MNT-15135 "Alfresco Media Management: Rendition Concurrency Failure on Property update"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-22 14:33:09 +00:00
Alan Davis
0d9da4a92c Merged 5.2.N (5.2.1) to HEAD (5.2)
124224 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124125 mward: MNT-15815: further test data fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127741 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:55:17 +00:00
Alan Davis
31526de797 Merged 5.2.N (5.2.1) to HEAD (5.2)
124218 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124092 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         123511 mward: MNT-15815: fix failing test due to prefix clash


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127738 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:54:57 +00:00
Alan Davis
21466b46ec Merged 5.2.N (5.2.1) to HEAD (5.2)
124216 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124090 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         123489 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            123148 mward: ACE-5120: change NS prefix in test to avoid clash


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:54:46 +00:00
Alan Davis
5cd5cf6dc0 Merged 5.2.N (5.2.1) to HEAD (5.2)
124214 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124088 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         123487 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            123142 mward: ACE-5120: further test fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:54:34 +00:00
Ancuta Morarasu
03b2b9ea85 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
Jamal Kaabi-Mofrad
57310498c9 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
Ancuta Morarasu
4ffff16e08 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124125 mward: MNT-15815: further test data fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124224 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:50:15 +00:00
Ancuta Morarasu
a0f1ae7a03 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124092 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123511 mward: MNT-15815: fix failing test due to prefix clash


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124218 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:49:23 +00:00
Ancuta Morarasu
4e7254d49d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124090 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123489 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123148 mward: ACE-5120: change NS prefix in test to avoid clash


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:49:05 +00:00
Ancuta Morarasu
92500f8d91 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124088 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123487 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123142 mward: ACE-5120: further test fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124214 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:48:48 +00:00
Matt Ward
8260fab95e MNT-15815: further test data fix
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-16 11:33:11 +00:00
Ancuta Morarasu
b4b3069bcf Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
123511 mward: MNT-15815: fix failing test due to prefix clash


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124092 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 15:02:40 +00:00
Ancuta Morarasu
917edf9a8d Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
123489 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123148 mward: ACE-5120: change NS prefix in test to avoid clash


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124090 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 14:59:22 +00:00
Ancuta Morarasu
fd2ea599b0 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
123487 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123142 mward: ACE-5120: further test fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124088 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 14:58:44 +00:00
Alan Davis
ac86882aee Reverse merged 5.1.N (5.1.1) to get a green build
123552: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123511 mward: MNT-15815: fix failing test due to prefix clash,
         123550: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123490 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123221 mward: ACE-5120: further fixes (ADMLuceneTest),
         123549: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123489 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123148 mward: ACE-5120: change NS prefix in test to avoid clash,
         123548: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123488 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123145 mward: ACE-5120: fix ADMLuceneCategoryTest,
         123547: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123487 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123142 mward: ACE-5120: further test fixes,
         123546: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123486 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123028 mward: ACE-5120: test fixes,
         123545: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123483 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123000 mward: ACE-5120: Dictionary should not allow duplication of namespace prefixes,
         123543: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123477 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123368 gjames: MNT-15114: Test to ensure the policy fires


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 10:16:48 +00:00
Alan Davis
4d3ad92812 Merged 5.1.N (5.1.1) to HEAD (5.1)
120880 dhulley: Added test for the IntegrityChecker around list-of-values, including leading and trailing spaces (ACE-5000)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:40:36 +00:00
Alan Davis
096c5871d8 Merged 5.1.N (5.1.1) to HEAD (5.1)
120108 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120075 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
         120039 amukha: Merged V4.2-BUG-FIX-MNT-14688 (4.2.6) to V4.2-BUG-FIX (4.2.6)
            120019 amukha: MNT-14688: version revert on first version failure if type has aspect
               - Restoring a version now restores the node's type.
               - Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:34:50 +00:00
Alan Davis
fd3c5c2b64 Merged 5.1.N (5.1.1) to HEAD (5.1)
120103 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120043 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
         119724 gjames: MNT-15211 Added a test for restoring non-auditable


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123609 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:34:22 +00:00
Alan Davis
0aa655a4cf Merged 5.1.N (5.1.1) to HEAD (5.1)
118715 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      118653 cturlica: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
         118604 amukha: Merged V4.2.3 (4.2.3.21) to V4.2-BUG-FIX (4.2.6)
            118292 adragoi: MNT-15169 : Receiving error when bulk deleting content in Share
               - fixed tests by translating test_alf_17260.js to java code


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123595 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:30:21 +00:00
Andrei Rebegea
03a2216ff7 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123511 mward: MNT-15815: fix failing test due to prefix clash


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 15:38:02 +00:00
Andrei Rebegea
ecb8d45ea9 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123489 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            123148 mward: ACE-5120: change NS prefix in test to avoid clash


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 15:34:34 +00:00
Andrei Rebegea
5cc6af9956 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123487 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            123142 mward: ACE-5120: further test fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 15:33:09 +00:00
Alan Davis
c6f0ce491f Merged 5.1.N (5.1.1) to HEAD (5.1)
- Merges from 5.1.0 (when it was 5.1) that did not make it to HEAD:
     122506,122513,123118-123119
   - RECORD ONLY Merges from HEAD: 119613-119617,119622,119706-119708,
     119752-119753,120076-120078,120116,120166-120178,120182-120183,
     120185-120193,120197-120201,120378-120385,120387,120431,120526,
     120604-120625,120832-120842,120844-120849,120977-120982,121142-121144,
     121313,121347-121348,121410,121412-121417,121684-121687,121802-121805,
     121810-121815,121861,122287,122342,122361,122439-122441,122579,122921
   - RECORD ONLY merges: 119602,119821-119822,119849,120065,120107,
     120159,120260,120295,120339,120342,120371,120411-120412,120524,120527,
     120696-120697,120705,120720,120746,120761,120819,120822,120893,
     120935-120936,120993,121045,121119,121121,121132,121156-121157,
     121299,121301,121309,121394,121408,121442,121481,121624,121626,
     121672,121675,121692,121753,121795,121798,121852,121898,121981,
     122030,122088,122114,122142,122213,122215,122217,122277,122340,
     122343,122426,122487,122552,122554,122607,122654,122734,122861,
     122906,122982,122985,122988,122996,123014,123031,123090,
     123115-123117,123120    
   - Merge from 5.1.N of fix that should have gone into 5.1 (found because of conflict on merge)
     123128: ACE-5155 Garbled message in patch-service.properties


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-04 18:14:23 +00:00
Alan Davis
927878fba2 Merged 5.1.0 (5.1.0) to 5.1.N (5.1.1)
122919 jphuynh: Merged SAVA/BRANCHES/ACE-5162 (5.1.0) to 5.1.0 (5.1.0)
      122838 sdinuta: ACE-5162: commited the changes for the solution before internal review


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123118 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-04 15:01:45 +00:00
Derek Hulley
929e59bbdc Added test for the IntegrityChecker around list-of-values, including leading and trailing spaces (ACE-5000)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120880 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-14 12:15:03 +00:00
Natalia Smintanca
03deaa808f Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120075 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      120039 amukha: Merged V4.2-BUG-FIX-MNT-14688 (4.2.6) to V4.2-BUG-FIX (4.2.6)
         120019 amukha: MNT-14688: version revert on first version failure if type has aspect
            - Restoring a version now restores the node's type.
            - Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:16:35 +00:00
Natalia Smintanca
70095470b6 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120043 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119724 gjames: MNT-15211 Added a test for restoring non-auditable


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:09:35 +00:00
Ancuta Morarasu
f187db02f3 Merged HEAD (5.1) to 5.1.N (5.1.1)
119450 mcozma: Merged BRANCHES/DEV/VF_REP_INT_51 to HEAD
   ACE-4716 Can't rename a document in a virtual context from CMIS
   ACE-4752 Type virtualization method does not work
   ACE-4717 Document name is renamed when making "Check in" for a document edited in Google Docs
   ACE-4700 Can't upload to a virtual folder when filename starts with a number and includes dashes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-04 09:10:57 +00:00
Mihai Cozma
6f16b07e61 Merged BRANCHES/DEV/VF_REP_INT_51 to HEAD
ACE-4716 Can't rename a document in a virtual context from CMIS
ACE-4752 Type virtualization method does not work
ACE-4717 Document name is renamed when making "Check in" for a document edited in Google Docs
ACE-4700 Can't upload to a virtual folder when filename starts with a number and includes dashes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119450 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-02 14:27:31 +00:00
Andrei Rebegea
721b1640e7 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118653 cturlica: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      118604 amukha: Merged V4.2.3 (4.2.3.21) to V4.2-BUG-FIX (4.2.6)
         118292 adragoi: MNT-15169 : Receiving error when bulk deleting content in Share
            - fixed tests by translating test_alf_17260.js to java code


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118715 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-27 09:12:50 +00:00
Natalia Smintanca
76b0d1dffb Merged HEAD (5.1) to 5.1.N (5.1.1)
117981 amukha: Merged DEV (5.1) to HEAD (5.1)
      117318: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
      117293: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
         - Changed the ClassBehaviourIndex#find as the main logic is handled by BehaviourFilterImpl#isEnabled
         - Updated the BehaviourFilter interface accordingly.,
      115822: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
         - Reworked the solution to use only one new method: disable(QName className, boolean includeSubClasses)
         - Modified the isEnabled(QName className) to correspond with the new logic
         - Modified the JUnit tests.,
      115078: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
      115071: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
         - Added new API for disabling behaviours.
         - Added JUnit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118033 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-19 09:48:28 +00:00
Natalia Smintanca
6f39a5a3e1 Merged HEAD (5.1) to 5.1.N (5.1.1)
117632 jphuynh: Merged JPHUYNH/BDE-443 (5.1.0) to HEAD (5.1)
      117183 adavis: BDE-443 Check whether we can buy licenses for the GPL components we ship
         - Remove Pdf2Swf specific transformer config from transformers.properties and spring context.xml
         - Remove references to Pdf2Swf and swftools from License notes, pom files, admin ui,
           admin ui English property values (translations still exist) and some obvious unit tests.
         - Note: SWFTransformationOptions has been left as it is used in tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117993 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-19 09:33:36 +00:00
Alex Mukha
c0c2a9c1d1 Merged DEV (5.1) to HEAD (5.1)
117318: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
   117293: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
      - Changed the ClassBehaviourIndex#find as the main logic is handled by BehaviourFilterImpl#isEnabled
      - Updated the BehaviourFilter interface accordingly.,
   115822: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
      - Reworked the solution to use only one new method: disable(QName className, boolean includeSubClasses)
      - Modified the isEnabled(QName className) to correspond with the new logic
      - Modified the JUnit tests.,
   115078: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
   115071: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
      - Added new API for disabling behaviours.
      - Added JUnit tests.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-18 17:13:08 +00:00
Jean-Pierre Huynh
43f68c654c Merged JPHUYNH/BDE-443 (5.1.0) to HEAD (5.1)
117183 adavis: BDE-443 Check whether we can buy licenses for the GPL components we ship
      - Remove Pdf2Swf specific transformer config from transformers.properties and spring context.xml
      - Remove references to Pdf2Swf and swftools from License notes, pom files, admin ui,
        admin ui English property values (translations still exist) and some obvious unit tests.
      - Note: SWFTransformationOptions has been left as it is used in tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-16 14:05:07 +00:00
Alan Davis
1ec4f05efc Merged HEAD (5.1) to 5.1.N (5.1.1)
117489 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:37:20 +00:00
Bogdan Horje
005c9543f5 CM-690 extensions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:32:24 +00:00
Tatyana Valkevych
3ca1dfd1ea Merged HEAD (5.1) to 5.1.N (5.1.1)
117315 tpage: ACE-2671 Unit tests for QNameTypeEditor.
   The QNameTypeEditor was migrated from RM to repo in r83388, but
   at the time there were no unit tests. This closes the issue by
   adding unit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117384 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 10:21:30 +00:00
Tom Page
b8d49e79a0 ACE-2671 Unit tests for QNameTypeEditor.
The QNameTypeEditor was migrated from RM to repo in r83388, but
at the time there were no unit tests. This closes the issue by
adding unit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117315 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-11 16:32:31 +00:00
Alan Davis
9f209f804b Merged HEAD (5.1) to 5.1.N (5.1.1)
112631 gjames: Better Null handling, ACE-4246


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@112682 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-23 10:56:22 +00:00
Gethin James
410c24d2d1 Better Null handling, ACE-4246
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@112631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-22 15:29:30 +00:00
Alex Mukha
f7b86ad94b Merged DEV to HEAD (5.1)
110000: MNT-13836: Custom behaviours cannot be disabled (using disableBehaviour(QName))
      - Changed class policies enabled/disabled checks. Now each behaviour at a given level must be explicitly disabled & re-enabled (unless all behaviours are disabled in the transaction).
      - Added JUnit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-14 09:16:26 +00:00
Alan Davis
3fd4104605 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108042: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107695: Merged NESS/5.0.N-2015_06_24 (5.0.2) to 5.0.N (5.0.3)
         107402: MNT-14275 - fixed the case where a Location with no path was provided when importing using UUID update
            - added a test case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108073 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:10:59 +00:00
Alan Davis
11ad4a1073 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
106849: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      106846: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         106845: MNT-14240 Emailed Aspect does not have user friendly property labels
            - Fix build again


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@106880 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-23 16:27:54 +00:00
Alan Davis
7078474695 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102708: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      102489: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         102284: Merged DEV to V4.2-BUG-FIX
            101812 : MNT-13710 : User cannot change site role if its current role contains an underscore
               - Added new unit test. Corrected some code.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103538 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:17:53 +00:00
Alan Davis
f1ebfb963f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93992: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93945: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93895: MNT-12873: Merged V4.2.3 (4.2.3.16) to V4.2-BUG-FIX(4.2.5)
            93552 :Merged DEV to V4.2.3 (4.2.3.16)
               93524: MNT-13156: CLONE - Introduction of SiteRole in 4.2.x breaks sites API when there is a custom role defined
                  - Implement site role as String instead of enumeration to allow custom roles. Add CustomRoleTest Unit Test. In SitesImpl convert UnknownAuthorityException into InvalidArgumentException.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:29:20 +00:00
Alan Davis
c5a524e616 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
88169: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      87959: Merged DEV (4.2.4) to V4.2-BUG-FIX (4.2.4)
         87891: MNT-12367 : Relaxed mode for mandatory association not possible
         Added support for relaxed mode of mandatory association target.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94563 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:58:45 +00:00