Commit Graph

5823 Commits

Author SHA1 Message Date
Alexandra Leahu
f8473165df Merged HEAD (5.1) to 5.1.N (5.1.1)
122540 adragoi: Merged DEV to HEAD (5.1)
      122252 ACE-5093 : Allow file content URLs to be generated by a provider
         - implemented TimeBasedFileContentUrlProvider,VolumeAwareFileContentUrlProvider  and test classes
      121979 ACE-5093 : Allow file content URLs to be generated by a provider
         - added deprecated annotation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-22 15:12:43 +00:00
Ancuta Morarasu
0689f35f52 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
122474 rneamtu: Merged DEV to 5.0.N (5.0.4)
      122425 rneamtu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - fixed cancel editing and delete failures


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 12:25:09 +00:00
Derek Hulley
c7c9bbf7f3 Increase the TTL for the property value cleaner to 1 hour (ACE-5153)
- Simplify the lock code because it's not iterative i.e. just lock and unlock


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122472 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 02:48:25 +00:00
Derek Hulley
d433d01b9f Request failure details from SQL execution in method 'PropertyValueDAOImpl.cleanupUnusedValues()' (ACE-5143)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122470 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 01:35:14 +00:00
Derek Hulley
509a828b43 Add option to propagate exceptions out during SQL execution, in order to detect failures (ACE-5143)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122469 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 01:33:19 +00:00
Derek Hulley
4b0293602c Add back missing code for MNT-12716 in order to address ACE-5143 correctly
- MNT-12716: 3.4 -> 4.2 Upgrade does not migrate locales of translated documents 
 - ACE-5143: CLONE - CleanAlfPropTables deleting more than it should
 - The move of the SQL execution framework to a ScriptExecutor seems to have dropped the feature allowing --ASSIGN to have a default value
 - Added back the feature
 - Added check of variable assignment with system message giving details e.g.
    Caused by: ... Variable assignment '--ASSIGN:PROP_DOUBLE_MAX_ID' produced no value. A default can be assigned e.g. '--ASSIGN:PROP_DOUBLE_MAX_ID!-1'. (line 80 of ...\CleanAlfPropTables.sql).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 01:24:25 +00:00
Ramona Neamtu
9d2679400f Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
122412 nsmintanca: MNT-15642 CLONE - Request to join a moderated site multiple times
      -added validation on backend to prevent multiple requests for joining a site
      -updated unit tests
      -added widget to display "Cancel request" button


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122427 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-18 12:51:10 +00:00
Ramona Neamtu
d7dd06fac3 Merged HEAD (5.1) to 5.1.N (5.1.1)
122265 slanglois: Merged 5.1.0 (5.1.0) to HEAD (5.1)
      122178 slanglois: Merged DEV/ACE-5111 to 5.1.0
         122171: ACE-5111 CMIS dictionary loading fails to resolve prefix for Smart Folders 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-17 12:01:10 +00:00
Ramona Neamtu
b335799e86 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
122280 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      122237 amukha: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
         122236 amukha: Merged AMUKHA/MNT-15509 (4.2.6) to V4.2.6 (4.2.6)
            122202 amukha: MNT-15509: Changing a Site from Private to Public duplicates permissions
               - Removed duplicate permissions for ScripNodes
               - Added JUnit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122341 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-17 11:41:40 +00:00
Ramona Neamtu
eb7bc51e00 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
122101 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      122078 amukha: MNT-15654: Un-sharing updates the modified properties of a file
         - Disabled audit during unshare.
         - Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-15 14:00:52 +00:00
Ramona Neamtu
6200e0675e Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
121772 amorarasu: Merged DEV to 5.0.N (5.0.4)
      120891 121263 amorarasu: MNT-14951: Using CMIS it is not possible to retrieve the secondary or the list of the parents of a folder
         - Changed getObjectParents() to return all the parents, not just the first one.
         - Added junit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121800 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-03 09:37:29 +00:00
Ramona Neamtu
ddb229c65c Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
121765 nsmintanca: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      121735 rneamtu: 121670: MNT-13814 : Using MS word Save As pdf does not work correctly.
         - Fixed failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121797 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-03 09:36:54 +00:00
Ramona Neamtu
704e64cfc0 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
121764 nsmintanca: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      121709 rneamtu: Merged DEV to V4.2-BUG-FIX (4.2.7)
         121670 rneamtu: MNT-13814 : Using MS word Save As pdf does not work correctly.
            - Added new mimetype "application/applefile" and set it for files that starts with "._"
            - Added new test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-03 09:36:42 +00:00
Raluca Munteanu
9f2d3441df Merged HEAD (5.1) to 5.1.N (5.1.1)
121650 sdinuta: CM-710: Merged from alfresco/BRANCHES/DEV/VF_REP_INT_51/root into/alfresco/HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-29 14:49:19 +00:00
Raluca Munteanu
8894536641 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
121659 abozianu: Merged DEV to 5.0.N (5.0.4)
      121643 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - fixed webscript error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121674 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-29 14:33:26 +00:00
Raluca Munteanu
46b53eb6c8 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
121619 mrogers: MNT-14860 - Unit test failure in CIFS Content Comparator for PPT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121671 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-29 14:32:32 +00:00
Raluca Munteanu
81128204c6 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
121496 arebegea: MNT-14409 : Unable to configure search filter for TAG/SITE via extension
      - Modified the SolrFacetConfig QName resolver to use the FacetQNameUtils that was also used when added a filter from Share
      - Had to move the FacetQNameUtils and the test class FacetQNameUtilsTest to repository project
      - Added the FacetQNameUtilsTest test to the AllUnitTestsSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-28 13:11:37 +00:00
Ramona Neamtu
8d05a12205 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120555: Merged DEV to 5.0.N (5.0.4)
      120544 rneamtu: MNT-13723 : Error message not clear, when de-activating a model dynamically deployed and content still exists.
         - Added externalized error message, generic for both delete and deactivate
         - Do not merge this forward, it will be merged manually
   120572: MNT-13723 : Error message not clear, when de-activating a model dynamically deployed and content still exists.
      - Fixed failing tests
      - Do not merge this forward, it will be merged manually

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121494 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-27 09:58:37 +00:00
Alex Mukha
a9f5ced0c4 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
121273 amukha: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4) (PARTIAL MERGE)
      121272 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
         121271 amukha: MNT-15543: CLONE - Remote access via JMX should be disabled by default
            - Added additional bean configuration to fully disable RMI by default.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121275 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-21 18:53:50 +00:00
Ancuta Morarasu
6471ae8b38 Merged HEAD (5.1) to 5.1.N (5.1.1)
120966 jkaabimofrad: ACE-4994: Removed the local cache to avoid issues when updating the custom model in a clustered env.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120982 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-18 09:37:15 +00:00
Ancuta Morarasu
1de7d64a22 Merged HEAD (5.1) to 5.1.N (5.1.1)
120912 jkaabimofrad: ACE-4924: Added a patch to ensure 'cm: extensions' and 'cm: module-deployments' folders within the surf-config folder exists, then adds the ALFRESCO_MODEL_ADMINISTRATORS Group to their Permission list.
    - Also, added ALFRESCO_MODEL_ADMINISTRATORS to the permission list for surf-config folders (i.e. cm:extensions and cm: module-deployments) created on bootstrap of a new install.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120979 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-18 09:35:31 +00:00
Ancuta Morarasu
1311c3af3a Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120957 rneamtu: Merged NESS/5.0.N-2016-01-05/ (5.0.4) to 5.0.N (5.0.4)
      120843: MNT-14386 : renditionService.render method is creating a temporary file in User's trashcan
         - Added temporary aspect on temporary rendition before delete it
      120927: MNT-14386 : renditionService.render method is creating a temporary file in User's trashcan
         - Added a test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120969 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-18 09:23:41 +00:00
Ancuta Morarasu
480038998d Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120952 aleahu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      120889 amukha: Merged AMUKHA/MNT-15398 (4.2.6) to V4.2-BUG-FIX (4.2.6)
         120887 amukha: MNT-15398: Supportability - warn about MS-SQL server mis-configuration
            - Added a check for the db.txn.isolation to be set to 4096 for the MS SQL Server dialect.
            - Used the message bundle for all logger messages.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120968 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-18 09:22:29 +00:00
Alexandra Leahu
4e38d63177 Merged HEAD (5.1) to 5.1.N (5.1.1)
120786 amukha: Merged AMUKHA/PLAT-HEAD-2016-01-11 (5.1) to HEAD (5.1)
      120772 amukha: ACE-4909: [Win 10, Chrome] - Site Members: Searching users with two chars results in wrapped exception
         - Added a check if the tenant is disabled;
         - Added JUnit test for disabled tenant and for deleted tenant.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120848 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-13 14:49:36 +00:00
Alexandra Leahu
c79dab110c 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/BRANCHES/DEV/5.1.N/root@120821 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-13 14:15:38 +00:00
Derek Hulley
3a7941d473 Fixed code warnings
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-11 14:16:30 +00:00
Alexandra Leahu
05a0978f56 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120675 dungureanu: Merged DEV to 5.0.N (5.0.4)
      120674 dungureanu: MNT-14922: Workflow console's user command is case sensitive
         - Look up the correct user, throw error if not found. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120715 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-11 13:39:52 +00:00
Cristian Turlica
6785aa607d Merged HEAD (5.1) to 5.1.N (5.1.1)
120465 ahind: Fix for     ACE-4900  "java.lang.IllegalArgumentException: bound must be positive" in DynamicSolrStoreMappingWrapperFactory
   - improved logging and fallback options


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-08 12:50:49 +00:00
Cristian Turlica
78f1f3108c Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120517 nsmintanca: Merged NESS/5.0.N-2016-01-05 (5.0.4) to 5.0.N (5.0.4)
      120487: MNT-14958: User cannot create public/public moderated site after set site.public.group to group id does not begin with 'GROUP_'   
         MNT-14958: User cannot create public/public moderated site after set site.public.group to group id does not begin with 'GROUP_'
         -added check and exception threat for  double-prefixed authorities
         -added unit test
         -formatted code; removed tabs
          
         


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120593 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-08 12:26:45 +00:00
Natalia Smintanca
909823a936 Merged HEAD (5.1) to 5.1.N (5.1.1)
120229 rdina: ACE-4836 Modifications on the FileInfoPropsComparator class so that it takes into account the IS_FOLDER attribute, which is not among the properties. Added FileInfoComparatotTest class.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120378 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-18 13:03:25 +00:00
Alan Davis
d67de89729 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120335 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      120325 cturlica: MNT-15399: Need to be able to turn off vulnerable classes bootstrap check
         - new alfresco global property added (default is true): unserializer.validator.enabled


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120340 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-18 06:50:00 +00:00
Ramona Neamtu
a2c245e353 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120179 amorarasu: Merged DEV to 5.0.N (5.0.4)
      120074 nabacioaiei: MNT-15252 : Any repository amp having set module.repo.version.min=5.0.2.1 cannot be applied to an Alfresco One 5.0.2.1 instance.
         - modified ModuleDetailsImpl to ignore version.label(if it exists) from module.repo.version.min and module.repo.version.max and log a warning.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120259 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-16 09:33:59 +00:00
Andreea Dragoi
884bb19489 Merged HEAD (5.1) to 5.1.N (5.1.1)
120082 bhorje: ACE-4845 added definition retrieval transaction enforcement and denial of unauthenticated virtualization


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 14:28:20 +00:00
Andreea Dragoi
12b52aeed3 Merged HEAD (5.1) to 5.1.N (5.1.1)
119950 jphuynh: 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/BRANCHES/DEV/5.1.N/root@120197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 14:24:30 +00:00
Andreea Dragoi
2c82c256cb Merged HEAD (5.1) to 5.1.N (5.1.1)
119945 jphuynh: 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/BRANCHES/DEV/5.1.N/root@120192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 13:26:39 +00:00
Ramona Neamtu
db6475fae6 Merged HEAD (5.1) to 5.1.N (5.1.1)
119838 gjames: ACE-4855: Added @AlfrescoPublicApi to AbstractModuleComponent and ImporterModuleComponent


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120172 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 12:53:26 +00:00
Ramona Neamtu
72b9e58ee9 Merged HEAD (5.1) to 5.1.N (5.1.1)
119739 mcozma: ACE-4715 Severe degradation of performance when opening a semi virtual folder root 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 12:36:06 +00:00
Ramona Neamtu
04fd7e80f4 Merged HEAD (5.1) to 5.1.N (5.1.1)
119738 mcozma: ACE-4715 Severe degradation of performance when opening a semi virtual folder root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 12:35:55 +00:00
Ramona Neamtu
4962ffe47c Merged HEAD (5.1) to 5.1.N (5.1.1)
119733 bhorje: ACE-4752 dynamic type filter creation - fixed invalid or missing namespace bug


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 12:35:44 +00:00
Ramona Neamtu
c1cb1a43b2 Merged HEAD (5.1) to 5.1.N (5.1.1)
119732 sdinuta: ACE-4795: Adding as favorite a folder/file in virtual context doesn't work as expected


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120166 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 12:33:47 +00:00
Natalia Smintanca
0b95d698a8 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120046 abozianu: Merged DEV to 5.0.N (5.0.4)
      117528 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - added a new aspect for cmis checked out documents : ASPECT_CMIS_CHECKEDOUT
      118441 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - changed aspect name from ASPECT_CMIS_CHECKEDOUT to ASPECT_CMIS_CREATED_CHECKEDOUT
      118775 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - fixed commit error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120109 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:21:09 +00:00
Natalia Smintanca
03deaa808f 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/BRANCHES/DEV/5.1.N/root@120108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:16:35 +00:00
Natalia Smintanca
4dbb27041f Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120071 rmunteanu: Merged 5.0.3 (5.0.3) to 5.0.N (5.0.4)
      119848 adragoi: Merged DEV to 5.0.3 (5.0.3)
         119808 adragoi: MNT-15338 : CMIS get object by path only shows the working copy file and not the original file
            - reverted commits related to "Ghost versions when Document is created with CheckinType CHECKOUT" stask :  
            100772 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
               100260: MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                  - Fix for tests failures
            100824 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
               100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                  100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                     99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                        - Don't include PWC in a version series
                     99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                        - Return PWC as a part of version series. Fixes to pass TCK
            100837 : Fix another merge issue as a result of a re factor that has taken place in 5.0
               Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                     100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                        99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                           - Don't include PWC in a version series
                        99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                           - Return PWC as a part of version series. Fixes to pass TCK
            101404 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
               101273: Merged DEV to V4.2-GUB-FIX (4.2.5)
                  100792 : MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                     - Added init-method for CMISConnector. Test is added
            101597 : Merged DEV to 5.0.N (5.0.2)
               101560 : MNT-13813 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                  - Fix to test failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120106 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:15:04 +00:00
Natalia Smintanca
e2d50154b5 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120045 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119806 gjames: MNT-15211 Re-enabled the non-auditable test, and corrected the createnode.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:10:27 +00:00
Natalia Smintanca
5e1515a7e8 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120042 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119705 gjames: MNT-15211 Restoring data from Trashcan with MySQL Cluster NDB backend doesn’t work


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120102 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:09:13 +00:00
Natalia Smintanca
1f479a1c88 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120041 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119608 gjames: MNT-15211 Restoring data from Trashcan with MySQL Cluster NDB backend doesn’t work


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120101 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:08:27 +00:00
Raluca Munteanu
fcc7d9bb1e Merged HEAD (5.1) to 5.1.N (5.1.1)
119729 bhorje: ACE-4804 forced read permission on allowed for read-only (due to missing filing path) virtual nodes  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120078 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-11 09:44:48 +00:00
Raluca Munteanu
c62d655585 Merged HEAD (5.1) to 5.1.N (5.1.1)
119697 bhorje: ACE-4744 javadoc and cleanup


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120076 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-11 09:41:45 +00:00
Raluca Munteanu
18966e394e Merged HEAD (5.1) to 5.1.N (5.1.1)
119689 mward: ACE-4765: fixed "schema comparison tool" XML parsing bug.
   Element text content was being trimmed, in sax parser's characters(...) method - but this method may be called multiple times with chunked data (due to buffering) and trim should not be applied until after the entire text has been parsed for that element.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119753 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-08 09:53:11 +00:00
Raluca Munteanu
5148eed78e Reverse merged 5.1.N (5.1.1)
119707 rmunteanu: Merged HEAD (5.1) to 5.1.N (5.1.1)
            119689 mward: ACE-4765: fixed "schema comparison tool" XML parsing bug.
            Element text content was being trimmed, in sax parser's characters(...) method - but this method may be called multiple times with chunked data (due to buffering) and trim should not be applied until after the entire text has been parsed for that element.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119752 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-08 09:46:59 +00:00