Commit Graph

14 Commits

Author SHA1 Message Date
Alan Davis
84841e063f Merged 5.2.N (5.2.1) to HEAD (5.2)
125788 rmunteanu: 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/HEAD/root@127810 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 17:08:06 +00:00
Alan Davis
91eb2644ad Merged 5.2.N (5.2.1) to HEAD (5.2)
125781 rmunteanu: 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/HEAD/root@127808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:40:56 +00:00
Jean-Pierre Huynh
e7411917d5 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119722 mrogers: Merge Activiti update ACE-1636


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:38:08 +00:00
Mark Rogers
030405dcb8 Rollback 118791 - ACE-1636
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118833 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-30 11:07:44 +00:00
Mark Rogers
441a1f4ae4 Merged ACE-1636 to HEAD update to Activiti 5.19.0
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118791 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-27 15:59:58 +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
4c2947f897 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94076: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94047: MNT-12705 : Cannot upgrade Xalan to 2.7.2 because DbObjectXMLTransformerTest fails
         - Test has been changed according to new SAXTransformer behavior


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95040 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:31:42 +00:00
Alan Davis
0fc76cf7ca Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94042: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94000: Merged DEV to 5.0.N (5.0.1)
         91309,91311 : MNT-12705 : Cannot upgrade Xalan to 2.7.2 because DbObjectXMLTransformerTest fails
            - Put STANDALONE to transformet to force newline after xml declaration. pox.xml dependency is changed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95035 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:30:47 +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
bfa69dcca9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58807: Categorised some more tests, less experimentation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62037 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:13:59 +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
436dfd3bfc Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58572: Added some tests to the own Jvm category


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:50:03 +00:00
Alan Davis
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
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