Commit Graph

5028 Commits

Author SHA1 Message Date
Alan Davis
32b92eb51b Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60652: Precautions against MNT-10486: NPE in NodeEntity during post-commit write through to shared cache
    - Ensure that NodeEntity objects are locked before going into cache (missed locks during bulk loading)
    - Do check on validity of NodeEntity during lock


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62355 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:31:36 +00:00
Alan Davis
c7ed0857ae Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60624: Failures in post-commit writes of NewCacheBuckets and UpdateCacheBuckets are logged in more details (MNT-10486)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62354 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:30:50 +00:00
Alan Davis
a67d74a6da Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60616: Correct compile error after bad merge.
      - Part of 58257: Added missing transaction(s) in SOLRDAOTest. (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62347 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:26:20 +00:00
Alan Davis
38efc4c619 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60607: Fixed generics, unused code and and some minor formatting - found during investigations.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62340 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:17:51 +00:00
Alan Davis
f68b048cbf Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60604: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60461: MNT-9369 : Addition of the cm:versionable aspect through the Share UI sets the cm:autoVersionOnUpdateProp=true regardless of the aspect property being set to 'false' in the contentModel.xml
      Fixed the security context error.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62337 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:15:28 +00:00
Alan Davis
2d972d8861 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60603: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60460: MNT-9369 : Addition of the cm:versionable aspect through the Share UI sets the cm:autoVersionOnUpdateProp=true regardless of the aspect property being set to 'false' in the contentModel.xml
      Updated the test content model for 4.2-BF branch.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62335 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:14:37 +00:00
Alan Davis
05e0f93494 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60598: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60375: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60154: Merged DEV to V4.1-BUG-FIX (4.1.8)
            60062: MNT-9369 : Addition of the cm:versionable aspect through the Share UI sets the cm:autoVersionOnUpdateProp=true regardless of the aspect
            property being set to 'false' in the contentModel.xml
            Added loading of default properties from Dictionary for versionable aspect.
            60063: MNT-9369 : Addition of the cm:versionable aspect through the Share UI sets the cm:autoVersionOnUpdateProp=true regardless of the aspect
            property being set to 'false' in the contentModel.xml
            Added a test to simulate the issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62328 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:10:32 +00:00
Alan Davis
73fe0fb759 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60596: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60363: Merged DEV to V4.2-BUG-FIX (4.2.2)
         58124: Added missing transaction(s) in SOLRTrackingComponentTest (MNT-9806)
         58128: Added missing transaction(s) in MultiTDemoTest (MNT-9806)
         58247: Added missing transaction(s) in TransferServiceToBeRefactoredTest.  Fixed dozens of warnings as well. (MNT-9806)
         58248: Added missing transaction(s) in WikiServiceImplTest.  Fixed code warnings. (MNT-9806)
         58249: Added missing transaction(s) in CalendarServiceImplTest. (MNT-9806)
         58251: Added missing transaction(s) in NodeServiceTest. (MNT-9806)
         58252: Added missing transaction(s) in LockDAOTest. (MNT-9806)
         58253: Added missing transaction(s) in NodeDAOTest. (MNT-9806)
         58257: Added missing transaction(s) in SOLRDAOTest. (MNT-9806)
         58259: Added missing transaction(s) in ReplicationRestApiTest (MNT-9806)
         58260: Added missing transaction(s) in RunningActionRestApiTest (MNT-9806)
         58304: Added missing transaction(s) in UnlockMethodTest (MNT-9806)
         58368: Added missing transaction(s) in UnlockMethodTest (MNT-9806)
         58892: Added missing transaction(s) in NodeServiceTest (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62327 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:09:43 +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
db883205f8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60593: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60361: Merged DEV to V4.2-BUG-FIX (4.2.2)
         58110: Added missing transaction in ActivityServiceImplTest (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:08:00 +00:00
Alan Davis
74f7a1d3a6 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60592: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60359: Merged DEV to V4.2-BUG-FIX (4.2.2)
         58109: Added missing transaction in AbstractMailActionExecuterTest (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62322 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:07:14 +00:00
Alan Davis
63b4fe4fae Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60591: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60358: Merged DEV to V4.2-BUG-FIX (4.2.2)
         58064: Fixed use of 'nodeService' vs 'NodeService' in DiscussionServiceImplTest (MNT-9806)
         58069: Fixed use of CheckOutCheckInService in StoreSelectorAspectContentStoreTest (MNT-9806)
                - Fixed formatting as well
         58071: Fixed transaction use around various services in SyncChangeMonitorTest (MNT-9806)
         58102: Remove unused code and other warnings from SyncChangeMonitorTest
         58103: Fixed transaction use around various services in SyncTrackerComponentTest (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62321 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:06:28 +00:00
Alan Davis
8b0d86a0b2 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60590: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60357: Minor formatting


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62319 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:05:41 +00:00
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
1cc54d1d24 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60178: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60175: Merged V4.2.1 (4.2.1) to V4.2-BUG-FIX (4.2.2)
         60174: Merged DEV (V4.2.1-2014_01_09) to V4.2.1 (4.2.1)
            60167: ACE-183 Intermittent test failure: LockStoreImplTxTest testReadsWhenNoTransaction
               - Stop running LockStoreImplTxTest - testReadsWhenNoTransaction (Matt says there is little value)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62297 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 12:48:57 +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
96921b50ea Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60138: Merged DEV to HEAD-BUG-FIX (4.3.0BF)
      60064 : MNT-10388 : Cant create folder in czech translation
         - Added test around creating nodes with names in different languages


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62273 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 10:30:46 +00:00
Alan Davis
3a4ec3048f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60133: BDE-239 (HEAD-BUG-FIX) Identify tests starting the repository which are not in suites
      - typo in test numbers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62272 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 10:29:47 +00:00
Alan Davis
09001be2d2 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60132: BDE-239 (HEAD-BUG-FIX) Identify tests starting the repository which are not in suites
      - DeploymentServiceTest had been moved out of the repository project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62271 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 10:28:45 +00:00
Alan Davis
ac43fba78f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60131: Merged V4.2-BIG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60130: Merged V4.2.1 (4.2.1) to V4.2-BIG-FIX (4.2.2)
         60129: BDE-239 (4.2) Identify tests starting the repository which are not in suites
            - Merged DEV to Merged DEV to V4.1.2 (4.2.1)
               59645,59650-59651,59653-59654,59663,59750-59751,59754-59755,59758,59762-59763,
         	  59768,59770,59834,59841,59946,60111,60115


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62270 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 10:27:41 +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
3aadf6bf6c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59989: Handling of no message for tests, ALF-20739


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62238 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:46:26 +00:00
Alan Davis
1e8074b637 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59942: Better handling of no message for tests, ALF-20739


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:44:43 +00:00
Alan Davis
1785ab9818 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59936: Added extra assertions (test pre-conditions) to help debug sporadic failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62234 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:43:00 +00:00
Alan Davis
00cd413c12 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59923: Fixes StandardQuotaStrategyTest, that was broken by changes in cache behaviour.
   Non-clustered (Google Guava) caches do not use maxItems as a hard-limit any more - eviction takes place as cache size approaches the limit.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:42:08 +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
4119889331 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59855: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59601: Merged DEV to V4.2-BUG-FIX
         58003: Prevent QNameDAO from being used without a txn (MNT-9806)
         58022: Fix bootstrap sequencing issues related to Content Publishing and Site models
                - I thought I had broken something but it's one of those random bean loading issues that we don't commonly see
                - Pulled models into core model lists so that we know and understand the ordering of the model loading
                - Removed QNameDAO transaction check, just in case (will reapply it with subsequent commit)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62193 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:07:52 +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
b6ef5c416b Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59816: Added AbstractTenantRoutingContentStoreTest to the own JVM Category


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62188 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:03:09 +00:00
Alan Davis
63d70eecee Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59746: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59561: Merged DEV to V4.2-BUG-FIX (4.2.1)
         59104: MNT-10197 : Intermittent test failure: RenditionServicePermissionsTest.userWithoutDeleteAccessTo(etc)
         Implemented a retry mechanism to solve the intermittent test failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62185 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:00:32 +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
d70e9ad7ad Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59474: BDE-195: bring back BulkImportTest into its own JVM + filter out CommentsApiTest, not run in Ant (for now?)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62139 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:35:27 +00:00