4896 Commits

Author SHA1 Message Date
Alan Davis
07beefbee7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60578: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60246: Merged DEV to V4.2-BUG-FIX
      59624 : MNT-10176 : Cmisaction:setContent: No minor version created
       Create a new version when execute "Set content stream" or "update properties" actions in CMIS workbench. Add new unit test. 
      59749 : Merged DEV
       59276 : MNT-10175 : CMIS 1.1 API: Two versions are created after appending content stream with isLastChunk=true
         Create new version of document only on appending last chunk of content
       59656 : MNT-10175 : CMIS 1.1 API: Two versions are created after appending content stream with isLastChunk=true
         Test for versioning around content appending 
      60185 : MNT-10176 : Cmisaction:setContent: No minor version created
       Fix some unit test. 
      60218 : MNT-10176 : Cmisaction:setContent: No minor version created
      Corrected TestCMIS.testVersioning. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:01:07 +00:00
Alan Davis
7aa1c5131b Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60177: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60156: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60155: MNT-10399 AutomaticBuilds: Alfresco doesn't shut down because of FullTextSearchIndexerImpl 
            - TABs to spaces


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62296 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 12:48:11 +00:00
Alan Davis
bc8088a4f8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60164: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60119: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60059: Merged DEV to V4.1-BUG-FIX (4.1.8)
            60025 : MNT-10244 : JavaScript: workflow.createPackage() should return noderef
               - Create ScriptNode with script global scope


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62279 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 10:35:08 +00:00
Alan Davis
a1c7917881 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60122: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60121: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60118: Merged DEV (V4.1-BUG-FIX-2013_11_14) to V4.1-BUG-FIX (4.1.8)
            60117: Merged DEV (V4.2.1-2014_01_09) to DEV (V4.1-BUG-FIX-2013_11_14)
               60116: MNT-10399: AutomaticBuilds: Alfresco doesn't shut down because of FullTextSearchIndexerImpl 
                  - Try to spot dead daemon threads holding the lock on subsystem shutdown


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 10:24:55 +00:00
Alan Davis
350b8883ef Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60032: Merged BRANCHES/DEV/43UIDEV to HEAD-BUG-FIX:
      This branch contained the Aikau and Surf framework updates implemented during the development hiatus post-4.2 completion. This features the change of Surf from 1.2.0 to Surf 1.2.1 which is for v4.3 releases only.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 10:12:44 +00:00
Alan Davis
13e34899ef Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59909: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59854: Merged DEV to V4.2-BUG-FIX (4.2.2)
         59847: MNT-10208 : Misleading comment on OnUpdateNodePolicy.onUpdateNode()
         Changed JavaDoc for OnUpdateNodePolicy.onUpdateNode() method.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62229 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:39:34 +00:00
Alan Davis
96c87c2d9c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59897: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59791: Merged DEV to V4.2-BUG-FIX (4.2.2)
         59719: MNT-10178 : BM-0012: Run v420b1527_01: Cannot find Content Reader for document RenditionServiceException
         Added a check to skip the nodes without content before trying to render.
         Fixed test.
         59739: MNT-10178 : BM-0012: Run v420b1527_01: Cannot find Content Reader for document RenditionServiceException
         Corrected mistakes in the fix r59719.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:29:21 +00:00
Alan Davis
ee70662f17 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59895: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59748: Merged DEV to V4.2-BUG-FIX (4.2.2)
         59567: MNT-10278: "Format" column is empty for Dublin Core View
            Implemented renderer for mymetype.
            Added mimetypeDisplayName property to JSON root values to be able to display human readable mimetype description without additional calls from JavaScript code.
            Added localized strings for unknown types in English and Russian languages.
            Edited dublin_core view sample to use mimetype instead of cm:mimetype.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62214 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:27:39 +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
6c45b22b37 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59887: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59643: Merged DEV to V4.2-BUG-FIX (4.2.2)
         59235: MNT-10223 : CMIS: Created document has incorrect value on Properties tab
         Fixed the isLatestMajorVersion() implementation to return false if the
         version of the doc is minor.
         59236: MNT-10223 : CMIS: Created document has incorrect value on Properties tab
         Added a test for the issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62205 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:16:47 +00:00
Alan Davis
dbcef62a9c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59886: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59621: Merged DEV to V4.2-BUG-FIX
         58258: MNT-10038 : CIFS and FTP accessing repo without transactions for MNT-9806
         58307: MNT-10038 - MNT-9806 Corrected transaction test error in ContentDiskDriverTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62203 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:15:52 +00:00
Alan Davis
3288e9dc06 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59884: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59611: Merged DEV to V4.2-BUG-FIX
         58117: Added read transactions to Repository's get methods (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:14:00 +00:00
Alan Davis
ac69d90741 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59882: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59607: Merged DEV to V4.2-BUG-FIX
         58111: Ensure a transaction is present while initialising the DictionaryRepositoryBootstrap (Repo-based dictionary) (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62198 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:12:15 +00:00
Alan Davis
ad6ffbde8c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59881: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59606: Merged DEV to V4.2-BUG-FIX
         58106: Fixed formatting in MailActionExecuter found during investigations
         58107: Fixed formatting issues in ActionExecuterAbstractBase found during investigations
         58108: Further detection of transaction state in the base action code (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:11:23 +00:00
Alan Davis
dc3d804dfe Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59880: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59604: Merged DEV to V4.2-BUG-FIX
         58029: Fix LicenseComponent to use a transaction when fetching descriptors from the repo (MNT-9806)
                - Possible relation to ALF-19629: BM-0013: SOAK: v420b214_01: DescriptorService intercepts retrying exception during concurrent start


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:10:30 +00:00
Alan Davis
79ccf18f85 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59851: Merged BRANCHES/DEV/mward/head_bf_gdata_upgd to BRANCHES/DEV/HEAD-BUG-FIX (local cache improvements):
      59586: DefaultSimpleCache max size is Integer.MAX_VALUE when configured with maxItems of 0.
      59590: maxItems for DefaultSimpleCache is now an optional feature.
      59592: non-clustered caches will not use size-based eviction when {cacheName}.eviction-policy=NONE, to match clustered caches.
      59594: Added TTL to DefaultSimpleCache - not yet configurable through the factory.
      59602: DefaultCacheFactory can create caches with a time-to-live setting enabled.
      59620: Organise imports for DefaultSimpleCache
      59622: DefaultSimpleCache: changed field name from map to cache, as this makes more sense with changing to use of CacheBuilder.
      59627: Added maxIdleSecs property to DefaultSimpleCache - not yet configurable from the cache factory.
      59629: DefaultCacheFactory now supports maxIdleSeconds property for configuring non-clustered caches.
      59633: Updated description of supported non-clustered cache properties in caches.properties


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:06:59 +00:00
Alan Davis
bdba166058 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59850: Merged BRANCHES/DEV/mward/head_bf_gdata_upgd to BRANCHES/DEV/HEAD-BUG-FIX (upgrade gdata libs):
      59515: Removed gdata-1.45.0 libraries.
      59516: Removed concurrentlinkedhashmap-lru-1.2 library.
      59518: Added gdata-1.47.1 library JARs (dependencies to follow)
      59521: Added gdata-1.47.1 dependencies (guava-11.0.2 and JSR-305)
      59524: Updated ant build files to use gdata-1.47.1
      59528: Removed outdated gdata-1.45.0 src zip.
      59530: Added gdata-1.47.1 src zip
      59531: Update eclipse .classpath with gdata 1.47.1 libraries
      59532: Exported new gdata-1.47.1 and guava-11 libs from 3rd party project
      59559: Fix DefaultSimpleCache to use a Guava Cache, replacing ConcurrentLinkedHashMap usage.
      59568: Reverted r59516: concurrentlinkedhashmap lib is required by Surf.
      59572: Replaced use of google-collections with guava in repository's pom.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62191 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:06:09 +00:00
Alan Davis
a4494111b8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59819: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59597: Merged DEV to V4.2-BUG-FIX
         57986: Merged BRANCHES/DEV/DEREK/MNT-9806 to BRANCHES/DEV/DEREK/MNT-9806-2:
            56847: Merged BRANCHES/DEV/DEREK/MNT-9740 to BRANCHES/DEV/DEREK/MNT-9806:
               56785: Fixed JavaDoc: MemoryCache *is* thread safe
               56786: Minor DEBUG message fixes noticed during investigations


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62189 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:04:05 +00:00
Alan Davis
ad1026086f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59741: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59512: MNT-10255: Merged DEV to V4.2-BUG-FIX (4.2.1).
         59393: MNT-10255 Mac OS -CIFS: Collaborator/editor can delete content created by other site members after editing.
            - In ScenarioTempDeleteShuffle.createInstance() was added check: (operation instanceof MoveFileOperation).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62180 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 07:56:11 +00:00
Alan Davis
b9aed87767 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59734: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59507: Reverse Merged - Wrong commit was made
         59504 : MNT-10255: Merged DEV to V4.2-BUG-FIX (4.2.1).
            59393: MNT-10255 Mac OS -CIFS: Collaborator/editor can delete content created by other site members after editing.
               - In ScenarioTempDeleteShuffle.createInstance() was added check: (operation instanceof MoveFileOperation). 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62177 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 02:15:46 +00:00
Alan Davis
55fb129877 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59732: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59504: MNT-10255: Merged DEV to V4.2-BUG-FIX (4.2.1).
          59393: MNT-10255 Mac OS -CIFS: Collaborator/editor can delete content created by other site members after editing.
                 - In ScenarioTempDeleteShuffle.createInstance() was added check: (operation instanceof MoveFileOperation).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62175 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 02:13:58 +00:00
Alan Davis
36dbb45644 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59731: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59502: Merged DEV to V4.2-BUG-FIX (4.2.1)
         59297 : MNT-10233: PermissionsManager : permissions property doesn't work
            - permissions property behavior in PermissionsManager is fixed. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62174 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 02:13:03 +00:00
Alan Davis
875b90ea55 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59554: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59450: MNT-9967: Using db-count for process/task entities for retreiving counts, instead of using actual list size (activiti)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62165 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 02:05:13 +00:00
Alan Davis
fc9358e3d8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59364: Merged DEV to HEAD-BUG-FIX (Cloud/4.3)
      59311: ALF-20682 : LDAP context not closed properly (connections to LDAP stay open)
      Fixed connection leak to LDAP server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62133 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:30:29 +00:00
Alan Davis
601826e772 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59337: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (4.3/Cloud)
      59273: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58959, 59195 : MNT-10111 : MSSQL: JBPM: A plenty of schema differences are present after schema bootstrap on a clean start
            - Type names only validator added. Validate nvarchar(max) fields with it
            - TypeNameOnlyValidatorTest added for TypeNameOnlyValidator
      59299: MNT-10111 : MSSQL: JBPM: A plenty of schema differences are present after schema bootstrap on a clean start
         - Additional commit of Schema-Reference-JBPM.xml, it was corrupted in r59273
      59335: Fix errors introduced into mergeinfo in r59273 (MNT-10111)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:27:19 +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
b5e03702c7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59258: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      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.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:21:30 +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
97569e7dba Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59253: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59199: Reverse Merged as it caused regression MNT-10075
         55285: Merged BRANCHES/DEV/BELARUS/HEAD-2013_08_27 to BRANCHES/V4.2:
             55068: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62117 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:17:23 +00:00
Alan Davis
efca2709c9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59252: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59196: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58963 : MNT-10006: SPP: NPE occurs for recurrent event which occurs monthly/yearly on any weekday/weekend day
            - Support of day/weekday/weekend recurrence pattern was implemented
            - Unit tests are added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:16:36 +00:00
Alan Davis
92d096ffe8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59250: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59188: MNT-9996: All day Calendar events do not show for the first day in the Share Site Calendar grid.
      Fix unit tests failure. Detect allday events as events with the same start and end dates which have UTC midnight time.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62114 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:14:57 +00:00
Alan Davis
0b62194fc7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59246: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59143: MNT-9996: All day Calendar events do not show for the first day in the Share Site Calendar grid.
      Force all day events to last from midnight till next midnight in current timezone so that they can be compared correctly and included into the requested range


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62110 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:11:47 +00:00
Alan Davis
8a8cf1b81a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59123: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59111: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59070: Merged DEV to V4.1-BUG-FIX (4.1.8)
            58849: MNT-10096: MT: AbstractTenantRoutingContentStore can return null list of stores
              - Ensure that RetryingTransactionHelper starts a transaction in txn-after-completion phase (MNT-9806).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:06:17 +00:00
Alan Davis
d156901f44 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59113: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59084: MNT-10028: Editing online document is not displayed in "I'm Editing" (and similar) filters in Share.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62093 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:58:28 +00:00
Alan Davis
3252a7a94e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59064: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59042: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58919 : MNT-9205 : Search by IM property with spaces doesn't work
            - Using correct regexp to split search term. Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:55:21 +00:00
Alan Davis
122952e3f3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59048: ALF-13291 - Transfer target is still displayed in replication job despite of target was deleted
      build fix.   fix incomplete.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:48:56 +00:00
Alan Davis
dd4f7bfaf5 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59034: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59000: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         - Missing file in last commit
         58913: Fix MT ContentStore so that it cannot return a null store
          - It was dependent, for some reason, on a cluster-aware cache that would be prone to nulling
            but the code just assumed that if it tried to set the value a few times it would stick.
          - Fixed transaction demarcation so that a transaction is always present when using the store.
            This is not ideal but it is inherently a repo-aware component and therefore needs it
          - MNT-9806: Prevent post-transaction handlers from rendering threads unusable
          - MNT-10096: MT: AbstractTenantRoutingContentStore can return null list of stores
         Merged from DEV/DEREK/MNT-9806 r58833


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62078 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:46:37 +00:00
Alan Davis
6ccd948c48 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59021: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58878: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58843: MNT-10137 : Update of document.name during creation leads to execution of a content rule specified for deletion (outbound)
         Added BeforeMoveNodePolicy binding to BeforeDeleteChildAssociationRuleTrigger to handle renames via move correctly.
         58645: ALF-12726 : Update of document.name during creation leads to execution of a content rule specified for deletion (outbound)
         Added a JUnit test to reproduce the issue.
         58670: MNT-10137 : Update of document.name during creation leads to execution of a content rule specified for deletion (outbound)
         Added an additional check to the test that reproduces the issue (does not pass).
         Added a test that uses NodeService to rename the node (passes).
         58675: MNT-10137 : Update of document.name during creation leads to execution of a content rule specified for deletion (outbound)
         Added fixes to the test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62065 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:36:16 +00:00
Alan Davis
f7f14fd0d2 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59013: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58856: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58845: ALF-18922 : Remove non empty emailserver:alias aspect results in orphaned alias
         Changed the policy binding for remove alias.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62061 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:33:07 +00:00
Alan Davis
bb1be40563 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58986: ALF-13291 - Transfer target is still displayed in replication job despite of target was deleted


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62059 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:31:33 +00:00
Alan Davis
da4170e6f2 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58970: ALF-20668 - hidden Files not shown in CIFS-Client


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62058 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:30:45 +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
e3762b0173 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58756: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58733: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58696: MNT-9111 : MS SQL Server 2008 R2 where user's default schema is not 'dbo', schema validator fails on subsequent restarts and application fails startup
         Fixed SchemaBootstrap to use the required schema from db.schema.name property if set.
         58712: MNT-9111 : MS SQL Server 2008 R2 where user's default schema is not 'dbo', schema validator fails on subsequent restarts and application fails startup
         Corrected the fix from r58696.
         Added the db.schema.name to repository.properties.
         Corrected property handling.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:08:16 +00:00
Alan Davis
b644b4d440 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58522: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58512: Reverse merge
         << Caused 5 build errors >>
         58449: Merged DEV to V4.2-BUG-FIX (4.2.1)
            58425 : MNT-9711: ldap synchronization algorithm is not optimal
               - The verification for deleting permissions was added for the full synchronization.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:47:38 +00:00
Alan Davis
6aac29b931 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58519: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58459: MNT-9834 : DB2: ACT: Schema differences is present after upgrade 3.4.13 > 4.1.5 > 4.2.0
         - Output information about ignored patches it INFO level to make SchemaBootstrap more informative.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62002 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:45:53 +00:00
Alan Davis
606e1866b0 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58518: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58449: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58425 : MNT-9711: ldap synchronization algorithm is not optimal
            - The verification for deleting permissions was added for the full synchronization.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62001 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:45:06 +00:00
Alan Davis
2493ba39ac Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58494: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58406: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58389: Fix for MNT-9272 	Duplicate entry error after LDAP sync with user with different case from alf_authority 
         - authority case changes that imply updates that violate integrity constraints are supported.
         - if permissions exist for a non existent user "BOB" and an existing user "bob" is updated to "BOB"
              - all "bob"'s permissions will be migrated and "BOB"s  will be added (as they are treated as one and the same)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61995 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:40:19 +00:00
Alan Davis
135625b740 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58408: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58267: MNT-7514 : Merged DEV to V4.2-BUG-FIX
       58142 : MNT-7514 : Uninformational error message on move when file name conflicts
        Added new failure message if file exists. 
       58263 : MNT-7514 : Uninformational error message on move when file name conflicts
        Was corrected showing failure message for copy/move a file or folder. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:29:14 +00:00