Commit Graph

6509 Commits

Author SHA1 Message Date
Jean-Pierre Huynh
fc74df4ab8 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119051 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117333 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117241 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114510 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113765 gcornwell: MNT-14892: Users password now gets re-hashed when they login if it is not using the preferred encoding (removes old MD4 and SHA encoded passwords)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119889 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:58:31 +00:00
Jean-Pierre Huynh
cdb95db67c Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119050 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117332 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117240 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114509 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113728 gjames: Changed updateUser to use a List MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119888 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:58:23 +00:00
Jean-Pierre Huynh
d97bed0aaa Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119045 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117327 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117235 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114504 adavis: Merged BCRYPT to 5.0.2-CLOUD (PARTIAL MERGE)
               113666 gjames: Initial integration of CompositePasswordEncoder for MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119883 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:57:42 +00:00
Jean-Pierre Huynh
01ffcc2511 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119044 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117325 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117234 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114503 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113532 gjames: Adding a CompositePasswordEncoder for MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:57:28 +00:00
Jean-Pierre Huynh
0f0037ae10 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119029 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      116130 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         115965 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
            115823 arebegea: MNT-14887 : Rework ChainingUserRegistrySynchronizer's methods that uses RetryingTransaction with 'requiresNew=true'.
               - removed the code that deleted the older property value that may have been present when updating a value.
               - fixed the tests from RepoUsageComponentTest.java
               - updated the authorised-users jar with the version that uses the attributeService again.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119867 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:50:23 +00:00
Gethin James
e9c42fa4f3 ACE-4855: Added @AlfrescoPublicApi to AbstractModuleComponent and ImporterModuleComponent
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119838 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-09 16:18:25 +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
Mihai Cozma
deb2813191 ACE-4715 Severe degradation of performance when opening a semi virtual folder root
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 16:59:08 +00:00
Mihai Cozma
bff78831dd ACE-4715 Severe degradation of performance when opening a semi virtual folder root
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119738 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 16:52:22 +00:00
Bogdan Horje
5f472d0b2a ACE-4752 dynamic type filter creation - fixed invalid or missing namespace bug
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 16:10:44 +00:00
Silviu Dinuta
71d9df71be ACE-4795: Adding as favorite a folder/file in virtual context doesn't work as expected
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 15:28:30 +00:00
Bogdan Horje
3961569456 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/HEAD/root@119729 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 14:55:42 +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
Bogdan Horje
e3032a1001 ACE-4744 javadoc and cleanup
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119697 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 09:32:31 +00:00
Matt Ward
380d6a6f3a 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/HEAD/root@119689 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-04 17:16:31 +00:00
Bogdan Horje
4028bb28a2 ACE-4752 dynamic type filter creation - fixed invalid or missing namespace bug
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119652 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-04 14:36:11 +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
Gethin James
02a23a2428 ACE-4793: Added @AlfrescoPublicApi to ActivityService and ActivityPostService
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-03 10:58:39 +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
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
Jan Vonka
5ffe135a2e 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/HEAD/root@118887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-01 08:49:39 +00:00
Mark Rogers
030405dcb8 Rollback 118791 - ACE-1636
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118833 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-30 11:07:44 +00:00
Mark Rogers
b87ce71ebf Rolled back CIFSComparator stuff incorrectly checked in
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118826 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-30 09:59:55 +00:00
Mark Rogers
441a1f4ae4 Merged ACE-1636 to HEAD update to Activiti 5.19.0
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118791 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-27 15:59:58 +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
Mihai Cozma
acb6e2db75 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/HEAD/root@118709 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-27 08:45:19 +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
Jan Vonka
b6bf8f5e1c 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/HEAD/root@118471 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-24 16:35:52 +00:00
Gavin Cornwell
620e4d37d5 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/HEAD/root@118420 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-24 12:01:01 +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
Silviu Dinuta
2ecad935cf 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/HEAD/root@118256 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-20 17:46:04 +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
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
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