Commit Graph

69 Commits

Author SHA1 Message Date
Alexandru Epure
e1489de6ab Merged 5.2.N (5.2.1) to HEAD (5.2)
128826 jvonka: MNT-16448 / REPO-928: Fix "Alfresco OOTB install doesn't show preview for .EML files"
   - add back Rfc822ToPdf to replace removal of Rfc822ToSwf (removed for BDE-443)
   - follow-on attempt to workaround build machine #fail (is this a wider issue for transform testing ... ?)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129304 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 14:06:56 +00:00
Alexandru Epure
17f07c060b Merged 5.2.N (5.2.1) to HEAD (5.2)
128822 jvonka: MNT-16448 / REPO-928: Fix "Alfresco OOTB install doesn't show preview for .EML files"
   - add back Rfc822ToPdf to replace removal of Rfc822ToSwf (removed for BDE-443)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 14:06:48 +00:00
Alexandru Epure
36c251afff Merged 5.2.N (5.2.1) to HEAD (5.2)
128569 adavis: 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/HEAD/root@129293 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 13:57:13 +00:00
Alexandru Epure
b62408d099 Merged 5.2.N (5.2.1) to HEAD (5.2)
128179 adavis: MNT-16381 Transformers must validate the content stream mimetype
      - Fix DifferrentMimeTypeTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129274 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 13:22:33 +00:00
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
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
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
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
c8aa156dda Merged 5.2.N (5.2.1) to HEAD (5.2)
124364 adragoi: 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/HEAD/root@127752 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:03:24 +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
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
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
Alan Davis
4314768f44 Merged 5.1.N (5.1.1) to HEAD (5.1)
119696 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      119612 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
         119559 ragauss: MNT-13919: Check for Metadata Embed Support is Incorrect
           - Added unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123602 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:26:32 +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
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
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
6a93e35eb0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102707: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      102488: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101886: Merged DEV to V4.2-BUG-FIX (4.2.5)
            101564: MNT-13531: EMLTransformer ignoring multipart emails
               - added EMLTransformerTest to Metadata Extractor and Transform test suite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103537 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:17:40 +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
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
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
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
36fdee5019 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
86331: MNT-11758 : Starting Alfresco with Centera as the main content store, with content store caching enabled, generates errors
      - correct compile error after merge


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94536 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:46:25 +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
Alan Davis
e507f9ea55 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85648: MNT-12422: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      85647: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         85646: MNT-11823: Upload of PPTX causes very high memory usage leading to system instability
            - Need to reduce the timeout (50ms -> 30ms) of the test as it failed on HEAD-BUG-FIX after a new version of POI was merged from V4.2-BUG-FIX
              as it completed the transform in 52ms which then tripped over the check that its should not have completed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85678 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-25 06:14:01 +00:00
Mark Rogers
912f07223e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84918: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83446: ACE-2664	 - Deprecate the ReplicatingContentStore in favour of AggregatingContentStore


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:09:20 +00:00
Mark Rogers
afe200fbd5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84811: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      82464: ACE-1246 "Allow the customer to change the document encryption key"
      Encrypting content store


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85170 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 08:36:54 +00:00
Alan Davis
7030eb0a29 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84255: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      84254: Reverse Merge V4.2-BUG-FIX (4.2.4)
         << Causes problems for other transformations such as those that start with an HTML file >>
         77398: MNT-11279: Docx Preview: FileName in the document header not previewing correctly
          - Keep original name during convertion.
          - Add unit testMNT-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@84651 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:32:35 +00:00
Alan Davis
862e07f3e2 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84058: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      83799: MNT-12238: Merged DEV 4.2-BUG-FIX (4.2.4) to V4.2-BUG-FIX (4.2.4)
         MNT-12238: Merged 4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
            80291: Merged V4.1.6 (4.1.6.21) to V4.1-BUG-FIX (4.1.10)
               77378: Merged DEV PATCHES/V4.1.6 (19) to PATCHES/V4.1.6 (20)
                  76649: MNT-11823: Upload of PPTX causes very high memory usage leading to system instability
                     - Patch from MNT-577 has been combined with new changes to avoid hanging of analyzing complicated PPTX documents. The fix just disables reading the entire contents of the complicated document. POI metadata extractor may be switched to standard behavior or reconfigured, using the following new properties: content.transformer.Poi.poiFootnotesLimit, content.transformer.Poi.poiExtractPropertiesOnly and content-services-context.xml/extracter.Poi/poiAllowableXslfRelationshipTypes
                  77379: MNT-11823: Upload of PPTX causes very high memory usage leading to system instability
                     Test and the test data for MNT-577 have been added. Test for MNT-11823 has also been added. But this test is commented because the test data (appropriate PPTX document) is not currently available. Getters for POI specific properties have been added to 'PoiMetadataExtracter' for tests. Also 'afterPropertiesSet()' logic has been a bit modified to allow setting 'false' value for 'poiExtractPropertiesOnly' parameter
                  77561: MNT-11823: Upload of PPTX causes very high memory usage leading to system instability
                     Fix for https://bamboo.alfresco.com/bamboo/browse/HF-PATCH416-126 build failure. POI extractor and transformer properties of 'AlfrescoPoiPatchUtils' have been isolated from each other using context. Each extractor or transformer now has its own context or uses the default context. Properties of the default context allow parsing the entire contents of XLSF documents. And footnotes limit is 50. Property names have not been changed, but currently 'content-services-context.xml/extracter.Poi/poiAllowableXslfRelationshipTypes=null' does not lead to 'content.transformer.Poi.poiExtractPropertiesOnly=false'. I. e., this list may be empty. 'PoiMetadataExtracterTest' test has been modified in accordance with the introduced changes. 'poi-OOXML-3.9-beta1-20121109.jar' has been renamed to 'poi-OOXML-3.9-beta1-20121109-patched.jar'
                  79180: MNT-12043: CLONE - Upload of PPTX causes very high memory usage leading to system instability
                     Timeout mechanism has been added to content transformers. Timeout configuration options have been added. Also mechanism to close streams after 'TimoutException' has been added to transformers and metadata extractors. Also timeout mechanism for input streams has been enabled in 'TikaPoweredContentTransformer'
                  79268: MNT-12043: CLONE - Upload of PPTX causes very high memory usage leading to system instability
                     Fix for the https://bamboo.alfresco.com/bamboo/browse/HF-PATCH416-133 build failure and comments of the review https://fisheye.alfresco.com/cru/CR-100#CFR-1184. The new test has been added into 'PoiOOXMLContentTransformerTest.testMnt12043()' to check out the newly added timeout mechanism
                  79290: MNT-12043: CLONE - Upload of PPTX causes very high memory usage leading to system instability
                     - Removed methods and properties that are no longer needed
                  79327: MNT-12043: CLONE - Upload of PPTX causes very high memory usage leading to system instability
                     - Increased ADDITIONAL_PROCESSING_TIME to 1500ms to try and avoid a new intermittent test failure.
      83885: MNT-12238 Bring Maven POM file in sync with latest patched version of poi-ooxml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:23:49 +00:00
Alan Davis
8ba7795cd5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83478: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      83322: Merged DEV to V4.2-BUG-FIX (4.2.4)
         83320 : MNT-12301
            - Util method was added for FileContentStore
            - Unit test added.
      83473: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) (RECORD ONLY)
      83474: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) (RECORD ONLY)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-05 17:17:58 +00:00
Will Abson
10ff05205d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80349: MNT-11779 Cannot create dynamic transformer transformer.complex.JodConverter... ERRORs in log
      - Allow Enterprise or AMP specific transformers to be ignored.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:26:04 +00:00
Erik Winlof
08501d9b8e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78913: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78866: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         78729: MNT-9257: Incorrect behaviour with password protected MS office documents
         Check if failover transformers support transformation for mimetype before calling it. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 13:21:27 +00:00
Erik Winlof
e429be8b8c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78537: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      77398: MNT-11279: Docx Preview: FileName in the document header not previewing correctly
       - Keep original name during convertion.
       - Add unit testMNT-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@82590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:29:43 +00:00
Erik Winlof
0baa0f74f4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78403: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75700: ACE-2149: EOL AVM / WCM
       - Remove most of the AVM and WCM beans, scripts, classes, patches, etc
       - The Explorer client is very broken for compilation
         - TODO: Remove all WCM-related functionality, which I thought would be best left to a UI dev
                 I've murdered many of the classes and beans but there's more to do
       - The repository compiles
         TODO: Get it running again
       - TODO: Check if we can wipe the 'deployment' project as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:01:49 +00:00
Mark Rogers
3349e56606 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77152: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73997: Test cleanup following r73957: ContentStore API cleanup


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78010 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:03:00 +00:00
Mark Rogers
f1310c6c8d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77148: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73957: ContentStore API cleanup
       - Removed previously-deprecated ContentStore.getWriter(ContentReader existingContentReader, String newContentUrl)
       - Removed previously-deprecated getSpaceUsed()
       - Removed previously-deprecated getTotalSize()
       - Deprecated optional and unused getUrls() and variants
       - Clean up of implementations to ignore relevant deprecations, etc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:57:20 +00:00
Will Abson
a6cd47c741 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73353: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73240: Merged DEV to V4.2-BUG-FIX (4.2.3)
         73207: MNT-11314 : Intermittent test failure: CachedContentCleanupJobTest.filesNewerThanMinFileAgeMillisAreNotDeleted
         Hardened the test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:59:16 +00:00
Alan Davis
b78998bd06 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68525: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68281: MNT-11350: Upgrade of Tika to 1.6-SNAPSHOT
         - Upgraded patched Tika, patched PDFBox, and other dependencies
         - Added a MediaTypeDisablingDocumentSelector to disable parsing of certain embedded attachments
         - Added TikaPoweredMetadataExtracter.buildParseContext method which sets the context's DocumentSelector if specified
         - Added setting of DocumentSelector if specified to TikaPoweredContentTransformer
         - Added MediaTypeDisablingDocumentSelector to the transformer.PdfBox bean config which disables parsing of embedded images
         - Updated PdfBoxContentTransformerTest to disable the parsing of embedded images


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70407 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:24:02 +00:00
Mark Rogers
e17716edc6 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68226: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68000: MNT-11015: Content indexing doesn't have transformation failover implementation
         - Failed unit test is fixed.
         - quick-differentMimetype.docx MIME type is changes from "application/msword" to "application/pdf"
         - If required transformer isn't found the more detailed message will be displayed into AssertionFailedError.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:36:07 +00:00
Mark Rogers
a8948748f8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68149: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67747:  Merged DEV to V4.2-BUG-FIX (4.2.3)
         66798: MNT-11015: Content indexing doesn't have transformation failover implementation
           - transformation failover implementation is added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68431 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:17:31 +00:00
Alan Davis
45a331e5c9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61242: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      61241: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         61240: MetadataExtracterLimitsTest has too short a timeout (50ms to 500ms)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62401 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:04:12 +00:00