Commit Graph

482 Commits

Author SHA1 Message Date
Alan Davis
35bcbde97d MNT-16381 Transformers must validate the content stream mimetype
- Ensure error when indexer is the caller includes the file name rather than null.
     NodeContentGet now calls transform method with TransformationOptions parameter and the original
     transformer method was deprecated as it should be been when this extra parameter was added.
   - Set the strictMimeTypeCheck and retryTransformOnDifferentMimeType properties on dynamically created
     pipeline and fail over transformers from global properties as is don for static transformers.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128569 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-04 16:37:13 +00:00
Martin Muller
88818dca9a Fixed some javadoc errors. REPO-466
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128510 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-01 08:34:26 +00:00
Alan Davis
bf346dba70 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/BRANCHES/DEV/5.2.N/root@128176 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-16 15:23:07 +00:00
Alan Davis
60a8b718bc 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/BRANCHES/DEV/5.2.N/root@128168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-15 16:11:15 +00:00
Alexandra Leahu
5ffc53461d 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/BRANCHES/DEV/5.2.N/root@126063 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-04 12:38:32 +00:00
Alexandra Leahu
a2a1443cd1 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/BRANCHES/DEV/5.2.N/root@126008 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-29 11:37:57 +00:00
Alexandra Leahu
fc20674988 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/BRANCHES/DEV/5.2.N/root@126004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-29 11:36:11 +00:00
Andreea Dragoi
7aafbaccd2 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/BRANCHES/DEV/5.2.N/root@125866 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-27 12:30:06 +00:00
Raluca Munteanu
5ad2a0e334 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/BRANCHES/DEV/5.2.N/root@125797 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 14:21:57 +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
dc6b2852d0 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/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:03:25 +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
Raluca Munteanu
21563c3946 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/BRANCHES/DEV/5.2.N/root@125779 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:19:38 +00:00
Raluca Munteanu
118bed4ed5 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/BRANCHES/DEV/5.2.N/root@125778 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:19:23 +00:00
Raluca Munteanu
2938c9620a 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/BRANCHES/DEV/5.2.N/root@125777 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:19:08 +00:00
Raluca Munteanu
90b0d1072e 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/BRANCHES/DEV/5.2.N/root@125776 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:18:54 +00:00
Raluca Munteanu
fd071daef2 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/BRANCHES/DEV/5.2.N/root@125775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:18:32 +00:00
Andreea Dragoi
5d13806c7e Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124313 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124244 abalmus: MNT-15497 : Keyword tags generated from metadata extraction are formed into a single string rather than split on delimiter
         - Fixed tag separation on delimiter
         - Enhanced existing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124364 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-22 14:32:10 +00:00
Ancuta Morarasu
d20141eb13 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124145 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124106 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124105 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
            123915 rmunteanu: Merged V4.1.7 (4.1.7.18) to V4.1-BUG-FIX (4.1.11)
               MNT-15801 : onContentUpdate policies not working for updates via webdav
                  - Reverted changes made for MNT-11185 and MNT-10966 , reverts that will fix MNT-15746
                  - Changed fix for MNT-5882 by adding the ASPECT_NO_CONTENT after the content is updated, this way preventing MNT-10966 from reproducing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124228 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:50:49 +00:00
Alan Davis
d945d8d955 Merged 5.1.N (5.1.1) to HEAD (5.2)
123502 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      123484 adavis: MNT-14295 TransformerConfigLimits Behavior Differs on Java 7 vs 8
         - Fixed TransformerPropertyNameExtractor so that it discarded limit or
           max properties if its sibling max or limit value is supplied and has
           a lower value (i.e. it should be used).
         - Cleaned up TransformerConfigLimits.setTransformationLimitsFromProperties
         - This has been a problem since 4.2.
         - The problem only came to light with the switch to Java 8, as the order in which
           transformer properties are loaded changed. They were being loaded in MapEntry order.
           The problem did not show up in the unit tests, because they too were impacted by
           the MapEntry order and ironically loaded the properties in the same order.
         - Added unit tests that are supply both max an limit values.
         - Enhanced the debug and toString methods in order to trace the problem.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:35:33 +00:00
Alan Davis
8f7e06cb95 Merged 5.1.N (5.1.1) to HEAD (5.2)
123030 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122981 rmunteanu: MNT-15167 : PageLimit value no longer pick up in 5.x with or without Transformation Server installed
         - Preserved transformer properties order.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:33:17 +00:00
Alan Davis
9aea46c7ae Merged 5.1.N (5.1.1) to HEAD (5.2)
122983 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122910 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122808 adavis: MNT-15738 Property to disable transformers by use (e.g. doclib thumbnail generation) in 4.2 is not working
            - Allow 'use' style properties to be set
            - Combine 'use' properties more flexibly with the default ones.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123686 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:32:22 +00:00
Alan Davis
b6bec0669e Merged 5.1.N (5.1.1) to HEAD (5.2)
122665 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      122615 rneamtu: Merged DEV to 5.0.N (5.0.4)
         122454 rneamtu: MNT-14602: Add config to support Visio 2013 previews and thumbnails
            - Added support for vsdx mimetype


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123682 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:31:52 +00:00
Alan Davis
42bc4fcb7d Merged 5.1.N (5.1.1) to HEAD (5.1)
121797 rneamtu: 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/HEAD/root@123652 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:43:05 +00:00
Alan Davis
05fd2f8800 Merged 5.1.N (5.1.1) to HEAD (5.1)
121796 rneamtu: 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/HEAD/root@123651 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:42:56 +00:00
Andreea Dragoi
0845c93af0 Reverse merged HEAD (5.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/HEAD/root@122918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-01 10:36:14 +00:00
Andreea Dragoi
04b6f386d7 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/HEAD/root@122540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-22 11:34:59 +00:00
Derek Hulley
b6aa21f5f0 CachingContentStore handles "spoof://" content URLs (ACE-4516:DataLoad file spoofing fails with S3 connector)
- Any store can now be used with the spoofed data load by wrapping it in the CachingContentStore (see S3 Connector)
 - Will work with S3 Connector against Alfresco 5.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115382 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-27 18:28:04 +00:00
Kevin Roast
54257dfdb6 ACE-4474 - ImageMagick typo in the Admin Console Summary
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114653 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-19 09:15:52 +00:00
Gethin James
156937fe92 Merge Sabre4 to HEAD
110749: Additional Public apis. RA-553


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:05:22 +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
e6985eb2b1 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
106092: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      106073: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         106001: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.5)
            105937: Merged DEV to V4.1-BUG-FIX (4.1.11)
               104782: MNT-13819 : Alfresco throws "TooBusyException" when uploading several files for transformation
                  -close TikaPoweredContentTransformer writer if input stream fails
                  -TransfomerActionExecutor : do not used shared transformationOption member for multithred transformation requests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@106099 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-13 07:07:47 +00:00
Alan Davis
3a8602f46c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
105991: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105915: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         105898: MNT-13901 TransformationOptions Timeout Can Not Easily Be Set
            - Fix "TransformationOptionPair.setMax(long max) and TransformationOptionPair.setLimit(long limit) so that they don't
              clear the other half of the pair when the value being set is < 0 (unset).
            - Unit tests added
            - Added comments about how the 'transformer' code builds up limits to include defaults.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@106013 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-12 10:33:47 +00:00
Alan Davis
bd1d0159e2 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
105789: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105688: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         105568: MNT-13919: Check for Metadata Embed Support is Incorrect
           - Fixed check for embedding support of media type


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-11 13:25:07 +00:00
Alan Davis
9552852b91 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104496: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104336: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
         103763: MNT-13920 - rewrite the image dimension properties if there is any exif dimensions information available
         104332: MNT-13920 - code changes based on review, improved javadoc and slight modifications on the extract size method


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104607 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 09:54:36 +00:00
Alan Davis
fba0e07a62 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
103441: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103246: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         103035: Merged NESS/4.2.N-2015_03_12 (4.2.5) to V4.2-BUG-FIX (4.2.5)
            102240: MNT-13531: EMLTransformer ignoring multipart emails
               - used htmlparser to extract text from html mail part
               - added test to check if html special chars appear in transformation result
            102375: MNT-13531: EMLTransformer ignoring multipart emails
               - use plain/text representation if present, prior to html representation on multipart/alternative parts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103625 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:44:41 +00:00
Alan Davis
800f4c1eea Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102706: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      102487: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101885: Merged DEV to V4.2-BUG-FIX (4.2.5)
            101133: MNT-13531: EMLTransformer ignoring multipart emails
               - updated transfer in order to identify multiparts and correctly process them
               - added tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103536 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:17:26 +00:00
Alan Davis
f70dc05311 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100990: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100834: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100784: Merged DEV to V4.2-BUG-FIX (4.2.5)
            100732: MNT-13655 : Just first keyword of the IPTC keywords list is extracted as metadata and put into description field of an image
               - Added special way for handling multi-valued meta-data properties retrieved from parser.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 01:27:45 +00:00
Alan Davis
448868345c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100870: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100832: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100751: MNT-13732 Merged CLOUD39 (Cloud 39.5) to V4.2-BUG-FIX (4.2.5)
            100220,100719: MNT-13731 Add NodeRef blacklist to transformation config
               - fix test failure in enterprise build (debug now included a noderef)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100940 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:22:30 +00:00
Alan Davis
17e4c1b55e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100845: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100756: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99878: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99807: Merged DEV to V4.1-BUG-FIX (4.1.10)
               99672: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
                  - Unit test to demonstrate issue was implemented.
                  - Previously suggested fix was also merged.
               99781: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
                  - Updated javadoc for new method in ContentDataDAO.
                  - Corrected logic of eager cleaner. If store is read-only content should not be deleted.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:13:31 +00:00
Alan Davis
a4a7c5f8e7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:00:01 +00:00
Alan Davis
168da1866d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99533: Put back the package level methods overridden by the Cloud mock FileContentStore
    - The FileContentStore changes reduced some string parsing by calling different, internal
      methods.  Unfortunately, these are overridden in the Cloud build, to mimic the the behaviour of the TenantS3ContentStore.
    - Files were being written to tenant-specific stores but read from the general store, where they didn't exist.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-17 09:39:45 +00:00
Alan Davis
ebeea13b8b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99377: BENCH-369: BM-0004: API and internals for Alfresco server
    - Move commons Math3 to 'core' project for general reuse
    - Clone NormalDistributionHelper class from Benchmark projects to Alfresco 'core'
    - API added: http://localhost:8080/alfresco/s/api/model/filefolder/load
      JSON:
      {
      "folderPath":"/Sites/t2/documentLibrary",
      "fileCount":"1",
      "minFileSize":"1024",
      "maxFileSize":"2048",
      "maxUniqueDocuments":"10000"
      }
    - Above JSON will create 1 file in the 't2' site document library with spoofed plain text
    - Change away from deprecated API for TransactionListenerAdapter
    - Fix imports and neatness
    - Improve FileNotFoundException details
    - Disable timestamp propagation on the parent folder to reduce CPU overhead
    - Document changes relating to the addition of cm:description properties
    - Add options to control generation of MLText cm:description fields
      - descriptionCount: number of cm:description translations to include
      - descriptionSize:  size in bytes of each cm:description translation
    - Use released 'alfresco-text-gen' V1.1
    - Use fixed text-gen component to prevent ArrayIndexOutOfBOunds
    - Tighten up error message when errors occur on reading content strings
    - Fix random seed generation bug


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99503 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-16 13:36:33 +00:00
Alan Davis
9e3ae9c8e4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99376: BENCH-371: BM-0004: Copy Alfresco and set up build plan
    - Modify FileContentStore to service 'spoof://' URLs
    - SpoofedTextContentReader to generate consistent text for URL
    - Fix FileContentStoreTest so that tests actually execute
    - Add override for @After so that no NPEs are thrown
    - Add tests for the 'spoof://' protocol
    - Some additional checks for IllegalArgumentException on SpoofedTextContentReader construction
    - Force delete of 'spoof' to return false but not fail with an exception
      This is handled neatly by the EagerContentStoreCleaner, which accepts that the stores may protect data according to their own needs e.g. Centera
    - Add spoofing option to FileFolderPerformanceTester
      290 files/s for 1K files vs 460 files/s for spoofed text files (no binary streaming required)
    - Start FileFolderLoader component that will be used by the API  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-16 13:35:57 +00:00
Alan Davis
a069bf7000 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96412: Merged DEV to HEAD-BUG-FIX (5.1.0)
      94103: ACE-3729: unhandled Exception: org.springframework.dao.CannotAcquireLockException on Cloud Staging
         - JobLockRefreshCallback will be used to refresh a lock.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96497 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:32:05 +00:00
Alan Davis
8c6c739a5e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
95693: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94442: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         94393: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
            94233: MNT-12802: CachingContentStore Quota & Performance
            Made the quota thresholds configurable.
            Introduced a property to configure a gap between normal cleanups.
            Changed cachingContentStoreCache configuration.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-02 10:05:36 +00:00
Alan Davis
662349a137 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92488: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92487: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         92486: MNT-13015 Some Transformer tests failing in JDK8
            - TransformerDebug was listing unsupported transformers in different ways in Java 7 & 8. Had no impact on usage, but broke a test.
            - Fixed a logic error highlighted by the switch to Java 8 in 5.1 to do with the default supported or unsupported values if there
              are some supported or unsupported properties specified, but the mimetype transformation being checked was not one of them.
              I don't think this will have come up causing any problems with the standard configuration defined in transformations.properties,
              but might in customisations created by customers, which is why this has been committed to 4.2.N.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:52:32 +00:00
Alan Davis
aebd5bf941 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
90762: Merged V4.2-BUG-FIX (4.2.5) to HEAD-BUG-FIX (5.0/Cloud)
      90378: Merged DEV to V4.2-BUG-FIX (4.2.4)
         90372 : MNT-12708 :  "Access to files outside of content store root is not allowed:" error when using symlinks inside the contentstore
            - Use normalized absolute path to control is content within content-store
      90538: MNT-12708 : "Access to files outside of content store root is not allowed:" error when using symlinks inside the contentstore
         - Fix for the test failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94705 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 10:59:25 +00:00
Alan Davis
b8709f0961 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
89429: ACE-2649: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      89386: Merged DEV to 4.2-BUG-FIX (4.2.4)
         85587: MNT-11279: Docx Preview: FileName in the document header not previewing correctly
            - Keep original name during convertion.
            - Add unit test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94626 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 10:40:19 +00:00
Alan Davis
9d7c30289a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
86231: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      86156: Merged DEV to V4.2-BUG-FIX (4.2.4)
         86145 : MNT-11758 : Starting Alfresco with Centera as the main content store, with content store caching enabled, generates errors
            - We should recache content if content url was changed after write operation (like centera or xam)
            - Unit test was added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94528 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:44:55 +00:00