20 Commits

Author SHA1 Message Date
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
Alan Davis
17456b8100 Reverse the reverse merge now that the problem has been fixed on HEAD-BUG-FIX
55059: Fix Build: Reverse Merged
      << Think issue is just from 55012, but not taking the chance. Left the wrong commit r54935 on HEAD-BUG-FIX. I misread 54935 as 54635 >>
      55006: Merged HEAD-BUG-FIX to HEAD (4.2)
         54919: MNT-9571: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
            54377: MNT-9090 "CMIS: Integer overflow in properties": checks for overflow + tests
      55012: Merged HEAD-BUG-FIX to HEAD (4.2)
         54933: MNT-9574: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
            54635: Merged DEV to HEAD-QA (4.1.N)
               MNT-9089 : CMIS: Missing boundaries for integer and long values
                  - Adding default constrains for Integer and Long CMIS PropertyDefinitions. Adding Test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55079 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-08 07:33:28 +00:00
Alan Davis
5a6bee26b8 Fix Build: Reverse Merged
<< Think issue is just from 55012, but not taking the chance. Left the wrong commit r54935 on HEAD-BUG-FIX. I misread 54935 as 54635 >>
   55006: Merged HEAD-BUG-FIX to HEAD (4.2)
      54919: MNT-9571: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
         54377: MNT-9090 "CMIS: Integer overflow in properties": checks for overflow + tests
   55012: Merged HEAD-BUG-FIX to HEAD (4.2)
      54933: MNT-9574: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
         54635: Merged DEV to HEAD-QA (4.1.N)
            MNT-9089 : CMIS: Missing boundaries for integer and long values
               - Adding default constrains for Integer and Long CMIS PropertyDefinitions. Adding Test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55059 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-06 15:21:04 +00:00
Alan Davis
281525308a Merged HEAD-BUG-FIX to HEAD (4.2)
54933: MNT-9574: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
      54635: Merged DEV to HEAD-QA (4.1.N)
         MNT-9089 : CMIS: Missing boundaries for integer and long values
            - Adding default constrains for Integer and Long CMIS PropertyDefinitions. Adding Test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55012 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-06 07:13:36 +00:00
Alan Davis
8ade4cb3f9 Merged HEAD-BUG-FIX to HEAD (4.2)
54919: MNT-9571: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
      54377: MNT-9090 "CMIS: Integer overflow in properties": checks for overflow + tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55006 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-06 07:09:52 +00:00
Derek Hulley
a6647f3b8b Fomatting in passing
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54868 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-03 20:41:40 +00:00
Derek Hulley
8fa8216fef Merged DEV to HEAD:
54373: MNT-2641 : User can delete or move a working copy
   54469: Compilation fix for MNT-2641 test
   54470: Removed thousands of tabs
   54523: Fixed ALF-19843: Integrity checking does not enforce mandatory aspects on aspects
   54525: Pull IntegrityChecker properties into property file (ALF-19843)
   54527: Fixed Eclipse warning about potentially unclosed file
   54528: Prevent cm:workingcopy aspect from being removed directly (MNT-2641)
   54529: Nail down behaviour around cm:workingcopy


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-02 17:45:26 +00:00
Neil McErlean
d6c28d0f2f Fixing a typo in test code. I accidentally put two @Rule annotations in when there only should have been one.
For the record, I think the presence of two of these @Rule annotations would mean that all @Test methods in this class would run inside *two* RunAs blocks instead of one. So wrong, but shouldn't have caused any problems.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-02 13:23:28 +00:00
Matt Ward
6ba121eb00 Merged BRANCHES/DEV/HEAD-BUG-FIX to HEAD:
54579: ALF-19785: Deadlock during build



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-02 07:52:11 +00:00
Alex Mukha
3fac82be1f ALF-15547 : Stack specific:Incorrect work of My Activities dashlet
Corrected the JUnit test.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54685 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-30 07:29:14 +00:00
Alex Mukha
da82e884f9 ALF-15547 : Stack specific:Incorrect work of My Activities dashlet
Fixed formatting in FeedNotifierTest.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-29 15:14:47 +00:00
Alex Mukha
c6bcff73df Merged DEV to HEAD (4.2)
54389: ALF-15547 : Stack specific:Incorrect work of My Activities dashlet
   Added a check for siteNetwork to be null in activity feed entry.
   Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54663 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-29 15:08:20 +00:00
Neil McErlean
9fbba5a5e0 Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:
54638: As part of work investigating ALF-19783 I have created a test case. I'm checking this in on 4.1 bugfix (where the issue is not reported)
Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:
   54640: (RECORD ONLY) (Part of prep work for ALF-19783) Moving a test class to the correct source tree.

Note that in doing the record-only merge above, the file ScriptNodeTest had been created on V4.1-BUG-FIX *and* on HEAD independently.
So I got a tree conflict in merging 54640 to HEAD as this attempted to svn mv ScriptNodeTest on top of HEAD's existing copy of that file.
So instead, I manually resolved the conflict by merging the two files.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54646 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-29 13:15:35 +00:00
Neil McErlean
6bc9570f65 Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:
54639: As part of work on ALF-19783, I have added support for versioned nodes to the TemporaryNodes JUnit rule.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54641 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-29 12:51:34 +00:00
Derek Hulley
859d4b9ce4 Fix tearDown code for UsageTestSuite classes
- Ensure that we either commit (successfully) or do rollback
 - Added leaked transaction detection to tests
 - ALF-19787: RED BUILD: Build repeatedly hanging in UsageTestSuite 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-28 14:41:04 +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
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
Matt Ward
6ee97b2625 ALF-19779: Stack specific: Caches are no synchronized between the nodes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54391 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-22 09:21:17 +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