Commit Graph

5921 Commits

Author SHA1 Message Date
Alexandru Epure
abc10a475e Merged 5.2.N (5.2.1) to HEAD (5.2)
128176 adavis: MNT-16381 Transformers must validate the content stream mimetype
      - Tika has problems identifying eps - it guesses ps, so allow this through.
      - Fix lost line in DifferrentMimeTypeTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129273 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 13:22:25 +00:00
Alexandru Epure
618ac2c7fe Merged 5.2.N (5.2.1) to HEAD (5.2)
128168 adavis: MNT-16381 Transformers must validate the content stream mimetype
      - Addition of AbstractContentTransformer2.strictMimeTypeCheck(...) to check that the
        declared mimetype is the same as the Tika derived mimetype. Controlled by a new alfresco
        global property content.transformer.strict.mimetype.check (set to true by default).
      - Added the UnsupportedTransformationException to a number of transformation callers as
        they should have been handling it already.
      - Modified DifferrentMimeTypeTest to test the new strictMimeTypeCheck.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129272 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 13:22:16 +00:00
Alexandru Epure
37cb92c8d6 Merged 5.2.N (5.2.1) to HEAD (5.2)
128144 rneamtu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128140 cpopa: MNT-14026: LDAP sync fails to update attribute's value deletion
         - Update to null, the node properties for which the corresponding LDAP attribute is missing.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129271 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 13:22:05 +00:00
Jan Vonka
d5cf631d22 Merged 5.2.N (5.2.1) to HEAD (5.2)
128780 jvonka: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128778 jvonka: Merged 5.1.0 (5.1.0.10) to 5.1.N (5.1.2)
         128763 jvonka: Fix missed import in merge (MNT-16538, MNT-16446).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@128782 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-14 10:22:01 +00:00
Jan Vonka
4d4bef068a Merged 5.2.N (5.2.1) to HEAD (5.2)
128779 jvonka: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128777 jvonka: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         128747 jvonka: MNT-16538: compensate for Media Management bean override (commentService) 
         - MNT-16446: Edit Comment permission


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@128781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-14 10:21:38 +00:00
Jan Vonka
3a4df907df Merged 5.2.N (5.2.1) to HEAD (5.2)
128387 jvonka: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128382 jvonka: MNT-16446: Edit Comment permission (part 3b) 
      - follow-on to fix test fallout
      - for CMIS (and future v1 Nodes REST)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@128731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-12 12:01:03 +00:00
Jan Vonka
4d06aafac8 Merged 5.2.N (5.2.1) to HEAD (5.2)
128386 jvonka: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128375 jvonka: MNT-16446: Edit Comment permission (part 3) 
      - for CMIS (and also future v1 Nodes REST API)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@128730 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-12 12:00:37 +00:00
Alan Davis
9f341cc361 Reverse Merge WITHOUT mergeinfo a commit that was merged to HEAD via API-STRIKES-BACK and 5.2.N!
127890 Merged 5.2.N (5.2.1) to HEAD (5.2)
      127465 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
         127454 jkaabimofrad: MNT-16224, RA-1093: Fixed Quickshare issue where deleting a shared node didn't remove the 'shared' aspect. The fix also takes care of the shared nodes that have been deleted but not yet restored, as well as, shared nodes that have already been restored from the trashcan (allow the user to un-share).
   - ENDED UP WITH DUPLICATE CODE ALREADY MERGED BY:
      127615 Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
         127462 jkaabimofrad: Merged 5.1.N (5.1.2) to API-STRIKES-BACK (5.2.0)
            127454 jkaabimofrad: MNT-16224, RA-1093: Fixed Quickshare issue where deleting a shared node didn't remove the 'shared' aspect. The fix also takes care of the shared nodes that have been deleted but not yet restored, as well as, shared nodes that have already been restored from the trashcan (allow the user to un-share).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127898 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 10:56:02 +00:00
Alan Davis
5418e7dcc1 Merged 5.2.N (5.2.1) to HEAD (5.2)
127483 aleahu: MNT-16224, RA-1093: Fixed compilation issue that occurred during merge (methods were already present in the 5.2.N branch)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127891 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:26:06 +00:00
Alan Davis
317e59e2ef Merged 5.2.N (5.2.1) to HEAD (5.2)
127465 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127454 jkaabimofrad: MNT-16224, RA-1093: Fixed Quickshare issue where deleting a shared node didn't remove the 'shared' aspect. The fix also takes care of the shared nodes that have been deleted but not yet restored, as well as, shared nodes that have already been restored from the trashcan (allow the user to un-share).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127890 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:26:00 +00:00
Alan Davis
282bdf0449 Merged 5.2.N (5.2.1) to HEAD (5.2)
127399 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127377 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         127306 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            127272 arebegea: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
               127195 cpopa: MNT-14453 : Deleting tag using TaggingService.deleteTag() causes issue where no more tags can be added to node
                  - Amended TaggingService.deleteTag() so as to remove references to a tag before being deleted. 
                  - Added 'nodeService.exists(beforeNodeRef)' checks in TaggingService.updateTags in order to protect against InvalidNodeRefException which may be thrown on nodes that still have references to tags deleted using the  current(incorrect) implementation of TaggingService.deleteTag() 
                  - Created DOCS-2060 in order document the manual procedure of tag scope refresh.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127888 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:25:48 +00:00
Alan Davis
9379b1720a Merged 5.2.N (5.2.1) to HEAD (5.2)
127393 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127370 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         127309 aleahu: MNT-14332 : Alfresco stops working when Type Hierarchy creates a circular reference
            - added validation to check if circular dependency was introduced when a new namespace is imported


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127885 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:25:30 +00:00
Alan Davis
702c88f8fb Merged 5.2.N (5.2.1) to HEAD (5.2)
127361 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127307 cturlica: Merged 5.1.0 (5.1.0.6) to 5.1.N (5.1.2)
         127235 cturlica: MNT-16292: Unzipped files which have folders do not get the cm:titled aspect applied
            - updated ImporterActionExecuter to add titled aspect
            - added test case for change and refactored test class


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127883 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:25:16 +00:00
Alan Davis
2fbd64cda1 Merged 5.2.N (5.2.1) to HEAD (5.2)
127288 cturlica: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127263 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         127236 dungureanu: MNT-15149 : Rule set with "Rule applied to subfolder" also applies to a comment node.
            - added fm:post into ignored types list
            - externalised list into the spring config 
            - created test for ignored types


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127878 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:22:12 +00:00
Alan Davis
620e24ef29 Merged 5.2.N (5.2.1) to HEAD (5.2)
127287 cturlica: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127262 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         127234 cpopa: MNT-16063 : Activiti workflows without userTask does not work
            - Prevent tasks retrieval from finished executions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127877 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:22:05 +00:00
Alan Davis
2fe43c3c6b Merged 5.2.N (5.2.1) to HEAD (5.2)
127252 arebegea: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127217 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         127179 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            127119 adragoi: MNT-16270 : Audit logger org.alfresco.repo.audit.inbound fails to log inbound auditable values
               - checked inboundLogger level value on areAuditValuesRequired() method


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127874 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:21:46 +00:00
Alan Davis
db287e9c24 Merged 5.2.N (5.2.1) to HEAD (5.2)
127160 cturlica: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127134 cturlica: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         127102 rmunteanu: MNT-15614 : Site with name "IT" cannot be managed properly
            - Changed the way the role name is striped out.
            - Implemented tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127868 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:21:06 +00:00
Alan Davis
3bf3914916 Merged 5.2.N (5.2.1) to HEAD (5.2)
127124 cturlica: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127078 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         127046 amorarasu: MNT-16277: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            126884 amorarasu: MNT-15710: No invalid synchronizations should appear in the cloud sync manager (step 2 - clean invalid synchronizations already created).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127867 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:20:59 +00:00
Alan Davis
a84bf314e3 Merged 5.2.N (5.2.1) to HEAD (5.2)
127122 cturlica: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127075 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         127055 gjames: MNT-16259, MNT-16265. Adding a patch to cleanup the admin user default password.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127866 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:20:53 +00:00
Alan Davis
6131b34ad2 Merged 5.2.N (5.2.1) to HEAD (5.2)
127010 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126675 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         126654 amukha: MNT-16272: User usages prevent some CMIS sessions from starting under load
            - Removed JobLock from RepoUsageComponent.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127861 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:19:01 +00:00
Alan Davis
9e72f69203 Merged 5.2.N (5.2.1) to HEAD (5.2)
126999 amorarasu: Update source headers - add new Copyrights for new Java files synced from Head (fix for part 2).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127855 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:17:18 +00:00
Alan Davis
a093515b79 Merged 5.2.N (5.2.1) to HEAD (5.2)
126997 amorarasu: Update source headers - add new Copyrights for new Java files synced from Head (part 2).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127853 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:10:06 +00:00
Alan Davis
6a9304a691 Merged 5.2.N (5.2.1) to HEAD (5.2)
126244 adragoi: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126126 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         126091 gjames: MNT-16161: Updated the javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127848 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:09:30 +00:00
Alan Davis
4f30a54465 Merged 5.2.N (5.2.1) to HEAD (5.2)
126098 amukha: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126058 jkaabimofrad: ACE-5001: Added a utility class to calculate the number of days between the start and end dates, so we could have a single source when dealing with such functionality. Also, changed the RepoUsageComponentImpl class to use this util class.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127841 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:35:08 +00:00
Alan Davis
412d05e36a Merged 5.2.N (5.2.1) to HEAD (5.2)
126063 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126025 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125910 rmunteanu: MNT-15553 : Inconsistent search result with .eml files.
            - Fix transformation for eml files containing nested alternative parts.
            - Added test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127840 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:35:01 +00:00
Alan Davis
1ee2b7c45d Merged 5.2.N (5.2.1) to HEAD (5.2)
126008 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125935 aleahu: MNT-16155 : Change source headers to new version
         - fixed more license headers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127838 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:34:49 +00:00
Alan Davis
6f41025dda Merged 5.2.N (5.2.1) to HEAD (5.2)
126007 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125933 aleahu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125907 mward: ACE-5052: close PrintWriter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127837 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:34:43 +00:00
Alan Davis
ce5a675361 Merged 5.2.N (5.2.1) to HEAD (5.2)
126004 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125892 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125842 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) (PARTIAL MERGE)
            125700 adavis: Merged V4.2.5 (4.2.5.7) to V4.2-BUG-FIX (4.2.7)
               125698: Merged DEV to V4.2.5 (4.2.5.7)
                  125677 arebegea: MNT-15219 : Excel (.xlsx) containing xmls (shapes/drawings) with multi byte characters may cause OutOfMemory in Tika
                     - Should not have updated version.properties as the original commit needs to be merged forwards.,
               125696: Merged DEV to V4.2.5 (4.2.5.7)
                  125677 arebegea: MNT-15219 : Excel (.xlsx) containing xmls (shapes/drawings) with multi byte characters may cause OutOfMemory in Tika
                     - Modified tika parser and tika core jars to allow some configuration parameters to be sent from Alfresco side using the metadata map parameter
                     - Excluded by default the parsing of drawings/shapes xmls because there was little valuable data that could be extracted from those xmls


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127835 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:34:29 +00:00
Alan Davis
640535fd09 Merged 5.2.N (5.2.1) to HEAD (5.2)
126003 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125891 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125841 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            125680 sglover: Merged BRANCHES/DEV/SG/MNT15914 to V4.2-BUG-FIX (4.2.7)
                  125540 sglover MNT-15914 "Add multi-threaded workers for FixedAclUpdater"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127834 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:34:20 +00:00
Alan Davis
61837639c8 Merged 5.2.N (5.2.1) to HEAD (5.2)
125866 adragoi: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125833 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125718 cpopa: MNT-15160 : Unable to transform DWT/XLAM files to JPEG
               - Disabled ImageMagick support for DWT mimetype


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127825 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 12:45:41 +00:00
Alan Davis
e3b9a10990 Merged 5.2.N (5.2.1) to HEAD (5.2)
125865 adragoi: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125832 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125670 abalmus: MNT-16188 : [Kerberos] Users Search doesn't work
            MNT-15038 : Unexpected behavior when disabling Active Directory user (New feature to sync userAccountControl)
               - Fixed NPE in AuthenticationServiceImpl.getAuthenticationEnabled (I guess sometimes the PersonService bean is not injected)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127824 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 12:45:34 +00:00
Alan Davis
9221d7a08b Merged 5.2.N (5.2.1) to HEAD (5.2)
125859 adragoi: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125817 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125673 abalmus: MNT-15421 : Intermittent failure SubsystemsTest.testAbstractPropertyBackedBean_performEarlyPropertyChecks_PortEarlyPropertyChecker
            - Fixed intermittently failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127820 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 11:01:10 +00:00
Alan Davis
b13e0dc4c4 Merged 5.2.N (5.2.1) to HEAD (5.2)
125798 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125734 rmunteanu: MNT-16201 : Failing test: AJExtensionsCompileTest
         - Fixed failing tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127819 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 11:01:03 +00:00
Alan Davis
92da0aaddd Merged 5.2.N (5.2.1) to HEAD (5.2)
125797 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125702 mward: ACE-5052: backed out r125594:125595
      Closing the file results in the channel being closed, so we can't do that.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127818 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 11:00:57 +00:00
Alan Davis
1ad1f74dc8 Merged 5.2.N (5.2.1) to HEAD (5.2)
125793 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125629 abalmus: MNT-15038 : Unexpected behavior when disabling Active Directory user (New feature to sync userAccountControl)
         - Fixed build on 5.1.N (Plat) due to new license header plugin checks (updated headers to the 3 new files)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127814 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 11:00:31 +00:00
Alan Davis
b4576ce3ca Merged 5.2.N (5.2.1) to HEAD (5.2)
125792 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125621 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125577 abalmus: MNT-15038 : Unexpected behavior when disabling Active Directory user (New feature to sync userAccountControl)
            - Implemented new requirements and tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127813 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 11:00:24 +00:00
Alan Davis
bd2cf2c35d Merged 5.2.N (5.2.1) to HEAD (5.2)
125790 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125618 rmunteanu: MNT-16155 : Change source headers to new version
         - fixed more license headers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127812 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 11:00:15 +00:00
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
12769c2923 Merged 5.2.N (5.2.1) to HEAD (5.2)
125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:45:04 +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
Alan Davis
6a300d8dd7 Merged 5.2.N (5.2.1) to HEAD (5.2)
125780 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125602 adragoi: MNT-16175 : CLONE - Time Consumed for Updating Folder Permission
         - added setInheritParentPermissions implementation to fix compilation error 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:12:21 +00:00
Alan Davis
cca0b3eb91 Merged 5.2.N (5.2.1) to HEAD (5.2)
125779 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125597 mward: ACE-5052: close stream


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127806 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:12:16 +00:00
Alan Davis
c8bb6ae44a Merged 5.2.N (5.2.1) to HEAD (5.2)
125778 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125596 mward: ACE-5052: added comment regarding close() expectations.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:12:10 +00:00
Alan Davis
a4bd3de5c5 Merged 5.2.N (5.2.1) to HEAD (5.2)
125777 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125595 mward: ACE-5052: close file


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127804 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:12:04 +00:00
Alan Davis
3bc4a6b0fe Merged 5.2.N (5.2.1) to HEAD (5.2)
125776 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125594 mward: ACE-5052: close file


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127803 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:11:58 +00:00
Alan Davis
a1f642e420 Merged 5.2.N (5.2.1) to HEAD (5.2)
125775 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125593 mward: ACE-5052: close stream


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127802 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:11:53 +00:00
Alan Davis
6310574263 Merged 5.2.N (5.2.1) to HEAD (5.2)
125773 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125591 mward: ACE-5052: close FileInputStream


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127800 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:11:42 +00:00
Alan Davis
c89f1f5315 Merged 5.2.N (5.2.1) to HEAD (5.2)
125772 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125587 mward: ACE-5052: close spring application context in FTPServerBean


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127799 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:11:36 +00:00
Alan Davis
4ca7800805 Merged 5.2.N (5.2.1) to HEAD (5.2)
125771 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125586 mward: ACE-5052: close spring application context in CIFSServerBean


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:11:30 +00:00
Alan Davis
c952c8d8b9 Merged 5.2.N (5.2.1) to HEAD (5.2)
125767 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125473 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125055 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) (PARTIAL MERGE)
            124999 adragoi: Merged DEV to V4.2-BUG-FIX (4.2.7)
               124402 adragoi: MNT-15368 : Time Consumed for Updating Folder Permission
                  - implemented an approach that uses a separate, asynchronous processes that sets fixed ACL's


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127794 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:11:08 +00:00