3256 Commits

Author SHA1 Message Date
Mark Rogers
ee52855f62 ALF-4898 - rework to deployment locks to implement Job Lock Service timeout callback.
- there is now two callbacks.   A short timeout (1 minute) for keeping the lock alive and a longer lock for timing 
out the whole deployment.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22961 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-07 13:56:35 +00:00
Jan Vonka
839d522808 Fix continuous build error (reverse part of r22938)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22946 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-07 10:27:53 +00:00
Neil McErlean
fc0cbe5ae8 Fix for ALF-5123. Do not cache thumbnail definitions when none have been (initially) found.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22941 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-07 09:57:20 +00:00
Jan Vonka
0ab098088d Enable logging for 2 unit tests (ALF-5096 / ALF-5097)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22938 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-07 08:57:57 +00:00
Derek Hulley
0b8316dc4c Correct debug messages for retry count
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-07 02:20:43 +00:00
Derek Hulley
d4e98a7161 Fixed getLock implementation to handle zero retry parameters
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22933 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-07 02:09:36 +00:00
Brian Remmington
54fd55d6b3 WebQS:
- ALF-4977  Wildcard search leads to error (WCMQS) - added '&' to the list of stripped-out characters
- Creation of a section now causes the creation of three collections by default (configurable)
- CMIS query parser now allows ordering by property defined on an aspect

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-06 21:27:49 +00:00
Jan Vonka
fd425423a0 ALF-3266 - further perf improvements (createVersion / getCurrentVersion)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22926 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-06 16:36:43 +00:00
Mark Rogers
7f720478fd ALF-5105 - typo in exception message
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22920 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-06 13:44:26 +00:00
Mark Rogers
88b31b6d3a ALF-5041 - replication action - send renditions/thumbnails as well as content. Share needs the thumbnails.
Also strip off versionable aspect since transferring versions is not yet implemented.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22919 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-06 13:34:45 +00:00
Nick Burch
28dcad6dba ALF-3262 - Avoid contention and auth issues when updating the last run details on a previously persisted action run through the action tracking service
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-06 12:33:11 +00:00
Mark Rogers
ae2ee867f1 change the name of the "inbound transfer report" to end in ".xml"
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22916 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-06 12:19:16 +00:00
David Caruana
cd3809b0e1 Resolve ALF-5002: Import tool - ability to process multiple input files
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-06 11:53:53 +00:00
Gavin Cornwell
4446ea6a9e Fixed ALF-3085: UI Bootstrap - No root 'Web Projects' folder exists (is WCM enabled ?)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22904 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-06 08:46:11 +00:00
Gary Spencer
843e1b27b3 Use real free/total disk space values for the repository filesystem, if the content store supports them. ALF-1530.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22893 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-05 15:41:40 +00:00
Jan Vonka
00ea243bc3 Merged BRANCHES/DEV/V3.3-BUG-FIX to HEAD:
22883: ALF-4800 - AVM - intermittent test failure (layered file delete)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22884 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-05 11:55:50 +00:00
Mark Rogers
5ef4758194 ALF-5068 - rework of content equality test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22880 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-05 11:23:46 +00:00
Nick Burch
e08fd4e940 When metadata extraction fails, perform the same check that content transformation now does, and give a more helpful error message if the mime type is wrong on the content
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22878 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-05 11:04:55 +00:00
Jan Vonka
f62629d5d4 AVM - minor cleanup (remove some unused imports & methods)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22877 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-05 10:52:02 +00:00
Jan Vonka
5922520777 AVM - mark "createLayeredFile" as deprecated
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22876 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-05 10:41:24 +00:00
Gary Spencer
eb2e61a3f6 Fix for file server logging inconsistent, updates to Alfresco debug logging interface used by the file server code. ALF-4672.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22875 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-05 10:35:24 +00:00
Nick Burch
40e6c1e1d9 Have the TikaAuto content transformer skip .tar and .tar.* files, since these are handled by the new Archive transformer which gives control over recursion
(Will fix the build failure caused by adding quick.tar earlier today)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22861 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-04 22:18:10 +00:00
Nick Burch
2d690eb109 Convert the archive transformer to use Tika, so that other archive formats (eg tar) are supported
Includes a configuration option (off by default) to recurse into embedded resources, along with unit tests for this
Also add support to the ComplexContentTransformer for tweaking TransformOptions, and use this to ensure that the SWF plain-text preview of archive files will only ever be the filenames, and not the text of their contents too


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22860 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-04 20:35:12 +00:00
Nick Burch
2c64a653e5 TransformationOptions update - add a new flag for including embedded resources
Also fix ImageTransformationOptions to properly obey the TransformationOptions contract, by including the extra details in the toMap method


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22859 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-04 20:32:49 +00:00
Nick Burch
82945aac38 Allow Tika powered transformers to customise the ParseContext, eg to enable recursion (which is off by default)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22858 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-04 20:31:07 +00:00
Nick Burch
4378355314 Fix typo in javadoc
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22857 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-04 20:26:48 +00:00
Roy Wetherall
04629bbf04 ALF-5060: Google Docs - Transformation failure
- Fixed up working. but slightly incorrect download URL (was downloading as HTML instead of Word format hence the transformation was broken)
- Added download root URL to configuration
- Unit test to show bug fixed



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22847 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-04 12:09:57 +00:00
David Caruana
ab72af7473 Fix regression from resolving ALF-5042 (Default root folder path '/Company Home' not found)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22845 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-04 11:45:02 +00:00
Neil McErlean
ffdef0597c Implementation of ALF-5066. Support for thumbnailing of .eps files.
Had to relax AbstractImageMagickContentTransformerWorker's restriction to 'image/*' mimetypes to allow 'application/eps'.
  Added application/eps to the MimetypeMap.
  Added application/eps to the view and edit modes of the mimetype.ftl forms control.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22838 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-04 10:50:15 +00:00
David Caruana
b482ea50f8 Resolve ALF-5042: Default root folder path '/Company Home' not found
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22837 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-04 10:48:18 +00:00
Nick Burch
98ba89bed7 Provide example context files for using FFMPEG to provide video -> flv transformations, and video thumbnailing using FFMPEG
These are based on the ones used on partners.alfresco.com, but slightly cleaned up
Also includes a slightly nicer way to register thumbnail definitions to the thumbnail registry from spring. (A proper fix is detailed in ALF-5051, but that will require a config file tweak)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22817 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-01 15:13:53 +00:00
Derek Hulley
71f1312474 Added callback-based JobLockService refreshLock
- JobLockService.refreshLock(..., JobLockRefreshCallback)
 - Added to support ALF-4898: Deployment: Reduce lock TTL


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22812 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-01 14:50:43 +00:00
Derek Hulley
d82de33326 Better fix for ALF-4919: Content Property format has changed
- Append ID to previously-informative 'info' URL in ContentDataWithId
 - Add proper conversion in DefaultTypeConverter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22810 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-01 13:01:29 +00:00
Derek Hulley
9aa9514956 Fixed ALF-4919: Content Property format has changed
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-01 12:35:14 +00:00
Jan Vonka
64389fa1bb ALF-4800 - add some info logging to show AVM conflicts
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-01 11:37:15 +00:00
Neil McErlean
b6bd5f427c Merge from V3.3-BUG-FIX to HEAD
r. 22803 Merge from DEV/QUITE-RIGHT to HEAD (svn comment typo: should be to V3.3-BUG-FIX)
    r. 22802 Fix for ALF-5040 SiteService.getSite(NodeRef) does not return the correct SiteInfo.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22804 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-01 10:00:08 +00:00
Dave Ward
5de4783dee Merged V3.3-BUG-FIX to HEAD
22796: Merged V3.3 to V3.3-BUG-FIX
      22728: (RECORD ONLY) Undoing (reverse-merging) change 22715 as it should not have been committed on this branch.
         22715 was a fix for ALF-4946 Possible NullPointerException during creation of thumbnails whose names are null-valued.
      22757: Fix for ALF-4984 - Removed obsolete bean defs from custom-slingshot-application-context.xml.sample file for Share
      22794: ALF-3858: Handle creation of custom subtypes and copying of their properties and aspects during the "MS Word Shuffle"
      22795: Merged DEV/TEMPORARY to V3.3
         22743: ALF-4949 : Impossible to import fileplan
            1. Incorrect import url generation was fixed.
            2. Manual testing was preformed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22797 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-30 18:45:02 +00:00
Derek Hulley
0fdf71553a Merged BRANCHES/DEV/DEREK/V3.4_GENERAL to HEAD:
22630: ALF-4106 AuditService: Return applications in alphabetical order
   22631: ALF-4106 AuditService: 'Audit' family of web scripts
   22632: ALF-4106 AuditService: Samples for documentation
   22635: ALF-4106 AuditService: Sample fix
   22642: ALF-4106 AuditService: Neater debug logging
   22643: ALF-4106 AuditService: Another sample
   22644: Added .sample to file extensions to include in line ending checks
   22654: Removed unnecessary INFO logging
   22655: Fixed ALF-4872: AuditService: Unable to restrict results to a specific value path


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22789 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-30 15:14:27 +00:00
Nick Burch
0105f86127 ALF-4448 - If a transformation fails, ask Tika if the mime type looks plausible, and if Tika thinks not, include the suggested real mime type in the exception
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22777 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-29 17:09:09 +00:00
Mark Rogers
9e746149f9 transfer service : temporary comment out of problematic unit tests.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22767 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-29 16:10:38 +00:00
Nick Burch
fad0dca893 ALF-4948 - If the replication definition payload contains deleted nodes, issue a warning but skip over them, rather than raising an error
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22766 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-29 16:02:50 +00:00
Mark Rogers
ffcbcd5649 transfer service : more debug logging.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22763 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-29 15:28:07 +00:00
Mark Rogers
00be00dd2a transferService : more debug logging
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22760 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-29 10:58:22 +00:00
Mark Rogers
29c36ff999 removed unwanted import from the previous check in.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22752 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-28 14:48:00 +00:00
Mark Rogers
48ab8265a7 transferServiceTest: new test to repeatedly update content.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22751 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-28 14:46:35 +00:00
Mark Rogers
5fe6ef9d2a extra debug logging
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22744 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-28 13:02:38 +00:00
Mark Rogers
25b81bcc7d empty content test: trivial logging changes.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22738 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-28 10:50:53 +00:00
Nick Burch
798e35c455 In the HTML rendering engine, when extracting out images, don't include WCM specific associations. (We'll put back some more general ones once composite content hopefully offers a suitable one)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-28 10:46:20 +00:00
Gavin Cornwell
778078e26c Fixed ALF-4751 (When starting a workflow with no form configuration duplicated fields are seen), ALF-4859 (Lifecycle review and approve form is incorrect) & ALF-4649 (Node based forms render a form containing system properties when no configuration is present)
The set of default fields for each type of form processor has been updated, default node and type forms now don't return the 'sys' properties previously seen, a default task form no longer returns the identifier field and a default workflow form no longer returns the task level description, priority and due date fields.

Also completed a coding standards and comments sweep across all forms code.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-28 09:35:45 +00:00
Kevin Roast
ea0b6d7602 ALF-4660 - People finder must search all text fields
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-27 20:03:34 +00:00