mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged V4.0-BUG-FIX to HEAD
34474: ALF-13169 Tomcat fails to shutdown
- fix non daemon Timer's
34475: Part 1: Fix for ALF-13244 SOLR Multi-threaded tracking is required for performance - simultaneous document transformations
- multi-threaded transaction and node tracking (off by default at the moment)
- fix index/repo sync check failure if ACLs have been indexed but no transactions
- minimise data sent back from query responses (not all stored fields)
- added SOLR side config for HTTPClient pooling, cache sizing and tracker configuration
- fixed SOLR incremental cache update for merges that end with all deletions in the old index
- fixed unclosed stream in SolrKeyResourceLoader
34478: ALF-13050 - CIFS: Disabling account is not respected
Also contains major rework of logging and exception handling.
34499: Fix for ALF-13150
34526: Fix for ALF-13288
34530: Minor CSS tweaks after changes for ALF-11991
34539: ALF-13176 - Implement Word for Mac 2011 Cifs Shuffle.
34541: ALF-13244 SOLR Multi-threaded tracking is required for performance - simultaneous document transformations
- multi-threaded ACL tracking
- multi-threaded statistics and reporting control
- nodes that can not be indexed have an error record added to the index and do not block indexing the transaction (nodes unindexed due to exceptions can be found by ID query and the exception stored in the index)
- nodes that are not-indexed have a minimal record added to the index for index consistency checking (unindexed nodes can be found by ID query)
34544: Add support for CIFS Level II shared oplocks. ALF-13138, ALF-13110.
Fixed CIFS open for attributes only access preventing oplock on the following file open.
Fixed reporting serialized copies of file access tokens as leaked.
34576: ALF-12767 - CIFS TextEdit - File has been modified outside TextEdit
34577: incorrectly checked in copy of network-protocol-context.xml
34580: ALF-13215: Ensure that permissions for everyone cannot be upgraded on moderated or private site. Fixed inconsistency between permissions shown in properties and in dialog
34582: ALF-13332: Updated modifier link for correct profile
34609: ALF-12740: Update to previous fix (only apply to IE8 and below)
34623: ALF-12767 - CIFS TextEdit - File has been modified outside TextEdit
34636: Fix for ALF-13365 SOLR: Recently modified docs dashlet sorts incorrectly
- respect short property names on sort requests @cm:created and not require the full @{uri...}created
34659: ALF-2550 - added enterprise repo config files.
34715: Fix for __ShowDetails desktop action returned URL is truncated if hostname too long. ALF-13202.
34726: ALF-13293: Webdav: Version history lost after editing content in Finder
34738: ALF-7883: WebDAV: support HEAD method for folder
- Fix by Pavel
34743: Fix for ALF-13244 SOLR Multi-threaded tracking is required for performance - simultaneous document transformations
- batch fetch for nodes in transaction, acls in sets, and acls and readers
- config for batch fetching
- Better reporting for ACL set indexing
34747: ALF-13262: adding missing indexes for new schema's (activiti-schema create) + schema patch for existing schema
34817: Merged V4.0 to V4.0-BUG-FIX
34493: SPANISH: translation updates based on EN r34103
34498: Fixed ALF-12031: WCM: Content cannot be expired: avmExpiredContentTrigger is missing
- Side-effect of ALF-11644: AVM cleanup jobs run when WCM is not installed
- WORKAROUND: Get file 'root\projects\installer\wcm-bootstrap-context.xml' and use that
34525: Fix for ALF-13210:
- removed "unsupported" from bulk filesystem import web pages
34531: Fix for ALF-13117 and ALF-13273
34549: Merged BRANCHES/DEV/BELARUS/HEAD-2012_03_15 to BRANCHES/V4.0:
34528: ALF-12874:
34552: ALF-13322: Fixed doc lib reload loop caused by "#" in folder name
34553: ALF-13311: Ensure images can be linked in TinyMCE create HTML content editor
34556: Minor: removed unused code
34557: Merged DEV to V4.0
34537: ALF-13035: Add "START WITH" parameter to IDENTITY field.
ALF-13034: Add "optional" parameter for statement that drops index that was generated automatically.
34567: ALF-11047: Ensure that Explorer linked files and folders (from outside of sites) display correctly
34578: Fixes: ALF-11744: Dates rendered with the form service date control are rendered on the server, so show server time.
- I've added the timezone to the display format and the ISO8601 date to the as an attribute on the HTML element to allow client side parsing
- Adds client side parsing on the Doc Details page, so times are shown in the timezone of the user's browser.
34583: GERMAN: Translation update, based on EN r34103, Fixes: ALF-13075,
34584: FRENCH: Translation update based on EN r34103, Fixes: ALF-13002, ALF-13003, ALF-13020
34585: ITALIAN: Translation update based on EN r34103
34586: JAPANESE: Translation update based on EN r34103
34587: DUTCH: Translation update based on EN r34103, Fixes: ALF-12575.
34626: Fixes: ALF-13375 - Date rendering bug in search results
34630: Further fix for ALF-13375 that modifies Alfresco.util.formatDate's ISO8601 support for backward compatibility (e.g. passing in non ISO strings).
34635: ALF-12061: Mac support: Document Connection always throws an error
- Case sensitivity fix by Pavel
34653: ALF-12308, ALF-12309, ALF-12554: Stack specific script errors
34655: Fix for ALF-12723 CMIS: Over-riding cm:autoVersionOnUpdateProps in custom model prevents startup
34656: Merged HEAD to BRANCHES/V4.0:
34654: Fixes: ALF-13389: Old element id used when setting event end date.
34657: Translation updates for all languages except JA.
34660: Fix to license driven config files to remove erroneous characters
34669: Merged DEV to V4.0
34663: ALF-12242: User activation issue
InviteHelper.acceptNominatedInvitation() method was changed to enable user account in any case(no matter was it enabled/disabled before)
34681: Merged DEV/THEMIS2 to V4.0
34472: Document List Customization Refactor
- SLingshotSiteModuleEvalutaor now has new <applyForNonSite> param that defaults to false for backward compability
- Slingshot extension points, surf-doclist.get now uses 2 spring beans:
* "resolver.doclib.doclistDataUrl" to get the repo doclist data url
* "resolver.doclib.actionGroup" to get each item/nodes action group id
34692: Fix for ALF-12715 - Incorrect SPP working (mimetype not set on document stored via ADM Remote Store API)
34708: ALF-13239: Merged V3.4-BUG-FIX (3.4.9) to V4.0 (4.0.1)
34707: ALF-13239 Share rule to convert to PNG fails on JPG images
- Issue was showing up in 4.0.1 as a change was made for iPad that introduced an imageOptions.isAutoOrient()
setting. This forced a concatenation of null with " -auto-orient". However there are also crop and resize
options that could also do this even in 3.4
Setting the commandOptions String to "" when null, is fine as this is how property value nulls are handled
later anyway.
34718: JAPANESE: Localisation of Company specific contact information & addition of timezone to form control.
34719: FRENCH: File consistency tweak.
34746: ALF-12903: Create HTML content fix
34754: Merged PATCHES/V4.0.0 to V4.0
34750: Reinstate ${version.label} into version.number property
34810: Merged DEV to V4.0 (with corrections)
34807: ALF-13290 : Mac Support: Error appears after collaborator saves changes to the document
deleteFailedThumbnailChildren method should be run as system user as it may fails with AccesssDenied if collaborator updates document
34876: Fix fo ALF-13503 Add SOLR client API tests to the SystemBuildTest project
- SOLR API tests run embedded with SSL
34984: ALF-13109 - Correction to NTIOCtl.FsCtlCreateOrGetObjectId
35009: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX:
35008: Fix for ALF-12817. Fixed as suggested - new method remove().
35031: Fix for ALF-12309
35032: Fix fo ALF-13535 using CMIS, on-disk tickets cache can grow unbounded
- expire tickets based on inactivity by default
- added job to clean up expired tickets
- all are configurable
35033: Fix fo ALF-13535 using CMIS, on-disk tickets cache can grow unbounded
- avoid NPE for null tickets
35037: Fix for ALF-13505 SOLR tracking readers does not encode all uids correctly
- fixed reader encoding
35049: ALF-13384 - Saving large Word (mac 2011) document via CIFS fails in Mac OS X Lion
35053: Merged V4.0 (V4.0.1) to V4.0-BUG-FIX (4.0.2)
34844: Merged V3.4-BUG-FIX (3.4.9) to V4.0 (4.0.1)
34843: ALF-5830 show_audit.ftl template doesn't work anymore
- Removed L10n messages that are no longer used (should have been removed in 3.4.6 when this issue was fixed)
34847: Merged HEAD to BRANCHES/V4.0:
34804: Fixes: ALF-13309: Issue with over zealous HTML escaping with truncated descriptions in the Calendar Agenda view.
34861: ALF-13497: Merged PATCHES/V4.0.0 to V4.0
34813: ALF-13115: No feedback is given to the user when Approve/Reject is clicked for a task when they followed a link to the task in an email.
- Fix by Pavel, reviewed by Kev
- Now they get a confirmation message followed by a redirect to their dashboard
34862: Fix for ALF-10823 "allowGuestLogin=false" and Share then fills the alfresco error log with "Guest authentication not supported"
Fix for ALF-12678 Errors in log on startup (ts.alfresco.com 4.0)
- improved handling of 500 errors relating to GuestAuthNotSupported when alfresco.authentication.allowGuestLogin=false
34867: Merged DEV to V4.0
34565: ALF-13074: JBPM workflow definitions are not resilient to missing model definitions
WARN messages have been added if JBPM workflow definitions cannot be loaded in the model definitions.
34855: ALF-13074: JBPM workflow definitions are not resilient to missing model definitions
Reimplemented to handle all exceptions during constructing WorkflowInstances WorkflowTasks and WorkflowDefinitions.
34859: ALF-13074: JBPM workflow definitions are not resilient to missing model definitions
Logger messages was changed to correspond the logger pattern.
34893: Translation updates for DE and ES.
34894: Fixes: ALF-13518; Updates Calendar event object's URL to work out of context.
34896: FRENCH: Translates new strings.
34915: Merged DEV to V4.0
34912: ALF-13267: There should not be a web-client-config-custom.xml in alfresco.war
Move "modules\quickr\config\alfresco\extension\web-client-config-custom.xml" to "modules\quickr\config\alfresco\module\org.alfresco.module.quickr\ui\web-client-custom.xml".
34913: ALF-13267: There should not be a web-client-config-custom.xml in alfresco.war
Delete "modules\quickr\config\alfresco\extension\web-client-config-custom.xml".
34916: ALF-13267: Merged V3.4 to V4.0 (and reversed previous duplicate fix)
24828: Merged BRANCHES/DEV/BELARUS/V3.4-2011_01_13 to BRANCHES/V3.4:
24824: ALF-6361: web-client-config-custom.xml doesn't work in /alfresco/tomcat/shared/classes/alfresco/extension
34929: ALF-12242: Issues activating users when more than one member in the authentication chain
- Correction to fix that caused regressions ALF-13494, ALF-13498
- Need to check for the mutability of a user's authentication before trying to enable it
- Also chaining of the authentication enabled attribute should assume true until false found, not the other way around
34930: ALF-12242: Reverted change to this class as it wasn't necessary and wouldn't work!
34932: ALF-13453: Enable XMLConstants.FEATURE_SECURE_PROCESSING feature on Transformer Factory to prevent remote code execution
- Now SecureTransformerFactory should be used as a standard
34965: Merged PATCHES/V4.0.0 to V4.0
34959: ALF-13550: Fix for ALF-13546 SOLR tracking fails for nodes with content and no auditable aspect - NPE as there is no last modification date to use
34960: ALF-13551: Merged BRANCHES/DEV/V4.0-BUG-FIX to PATCHES\V4.0.0
- fix for ALF-13544 When SOLR encounters an error indexing a document, subsequent indexing does not occur
34541: ALF-13244 SOLR Multi-threaded tracking is required for performance - simultaneous document transformations
- nodes that can not be indexed have an error record added to the index and do not block indexing the transaction (nodes unindexed due to exceptions can be found by ID query and the exception stored in the index)
- nodes that are not-indexed have a minimal record added to the index for index consistency checking (unindexed nodes can be found by ID query)
34968: ALF-13453: Reversed XSLTProcessor and XSLTRenderingEngine changes for now as they break http://wiki.alfresco.com/wiki/WCM_Forms_Rendering and model handling via bsf extensions. A more sophisticated approach is required. See bug for more info.
34972: ALF-13340: Upgrade postgres JDBC driver to tested/supported version!
34997: ALF-13453, ALF-13565: Fully reverted revision 34932 as it prevents startup on Weblogic
34998: Merged V4.0-BUG-FIX to V4.0
34992: DUTCH: translation updates based on EN r34861
34993: FRENCH: Translation updates based on r34861
34994: ITALIAN: Translation updates based on r34861
35013: ALF-13561: Not found error after uploading new version
- Fix by Pavel
35034: Fixes ALF-13570: Error loading event info panel.
35039: ALF-13573: Merged V3.4-BUG-FIX (3.4.9) to V4.0 (4.0.1)
35022: ALF-13451: Allow modules to configure mimetypes
35041: ALF-13466: Error is displayed by approve or reject wcm workflow
- Fixed regression caused by ALF-4098
- Protected calls to new addNewChildrenIfAny() method with isDirectory() checks
35042: GERMAN: Translation updates based on r35029, and fixes ALF-12471.
35043: SPANISH: Translation updates based on r35029, and fixes ALF-12471.
35044: FRENCH: Translation updates based on r35029, and fixes ALF-12471.
35045: ITALIAN: Translation updates based on r35029, and fixes ALF-12471.
35046: JAPANESE: Translation updates based on r35029, and fixes ALF-12471.
35047: DUTCH: Translation updates based on r35029, and fixes ALF-12471.
35090: Remove Kofax. It has been migrated to integrations/kofax
35097: Added new file server cluster tests.
Open for attributes only overlapped with open with oplock.
Open with oplock with break to level II shared oplock.
35099: JLAN Client updates to support level II oplocks, required by new cluster tests.
35100: Various oplock related fixes, including problems opening file on second cluster node. ALF-13109.
35107: remove errant '>'
35116: ALF-13401 - Mac LION Powerpoint CIFS
35162: Removed spurious attempt to force a concurrency exception for getNodePair after a node had actually been deleted. Code would retry 50 times before failing. Reviewed with Derek, its not the node service's job to second guess that there may be a concurrency problem in a client's cache.
35164: Fix for ALF-13641 - Negative cases for date value in propertyNegative cases for date value in property. Today button
35169: ALF-13401, ALF-12393: Added exception translation to AbstractReindexComponent retrying transactions, following change in r35162
35172: ALF-13626: category.put.json.ftl has wrong bracket
35173: ALF-12749 - CIFS: Editing of ppt/pptx files fails (MacOSx specific)
35174: Fix for ALF-13556 - Sorting for custom model fields doesn't work for search results in Share
35176: Fix for ALF-4281 - Script error at 'Email space users' form
35186: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-34847 to BRANCHES/DEV/V4.0-BUG-FIX:
34875: Creating new branch from $FROM
34939: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-34397 to BRANCHES/DEV/DAM/V4.0-BUG-FIX-34847:
34400: Creating new branch from $FROM
34422: Merged DEV/DAM-0.1 to DEV/DAM/V4.0-BUG-FIX-34397
34085: Allow for generateThumbnailUrl to accept a rendition name parameter.
34086: Changed simpleView view type switch to integer implementation rather than boolean.
34087: Pulled specific rendering code for simple and detail view into separate view renderer objects.
34092: If simpleView was stored as a boolean convert it to an integer for ALF-12952.
34423: Merged DEV/DAM/HEAD-34276 to DEV/DAM/V4.0-BUG-FIX-34397
34307: ALF-12952: Change DocumentList simpleView Nav Switch to an Int Implementation
34957: ALF-12952: Change DocumentList simpleView Nav Switch to an Int Implementation
- Removed ability to specify index on registerViewRenderer
- Added firing of setupAdditionalViewRenderers to make it easier for extensions to register themselves at the appropriate time
35021: ALF-12955: Share Document Library and Repository Browser Should Easily Allow for Additional Views
- Changed viewRenderers to an object implementation with storage/retrieval via named properties or 'keys'
35050: ALF-12955: Share Document Library and Repository Browser Should Easily Allow for Additional Views
- Renamed simpleView preference and option to viewRendererName
- Reintroduced simpleView boolean preference and option as deprecated to allow deletion of old preference
- Renamed viewRendererOrder to viewRendererNames
- Added default viewRendererNames at DocumentList.options level
- Renamed widgets.simpleDetailed to widgets.viewRendererSelect but did NOT change HTML id for backwards compatibility
- Renamed onSimpleDetailed to onViewRendererSelect
- Added deletion of deprecated simpleView preference if it exists
35056: ALF-12955: Share Document Library and Repository Browser Should Easily Allow for Additional Views
- Made viewRenderer methods a proper Alfresco.ViewRenderer object which is more easily extended
- Added name property to ViewRenderer constructor and changed registerViewRenderer to use that as a key
- With more strictly defined ViewRenderers in place, changed select button to iterate over viewRendererNames rather than explicit list
35104: ALF-12955: Share Document Library and Repository Browser Should Easily Allow for Additional Views
- Added markup tag around the document list container
35126: ALF-12955: Share Document Library and Repository Browser Should Easily Allow for Additional Views
- Added markup tag documentListConstructorSetOptions around setOptions after DocumentList object constructor
- Added markup tag documentListViewRendererSelect around view select buttons
- Added markup tag documentListShowFolders around show folders button
- Added markup tag documentListSortSelect around sort selection buttons
- Renamed Alfresco.ViewRenderer to more specific Alfresco.DocumentListViewRenderer and private methods similarly
- Added default for viewRendererName if it's undefined in options
- Added check for availability of renderer specified in user preference, if not use default, and consolidated renderer index lookup
35179: ALF-12955: Share Document Library and Repository Browser Should Easily Allow for Additional Views
- Removed documentListConstructorSetOptions
35194: Temp disable cifs text edit test.
35197: ALF-13097 - IMAP templates have wrong mimetype
35201: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
34462: Merged DEV to V3.4-BUG-FIX
34461: ALF-10759: Advanced search fails for sub-element tags
UITagSelector component which allows Advanced Search to add new tag option to search
34479: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
34477: ALF-13237: Yet another 13th hour Spring Surf Regression
- Can't afford to pull in all the latest surf goodies so overriding PageImpl.class with one corresponding to Surf revision 1034 in WEB-INF/classes, just for 3.4.8
34515: ALF-9855: Alfresco side to support standard Adobe-Japan1 PDF fonts in swftools
- Bitrock binaries provided
34518: ALF-13266: Ubuntu installation fails in non-obvious way when machine lacks sufficient memory
- Fix from Bitrock
- L10N required
34536: Merged DEV to V3.4-BUG-FIX
34529: ALF-13135: Impossible to Add new member on Workspace using email address
NPE fix if AD users don't have e-mail address as a property.
34538: ALF-12812 Saving files with apps on Mac OS X Lion in CIFS doesn't invoke rules (Update rule fires BEFORE, FileFolderInterceptor recalcs HIDDEN and TEMPORARY )
34542: Add support for Level II shared oplock. ALF-13093, ALF-12328.
Fixed CIFS open for attributes only access preventing oplock on the following file open.
34543: Oplock and open for attributes fixes to the repo/AVM filesystems. ALF-13093, ALF-12328.
34579: ALF-13284: Removing obselete files
34603: ALF-10833 Alfresco does not show correct thumbnails for some specific kind of PDFs
- Patched PDFRenderer-0.9.1 to return a null page if there was an error.
The code structure did not lend itself to simply throwing the exception.
- Modified PdfToImageContentTransformer to check for a null page and it then throws an AlfescoRuntimeException
which causes the failover transformer to use the next transformer in the list: PDBBox which is able to
transform the pdf and the image that was missing.
34617: Add missing source Java folder.
34629: ALF-13188: Content IO Channel not closed
34697: ALF-13149: Start up performance suffers if the alf_transaction table grows too large.
34712: ALF-13063: sample settings for DB2
34803: New installer translations from Gloria
34809: ALF-11956: Merged BELARUS/V3.4-BUG-FIX-2012_01_26 to V3.4-BUG-FIX (V3.4.9)
<< In addition to the 2 merged revisions, includes the change for ALF-11972 and test all-widgets.xsd >>
33715: ALF-11956: WCM accessibility
- sandbox name oriented titles were added almost to all action links at 'Browse Website' page view;
- adding titles to image tags functionality was added to ActionLinkRenderer, UIMenu and UISandboxes (this includes arrow icons for 'Web Forms' and 'Modified Items');
- titles were added to XForm Date/Time picker controls (text input and arrow buttons);
- 'Click to edit' functionality via keyboard availability was added to XForms TinyMCE editor control (using 'Tab' key, 'Alt' + 'E' in IE or 'Alt' + 'Shift' + 'E' in FireFox);
- additional i18n properties for Date/Time picker and action link titles were added
34625: ALF-11956: WCM accessibility
Increasing XForms widgets readability by screen reader tools:
- Tiny MCE 3.2.7 buttons;
- required fields;
- inputs labels;
- VGroup, HGroup and Repeating widgets folding icons/buttons and others
ALF-11972: Title attributes for the WCM form element xs:anyURI not included to allow multiple xs:anyURI file picker "Select" buttons to be distinguished by screen readers
- Change defined in JIRA
34846: Translation updates:
- FR: Missing Strings
- DE: Fixes encoding issue
34881: ALF-13512: Merged PATCHES/V3.4.8 to V3.4-BUG-FIX
34829: ALF-12621: Sort order of folders including hyphens ( - ) are different in folder-tree and view on folders (in Share)
- Switched from using JS sort to Java locale-based sort
34845: ALF-12621: Fixed array typing problems in previous checkin
34918: Fix for ALF-13385 Access DENIED api does not seem to work
- changed default behaviour to any-deny-denies
- config to switch back
- needs custom port to 4.0 for SOLR
- unit tests added
34919: Fix for ALF-13385 Access DENIED api does not seem to work
- added property based configuration and default configuration check
34937: ALF-11956: Merged BELARUS/V3.4-BUG-FIX-2012_01_26 to V3.4-BUG-FIX (V3.4.9)
34886: ALF-11956: WCM accessibility
- headings functionality is added. WAI-ARIA markup was used;
- alert for XForms validation errors is added. WAI-ARIA markup was used;
- previous accessibility changes tested and fixed against the new functionality
35003: Merged HEAD to V3.4-BUG-FIX
34673: Changed from time-based module and component names to GUID-based names. Not likely to affect anything.
35057: Fix for ALF-12590 Share - Document library doesn't return subfolders when parent space contains the character "- "
- updated to the latest version of jaxen (which now includes saxpath)
- the problem path is now parsed correctly
35074: ALF-13597: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
34978: ALF-13489: Index tracker now has ability to distinguish create/update/rename/link/unlink
- Will prevent unnecessary cascading PATH regeneration on remote cluster nodes
- QNames and noderefs of parents in index compared with those in the database
- Experimental - needs testing
34983: ALF-13489: Correction to renamed node detection
34985: ALF-13489: Even more foolproof parent assoc cross-referencing
- Should handle duplicate QNames, etc.
- Renames now just an add and a remove
35075: ALF-13598: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
34872: Merged DEV (by Pavel) to PATCHES/V3.4.6 (and refactored)
34554: ALF-11777 : Persistent lock is left on document in certain use cases when editing online (spp)
1. From now documents are locked for maximum 24 hours when working through WebDAV/Vti.
2. Session listeners were added for web-client and vti-module to allow handling session expiration event.
3. WebDAVLockService class was implemented. It is used by session listeners to perform session cleaning (forcibly unlock all documents that were persistently locked during http session).
4. LOCK/UNLOCK webdav methods and Get/Checkout/UncheckoutDocumentMethod vti methods where updated to correctly populate session list of locked documents.
34832: ALF-11777 : Persistent lock is left on document in certain use cases when editing online (spp)
1. From now documents are locked for maximum 24 hours when working through WebDAV/Vti.
2. Session listener was added for webdav/vti to allow handling session expiration event.
3. LOCK/UNLOCK webdav methods and Get/Checkout/UncheckoutDocumentMethod vti methods where updated to use shared code to lock/unlock nodes.
34833: ALF-11777 : Persistent lock is left on document in certain use cases when editing online (spp)
1. Remove unnecessary classes after 34554 rev.
34852: ALF-11777 : Persistent lock is left on document in certain use cases when editing online (spp)
1. Some changes after David's review of revisions 34832, 34833.
34874: ALF-11777: Fixed typo
35078: ALF-12785: BaseDownloadContentServlet could co into an infinite loop if asked to seek past the end of a file
35079: ALF-12490 "HTTP Status 500 - 00200935 Exception in Transaction" message error with webform
- ALF-9524 fix assumed there were only switch elements in a form
35086: ALF-13563: Upgrade to Bitrock 8.1.0 to fix password validation issue
35095: ALF-12764: New distributable alfresco-enterprise-ear-3.4.9.zip
- Like war zip, but contains .ear file instead of .wars and also contains WAS shared library
- Means samples and other bits are finally available to non-Tomcat users
35103: Merged DEV to V3.4-BUG-FIX
35098: ALF-12776: if a user requests to join a moderated site, and that request is rejected, the rejection email is sent to the user-id and not the email id.
Implemented
Correct WorkflowModelModeratedInvitation.WF_PROP_REVIEW_COMMENTS field in configuration for moderatedInvitationReviewTask
Person's email into emailAction PARAM_TO
35114: ALF-12766 Creating Web Content several users - different sandboxes
- To be consistent with ALF-11440 PM comment 18-Dec-2011 and ALF-8787
A Manager should only be able to create a file in a sandbox
if it is NOT locked somewhere else.
- Not much can be done about the error message as the locked path is useful in other
situations and it is not possible to issue a different message on create only
35121: ALF-11956: Merged BELARUS/V3.4-BUG-FIX-2012_04_05 to V3.4-BUG-FIX (V3.4.9)
35109: ALF-11956: WCM accessibility
- Date/Time Pickers are made accessible via the keyboard and readable by JAWS (13, demo version). WAI-ARIA standard is used;
- corrected 'expanded' state determination for Date/Time Pickers;
- Modified Items and Web Forms arrow buttons are made accessible via the keyboard on the Browse Website page;
- some changes per the description of the issue and per the comment of the 23-Feb-12 11:33 AM
35145: ALF-11990: CIFS login with case insensitive username is rejected
- User name normalization moved to before MD4 hash retrieval
35151: Port of oplock related changes from v4.x.
35177: Fix for ALF-11936 - RSS feed from the activities dashlet produces invalid XML
35178: ALF-12631: removeChild requires delete permissions on the child node, even when it is a secondary association
- now it doesn't (thanks to Andy's solution)
- new ACL_PRI_CHILD_ASSOC_ON_CHILD ACL entry only enforces the permission on the child node when it is a primary association
35181: Merged DEV to V3.4-BUG-FIX
35165: ALF-13409: Invite to a site throws an error if an instance of invitation-moderated-workflow is started by a user whose account is subsequently deleted
InvitationServiceImpl listens for person node deletions (it already implements beforeDeleteNode) and cancels invitations within beforeDeleteNode
35182: ALF-12567 Unable to create thumbnails for certain PDF files
- The supplied PDF contains an invalid offset in the xref table. This turns out to be a quite common error resulting in
thousands of Google hits. The offset is set to the string value "4294967295". This number in hex is FFFFFFFF. The value
of an 4 byte int in C or Java with this value is -1. Neither PDFRenderer nor PDFBox have workarounds for this although
lots of other systems do, which is why it is possible to view or edit it in other systems.
Patched both PDFRenderer and PDFBox to handle this common error.
35185: ALF-13033: Friendlier error message when you try to delete non existent content from a sandbox
35191: ALF-13409: Fix build.
35192: Merged V3.4 to V3.4-BUG-FIX
35161: ALF-13624: Merged V4.0-BUG-FIX to V3.4
34474: ALF-13169 Tomcat fails to shut down
- fix non daemon Timers (and punctuation!)
35163: ALF-13656: Merged HEAD to V3.4
31375: Fix for ALF-435 - Unfriendly error occurs when trying to delete renamed category from category page
35189: Italian translations from Gloria
35193: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
35125: Merged V3.4-BUG-FIX to V3.4
35156: Correction to merge in revision 35125 (a reintegrate merge rather than a selective merge)
35202: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
34532: ALF-13233: Merged HEAD to V3.4-BUG-FIX
32960: ALF-11008 - Support the WebDAV DELETE method in SPP/VTI, with the special response required by SPP for locked documents
34559: ALF-13106: Merged HEAD to V3.4-BUG-FIX
28223: Merged DEV/SWIFT to HEAD (Tika and Poi)
30589: Upate Tika and add Ogg Vorbis support + tests
30673: Upgrade POI and Tika for recent fixes
31009: Bump the Tika version for some recent fixes
31010: Update the test audio files to include more metadata
31011: ALF-6170 Add missing audio model (needed in devcon demo)
31013: Update the MP3 extractor to output audio keys (related to ALF-6170), and refactor the audio extractors to share more common code. Also expands the audio extractor tests to share common code, and test more metadata. (Needed for devcon demo)
31022: Tika update for custom mimetypes enhancement
31023: Add @since tags where known, and do a quick coding standards sweep
31274: ALF-10813 follow-on - make it clearer that we're just creating the one detector, and switch to the new style version
31289: ALF-10803 - Upgrade Tika to add the extra WordPerfect mimetype
31553: ALF-10525 ACP mimetype detection fix, unit tests for it, and a NPE fix
31554: Update Tika to get the fix for TIKA-764
32105: ALF-11574 Upgrade Tika for the fix to TIKA-784, and add the DITA types to the Alfresco mimetype map
32138: Bump the Tika version for the updated TIKA-784 fix, and add an Alfresco side unit test for this case
32153: Update the vorbis jar to one that includes the license info more clearly in META-INF (without needing to read the POM)
32320: ALF-11650 Upgrade Tika for TIKA-789 (MPP Detection), and add tests that show it is now being correctly handled
32363: Update POI and Tika for the new code required to solve ALF-10980 (MPP Open/Change detection)
34560: ALF-13106: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
33330: ALF-12487 In Mimetype Detection, if Tika detects a generic type of text/plain or XML, defer to the Alfresco filename based type (as we already do for octet stream)
33379: Add the TIFF mimetype
33380: Improve the stream to Tika conversion code, following review for THOR-952
33385: Upgrade to the latest Tika and POI, for recent bug fixes
33779: Upgrade Tika for ALF-12714
33782: ALF-12714 Add 3GPP/3GPP2 video, and MP4 Audio mimetypes
33783: Update Tika for more MP4/QuickTime support, and enable MP4 audio metadata extraction + "quick" testing
34561: ALF-13106: Fixed merge errors
34562: ALF-13106: Merged SWIFT to V3.4-BUG-FIX
26546: Have one copy of the Tika Config in spring, rather than several places fetching their own copy of the default one (either explicitly or implicitly).
34563: ALF-13106: Merged HEAD to V3.4-BUG-FIX
32264: Adding "quick" test resources for MS project.
34564: ALF-13106: Fix unit test
34752: GERMAN: Translation updates, based on EN: 34612
34753: SPANISH: Translation updates, based on EN: 34612
34755: FRENCH: Translation updates, based on EN: 34612
34756: ITALIAN: Translation updates, based on EN: 34612
34967: ALF-13552: Merged V4.0 to V3.4-BUG-FIX
34932: ALF-13453: Enable XMLConstants.FEATURE_SECURE_PROCESSING feature on Transformer Factory to prevent remote code execution
- Now SecureTransformerFactory should be used as a standard
34971: ALF-13552: Merged V4.0 to V3.4-BUG-FIX
34968: ALF-13453: Reversed XSLTProcessor and XSLTRenderingEngine changes for now as they break http://wiki.alfresco.com/wiki/WCM_Forms_Rendering and model handling via bsf extensions. A more sophisticated approach is required. See bug for more info.
34982: ALF-13554: Merged V4.0 to V3.4-BUG-FIX
34972: ALF-13340: Upgrade postgres JDBC driver to tested/supported version!
34999: ALF-13552: Merged V4.0 to V3.4-BUG-FIX
34997: ALF-13453, ALF-13565: Fully reverted revision 34932 as it prevents startup on Weblogic
35000: Translation updates for DE, ES, IT. Based on EN r34846.
35015: ALF-13451: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
33864: ALF-10736: JSF - Adding mimetype does not work on 3.4.x
35020: ALF-13451: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
33863: ConfigSource for XMLConfigService which uses a ResourceFinder for wildcard-compatible lookups (UrlConfigSource does not support them)
35029: JAPANESE: Translation updates based on EN r34846
35212: ALF-13409: Deleting a person can now cancel their invitations. Cancelling invitations can delete inactive persons! So prevent infinite looping with a transaction local resource
- Also fix up other invite related unit tests
35217: Merged DEV to V4.0-BUG-FIX
35214: ALF-12745 : AD-LDAP: alfresco hangs when upload user csv file
Disable 'Upload User CSV File' button in Share admin console in case of AD-LDAP
35221: Avoid a NPE if Repository.getPerson() is called when no RunAsUser is active, instead return Null as for users with no defined NodeRef
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@35229 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
@@ -36,7 +36,6 @@
|
|||||||
<td><nobr>Bulk Filesystem Import Tool Status</nobr></td>
|
<td><nobr>Bulk Filesystem Import Tool Status</nobr></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr><td><td>Alfresco ${server.edition} v${server.version}
|
<tr><td><td>Alfresco ${server.edition} v${server.version}
|
||||||
<tr><td><td><b>Note: this is unsupported and may be removed from the product in future.</b>
|
|
||||||
</table>
|
</table>
|
||||||
<blockquote>
|
<blockquote>
|
||||||
<p>
|
<p>
|
||||||
|
|||||||
@@ -61,7 +61,6 @@
|
|||||||
<td><nobr>Bulk Filesystem Import Tool</nobr></td>
|
<td><nobr>Bulk Filesystem Import Tool</nobr></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr><td><td>Alfresco ${server.edition} v${server.version}
|
<tr><td><td>Alfresco ${server.edition} v${server.version}
|
||||||
<tr><td><td><b>Note: this is unsupported and may be removed from the product in future.</b>
|
|
||||||
</table>
|
</table>
|
||||||
<form action="${url.service}/initiate" method="post" enctype="multipart/form-data" charset="utf-8" onsubmit="return validateForm(this);">
|
<form action="${url.service}/initiate" method="post" enctype="multipart/form-data" charset="utf-8" onsubmit="return validateForm(this);">
|
||||||
<table>
|
<table>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
<#if redirect??>"redirect": "${redirect}",</#if>
|
<#if redirect??>"redirect": "${redirect}",</#if>
|
||||||
<#if persistedObject??>"persistedObject": "${persistedObject?replace("\t", "")?string)}",</#if>
|
<#if persistedObject??>"persistedObject": "${persistedObject?replace("\t", "")?string}",</#if>
|
||||||
"message": "${msg(messageKey)}",
|
"message": "${msg(messageKey)}",
|
||||||
"name": "${name}"
|
"name": "${name}"
|
||||||
}
|
}
|
||||||
@@ -7,4 +7,11 @@
|
|||||||
<#if aclChangeSet_has_next>,</#if>
|
<#if aclChangeSet_has_next>,</#if>
|
||||||
</#list>
|
</#list>
|
||||||
]
|
]
|
||||||
|
<#if maxChangeSetCommitTime??>
|
||||||
|
,"maxChangeSetCommitTime": ${maxChangeSetCommitTime?c}
|
||||||
|
</#if>
|
||||||
|
<#if maxChangeSetId??>
|
||||||
|
,"maxChangeSetId": ${maxChangeSetId?c}
|
||||||
|
</#if>
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
"readers" :
|
"readers" :
|
||||||
[
|
[
|
||||||
<#list aclReaders.readers as reader>
|
<#list aclReaders.readers as reader>
|
||||||
${reader?string}
|
"${reader?string}"
|
||||||
<#if reader_has_next>,</#if>
|
<#if reader_has_next>,</#if>
|
||||||
</#list>
|
</#list>
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -84,6 +84,15 @@ function runAction(p_params)
|
|||||||
for (var i = 0, j = jsonPermissions.length; i < j; i++)
|
for (var i = 0, j = jsonPermissions.length; i < j; i++)
|
||||||
{
|
{
|
||||||
permissions[jsonPermissions[i].get("group")] = String(jsonPermissions[i].get("role"));
|
permissions[jsonPermissions[i].get("group")] = String(jsonPermissions[i].get("role"));
|
||||||
|
|
||||||
|
// It is not allowed for a user to increase access for "All Other Users" on a non-public site.
|
||||||
|
// This is because the site cannot be accessed until the user has been invited to join the site
|
||||||
|
if (jsonPermissions[i].get("group") == "GROUP_EVERYONE" && !site.isPublic)
|
||||||
|
{
|
||||||
|
result.success = false;
|
||||||
|
status.setCode(status.STATUS_BAD_REQUEST, "Cannot give permissions to all other permissions on non-public site");
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
site.setPermissions(fileNode, permissions);
|
site.setPermissions(fileNode, permissions);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
<#macro dateFormat date>${date?string("dd MMM yyyy HH:mm:ss 'GMT'Z '('zzz')'")}</#macro>
|
|
||||||
<#escape x as jsonUtils.encodeJSONString(x)>
|
<#escape x as jsonUtils.encodeJSONString(x)>
|
||||||
{
|
{
|
||||||
"items":
|
"items":
|
||||||
@@ -13,7 +12,7 @@
|
|||||||
"title": "${item.title}",
|
"title": "${item.title}",
|
||||||
</#if>
|
</#if>
|
||||||
"description": "${item.description!''}",
|
"description": "${item.description!''}",
|
||||||
"modifiedOn": "<@dateFormat item.modifiedOn />",
|
"modifiedOn": "${xmldate(item.modifiedOn)}",
|
||||||
"modifiedByUser": "${item.modifiedByUser}",
|
"modifiedByUser": "${item.modifiedByUser}",
|
||||||
"modifiedBy": "${item.modifiedBy}",
|
"modifiedBy": "${item.modifiedBy}",
|
||||||
"size": ${item.size?c},
|
"size": ${item.size?c},
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
<#assign page = p.page>
|
<#assign page = p.page>
|
||||||
<item>
|
<item>
|
||||||
<title>${(page.title!"")?html}</title>
|
<title>${(page.title!"")?html}</title>
|
||||||
<link>${shareUrl}/page/site/${siteId}/wiki-page?title=${page.systemName}</link>
|
<link>${shareUrl}/page/site/${siteId}/wiki-page?title=${page.systemName?url('UTF-8')}</link>
|
||||||
<pubDate>${page.modifiedAt?string("EEE, dd MMM yyyy HH:mm:ss zzz")}</pubDate>
|
<pubDate>${page.modifiedAt?string("EEE, dd MMM yyyy HH:mm:ss zzz")}</pubDate>
|
||||||
<guid isPermaLink="false">${node.id}</guid>
|
<guid isPermaLink="false">${node.id}</guid>
|
||||||
</item>
|
</item>
|
||||||
|
|||||||
@@ -362,8 +362,10 @@ public class ADMRemoteStore extends BaseRemoteStore
|
|||||||
FileInfo fileInfo = fileFolderService.create(
|
FileInfo fileInfo = fileFolderService.create(
|
||||||
parentFolder.getNodeRef(), encpath.substring(off + 1), ContentModel.TYPE_CONTENT);
|
parentFolder.getNodeRef(), encpath.substring(off + 1), ContentModel.TYPE_CONTENT);
|
||||||
|
|
||||||
contentService.getWriter(
|
ContentWriter writer = contentService.getWriter(
|
||||||
fileInfo.getNodeRef(), ContentModel.PROP_CONTENT, true).putContent(content);
|
fileInfo.getNodeRef(), ContentModel.PROP_CONTENT, true);
|
||||||
|
writer.guessMimetype(fileInfo.getName());
|
||||||
|
writer.putContent(content);
|
||||||
if (logger.isDebugEnabled())
|
if (logger.isDebugEnabled())
|
||||||
logger.debug("createDocument: " + fileInfo.toString());
|
logger.debug("createDocument: " + fileInfo.toString());
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -65,6 +65,19 @@ public class AclChangeSetsGet extends DeclarativeWebScript
|
|||||||
Map<String, Object> model = new HashMap<String, Object>(1, 1.0f);
|
Map<String, Object> model = new HashMap<String, Object>(1, 1.0f);
|
||||||
model.put("aclChangeSets", changesets);
|
model.put("aclChangeSets", changesets);
|
||||||
|
|
||||||
|
Long maxChangeSetCommitTime = solrTrackingComponent.getMaxChangeSetCommitTime();
|
||||||
|
if(maxChangeSetCommitTime != null)
|
||||||
|
{
|
||||||
|
model.put("maxChangeSetCommitTime", maxChangeSetCommitTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
Long maxChangeSetId = solrTrackingComponent.getMaxChangeSetId();
|
||||||
|
if(maxChangeSetId != null)
|
||||||
|
{
|
||||||
|
model.put("maxChangeSetId", maxChangeSetId);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if (logger.isDebugEnabled())
|
if (logger.isDebugEnabled())
|
||||||
{
|
{
|
||||||
logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
|
logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
|
||||||
|
|||||||
@@ -117,6 +117,11 @@ public class NodeContentGet extends StreamContent
|
|||||||
|
|
||||||
// check If-Modified-Since header and set Last-Modified header as appropriate
|
// check If-Modified-Since header and set Last-Modified header as appropriate
|
||||||
Date modified = (Date)nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIED);
|
Date modified = (Date)nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIED);
|
||||||
|
// May be null - if so treat as just changed
|
||||||
|
if(modified == null)
|
||||||
|
{
|
||||||
|
modified = new Date();
|
||||||
|
}
|
||||||
long modifiedSince = -1;
|
long modifiedSince = -1;
|
||||||
String modifiedSinceStr = req.getHeader("If-Modified-Since");
|
String modifiedSinceStr = req.getHeader("If-Modified-Since");
|
||||||
if(modifiedSinceStr != null)
|
if(modifiedSinceStr != null)
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import org.alfresco.service.cmr.model.FileFolderService;
|
|||||||
import org.alfresco.service.cmr.model.FileInfo;
|
import org.alfresco.service.cmr.model.FileInfo;
|
||||||
import org.alfresco.service.cmr.model.FileNotFoundException;
|
import org.alfresco.service.cmr.model.FileNotFoundException;
|
||||||
import org.alfresco.service.cmr.repository.NodeRef;
|
import org.alfresco.service.cmr.repository.NodeRef;
|
||||||
|
import org.alfresco.service.cmr.repository.NodeService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Implements the WebDAV COPY and MOVE methods
|
* Implements the WebDAV COPY and MOVE methods
|
||||||
@@ -125,7 +126,8 @@ public abstract class AbstractMoveOrCopyMethod extends HierarchicalMethod
|
|||||||
throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
|
throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
|
||||||
}
|
}
|
||||||
// delete the destination node if it is not the same as the source node and not a working copy
|
// delete the destination node if it is not the same as the source node and not a working copy
|
||||||
if (!destInfo.getNodeRef().equals(sourceInfo.getNodeRef()) && !isDestWorkingCopy)
|
if (!destInfo.getNodeRef().equals(sourceInfo.getNodeRef()) && !isDestWorkingCopy &&
|
||||||
|
!isShuffleOperation(sourceInfo) && !isVersioned(destInfo))
|
||||||
{
|
{
|
||||||
checkNode(destInfo);
|
checkNode(destInfo);
|
||||||
|
|
||||||
@@ -161,4 +163,22 @@ public abstract class AbstractMoveOrCopyMethod extends HierarchicalMethod
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
protected boolean isVersioned(FileInfo fileInfo)
|
||||||
|
{
|
||||||
|
NodeService nodeService = getNodeService();
|
||||||
|
boolean versioned = nodeService.hasAspect(fileInfo.getNodeRef(), ContentModel.ASPECT_VERSIONABLE);
|
||||||
|
return versioned;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected boolean isShuffleOperation(FileInfo sourceInfo)
|
||||||
|
{
|
||||||
|
NodeService nodeService = getNodeService();
|
||||||
|
boolean hidden = nodeService.hasAspect(sourceInfo.getNodeRef(), ContentModel.ASPECT_HIDDEN);
|
||||||
|
boolean temporary = nodeService.hasAspect(sourceInfo.getNodeRef(), ContentModel.ASPECT_TEMPORARY);
|
||||||
|
boolean shuffleOperation = hidden && temporary;
|
||||||
|
return shuffleOperation;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -178,8 +178,8 @@ public class GetMethod extends WebDAVMethod
|
|||||||
// is content required
|
// is content required
|
||||||
if (!m_returnContent)
|
if (!m_returnContent)
|
||||||
{
|
{
|
||||||
// it is a folder and no content is required
|
// ALF-7883 fix, HEAD for collection (see http://www.webdav.org/specs/rfc2518.html#rfc.section.8.4)
|
||||||
throw new WebDAVServerException(HttpServletResponse.SC_BAD_REQUEST);
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate a folder listing
|
// Generate a folder listing
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ public class LockMethod extends WebDAVMethod
|
|||||||
|
|
||||||
private static Timer timer = new Timer(true);
|
private static Timer timer = new Timer(true);
|
||||||
|
|
||||||
protected int m_timeoutDuration = WebDAV.TIMEOUT_INFINITY;
|
protected int m_timeoutDuration = WebDAV.TIMEOUT_24_HOURS;
|
||||||
|
|
||||||
protected LockInfo lockInfo = new LockInfoImpl();
|
protected LockInfo lockInfo = new LockInfoImpl();
|
||||||
|
|
||||||
@@ -371,7 +371,6 @@ public class LockMethod extends WebDAVMethod
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
m_response.setHeader(WebDAV.HEADER_LOCK_TOKEN, "<" + WebDAV.makeLockToken(lockNodeInfo.getNodeRef(), userName) + ">");
|
m_response.setHeader(WebDAV.HEADER_LOCK_TOKEN, "<" + WebDAV.makeLockToken(lockNodeInfo.getNodeRef(), userName) + ">");
|
||||||
m_response.setHeader(WebDAV.HEADER_CONTENT_TYPE, WebDAV.XML_CONTENT_TYPE);
|
m_response.setHeader(WebDAV.HEADER_CONTENT_TYPE, WebDAV.XML_CONTENT_TYPE);
|
||||||
|
|
||||||
|
|||||||
@@ -87,6 +87,11 @@ public class MoveMethod extends AbstractMoveOrCopyMethod
|
|||||||
|
|
||||||
checkNode(sourceFileInfo);
|
checkNode(sourceFileInfo);
|
||||||
|
|
||||||
|
if (destFileInfo != null && (isShuffleOperation(sourceFileInfo) || isVersioned(destFileInfo)))
|
||||||
|
{
|
||||||
|
copyOnlyContent(sourceNodeRef, destFileInfo, fileFolderService);
|
||||||
|
}
|
||||||
|
else
|
||||||
// ALF-7079 fix, if source is working copy then it is just copied to destination
|
// ALF-7079 fix, if source is working copy then it is just copied to destination
|
||||||
if (nodeService.hasAspect(sourceNodeRef, ContentModel.ASPECT_WORKING_COPY))
|
if (nodeService.hasAspect(sourceNodeRef, ContentModel.ASPECT_WORKING_COPY))
|
||||||
{
|
{
|
||||||
@@ -98,12 +103,7 @@ public class MoveMethod extends AbstractMoveOrCopyMethod
|
|||||||
else if (destFileInfo != null && nodeService.hasAspect(destFileInfo.getNodeRef(), ContentModel.ASPECT_WORKING_COPY))
|
else if (destFileInfo != null && nodeService.hasAspect(destFileInfo.getNodeRef(), ContentModel.ASPECT_WORKING_COPY))
|
||||||
{
|
{
|
||||||
// copy only content for working copy destination
|
// copy only content for working copy destination
|
||||||
ContentService contentService = getContentService();
|
copyOnlyContent(sourceNodeRef, destFileInfo, fileFolderService);
|
||||||
ContentReader reader = contentService.getReader(sourceNodeRef, ContentModel.PROP_CONTENT);
|
|
||||||
ContentWriter contentWriter = contentService.getWriter(destFileInfo.getNodeRef(), ContentModel.PROP_CONTENT, true);
|
|
||||||
contentWriter.putContent(reader);
|
|
||||||
|
|
||||||
fileFolderService.delete(sourceNodeRef);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -119,4 +119,14 @@ public class MoveMethod extends AbstractMoveOrCopyMethod
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void copyOnlyContent(NodeRef sourceNodeRef, FileInfo destFileInfo, FileFolderService fileFolderService)
|
||||||
|
{
|
||||||
|
ContentService contentService = getContentService();
|
||||||
|
ContentReader reader = contentService.getReader(sourceNodeRef, ContentModel.PROP_CONTENT);
|
||||||
|
ContentWriter contentWriter = contentService.getWriter(destFileInfo.getNodeRef(), ContentModel.PROP_CONTENT, true);
|
||||||
|
contentWriter.putContent(reader);
|
||||||
|
|
||||||
|
fileFolderService.delete(sourceNodeRef);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,6 +61,7 @@ public class WebDAV
|
|||||||
public static final int DEPTH_1 = 1;
|
public static final int DEPTH_1 = 1;
|
||||||
public static final int DEPTH_INFINITY = -1;
|
public static final int DEPTH_INFINITY = -1;
|
||||||
public static final short TIMEOUT_INFINITY = -1;
|
public static final short TIMEOUT_INFINITY = -1;
|
||||||
|
public static final int TIMEOUT_24_HOURS = 86400;
|
||||||
|
|
||||||
// WebDAV HTTP response codes
|
// WebDAV HTTP response codes
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ import org.alfresco.repo.tenant.TenantService;
|
|||||||
import org.alfresco.service.ServiceRegistry;
|
import org.alfresco.service.ServiceRegistry;
|
||||||
import org.alfresco.service.cmr.action.ActionService;
|
import org.alfresco.service.cmr.action.ActionService;
|
||||||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||||||
import org.alfresco.service.cmr.lock.LockService;
|
|
||||||
import org.alfresco.service.cmr.model.FileFolderService;
|
import org.alfresco.service.cmr.model.FileFolderService;
|
||||||
import org.alfresco.service.cmr.model.FileInfo;
|
import org.alfresco.service.cmr.model.FileInfo;
|
||||||
import org.alfresco.service.cmr.model.FileNotFoundException;
|
import org.alfresco.service.cmr.model.FileNotFoundException;
|
||||||
@@ -52,6 +51,7 @@ import org.alfresco.service.cmr.security.PermissionService;
|
|||||||
import org.alfresco.service.cmr.site.SiteInfo;
|
import org.alfresco.service.cmr.site.SiteInfo;
|
||||||
import org.alfresco.service.cmr.site.SiteService;
|
import org.alfresco.service.cmr.site.SiteService;
|
||||||
import org.alfresco.service.namespace.NamespaceService;
|
import org.alfresco.service.namespace.NamespaceService;
|
||||||
|
import org.alfresco.service.namespace.QName;
|
||||||
import org.alfresco.util.EqualsHelper;
|
import org.alfresco.util.EqualsHelper;
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
@@ -90,7 +90,7 @@ public class WebDAVHelper
|
|||||||
private NamespaceService m_namespaceService;
|
private NamespaceService m_namespaceService;
|
||||||
private DictionaryService m_dictionaryService;
|
private DictionaryService m_dictionaryService;
|
||||||
private MimetypeService m_mimetypeService;
|
private MimetypeService m_mimetypeService;
|
||||||
private LockService m_lockService;
|
private WebDAVLockService m_lockService;
|
||||||
private LockStore m_lockStore;
|
private LockStore m_lockStore;
|
||||||
private ActionService m_actionService;
|
private ActionService m_actionService;
|
||||||
private AuthenticationService m_authService;
|
private AuthenticationService m_authService;
|
||||||
@@ -114,7 +114,7 @@ public class WebDAVHelper
|
|||||||
m_namespaceService = m_serviceRegistry.getNamespaceService();
|
m_namespaceService = m_serviceRegistry.getNamespaceService();
|
||||||
m_dictionaryService = m_serviceRegistry.getDictionaryService();
|
m_dictionaryService = m_serviceRegistry.getDictionaryService();
|
||||||
m_mimetypeService = m_serviceRegistry.getMimetypeService();
|
m_mimetypeService = m_serviceRegistry.getMimetypeService();
|
||||||
m_lockService = m_serviceRegistry.getLockService();
|
m_lockService = (WebDAVLockService)m_serviceRegistry.getService(QName.createQName(NamespaceService.ALFRESCO_URI, WebDAVLockService.BEAN_NAME));
|
||||||
m_actionService = m_serviceRegistry.getActionService();
|
m_actionService = m_serviceRegistry.getActionService();
|
||||||
m_permissionService = m_serviceRegistry.getPermissionService();
|
m_permissionService = m_serviceRegistry.getPermissionService();
|
||||||
m_tenantService = tenantService;
|
m_tenantService = tenantService;
|
||||||
@@ -187,7 +187,7 @@ public class WebDAVHelper
|
|||||||
/**
|
/**
|
||||||
* @return Return the lock service
|
* @return Return the lock service
|
||||||
*/
|
*/
|
||||||
public final LockService getLockService()
|
public final WebDAVLockService getLockService()
|
||||||
{
|
{
|
||||||
return m_lockService;
|
return m_lockService;
|
||||||
}
|
}
|
||||||
|
|||||||
389
source/java/org/alfresco/repo/webdav/WebDAVLockService.java
Normal file
389
source/java/org/alfresco/repo/webdav/WebDAVLockService.java
Normal file
@@ -0,0 +1,389 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2005-2012 Alfresco Software Limited.
|
||||||
|
*
|
||||||
|
* This file is part of Alfresco
|
||||||
|
*
|
||||||
|
* Alfresco is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Alfresco is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.alfresco.repo.webdav;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpSession;
|
||||||
|
|
||||||
|
import org.alfresco.model.ContentModel;
|
||||||
|
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||||
|
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
|
||||||
|
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
||||||
|
import org.alfresco.service.Auditable;
|
||||||
|
import org.alfresco.service.cmr.coci.CheckOutCheckInService;
|
||||||
|
import org.alfresco.service.cmr.lock.LockService;
|
||||||
|
import org.alfresco.service.cmr.lock.LockStatus;
|
||||||
|
import org.alfresco.service.cmr.lock.LockType;
|
||||||
|
import org.alfresco.service.cmr.repository.NodeRef;
|
||||||
|
import org.alfresco.service.cmr.repository.NodeService;
|
||||||
|
import org.alfresco.service.transaction.TransactionService;
|
||||||
|
import org.alfresco.util.Pair;
|
||||||
|
import org.apache.commons.logging.Log;
|
||||||
|
import org.apache.commons.logging.LogFactory;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>
|
||||||
|
* WebDAVLockService is used to manage file locks for WebDAV and Sharepoint protocol. It ensures a lock never persists
|
||||||
|
* for more than 24 hours, and also ensures locks are timed out on session timeout.
|
||||||
|
*
|
||||||
|
* @author Pavel.Yurkevich
|
||||||
|
*/
|
||||||
|
public class WebDAVLockService
|
||||||
|
{
|
||||||
|
public static final String BEAN_NAME = "webDAVLockService";
|
||||||
|
|
||||||
|
/** The session attribute under which webdav/vti stores its locked documents. */
|
||||||
|
private static final String LOCKED_RESOURCES = "_webdavLockedResources";
|
||||||
|
|
||||||
|
private static Log logger = LogFactory.getLog(WebDAVLockService.class);
|
||||||
|
|
||||||
|
private static ThreadLocal<HttpSession> currentSession = new ThreadLocal<HttpSession>();
|
||||||
|
|
||||||
|
private LockService lockService;
|
||||||
|
private NodeService nodeService;
|
||||||
|
private TransactionService transactionService;
|
||||||
|
private CheckOutCheckInService checkOutCheckInService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the LockService
|
||||||
|
*
|
||||||
|
* @param lockService
|
||||||
|
*/
|
||||||
|
public void setLockService(LockService lockService)
|
||||||
|
{
|
||||||
|
this.lockService = lockService;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the NodeService
|
||||||
|
*
|
||||||
|
* @param nodeService
|
||||||
|
*/
|
||||||
|
public void setNodeService(NodeService nodeService)
|
||||||
|
{
|
||||||
|
this.nodeService = nodeService;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the TransactionService
|
||||||
|
*
|
||||||
|
* @param transactionService
|
||||||
|
*/
|
||||||
|
public void setTransactionService(TransactionService transactionService)
|
||||||
|
{
|
||||||
|
this.transactionService = transactionService;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the CheckOutCheckInService
|
||||||
|
*
|
||||||
|
* @param checkOutCheckInService
|
||||||
|
*/
|
||||||
|
public void setCheckOutCheckInService(CheckOutCheckInService checkOutCheckInService)
|
||||||
|
{
|
||||||
|
this.checkOutCheckInService = checkOutCheckInService;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Caches current session to the thread local variable
|
||||||
|
*
|
||||||
|
* @param currentSession
|
||||||
|
*/
|
||||||
|
public static void setCurrentSession(HttpSession session)
|
||||||
|
{
|
||||||
|
currentSession.set(session);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
public void sessionDestroyed()
|
||||||
|
{
|
||||||
|
HttpSession session = currentSession.get();
|
||||||
|
|
||||||
|
if (session == null)
|
||||||
|
{
|
||||||
|
if (logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
logger.debug("Couldn't find current session.");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// look for locked documents list in http session
|
||||||
|
final List<Pair<String, NodeRef>> lockedResources = (List<Pair<String, NodeRef>>) session.getAttribute(LOCKED_RESOURCES);
|
||||||
|
|
||||||
|
if (lockedResources != null && lockedResources.size() > 0)
|
||||||
|
{
|
||||||
|
if (logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
logger.debug("Found " + lockedResources.size() + " locked resources for session: " + session.getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
for (Pair<String, NodeRef> lockedResource : lockedResources)
|
||||||
|
{
|
||||||
|
String runAsUser = lockedResource.getFirst();
|
||||||
|
final NodeRef nodeRef = lockedResource.getSecond();
|
||||||
|
|
||||||
|
// there are some document that should be forcibly unlocked
|
||||||
|
AuthenticationUtil.runAs(new RunAsWork<Void>()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public Void doWork() throws Exception
|
||||||
|
{
|
||||||
|
return transactionService.getRetryingTransactionHelper().doInTransaction(
|
||||||
|
new RetryingTransactionCallback<Void>()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public Void execute() throws Throwable
|
||||||
|
{
|
||||||
|
// check whether this document still exists in repo
|
||||||
|
if (nodeService.exists(nodeRef))
|
||||||
|
{
|
||||||
|
if (logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
logger.debug("Trying to release lock for: " + nodeRef);
|
||||||
|
}
|
||||||
|
|
||||||
|
// check the lock status of document
|
||||||
|
LockStatus lockStatus = lockService.getLockStatus(nodeRef);
|
||||||
|
|
||||||
|
// check if document was checked out
|
||||||
|
boolean hasWorkingCopy = checkOutCheckInService.getWorkingCopy(nodeRef) != null;
|
||||||
|
boolean isWorkingCopy = nodeService.hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY);
|
||||||
|
|
||||||
|
// forcibly unlock document if it is still locked and not checked out
|
||||||
|
if ((lockStatus.equals(LockStatus.LOCKED) ||
|
||||||
|
lockStatus.equals(LockStatus.LOCK_OWNER)) && !hasWorkingCopy && !isWorkingCopy)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// try to unlock it
|
||||||
|
lockService.unlock(nodeRef);
|
||||||
|
|
||||||
|
if (logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
logger.debug("Lock was successfully released for: "
|
||||||
|
+ nodeRef);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
if (logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
logger.debug("Unable to unlock " + nodeRef
|
||||||
|
+ " cause: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// document is not locked or is checked out
|
||||||
|
if (logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
logger.debug("Skip lock releasing for: " + nodeRef
|
||||||
|
+ " as it is not locked or is checked out");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// document no longer exists in repo
|
||||||
|
if (logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
logger.debug("Skip lock releasing for an unexisting node: " + nodeRef);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}, transactionService.isReadOnly());
|
||||||
|
}
|
||||||
|
}, runAsUser == null ? AuthenticationUtil.getSystemUserName() : runAsUser);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// there are no documents with unexpected lock left on it
|
||||||
|
if (logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
logger.debug("No locked resources were found for session: " + session.getId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shared method for webdav/vti protocols to lock node. If node is locked for more than 24 hours it is automatically added
|
||||||
|
* to the current session locked resources list.
|
||||||
|
*
|
||||||
|
* @param nodeRef the node to lock
|
||||||
|
* @param lockType the lock type
|
||||||
|
* @param timeout the number of seconds before the locks expires
|
||||||
|
*/
|
||||||
|
public void lock(NodeRef nodeRef, LockType lockType, int timeout)
|
||||||
|
{
|
||||||
|
boolean performSessionBehavior = false;
|
||||||
|
|
||||||
|
// ALF-11777 fix, do not lock node for more than 24 hours (webdav and vti)
|
||||||
|
if (timeout >= WebDAV.TIMEOUT_24_HOURS || timeout == WebDAV.TIMEOUT_INFINITY)
|
||||||
|
{
|
||||||
|
timeout = WebDAV.TIMEOUT_24_HOURS;
|
||||||
|
performSessionBehavior = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.lockService.lock(nodeRef, lockType, timeout);
|
||||||
|
|
||||||
|
if (logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
logger.debug(nodeRef + " was locked for " + timeout + " seconds.");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (performSessionBehavior)
|
||||||
|
{
|
||||||
|
HttpSession session = currentSession.get();
|
||||||
|
|
||||||
|
if (session == null)
|
||||||
|
{
|
||||||
|
if (logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
logger.debug("Couldn't find current session.");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
storeObjectInSessionList(session, LOCKED_RESOURCES, new Pair<String, NodeRef>(AuthenticationUtil.getRunAsUser(), nodeRef));
|
||||||
|
|
||||||
|
if (logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
logger.debug(nodeRef + " was added to the session " + session.getId() + " for post expiration processing.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shared method for webdav/vti to unlock node. Unlocked node is automatically removed from
|
||||||
|
* current sessions's locked resources list.
|
||||||
|
*
|
||||||
|
* @param nodeRef the node to lock
|
||||||
|
*/
|
||||||
|
public void unlock(NodeRef nodeRef)
|
||||||
|
{
|
||||||
|
this.lockService.unlock(nodeRef);
|
||||||
|
|
||||||
|
if (logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
logger.debug(nodeRef + " was unlocked.");
|
||||||
|
}
|
||||||
|
|
||||||
|
HttpSession session = currentSession.get();
|
||||||
|
|
||||||
|
if (session == null)
|
||||||
|
{
|
||||||
|
if (logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
logger.debug("Couldn't find current session.");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean removed = removeObjectFromSessionList(session, LOCKED_RESOURCES, new Pair<String, NodeRef>(AuthenticationUtil.getRunAsUser(), nodeRef));
|
||||||
|
|
||||||
|
if (removed && logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
logger.debug(nodeRef + " was removed from the session " + session.getId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the lock status for the node reference relative to the current user.
|
||||||
|
*
|
||||||
|
* @see LockService#getLockStatus(NodeRef, NodeRef)
|
||||||
|
*
|
||||||
|
* @param nodeRef the node reference
|
||||||
|
* @return the lock status
|
||||||
|
*/
|
||||||
|
@Auditable(parameters = {"nodeRef"})
|
||||||
|
public LockStatus getLockStatus(NodeRef nodeRef)
|
||||||
|
{
|
||||||
|
return this.lockService.getLockStatus(nodeRef);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add the given <code>object</code> to the session list that is stored in session under <code>listName</code> attribute
|
||||||
|
*
|
||||||
|
* @param session the session
|
||||||
|
* @param listName the list name (session attribute name)
|
||||||
|
* @param object the object to store in session list
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
private static final void storeObjectInSessionList(HttpSession session, String listName, Object object)
|
||||||
|
{
|
||||||
|
List<Object> list = null;
|
||||||
|
|
||||||
|
synchronized (session)
|
||||||
|
{
|
||||||
|
list = (List<Object>) session.getAttribute(listName);
|
||||||
|
|
||||||
|
if (list == null)
|
||||||
|
{
|
||||||
|
list = new ArrayList<Object>();
|
||||||
|
session.setAttribute(listName, list);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
synchronized (list)
|
||||||
|
{
|
||||||
|
if (!list.contains(object))
|
||||||
|
{
|
||||||
|
list.add(object);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removes the given <code>object</code> from the session list that is stored in session under <code>listName</code> attribute
|
||||||
|
*
|
||||||
|
* @param session the session
|
||||||
|
* @param listName the list name (session attribute name)
|
||||||
|
* @param object the object to store in session list
|
||||||
|
*
|
||||||
|
* @return <tt>true</tt> if session list contained the specified element, otherwise <tt>false</tt>
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
private static final boolean removeObjectFromSessionList(HttpSession session, String listName, Object object)
|
||||||
|
{
|
||||||
|
List<Object> list = null;
|
||||||
|
|
||||||
|
synchronized (session)
|
||||||
|
{
|
||||||
|
list = (List<Object>) session.getAttribute(listName);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (list == null)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
synchronized (list)
|
||||||
|
{
|
||||||
|
return list.remove(object);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -333,6 +333,9 @@ public abstract class WebDAVMethod
|
|||||||
WebDAVMethod.this.m_inputStream = null;
|
WebDAVMethod.this.m_inputStream = null;
|
||||||
WebDAVMethod.this.m_reader = null;
|
WebDAVMethod.this.m_reader = null;
|
||||||
|
|
||||||
|
// cache current session
|
||||||
|
WebDAVLockService.setCurrentSession(m_request.getSession());
|
||||||
|
|
||||||
executeImpl();
|
executeImpl();
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,88 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
||||||
|
*
|
||||||
|
* This file is part of Alfresco
|
||||||
|
*
|
||||||
|
* Alfresco is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Alfresco is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.alfresco.repo.webdav;
|
||||||
|
|
||||||
|
import javax.servlet.ServletContextEvent;
|
||||||
|
import javax.servlet.ServletContextListener;
|
||||||
|
import javax.servlet.http.HttpSessionEvent;
|
||||||
|
import javax.servlet.http.HttpSessionListener;
|
||||||
|
|
||||||
|
import org.apache.commons.logging.Log;
|
||||||
|
import org.apache.commons.logging.LogFactory;
|
||||||
|
import org.springframework.context.ApplicationContext;
|
||||||
|
import org.springframework.web.context.support.WebApplicationContextUtils;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>WebDAVSessionListener is used to forcibly unlock documents that were
|
||||||
|
* persistently locked during user's session and were not unlocked because of some extraordinary
|
||||||
|
* situations such as network connection lost. Was introduced in ALF-11777 jira issue.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @author Pavel.Yurkevich
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public class WebDAVSessionListener implements HttpSessionListener, ServletContextListener
|
||||||
|
{
|
||||||
|
private static Log logger = LogFactory.getLog(WebDAVSessionListener.class);
|
||||||
|
private WebDAVLockService webDAVLockService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param webDAVLockService
|
||||||
|
* the webDAVLockService to set
|
||||||
|
*/
|
||||||
|
public void setWebDAVLockService(WebDAVLockService webDAVLockService)
|
||||||
|
{
|
||||||
|
this.webDAVLockService = webDAVLockService;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void sessionCreated(HttpSessionEvent hse)
|
||||||
|
{
|
||||||
|
if (logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
logger.debug("Session created " + hse.getSession().getId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
@Override
|
||||||
|
public void sessionDestroyed(HttpSessionEvent hse)
|
||||||
|
{
|
||||||
|
WebDAVLockService.setCurrentSession(hse.getSession());
|
||||||
|
webDAVLockService.sessionDestroyed();
|
||||||
|
|
||||||
|
if (logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
logger.debug("Session destroyed " + hse.getSession().getId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void contextDestroyed(ServletContextEvent sce)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void contextInitialized(ServletContextEvent sce)
|
||||||
|
{
|
||||||
|
ApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(sce.getServletContext());
|
||||||
|
this.webDAVLockService = (WebDAVLockService)context.getBean(WebDAVLockService.BEAN_NAME);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user