Commit Graph

34 Commits

Author SHA1 Message Date
Ancuta Morarasu
dd08919347 REPO-1682 / MNT-15447: getCurrentVersion(node) throws ConcurrencyFailureException after creating multiple versions of a node
- Changes after review (broader check on the type of node + formatting).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133902 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-19 18:37:05 +00:00
Ancuta Morarasu
9794eb72dc REPO-1682 / MNT-15447: getCurrentVersion(node) throws ConcurrencyFailureException after creating multiple versions of a node
- Throw IllegalArgumentException when not a 'live' noderef is used for retrieving the current version.
   - Added Junit test.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133884 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-19 12:05:24 +00:00
Martin Muller
1292beeb9a MNT-13097 content reverted as well to head version if you delete last version of node
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133813 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-16 10:49:25 +00:00
Martin Muller
b264e2c4ec MNT-13097 content reverted as well to head version if you delete last version of node
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-15 16:39:38 +00:00
Martin Muller
3c8f669b98 MNT-13097 content reverted as well to head version if you delete last version of node
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-15 13:29:14 +00:00
Martin Muller
f4e2424af7 MNT-13097 content reverted as well to head version if you delete last version of node
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133689 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-14 16:41:07 +00:00
Jan Vonka
cc97515300 REPO-1144: LockService - add isLocked & isLockedAndReadOnly common helper methods to public API
- remove duplicated code from various locations to use the new methods
- add sanity checks to Lock*Test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-22 14:20:52 +00:00
Raluca Munteanu
6afb44e712 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
8674e2bfc8 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Alan Davis
fa1613fa7e Merged 5.1.N (5.1.1) to HEAD (5.1)
120821 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120757 adragoi: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
         120693 abalmus: MNT-14681 : No VersionType is set when content is updated and autoversion is active
            - Provided fix and tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:40:13 +00:00
Alan Davis
096c5871d8 Merged 5.1.N (5.1.1) to HEAD (5.1)
120108 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120075 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
         120039 amukha: Merged V4.2-BUG-FIX-MNT-14688 (4.2.6) to V4.2-BUG-FIX (4.2.6)
            120019 amukha: MNT-14688: version revert on first version failure if type has aspect
               - Restoring a version now restores the node's type.
               - Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:34:50 +00:00
Jean-Pierre Huynh
e3c4cb6561 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119558 gcornwell: Merged code coverage improvements to 5.1-MC1 (5.1.0)
      r117774 gjames: RA-567: Increase /workflow/processes API code coverage
      r117773 gjames: RA-567: /workflow/processes coverage, removed unused ActivitiTypeConverter
      r116883 gjames: RA-531: reapplied change after merge, for MultiTServiceImpl test coverage
      r116629 gjames: RA-568 Increase /workflow/process-definitions API code coverage
      r116574 gjames: RA-569 Increase /workflow/tasks API code coverage
      r116286 gjames: RA-567: Increase /workflow/processes API code coverage
      r115853 gjames: RA-566: Increasing /people api coverage (description field)
      r115811 gjames: RA-566: Increasing /people api coverage
      r113007 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DynamicNamespacePrefixResolver RA-521
      r113006 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DictionaryComponent RA-514
      r112969 gjames: Adding additional test coverage for TemplateServiceImpl RA-530
      r112960 gjames: Alternative test approach for ModuleServiceImpl RA-520
      r112703 gjames: Adding additional test coverage for NodeLocatorService RA-522
      r112702 gjames: Adding additional test coverage for JobLockServiceImpl RA-516
      r112699 gjames: Adding additional test coverage for ModuleServiceImpl RA-520
      r112508 gjames: Adding additional test coverage for RenditionServiceImpl RA-526
      r112476 gjames: Adding additional test coverage for ContentServiceImpl RA-513
      r112475 gjames: Adding additional test coverage for MimetypeMap RA-519
      r112238 gjames: Adding additional test coverage for MimetypeMap RA-519
      r112237 gjames: Adding additional test coverage for TaggingService RA-529
      r112236 gjames: Adding additional test coverage for MultiTServiceImpl RA-531
      r112206 gjames: Adding additional test coverage for ContentServiceImpl RA-513
      r112167 gcornwell: RA-523: Increase NodeService code coverage (removed redundant code that was testing a version store we no longer use)
      r112102 gjames: Reverted changes to PermissionServiceImpl for RA-524
      r112048 gjames: Temporarily removed some PermissionServiceImpl code. I need to put it back.
      r111620 gjames: Adding additional test coverage for PermissionService RA-524
      r111619 gjames: Added some @Override to make Sonar happier
      r111456 gjames: Adding additional test coverage for AuthenticationService RA-509
      r111427 gjames: Adding additional test coverage for AttributeService RA-509
      r111317 gjames: Adding additional test coverage for WorkflowService RA-533


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:35:05 +00:00
Alan Davis
4165e47032 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115460 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113727 amorarasu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113684 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
            113603 cturlica: Merged DEV to V4.2-BUG-FIX (4.2.6)
               113602 cturlica: MNT-14504: Cloud pull process not working after large delete


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115670 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:10:30 +00:00
Tatyana Valkevych
9cdc1f1377 Merged 5.0.N (5.0.3) to HEAD (5.1)
110205: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110092: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110055: Merged DEV to PATCHES/V4.2.5 (4.2.5)
            109047 : MNT-12226 : Alfresco fails to version metadata after uploading new content version even when autoVersionOnUpdateProps=true
               - Reimplemented previous solution. Configuration properties for autoVersioning should not affect all nodes in repo. They should just provide default behavior.
               - Added ability to specify default values for model properties using standard alfresco GLOBAL_PROPERTIES file.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-21 16:42:09 +00:00
Alan Davis
6c2b75c970 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108040: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107606: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         107460: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.5)
            107307: Merged DEV to V4.1-BUG-FIX (4.1.11)
               107064 : MNT-13719 : CLONE - Comments' counter is working incorrectly after reversion major version of the uploaded document.
                  - Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108071 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:10:15 +00:00
Alan Davis
65aa48b800 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108038: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107601: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         107332: Merged DEV to V4.2-BUG-FIX (4.2.5)
            105981 : MNT-12226 : Alfresco fails to version metadata after uploading new content version even when autoVersionOnUpdateProps=true
               - Added config for upload.post.js webscript. So now users may configure versioning for Share APP separatelly.
            106157 : MNT-12226 : Alfresco fails to version metadata after uploading new content version even when autoVersionOnUpdateProps=true
               - Updated previous solution so that if no config provided for upload.post.js webscript then default model versioning strategy used.,
         107537: MNT-12226 : Alfresco fails to version metadata after uploading new content version even when autoVersionOnUpdateProps=true
            - Fixed build failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108069 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:09:30 +00:00
Tatyana Valkevych
7dd2291753 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-02 16:13:03 +00:00
Alan Davis
0efec9d6ec Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107149: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107038: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         107000: Merged DEV to V4.2-BUG-FIX (4.2.5).
            106581: MNT-14143: Reverting to previous version is removing the aspects added to document in between.
                       - in VersionServiceImplTest was added test_MNT14143 test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107166 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-25 22:46:06 +00:00
Alan Davis
dcc1ce2994 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98999: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98978: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98931: MNT-13562: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            98757: Merged DEV to V4.1-BUG-FIX (4.1.10)
               94378 : MNT-6400: Issue with versioning and comments
                  - Ignore comments properties/aspects/children
               96791 : MNT-6400: Issue with versioning and comments
                  - Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99002 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-07 16:36:22 +00:00
Alan Davis
f764bfec04 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98998: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98976: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98929: Reverse Merge V4.2-BUG-FIX (4.2.5)
            98859: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
               98757: Merged DEV to V4.1-BUG-FIX (4.1.10)
                  94378 : MNT-6400: Issue with versioning and comments
                     - Ignore comments properties/aspects/children
                  96791 : MNT-6400: Issue with versioning and comments
                     - Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99001 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-07 16:36:10 +00:00
Alan Davis
af76d879cb Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98997: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98975: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98859: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            98757: Merged DEV to V4.1-BUG-FIX (4.1.10)
               94378 : MNT-6400: Issue with versioning and comments
                  - Ignore comments properties/aspects/children
               96791 : MNT-6400: Issue with versioning and comments
                  - Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99000 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-07 16:35:57 +00:00
Derek Hulley
c5ac017dfb ACE-2030: Remove some patches for V3.1, including Version store migrator
- Deprecated VersionStore V1 is no longer usable by any means
 - Various scripts and other patches retired


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@87775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-10 17:12:57 +00:00
Erik Winlof
f4e6466c93 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78501: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76817: MNT-11756: Merged DEV to V4.2-BUG-FIX (4.2.4)
         76808: MNT-11756: Associated nodes deleted when reverting to older version.
            - Keep secondary association during revert if versioned and current node have child association with the same node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:20:51 +00:00
Will Abson
d01a3d57c5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71766: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      71655: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         70355: Merged DEV to V4.1-BUG-FIX (4.1.9)
            57716 : MNT-6400 : Issue with versioning and comments
               - Test added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74717 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:34:07 +00:00
Alan Davis
3f9c22dd32 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61122: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60991: Merged DEV to V4.2-BUG-FIX
      60325 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Added some unit tests. 
      60443 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Added tests, debug log. Run work as system user in VersionableAspect. 
      60452 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Wrap debug statements. 
      60492 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Fix if statement indents. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:54:12 +00:00
Alan Davis
1253d2d40e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58397: Added more tests to ownJVMCategory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61977 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:26:07 +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
Pavel Yurke
47436a8477 MNT-9318: CLONE - It's impossible to update comment for the content after version revert
Merged V4.1-BUG-FIX (4.1.7) to HEAD (4.2)
    55265: Merged DEV to V4.1-BUG-FIX (4.1.7)
       55184: MNT-6334: It's impossible to update comment for the content after version revert
        - Restore association if it was removed in older document version.
        - Extend unit test.
       55221: MNT-6334: It's impossible to update comment for the content after version revert
        - Make corrections to the code.
        - Extend unit test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-16 10:53:10 +00:00
Andrew Hind
8f4c7de052 Fix for ALF-19234 : An Editor (probably also Collaborator) can take ownership of a document (probably also folders)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-11 13:34:48 +00:00
Pavel Yurke
d11310cea9 ALF-19234 : An Editor (probably also Collaborator) can take ownership of a document (probably also folders)
- Reverted r55167 since it cuases a lot of unit test failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-11 12:53:53 +00:00
Pavel Yurke
da112f3a33 Merged DEV to HEAD (4.2)
54623: ALF-19234: An Editor (probably also Collaborator) can take ownership of a document (probably also folders)
     - The new "ACL_ITEM" cad was implemented. Now we check TakeOwnership permission if cm:owner property is going to change when NodeService.addProperties(), NodeService.addAspect(), NodeService.setProperties(), NodeService.setProperty() methods were invoked. Also testTakeOwnershipPermission test was added to check if we can take document ownership through NodeService without appropriate permissions.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-10 10:11:58 +00:00
Derek Hulley
0d781560bf Fix ALF-19749: NodeService/CopyService interface changes breaks backwards compatibility with add-ons
- This maintains binary compatibility with extensions build before 4.2
 - e.g.  GOOGLEDOCS-235 Unable to deploy latest Google Docs Enterprise AMPs onto 4.2 (HEAD-QA) 
 - Reversed ALF-19217: NodeService and CopyService APIs return modified flags
   We are back to creating redundant versions when duplicate changes are made to data


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-27 11:12:54 +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