Commit Graph

5782 Commits

Author SHA1 Message Date
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
4dbb27041f Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120071 rmunteanu: Merged 5.0.3 (5.0.3) to 5.0.N (5.0.4)
      119848 adragoi: Merged DEV to 5.0.3 (5.0.3)
         119808 adragoi: MNT-15338 : CMIS get object by path only shows the working copy file and not the original file
            - reverted commits related to "Ghost versions when Document is created with CheckinType CHECKOUT" stask :  
            100772 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
               100260: MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                  - Fix for tests failures
            100824 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
               100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                  100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                     99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                        - Don't include PWC in a version series
                     99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                        - Return PWC as a part of version series. Fixes to pass TCK
            100837 : Fix another merge issue as a result of a re factor that has taken place in 5.0
               Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                     100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                        99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                           - Don't include PWC in a version series
                        99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                           - Return PWC as a part of version series. Fixes to pass TCK
            101404 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
               101273: Merged DEV to V4.2-GUB-FIX (4.2.5)
                  100792 : MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                     - Added init-method for CMISConnector. Test is added
            101597 : Merged DEV to 5.0.N (5.0.2)
               101560 : MNT-13813 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                  - Fix to test failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120106 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:15:04 +00:00
Natalia Smintanca
e2d50154b5 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120045 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119806 gjames: MNT-15211 Re-enabled the non-auditable test, and corrected the createnode.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:10:27 +00:00
Natalia Smintanca
5e1515a7e8 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120042 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119705 gjames: MNT-15211 Restoring data from Trashcan with MySQL Cluster NDB backend doesn’t work


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120102 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:09:13 +00:00
Natalia Smintanca
1f479a1c88 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120041 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119608 gjames: MNT-15211 Restoring data from Trashcan with MySQL Cluster NDB backend doesn’t work


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120101 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:08:27 +00:00
Raluca Munteanu
fcc7d9bb1e Merged HEAD (5.1) to 5.1.N (5.1.1)
119729 bhorje: ACE-4804 forced read permission on allowed for read-only (due to missing filing path) virtual nodes  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120078 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-11 09:44:48 +00:00
Raluca Munteanu
c62d655585 Merged HEAD (5.1) to 5.1.N (5.1.1)
119697 bhorje: ACE-4744 javadoc and cleanup


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120076 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-11 09:41:45 +00:00
Raluca Munteanu
18966e394e Merged HEAD (5.1) to 5.1.N (5.1.1)
119689 mward: ACE-4765: fixed "schema comparison tool" XML parsing bug.
   Element text content was being trimmed, in sax parser's characters(...) method - but this method may be called multiple times with chunked data (due to buffering) and trim should not be applied until after the entire text has been parsed for that element.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119753 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-08 09:53:11 +00:00
Raluca Munteanu
5148eed78e Reverse merged 5.1.N (5.1.1)
119707 rmunteanu: Merged HEAD (5.1) to 5.1.N (5.1.1)
            119689 mward: ACE-4765: fixed "schema comparison tool" XML parsing bug.
            Element text content was being trimmed, in sax parser's characters(...) method - but this method may be called multiple times with chunked data (due to buffering) and trim should not be applied until after the entire text has been parsed for that element.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119752 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-08 09:46:59 +00:00
Raluca Munteanu
42863c8911 119707 rmunteanu: Merged HEAD (5.1) to 5.1.N (5.1.1)
119689 mward: ACE-4765: fixed "schema comparison tool" XML parsing bug.
         Element text content was being trimmed, in sax parser's characters(...) method - but this method may be called multiple times with chunked data (due to buffering) and trim should not be applied until after the entire text has been parsed for that element.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119707 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 10:00:42 +00:00
Raluca Munteanu
093560c002 Merged HEAD (5.1) to 5.1.N (5.1.1)
119652 bhorje: ACE-4752 dynamic type filter creation - fixed invalid or missing namespace bug


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119706 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 09:59:09 +00:00
Ancuta Morarasu
fb2513f2dd Merged HEAD (5.1) to 5.1.N (5.1.1)
119516 gjames: ACE-4793: Added @AlfrescoPublicApi to ActivityService and ActivityPostService


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119616 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-04 09:12:26 +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
Ancuta Morarasu
38ab389189 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
119576 adavis: Merged 5.0.3 (5.0.3) to 5.0.N (5.0.4)
      119521 amukha: Merged 5.0.3-MNT-15258 (5.0.3) to 5.0.3 (5.0.3)
         118559 amukha: MNT-15258: Huge database after upgrade to 5.1.c
            - Added usage of JobLockService for prop cleanup job.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119609 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-04 08:58:36 +00:00
Ancuta Morarasu
60408a953b Merged HEAD (5.1) to 5.1.N (5.1.1)
118887 jvonka: ACE-198 / ACE-202 / ACE-4734: Perf improvements for CMIS (getChildren et al)\n Merge BRANCHES/DEV/HEAD_ACE198_2


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119389 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-02 10:14:31 +00:00
Ancuta Morarasu
fe9b8480a8 Merged HEAD (5.1) to 5.1.N (5.1.1)
118826 mrogers: Rolled back CIFSComparator stuff incorrectly checked in


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-02 10:11:24 +00:00
Ancuta Morarasu
49852d0e35 Merged HEAD (5.1) to 5.1.N (5.1.1)
118709 mcozma: ACE-4726 Max number of open files reached when browsing virtual folders (Linux OS)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-02 09:41:25 +00:00
Andrei Rebegea
ef75f4d89e Merged HEAD (5.1) to 5.1.N (5.1.1)
118471 jvonka: ACE-4734 - minor: add optional info/debug logging for CMIS calls (to get/list object/objects)
   - relates to ACE-198 & ACE-202


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-27 10:12:58 +00:00
Andrei Rebegea
3294710888 Merged HEAD (5.1) to 5.1.N (5.1.1)
118420 gcornwell: ACE-4598: ServiceRegistry exposes services that are not part of the public API
   Updated the deprecated message wording to make it clearer it's just the method on ServiceRegistry that's deprecated and not the service/object being returned.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-27 10:10:34 +00:00
Andrei Rebegea
f7ac2331dd Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118657 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.0.N (5.0.4)
      118656 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
         118655 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
            118542 amorarasu: Merged DEV to 5.0.2-PLUS (5.0.2-PLUS)
               117462 118473 amorarasu: MNT-15147: Cloud 40 Upgrade takes too long
                  - Make the patch.fixPersonSizeCurrentType to not apply to tenants
                  - Added support for making patch.addUnmovableAspect deferred


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118716 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-27 09:17:00 +00:00
Andrei Rebegea
c6ad312dea Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118652 cturlica: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      118603 amukha: Merged V4.2.3 (4.2.3.21) to V4.2-BUG-FIX (4.2.6)
         117952 adragoi: MNT-15169 : Receiving error when bulk deleting content in Share
            - moved deletion in a retrying context 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118714 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-27 09:12:13 +00:00
Andrei Rebegea
ac776d8476 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118435 cturlica: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      118397 cturlica: MNT-15229: Add check of vulnerable classes to bootstrap
         -  changes on bootstrap bean validator and bootstrap-context.xml 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118524 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-25 11:38:03 +00:00
Natalia Smintanca
efb26c99dc Merged HEAD (5.1) to 5.1.N (5.1.1)
118256 sdinuta: ACE-4699: Document preview is changed to the physical location after "Edit Offline \ Cancel Editing" action


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118350 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-23 11:31:38 +00:00
Natalia Smintanca
4720b731fe Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118271 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.0.N (5.0.4)
      118270 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
         118269 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
            118268 adavis:       Reverse merged 5.0.2-PLUS (5.0.2-PLUS)
                  << Caused lots of failures with the real fix rather than the patched one in 39.6.6 >>
                     118213 adavis: Merged CLOUD39.6 (Cloud 39.6.6) to 5.0.2-PLUS (5.0.2-PLUS)
                        116649 cturlica: MNT-15229/MNT-15170: [Security] Java unserialize remote code execution
                           - added bootstrap unserializer validator: a bootstrap bean that checks that the classes that would favor Java unserialize remote code execution are not available. Check is needed because libs could be introduced by the application server (attached jars should be uploaded).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118314 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-23 11:01:03 +00:00
Natalia Smintanca
0c55fc5905 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118237 aleahu: MNT-14853 : Unable to download zip with non primary child
      - Fixed spacing by removing tabs as per Derek's request.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-23 10:57:08 +00:00
Natalia Smintanca
e00500f6f0 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118231 aleahu: MNT-14853 : Unable to download zip with non primary child
      - Added the flag exportSecondaryNodes for the ExporterComponent, and if this is set on true we export the secondary nodes as actual nodes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118307 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-23 10:56:56 +00:00
Natalia Smintanca
f274fc9ce7 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118229 aleahu: MNT-14730 : Approve and Reject workflow not working in subfolders after the rule has been applied
      - Renamed the copied file when executing a simple workflow rule in order to avoid name conflicts by using copyAndRename instead of copy.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-23 10:56:43 +00:00
Natalia Smintanca
5d5fc30a91 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118217 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      118216 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to V4.2-BUG-FIX (4.2.6)
         118215 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            118214 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
               118213 adavis: Merged CLOUD39.6 (Cloud 39.6.6) to 5.0.2-PLUS (5.0.2-PLUS)
                  116649 cturlica: MNT-15229/MNT-15170: [Security] Java unserialize remote code execution
                     - added bootstrap unserializer validator: a bootstrap bean that checks that the classes that would favor Java unserialize remote code execution are not available. Check is needed because libs could be introduced by the application server (attached jars should be uploaded).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118305 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-23 10:56:29 +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
a5b9ac9bef Merged HEAD (5.1) to 5.1.N (5.1.1)
117847 ahind: Fix for     ACE-4575 SOLR 4 - Sharded - Backup should fail gracefully


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-19 09:41:25 +00:00
Natalia Smintanca
548b90a94b Merged HEAD (5.1) to 5.1.N (5.1.1)
117598 bhorje: CM-690 reverted AMD DAO trait extension 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117987 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-19 09:25:58 +00:00
Ramona Neamtu
d0d33807ca Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
117707 aleahu: MNT-14341 : FTP authentication fails when External authentication is enabled
      - Checked that the instance of the authenticator used is not the same as the one from which the call is made


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117930 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-18 14:18:19 +00:00
Alan Davis
cd43fe582c Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
117582 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
      116652 amorarasu: MNT-14983: CMIS: Euro character not encoded correctly
         Merged V4.2.4 (4.2.4.19) to V4.2-BUG-FIX (4.2.6)
            115140 115998 116396 amorarasu: MNT-15044: CLONE - CMIS: Euro character not encoded correctly
               - Removed the unicode interval that was used to escape characters from the categories: currency, general punctuation, subscripts and superscripts (2000-20FF).
               - Changed the way the control characters are filtered + adapted tests.
               - Removed unnecessary j_string use from the ftl and added proper xml encoding.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117597 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-15 21:30:05 +00:00
Alan Davis
9104f61c74 Merged HEAD (5.1) to 5.1.N (5.1.1)
117537 bhorje: CM-690 reverted AMD DAO trait extension 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117578 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:38:30 +00:00
Alan Davis
9e202dcd66 Merged HEAD (5.1) to 5.1.N (5.1.1)
117531 bhorje: CM-690 virtualization is disabled by default - virtualization integration tests and the integration tests suite  run with vf enabled 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117577 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:38:20 +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
Alan Davis
508e2e52d8 Merged HEAD (5.1) to 5.1.N (5.1.1)
117488 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:35:53 +00:00
Alan Davis
a64d5324e9 Merged HEAD (5.1) to 5.1.N (5.1.1)
117487 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:35:46 +00:00
Alan Davis
7ec342be8b Merged HEAD (5.1) to 5.1.N (5.1.1)
117486 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:35:39 +00:00
Alan Davis
ac94987b61 Merged HEAD (5.1) to 5.1.N (5.1.1)
117485 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117569 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:35:32 +00:00
Alan Davis
ea1b4f89c1 Merged HEAD (5.1) to 5.1.N (5.1.1)
117484 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117568 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:35:26 +00:00
Alan Davis
be8b2fa355 Merged HEAD (5.1) to 5.1.N (5.1.1)
117483 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:35:19 +00:00
Alan Davis
cda0437ea3 Merged HEAD (5.1) to 5.1.N (5.1.1)
117482 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:35:12 +00:00
Alan Davis
3f578fdc6b Merged HEAD (5.1) to 5.1.N (5.1.1)
117481 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117565 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:35:05 +00:00
Alan Davis
9fabc967ee Merged HEAD (5.1) to 5.1.N (5.1.1)
117474 bhorje: CM-690 virtualization


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:32:21 +00:00
Alan Davis
98213d66d7 Merged HEAD (5.1) to 5.1.N (5.1.1)
117473 bhorje: CM-690 trait extension


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:32:09 +00:00
Tatyana Valkevych
c9618fdb69 Merged HEAD (5.1) to 5.1.N (5.1.1)
117316 gcornwell: ACE-4598: ServiceRegistry exposes services that are not part of the public API (i.e. not annotated via @AlfrescoPublicApi)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117385 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 10:22:23 +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
Alan Davis
3e5bf71699 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117263 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114898 gjames: BCRYPT MNT-14892 RA-609, better logging messages and added OnStartup validation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117356 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-11 18:03:28 +00:00
Alan Davis
2e4871ec6e Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117261 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114795 gjames: BCRYPT RA-609: Ensure system does not double hash encoders if not safe


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117354 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-11 18:03:10 +00:00