inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,318 Commits 335 Branches 2,191 Tags
f73e43b9115d24a7a11bdfb100e89cf5e869f370
Commit Graph

48 Commits

Author SHA1 Message Date
Alan Davis
2b15a5b5ad Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 
84138: Merged FEATURE2 (5.0.0.FEATURE2) to HEAD-BUG-FIX (5.0/Cloud)
      83970: ACE-2268 : make ldaps (LDAP over SSL) configurable using ldap subsystem properties and not only JVM (system) properties (JAVA_OPTS)
      Implemented the LDAPS truststore configuration via subsystem's properties.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-09-18 17:26:44 +00:00
Erik Winlof
8801446a2b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 
78434: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76169: ACE-2149: EOL AVM / WCM
       - Adjust permission count checks after AVM/WCM removal


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82561 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-09-03 12:14:46 +00:00
Erik Winlof
e94f8f8351 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 
78429: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75801: ACE-2149: EOL AVM / WCM
       - Thorough sweep of 'avm' and 'wcm' references
       - Picked up on many 'deployment' and related classes and configuration
       - Repo starts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-09-03 12:13:50 +00:00
Erik Winlof
0baa0f74f4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 
78403: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75700: ACE-2149: EOL AVM / WCM
       - Remove most of the AVM and WCM beans, scripts, classes, patches, etc
       - The Explorer client is very broken for compilation
         - TODO: Remove all WCM-related functionality, which I thought would be best left to a UI dev
                 I've murdered many of the classes and beans but there's more to do
       - The repository compiles
         TODO: Get it running again
       - TODO: Check if we can wipe the 'deployment' project as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-09-03 12:01:49 +00:00
Erik Winlof
d385bc9bb1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 
78359: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76619: Merged DEV to V4.2-BUG-FIX (4.2.4).
         76456: MNT-10693 Changing permission on a document changes its modified fields in Share
         76496: MNT-10693 Changing permission on a document changes its modified fields in Share
         76499: MNT-10693 Changing permission on a document changes its modified fields in Share
                   - In PermissionServiceTest.testPreserveAuditableData() was made changes.
         76520: MNT-10693 Changing permission on a document changes its modified fields in Share
                   - In AbstractPermissionTest was changed visibility of 'applicationContext' to 'protected'. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-09-03 11:36:59 +00:00
Mark Rogers
2dc446694d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 
76911: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      66893: Clean up use of deprecated 'UserRegistrySynchronizer.synchronize' and general code clean up


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77754 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-07-23 10:30:19 +00:00
Mark Rogers
77222c3023 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 
76565: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76177: Merged DEV to V4.2-BUG-FIX (4.2.3)
         74967 : MNT-11749 : It is possible to create groups with same name in race conditions
            - Disallow creation of authorities with equal names
         76118 : MNT-11749 : It is possible to create groups with same name in race conditions
            - Remove throwing AlfrescoRuntimeException for duplicated authorities. Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-07-22 15:31:28 +00:00
Mark Rogers
8db8094c57 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 
75525: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      75287: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         75284: Merged V4.1.8 (4.1.8.11) to V4.1-BUG-FIX (4.1.10)
            75265: MNT-11766 : User with username starting with admin gets admin rights
               - Previous fix was corrected according to Derek's review.
               - Unit test that demonstrates fix added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-07-22 12:55:23 +00:00
Will Abson
4bbfd2b76c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud) 
71601: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70356: MNT-11233: DEV to V4.2-BUG-FIX (4.2.3)
         67973: MNT-11233: Alfresco CMIS API /alfresco/api/-default-/cmis/versions/1.1/atom cannot be used with external authentication
            - Move RemoteUserMapper from Web-Client to Repository project. Use RemoteUserMapper in PublicApiAuthenticator to retrieve remote user from request.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74695 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-06-25 15:31:06 +00:00
David Draper
dcdfa645c1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
70685: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      69750: ACE-848: Added ALFRESCO_SEARCH_ADMINISTRATORS group as well as a patch.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-05-19 12:50:54 +00:00
Alan Davis
263b73e5c1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
64423: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      62493: ACE-563: Fixed the build test failure as a result of adding the new SITE_ADMINISTRATORS group.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64569 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-03-15 01:37:06 +00:00
Alan Davis
8f8553ef23 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
64403: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      61444: ACE-563: Added SITE_ADMINISTRATORS group as well as a patch.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-03-15 01:14:57 +00:00
Alan Davis
983b3640da Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
64105: Reverse Merge HEAD-BUG-FIX (4.3.0.BF)
      << Reverted to see if commit was reason for build failures >>
      63912: Merged DEV to HEAD-BUG-FIX (4.3.0.BF)
         63885: MNT-10338 : WebDav MT RepositoryAuthenticationDao.getUserFolderLocation() seems to be no tenant-safe
         Implemented a JUnit test.
         Fixed RepositoryAuthenticationDAO.getUserFolderLocation() to use cache keys with tenant domain and use the domain to find correct user store.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-03-14 17:46:41 +00:00
Alan Davis
0124e5cdf8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
63912: Merged DEV to HEAD-BUG-FIX (4.3.0.BF)
      63885: MNT-10338 : WebDav MT RepositoryAuthenticationDao.getUserFolderLocation() seems to be no tenant-safe
      Implemented a JUnit test.
      Fixed RepositoryAuthenticationDAO.getUserFolderLocation() to use cache keys with tenant domain and use the domain to find correct user store.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64334 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-03-14 17:07:47 +00:00
Derek Hulley
7e2d1a95c6 Reverted 63895 (MNT-10338), which went onto the wrong branch 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@63908 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-03-11 12:38:58 +00:00
Alex Mukha
69f2922c30 Merged DEV to HEAD (4.3.0) 
63885: MNT-10338 : WebDav MT RepositoryAuthenticationDao.getUserFolderLocation() seems to be no tenant-safe
   Implemented a JUnit test.
   Fixed RepositoryAuthenticationDAO.getUserFolderLocation() to use cache keys with tenant domain and use the domain to find correct user store.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@63895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-03-11 11:37:48 +00:00
Alan Davis
4faaf92018 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
61345: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      61071: Merged DEV to V4.2-BUG-FIX (4.2.2)
         60764: MNT-10533: Calls during the beforeDeleteNode phase of a group deletion may confuse the AuthorityDaoImpl cache
          - First delete authority and refresh cache only after that 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62407 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-12 15:08:11 +00:00
Alan Davis
72662536a7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
60595: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60362: Merged DEV to V4.2-BUG-FIX (4.2.2)
         58112: Added missing transaction(s) in CheckOutCheckInServiceImplTest (MNT-9806)
         58113: Added missing transaction(s) in LockableAspectInterceptorTest (MNT-9806)
         58114: Added missing transaction(s) in LockableAspectInterceptorTest (MNT-9806)
         58115: Added missing transaction(s) in TransactionCleanupTest (MNT-9806)
         58116: Added missing transaction(s) in GetChildrenCannedQueryTest (MNT-9806)
         58118: Added missing transaction(s) in RatingServiceIntegrationTest (MNT-9806)
         58119: Added missing transaction(s) in ReplicationServiceIntegrationTest (MNT-9806)
         58121: Added missing transaction(s) in PersonTest (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-12 14:08:49 +00:00
Alan Davis
bdff1bca64 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
59891: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59686: Merged PATCHES/V4.2.1 (4.2.1) to V4.2-BUG-FIX (4.2.2)
         59685 : Merged DEV to PATCHES/V4.2.1 (4.2.1)
            59669 : MNT-10257 : Error during synchronization: java.lang.Integer cannot be cast to java.lang.Long
               - New fix for this issue was implemented.
               - Unit test was added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62210 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-12 09:24:13 +00:00
Alan Davis
cf9cbbed5f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
59889: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59662: Merged V4.2.1 (4.2.1) to V4.2-BUG-FIX (4.2.2)
         59613: Merged DEV to V4.2.1
            59345: MNT-10267: Authority Search does not work for groups with Unicode display name
             - Modify GetAuthoritiesCannedQuery to respect unicode. 
            59514: MNT-10267: Authority Search does not work for groups with Unicode display name
             - Add unit test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62208 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-12 09:22:30 +00:00
Alan Davis
0144810a6d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
59269: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59268: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59264: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8) AGAIN!
            58707: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
               58676: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Delete associated groups on callback when archived site is purged. Add unit test for case.
            58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
               58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
               58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Return beforePurgeNode callback binding to Site class.
            58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
            58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-12 01:24:08 +00:00
Alan Davis
dd04a7ebfa Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
59267: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (4.3/Cloud)
      59266: Reverse Merge attempt at merging from V4.1-BUG-FIX (will do it again)
         AND record only merge the original commits 59231,59239 and reverse merge 59262 that took place on V4.1-BUG-FIX   
         59237: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
            59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
               58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
                  58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
                  58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Return beforePurgeNode callback binding to Site class.
               58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
                  58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
               58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
                  58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.
         59240: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
            59239: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
               - The merge of the HF commit on 4.1.6 removed a variable that was not being used, but
                 was being used in later versions.
         59241: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
            - Correct error in merge from V4.1-BUG-FIX to V4.2-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62124 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-12 01:23:12 +00:00
Alan Davis
8d76c8edf7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
59256: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59237: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
            58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
               58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
               58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Return beforePurgeNode callback binding to Site class.
            58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
            58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-12 01:19:54 +00:00
Alan Davis
d6d16285d9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
59040: Added AuthenticationBootstrapTest to the own JVM Category


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62079 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-12 00:47:23 +00:00
Alan Davis
5d0d4fb5ed Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
58817: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58784: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58617 : MNT-9711: ldap synchronization algorithm is not optimal
            - The verification for deleting permissions was added for the full synchronization.
            - The unit tests were modified according the new logic.
         58667 : MNT-9711: ldap synchronization algorithm is not optimal
            - Refactoring code. Removed unreachable code.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62038 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-12 00:14:46 +00:00
Alan Davis
436dfd3bfc Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
58572: Added some tests to the own Jvm category


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 23:50:03 +00:00
Alan Davis
893c902a2d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
58390: Added more tests to ownJVMCategory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61973 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 23:22:57 +00:00
Alan Davis
068939e250 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
58376: Added additional tests to ownJVMCategory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61971 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 23:20:56 +00:00
Alan Davis
eadda12eb8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
58310: Merge Dev to HEAD-BUG-FIX
     MNT-8647 : inconsistent ftp authentication chain behaviour


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61955 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 23:09:36 +00:00
Alan Davis
afe3962384 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
58198: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58062: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
           56942: Merged DEV to V4.1-BUG-FIX (4.1.7)
               56883 : MNT-9794: Authorities with duplicate names can be easilly created using « AuthorityService »
                       - Creation of the duplicated authorities is fixed. Unit tests are added.
           58059: Revised for for     MNT-9794   Authorities with duplicate names can be easilly created using « AuthorityService »
           Includes build fix from this merge
           - MNT-10010   In some cases (e.g. SiteServiceImpl) we are using onBootstrap to bind behaviour multiple times


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61937 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 22:52:10 +00:00
Alan Davis
d447b6b36a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
58165: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58031: Reverse merged (again) in V4.2-BUG-FIX - merged the wrong commit
         58030: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
            56942: Merged DEV to V4.1-BUG-FIX (4.1.7)
               56883 : MNT-9794: Authorities with duplicate names can be easilly created using « AuthorityService »
                  - Creation of the duplicated authorities is fixed. Unit tests are added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61930 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 22:46:18 +00:00
Alan Davis
5bf400fac6 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
58164: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58030: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         56942: Merged DEV to V4.1-BUG-FIX (4.1.7)
            56883 : MNT-9794: Authorities with duplicate names can be easilly created using « AuthorityService »
               - Creation of the duplicated authorities is fixed. Unit tests are added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61929 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 22:45:28 +00:00
Alan Davis
c791da212f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
57640: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57627: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57566: Reverse Merged: Appears to have caused build failures https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV41BUGFIX-829
            57419: Merged DEV to V4.1-BUG-FIX (4.1.8)
               MNT-9794: Authorities with duplicate names can be easilly created using AuthorityService
                  - ContentModel.PROP_NAME was added for preventing the generation of new uid for every new authority nodes with the duplicated names in 'child_node_name' field into 'alf_child_assoc' table.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 21:21:07 +00:00
Alan Davis
881e324c76 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
57639: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57626: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57419: Merged DEV to V4.1-BUG-FIX (4.1.8)
            - correction to the merge


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 21:20:19 +00:00
Alan Davis
3fc589c168 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
57638: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57625: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57419: Merged DEV to V4.1-BUG-FIX (4.1.8)
            MNT-9794: Authorities with duplicate names can be easilly created using AuthorityService
               - ContentModel.PROP_NAME was added for preventing the generation of new uid for every new authority nodes with the duplicated names in 'child_node_name' field into 'alf_child_assoc' table.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 21:19:30 +00:00
Alan Davis
d33d2335f8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
57505: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57346: Merged DEV to V4.2-BUG-FIX (4.2.1)
         57172: MNT-9768 : ChainingUserRegistrySynchronizerTest never ending on SQL Server
         Changed the API to use the synchronization only with split transactions. Fixed the test to pass on SQL Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61835 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 20:57:41 +00:00
Alan Davis
a807469fba Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
57241: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57221: Reverse Merge as it caused SiteServiceImplMoreTest deleteSiteAndRestoreEnsuringSiteGroupsAreRecovered to fail
         57067: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
            56942: Merged DEV to V4.1-BUG-FIX (4.1.7)
               56883 : MNT-9794: Authorities with duplicate names can be easilly created using « AuthorityService »
                  - Creation of the duplicated authorities is fixed. Unit tests are added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 20:27:29 +00:00
Alan Davis
71791b0c00 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
57228: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57067: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56942: Merged DEV to V4.1-BUG-FIX (4.1.7)
            56883 : MNT-9794: Authorities with duplicate names can be easilly created using « AuthorityService »
               - Creation of the duplicated authorities is fixed. Unit tests are added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 20:17:00 +00:00
Alan Davis
1230bde9a6 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
57164: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57017: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         57004: MNT-9375: Fixed the test that caused a lot of build errors (running SecurityTestSuite) when merged with 4.2 Bug Fix (build #7) 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 20:15:16 +00:00
Alan Davis
7ec5353411 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
57163: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57016: Reverse Merge to the original
         56761: Reverse Merge: Caused lots of build errors running SecurityTestSuite. Specifically HomeFolderProviderSynchronizerTest
               which ran after AuthorityBridgeTableAsynchronouslyRefreshedCacheTest.
               See https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-7 (#11 has 30 errors including 26 from HFPST and ABTARCT)
            56562: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               56138: Merged DEV to V4.1-BUG-FIX (4.1.7)
                  56075: MNT-9375 (related to MNT-9485): MT - when users are added to site with a group addition versus individual, they are not handled as members of site
                  Added JUnit test for the issue. Added the test to SecurityTestSuite.
            56580: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               56026: Merged DEV to V4.1-BUG-FIX (4.1.7)
                  55892: MNT-9485: MT Users added to Alfresco Administrators group via Group addition do not have 'admin' privileges
                   - Build bridge cache on behalf of provided tenant user. 
            56581: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               << last commit missed a file >>
               56026: Merged DEV to V4.1-BUG-FIX (4.1.7)
                  55892: MNT-9485: MT Users added to Alfresco Administrators group via Group addition do not have 'admin' privileges
                   - Build bridge cache on behalf of provided tenant user. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 20:14:29 +00:00
Alan Davis
4f4d6ec937 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
57112: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56761: Reverse Merge: Caused lots of build errors running SecurityTestSuite. Specifically HomeFolderProviderSynchronizerTest
            which ran after AuthorityBridgeTableAsynchronouslyRefreshedCacheTest.
            See https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-7 (#11 has 30 errors including 26 from HFPST and ABTARCT)
         56562: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
            56138: Merged DEV to V4.1-BUG-FIX (4.1.7)
               56075: MNT-9375 (related to MNT-9485): MT - when users are added to site with a group addition versus individual, they are not handled as members of site
               Added JUnit test for the issue. Added the test to SecurityTestSuite.
         56580: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
            56026: Merged DEV to V4.1-BUG-FIX (4.1.7)
               55892: MNT-9485: MT Users added to Alfresco Administrators group via Group addition do not have 'admin' privileges
                - Build bridge cache on behalf of provided tenant user. 
         56581: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
            << last commit missed a file >>
            56026: Merged DEV to V4.1-BUG-FIX (4.1.7)
               55892: MNT-9485: MT Users added to Alfresco Administrators group via Group addition do not have 'admin' privileges
                - Build bridge cache on behalf of provided tenant user. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61742 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 19:44:32 +00:00
Alan Davis
9f7031eaea Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
57111: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56714: Fix build error LockOwnerDynamicAuthorityTest.testPermissionWithEphemeralLockAspect
         - Fix similar to the fix for three testes in the same class on V4.1-BUG-FIX r56597 for MNT-9502
           Error started after merge from V4.1-BUG-FIX of the original part of the MNT-9502 fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61741 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 19:43:43 +00:00
Alan Davis
25286d4fb1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
57099: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56605: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56597: MNT-9502 : Unlocking working copy leaves node in an unacessible and undefined state
            - Test failures fixed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61728 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 19:34:14 +00:00
Alan Davis
78c78f13b1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
57075: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56562: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56138: Merged DEV to V4.1-BUG-FIX (4.1.7)
            56075: MNT-9375 (related to MNT-9485): MT - when users are added to site with a group addition versus individual, they are not handled as members of site
            Added JUnit test for the issue. Added the test to SecurityTestSuite.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61706 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 19:16:37 +00:00
Derek Hulley
df7349b6e3 Merged DEV to HEAD: 
52797: Fixed ALF-19301 (CLOUD-1685): Unsafe usage of transactions around authenticationCache
   54967: Fix test after changes for ALF-19301: Unsafe usage of transactions around authenticationCache
   Merge: Note that the test changes were applied by using 'patch' because of the file relocation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55090 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-09-08 22:21:11 +00:00
Andrew Hind
0d4d8c41d1 Fix for ALF-13535 Using CMIS, on-disk tickets cache can grow unbounded 
- Single ticket per user (you can have a ticket per login via configuration)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-08-28 13:12:29 +00:00
Samuel Langlois
eab5cddc79 Merged HEAD-QA to HEAD (4.2) - final one 
r54310-54386


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-08-22 08:25:02 +00:00
Samuel Langlois
ab4ca7177f Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders) 
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-08-20 17:17:31 +00:00