mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
25384: ALF-5352 - user usages - re-apply r19862 (ALF-713 fix) that was lost (probably due to merge conflict) 25440: Merged DEV/TEMPORARY to V3.4-BUG-FIX 25232: ALF-4300: DB2: Review schema (eg. VARCHAR columns) with respect to multi-byte support (when using DB2 / UTF-8) 25371: ALF-4300: DB2: Review schema (eg. VARCHAR columns) with respect to multi-byte support (when using DB2 / UTF-8) - All VARCHAR fields quadrupled for DB2 relative to MySQL to support UTF-8 character sets - ‘varchar-field-sizes-quadruple-increasing.sql’ introduced by patch - Minor conflict anticipated on AlfrescoSchemaUpdate-2.1-A--to--2.2-ACL.sql; ensure larger column size is kept. - Schema number now at 4201. 25444: Fix ALF-6689: WQS: Incorrect work of email field on contact page Fix ALF-7058: WQS: Blog article page of custom type gives an error 25447: Fix ALF-5198: WQS: Error while Name field filled with more than 70 characters or special characters 25506: ALF-6281: Actions for folder do not work (Quickr connector plug-in) 25534: ALF-646: Alfresco Logo isn't displayed in SPP Open window 25590: Merged DEV/TEMPORARY to V3.4-BUG-FIX 25582: ALF-6282: Incorrect behavior of Propertiesa - Add "Created", "Modified" and "Label" tags to document/folder entries in AlfrescoAtomBasedFeedServiceImpl.createEntry() 25595: Merged DEV/TEMPORARY to V3.4-BUG-FIX 25592:ALF-7194: Saving a Excel file with CIFS reset permissions. - Copy value of "Inherit Parent Space Permissions" flag to the new node in ContentDiskDriver.cloneNode() method. 25635: Merged DEV/TEMPORARY to V3.4-BUG-FIX 25574: ALF-6288: Action 'Send Link' is not worked 25616: ALF-6288: Action 'Send Link' is not worked - AlfrescoQuickrPathHelper.getNodePath() method was modified to return full node path, e.g. "/Company Home/Sites/TestSite/documentLibrary/test.odt". - AlfrescoQuickrPathHelper.removeSlashesAndRoot(String value) method was renamed to AlfrescoQuickrPathHelper.resolveNodePath(String path, boolean isRelative). 25638: Merged DEV/TEMPORARY to V3.4-BUG-FIX (with feedback from Gary) 25376: ALF-684: Ftp requests to the IPv6 resolved hostname are failing The ftp.ipv6.enabled property was removed, and a ServerSocket is opened without InetAddress parameter. It allows Java to determine if a IPv6 is used and bind "::" any local address to the server socket. It allows to connect to the Alfresco FTP using both IPv4 and IPv6 addresses regardless to server OS. 25639: ALF-5115: Removed circular dependency from non-continuous builds - No need to use -f continuous.xml anymore when building enterprise or community - Added assemble-command-extras stub to community build.xml, overridden by enterprise build.xml and called by continuous.xml 25699: MERGE DEV to V3.4-BUG-FIX ALF-5745 : AVMTemplateNode d:date properties are wrong. 25770: Investigation tests for ALF-6904: Wrong behaviour when overriding a constraint in content model 25774: Fixed ALF-7193: XAM Connector: xam.archive.nodePropertiesToWrite must not make properties mandatory - The property had to be set to null - achievable because it is MLText - Added full d:mltext expansion - Added double checks for nulls creeping in 25851: Fixed ALF-7381: OOM when Debug logging on ReferenceCountingReadOnlyIndexReaderFactory - Use a WeakHashMap 25853: Merged DEV/TEMPORARY to V3.4-BUG-FIX 25852: ALF-6373: Preview isn't generated for content added by quickr Added AlfrescoQuickrDocumentHelper.getMimeType(NodeRef fileRef) method that resolves the mime type using the node name. Set the mime type of nodes created in AlfrescoDocumentServiceImpl and AlfrescoAtomBasedFeedServiceImpl. 25860: Resolve ALF-7286: CMIS UP link for document doesn't contain all parents 25866: Fix for ALF-6312 - moved configuration to the correct file to be picked up by Spring Surf 25870: Merged DEV/TEMPORARY to V3.4-BUG-FIX 25840: ALF-6279: Failed to save properties in Symphony documents. AlfrescoDocumentServiceImpl.setDocType() method was modified to check for existence of document type in provided ClbDraft object. 25908: Set 3.4.2 revision 25931: Fix for ALF-6565: Explorer UI allows duplication of Replication targets which in effects breaks Alfresco 25987: DOC-238: Sharepoint (VTI) Protocol Configuration Documentation is outdated - have added comments in the properties file to indicate what they do 25994: WQS: Added a little more information to the log message when a 404 is returned 26003: ALF-7663: NPEs when using PermissionService with AVM stores - added unit tests for regression testing - no longer an issue 26004: ALF-7662: AVM permissions - access denied exception when trying to create file in a layered directory, when no explicit permissions set (on root dir node) - test passes on 3.4.2 - updated test to reflect 2.1 state 26011: ALF-6372 Now when the package manager adds items to a package it does not mark the items as modified. 26026: ALF-6350: Add support for Ideographic Space to the Full Text Search - - added full set of Unicode characters for letters and digits (0x0000 - 0xFFFF) - added fill set of Unicode whitespace - class to generate Unicode types -> ranges - upgraded antlr to 3.3. (required to resolve 3.2 bug) - fixed Lexer and parser test - much still depends on the tokeniser .... 26048: Fix for ALF-7507 - Manage Deleted Items - Recover All Icon Missing 26050: Fixed failing tests WorkflowFormProcessorTest and TaskFormProcessorTest. 26068: Resolve ALF-7342 - dynamic Models - unable to add new properties to an aspect if the aspect is a mandatory aspect of another aspect 26082: WQS: Improved debug-level logging to track WQS-to-repo interaction better. 26094: Some formatting 26095: Fixed ALF-7531: alfresco.jgroups.bind_interface is not taken into account - Added 'bind_interface' property to TCP config - Value injected into system properties: alfresco.jgroups.bind_interface 26130: Fix for CIFS multitenancy not working. ALF-6816. Need to search the global share list for admin named pipe shares. 26131: Fix for CIFS cut/paste write-protected error. ALF-1822 26132: Solairs/NFS ReadDir issue, cannot list folder more than once. ALF-5386 Search resume id/cookie value of zero has special meaning for NFS. 26133: Changed FTP return status for MKD command to 257, for RFC compliance. ALF-7501. 26136: Fix for FTP CWD-MKD-CWD sequence failing. ALF-7530 Trim filesystem path to make sure there is no trailing backslash. 26144: Merged V3.4 to V3.4-BUG-FIX 25890: Fix for ALF-5796 - It's impossible to add tag in Japanese language (IE specific) 25891: Fixes: ALF-7363 (updated JA translation) 25894: Fixed Legal and License url in About dialog 25896: ALF-6476 -translation on Transfer Target configuration 25899: First cut of French transfer properties. Mostly English! but has 3 lines of French. 25900: Fix for ALF-6916: More Deployment Reports action causes an error 25901: Fixes: ALF-6847 (Italian Translation) 25902: Fixes: ALF-6861 (incorrectly encoded German character) 25904: Fixes: ALF-6755 (translation quoting error) 25911: Fixes: ALF-6478 - French translation correction 25913: Fixes: ALF-6334 and ALF-6477 (Profile Edit style issues - makes mark up consistent, clears floats to allow for foreign languages being a tad more verbose than English and adjusts padding to help input boxes line up. 25914: Help URL for 3.4 enterprise docs 25915: Updates TinyMCE translation as requested in ALF-6486. 25916: Updated support URL in readme 25917: Fixes: ALF-6482, wrong word order in FR has been corrected. 25919: Fixes: ALF-6655 updated to allow enough space for verbose languages (e.g. FR, ES) 25925: Fix for ALF-6885: alfresco-enterprise-3.4.0.zip package has 2 issues with apply_amps.sh 25936: ALF-6469 - transfer folders internationalized 25941: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4: 25939: Latest JA update from Translators, received: 2011-02-28 25943: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4: 25942: Language updates for property string changes and additions between 3.4.0 and 3.4.1 25946: ALF-7191: Generate duplicate _en resource bundles, using location of _fr bundles as a guide for ALL bundles under alfresco and share WEB-INF/classes 25947: ALF-7191: Reverse accidentally committed changes to WebDAV in 25946! 25949: Fixes: ALF-6521 and ALF-6493 (Site discussion's handling of tags with special characters in them) 25950: Fixes: ALF-6489 - encodes the content's name to make it safe for a URL. 25951: Fixes: ALF-6487 Adjusts styling for rename panel 25954: ALF-7191 - Generate _en bundles for all message bundles for Explorer and Share - using known location of message bundles 25956: Allow a bit of leeway with audit timing during delete tests 25957: Fixed ALF-7341: Upload performance degradation when uploading contents to folders with content rules applied. - Action executions were being recorded by the ActionTrackingService for all actions - Post-commit updates of the action node was reducing performance - Added 'trackStatus' to ActionExecuter, ActionDefinition and Action - Default 'trackStatus' is false; exceptions: 'replicationActionExecutor' and 'commit-transfer' - Adjusted tests accordingly - General cleanup around modifications 25964: ALF-5625 - When viewing properties in version history hitting close results in loop 25970: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4: 25967: Fix ALF-7440: WQS: commons-pool library has been upgraded, but WQS build properties have not been changed accordingly 25971: ALF-7441: Help URLs pointing to new doc system (1 of 2) 25972: ALF-7441: Help URLs pointing to new doc system (2 of 2) 25974: Reverted rev 25964 - as fix is scheduled for 3.4.2 25979: Disabling intermittent failing unit test. ALF-7443 logged. 25980: Merged V3.4-BUG-FIX to V3.4 25978: ALF-7394 - Alfresco Network dashlet, now Alfresco Support information 26014: ALF-7087 - Cannot override webscript files in case of using jboss 5.1GA 26024: ALF-7466 - Links do not appear correctly in the management Console (RM) 26036: ALF-6403: Merged V3.4 to V3.4 (lost revision) 25627: Fixes ALF-7222: Updated linux installer window height (with taller image to hide additonal background) 26039: Fix intermittent failures in InviteServiceTest.tearDown() 26040: Fix intermittent failures in InviteServiceTest.setUp() 26043: Sync up run-junit-test with junit macros so that it can be used to run unit tests in an enterprise environment (e.g. DB2 / Oracle) 26044: Possibly fix intermittent TransferServiceImplTest failures by using org.alfresco.repo.transaction.RetryingTransactionInterceptor 26052: Do not wait indefinitely for a heartbeat in HeartBeatTest. A broken heartbeat would cause the build to hang forever! 26056: Merged V3.4-TEAM to V3.4 26053: Added in loop to wait for asynchronous post-failure auditing (ALF-3055) 26077: Upped LOGFILSIZ to avoid failures in unit tests with large transactions on DB2 26084: Avoid intermittent test failures in AbstractTestFormRestApi by using retrying transactions 26096: Correction to DB2 drop / create commands 26097: Fixes: ALF-7102, typo in property string. 26100: Merged V3.4-TEAM to V3.4 25985: Another cycle of fixing installer from Win builds. Still waiting for official fix from Bitrock. 26067: Fixes for installer builds on Windows 26102: Attempt to avoid intermittent failures in TaggingServiceImplTest by upping wait time 26109: Another go at executing the db2 creation statements synchronously through db2cmd 26111: ALF-6764 - Copyright year on Share login page out of date 26127: Merged V3.4-TEAM to V3.4 26120: Fix postgres.bki on Win builds 26142: Merged PATCHES/V3.4.0 to V3.4 25999: ALF-7377: Validate and reject partial WebDAV requests sometimes produced by NetDrive 26145: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 26143: Merged PATCHES/V3.4.0 to V3.4 26005: Merged V3.4-BUG-FIX to PATCHES/V3.4.0 26002: ALF-7282 Updated NodeListConverter so that it now implements the method revert(Object, ProcessDefinition) 26153: Fix for CIFS concurrent folder listing returns wrong list of files. ALF-6385. Synchronize the VirtualCircuit.allocateSearchSlot() method and put a marker object in the allocated slot so it does not get reused before the real search is put into the slot. 26156: Merged /BRANCHES/DEV/BELARUS/V3.3-2010_12_20 to BRANCHES/DEV/V3.4-BUG-FIX: 24902: ALF-5985: Users with an apostrophe in their username cannot cancel their own workflow no action button shown 26177: ALF-6686 - DOCLIB - add 'add-default-resource' as enhancement. 26181: Fix for ALF-7179 - NPE on Check in action when define lockable aspect as mandatory. 26182: ALF-3145 - Caller of CopyBehaviorCallback.getCopyProperties should ensure modifiability of properties map - Copy Service was already done. Merged similar changes to CopyBehaviourCallback. 26185: ALF-7238 - Value for $fieldHtmlId changes after metadata refresh 26196: Fixed ALF-3383: range slider does not honor xs:fractionDigits 26202: ALF-6947: RM LOV Constraint values are not returned in alphabetic order * RM list of values are now shown in the UI as ordered * this can be overridden in the constrant definition but isn't exposed in the admin UI 26206: Fixed ALF-6538 "My Tasks Dashlet needs to use Page URL" (code contribution from Jeff Potts) 26211: Fixed ALF-1289 "Search for groups on "Add Group" form works incorrectly" 26213: Fixes ALF-6697: Updates to flash and html uploaders to prevent files named with (Windows) illegal characters from being uploaded 26220: Fixed CopyServicePolicies javadoc 26221: Fixed ALF-4926: Incorrect behavior of update and move rule for the same folder - Pulled rule-specific code out of FileFolderService - Added detection for new nodes and renamed nodes in current transaction - New nodes will only fire inbound properties, renamed nodes won't fire outbound, etc - Added in coverage tests: - testCheckThatModifyNameDoesNotTriggerInboundRule - testCheckThatModifyNameDoesNotTriggerOutboundRule - testUpdateAndMoveRuleOnSameFolder - Requires regression tests of ALF-4846 and rule-based test cases - Inbound, update and outbound have to be respected for all clients 26222: Confirmed 3.4 fix presence for ALF-5001: cm:name uniqueness check can fail if the property is not set - Unit test the condition - Checked that code now uses the node UUID as a cm:name substitute 26228: Test fix after rev 25770 for ALF-6904 26232: Fixes ALF-6697: Improved error handling for HTML uploader 26236: Fixes ALF-6697: Re-use forms validation logic 26237: Build fix for lexer tests (character encoding issues on build box + using unfixed antlr test environment for one test) 26244: Merged BRANCHES/DEV/BELARUS/V3.3-2011_01_18 to BRANCHES/DEV/V3.4-BUG-FIX: (with modifications) 25071: ALF-1846: Workflow validation is not perfomed when tasks progression are requested 26259: Fix for ALF-7520: Upgrading from "old permission model" to "new permission model" (DmPermissionsPatch) - include generic patch to fix up permission inheritance issues Probable work around for ALF-7453: ACL Propagation issue for large number of users/ACLs 26276: Unit test fix for ALF-4926: Incorrect behavior of update and move rule for the same folder - Content update trigger now ignores nodes that are created in the same transaction 26277: Fix for ALF-7636, the onLoggedOut function was being called directly rather than an event being triggered, which made it impossible for plugins to use the event. 26278: Fix ALF-7568: Thumbnails should not go into the trash can - For 3.4: Just the content model setting for cm:thumbnail - Relates to TEAM rev 25038 26283: If we're not doing action tracking during execution and completion, then don't do the pending step either (ALF-7341) 26284: ALF-5998 - German language pack error in Explorer - Incorrect layout of Manage Task button in My tasks component in alfresco explorer 26285: Hopefully avoid intermittent failures caused by either slow machines (by ensuring locks are held during slow execution), and fixing up the action tracking parts of the test (broken by ALF-7341 changes) 26286: ALF-5889 - Italian translation errors in Explorer and Share - Aspects 26299: Fixed ALF-6289 "Contributor is absent in Permissions section at the details page" 26305: ALF-7264 - Improve error messages when there are no valid email addresses to send an email too (avoids a null pointer, instead gives a helpful one), and also a provisional fix for @localhost email validation (pending a proper fix via VALIDATOR-292) 26308: ALF-6073 - *.docx document is displayed on all views (Document List portlet) 26309: ALF-7532 - Content Rule on RM site (other than Folder) creates 'GUID' folder in Share Note: Fixed on Team, but along with many other unrelated fixes; hence not merged directly. 26311: Fixed ALF-7162: Bulk import NPE 26317: ALF-5560 - Incorrect behaviour on import. RM FilePlan now tolerates (but does not render) non-RM content which was causing the original issue. 26318: Fixes ALF-7321: Ensure that WCM and Share groups don't appear as options in Repository web-client start workflow wizard for group and pooled review workflows 26327: Merged V3.4 to V3.4-BUG-FIX 26158: Merged DEV/TEMPORARY to V3.4 26154: ALF-7571: Create Web Project wizard - Step 3 Superfluous “cellpadding” elements were removed. Missing space was added. 26164: ALF-6885: Changed svn:eol-style from native to LF for all .sh scripts 26165: Merged V3.4-TEAM to V3.4 26161: Fix full installer. 26178: Merged DEV/TEMPORARY to V3.4 26172: ALF-7601: 3.4.1 SDK WebServiceSamples multiple problems Configuration properties for WebServiceSamples was moved to correct place. Dependency to SDK AlfrescoEmbedded was added to classpath. It is required for FileCopyUtils from Spring which is used in WebServiceSamples. 26190: Reversed 26165 / 26161 - breaks installer building 26192: Convert TaggingServiceImplTest to use retrying transactions! 26194: ALF-7045: AVM upgrade - re-implement AVM "rename duplicates" patch as a DB upgrade script 26195: Update installer overlay files 26197: Final installer updates - built and tested on OSX 26199: Allow relocatable data for postgres - part2 26204: Attempt to avoid intermittent unit test failures in RecordsManagementAuditServiceImplTest by adding some Thread.sleep() calls to allow for asynchronous audit behaviour 26207: Set site notification to false on install (ALF-6181) 26212: Merged DEV to V3.4 26203: ALF-7605 PostgreSQL: Upgrade from 2.1.7 to 3.4.1 is failing - constraint "alf_access_control_entry_acl_id_key" does not exist 1. The statements which are drop constraints, marked as optional 2. The alter statements with new constraint names were added 26245: Added OOo port number configuration 26256: Fixes ALF-7679: Remove webscript-framework-config-custom.xml file 26270: License updates from Ashutosh 26274: Fix intermittent unit test failure with retrying transaction 26275: Possible fix to intermittent test failure. 26295: Reduce scope of retrying transaction, in a hope of fixing TaggingServiceImplTest.testOnStartupJob() 26303: And the prize for the largest number of retrying transactions in a single unit test goes to... 26307: Fixes: ALF-7704: Japanese language option not appearing in dropdown box on log in page. 26314: Another defensive sleep() in RecordsManagementAuditServiceImplTest 26325: Moved defensive sleep() in RecordsManagementAuditServiceImplTest 26329: Resolved merge issue in TaggingServiceImplTest 26332: ALF-7499: DOD5015 PublishUpdatesJob is not resilient to missing nodes 26337: Build fix - Added checks for new "sorted" parameter on ListOfValuesConstraint 26338: ALF-6004 - Verisonable aspect applied to content in Web Quick Start does not result in version information being exposed 26341: ALF-5394 Fixed issue where pooled actors (users not groups) were not working properly. 26352: Removed svn:mergeinfo 26357: ALF-5369: Disposition errors when importing FilePlan which includes custom event * missing events are now created with the information available * prevents exception when browsing imported file plan * TODO make sure sufficient information is stored in the export file so that events missing can be correctly recreated 26358: Found and fixed javascript error/bug when date-picker was used in form w read-only="true" 26360: Fixed ALF-5980 "Language pack errors in Share - Incorrect layout on Manage permissions page" 26362: Fixed ALF-5894 "Italian language pack in Share - Incorrect layout of My Profile dashlet" 26367: MERGE SWIFT to V3.4 BUG-FIX for ALF-5125 word offfice 2007 creates permanent temporary files on 3.2.2.1, and possible wrong ownership 26001 26081 26208 26216 26261 26315 26339 26370: MERGE DEV To V3.4-BUG FIX 26342 : ALF-5125 - word office 2007 creates permanent temporary files on 3.2.2.1, and possible wrong ownership 26382: Using predefined statics and neatening 26387: ALF-4101: Blog Archive filter has duplicate dates 26396: Fix for ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs - final part of fix for locking ACL changes (avoid simultaneous changes to the ACEs associated with an ACL) 26397: ALF-7823 - CIFS shuffle looses "mime type" of attachment. ALF-7670 - MS Word 2003 'Save As' to CIFS in a folder with a rule 'extract common metadata' does NOT extract the metadata 26398: Fixed ALF-6384 "Share - 'Insert Image Library' function in WIKI not working properly in IE8" 26407: Merged V3.4-2010_11_29 to V3.4-BUG-FIX 24159: ALF-413: Incorrect notification is displayed on Manage deleted items page when deleting an item that is already recovered 26412: Fix for ALF-4400: Share Search - Not Finding Document When Search Uses More Than One Tag in the Search Criteria - added TAG field - UI no longer has to do ugly query build and TAG is part of the default macro - Fixed unreported AND OR precedence issue and added grouping 26424: Fix for ALF-7795: Greater than (>) operator does not work with untokenised String properties in CMIS Query - fixed with issues will be resolved in SOLR/SWIFT - any term starting with { (used to encode locale) will be excluded from the range. - range queries not supported for urls .... 26449: Fixed ALF-5385 "Unable to edit groups on ts.alfresco.com" 26454: Fix for ALF-7852: Query consuming all heap and receiving an OOM exception - missing close on TermDocs and TermPositions 26460: ALF-634, ALF-7103 Externalized the JBPM Config location, so it can now be set as a property in repository.properties. 26470: Fixed ALF-7744: Ensure that new options.limit gets set when updating RSS feed results 26479: ALF-6533 - GROUP_EVERYONE is a special group, so when looking up the members to send an email, we need to call a different authority service method to get everyone 26484: ALF-7715 - Switch from the old Ant ZipFile to the new Commons Compress one, which supports the new file encoding zip extension 26488: ALF-7192 - Invitation code should support subtypes of Site in addition 26489: ALF-7192 - Update the Browse Bean and Site Aspect policy to support subtypes of Site 26493: ALF-7192 - When handling permissions and roles on sites, allow for sites which are a subtype of the default site type, rather than only supporting SiteModel.TYPE_SITE. (Unit test to follow) 26499: Fixes ALF-6415: Ensure that labels on installer radio buttons doesn't flow outside the window 26511: Merged DEV to V3.4-BUG-FIX 26406: ALF-7680: Check out of document allows users to create Working-Copy into Spaces where they do not have write access - Unit tests for ALF-7680 and ETHREEOH-535 were added. 26442: ALF-7680: Check out of document allows users to create Working-Copy into Spaces where they do not have write access - If destination folder for working copy is the same as the parent folder of the source node then working copy should be created even if the user has no permissions to create children in the parent of the source node. The following logic was added for Check Out operation to apply it: - if the target folder node is the same as the parent folder of the source document then working copy is created using 'System' user - if the target folder is a different parent, then working copy is created using current user. 26515: Partially fixes ALF-5774: Set correct Japanese date formatting on Repo Web Client summary panels 26529: Fix for ALF-6722 MT: Cancel workflow button isn't available for tenant users 26533: Fixed ALF-6563: Can't properly expose categories or associations on AWE forms 26534: Added correct source files for jbpm-jpdl-3.3.1 26535: Updated disabled testAsynchronousTaskExecutes as part of investigation into ALF-6405 26537: Fixed ALF-7927: Script error on Step 3 of Create Web Project Wizard - IE6/IE7 26540: ALF-7192 - Add unit test for custom site type 26559: Merged DEV to V3.4-BUG-FIX 26547: ALF-7528 : JSF - Edit online with Office 2010 causes the document mimetype to be lost - PutMethod was modified to use only guessed mime type for documents and completely ignore the Content-Type header from client. 26560: Fixes ALF-7931: Ensure checkboxes render correctly in IE6 for forms and replication job 26565: ALF-7232 - remove temporary (unit test) debug from log4j.properties 26566: Add a couple more site service checks for roles 26568: Fixes: ALF-7950 - escaped apostrophe 26576: Fix for: ALF-7996: Error when applying patch.fixAclInheritance - removed having clause for nasty where clause - hopefully optimised out .... 26580: Fixed ALF-7915 "Cannot delete rules created with check-in perform action." 26591: ALF-7995 - Repo tier web script get dataLists returns rule folder. Also fixed incorrect folder path rendering on non-Site rules page and removed reference to non-existent file. 26598: Add notes on if Transformers can be converted to Tika or not, and if not why 26601: Fixed ALF-7804: XAM: Long paths cause 'org.snia.xam.InvalidArgumentException' when XAM aspect is applied - Path-generation truncates the first characters to leave only 512 in the path - Added catch and WARN on failure to write properties to XSet (rather than fail) - Added log4j config for XAM 26603: Fixes: ALF-868 - IE Bug. 26604: Fixes: ALF-6486 - L10N bug in width of TinyMCE's dropdown lists not accommodating longer phrases in other languages. Width is now fluid 26606: Fixes: ALF-7397 - Removed repeated chars in JA dates that include long names for days of the week. 26611: Upgrade POI and Tika for ALF-7959 26612: Add test file from ALF-7959, tweaked to include the "Quick" text, and with the original user details munged 26613: Fix up unit tests after Tika upgrade for ALF-7959 26618: ALF-7959 - Convert the Outlook MSG text converter to using Tika, which fixes encoding problems 26628: Merged PATCHES/V3.1.2 to V3.4-BUG-FIX 26626: Merged DEV/TEMPORARY to PATCHES/V3.1.2 26400: ALF-607: Rules not firing on subspaces Execute RuleServiceImpl. getRules(), RuleServiceImpl. getOwningNodeRef(Rule) and RuleServiceImpl. getOwningNodeRef(Action) methods from System User. 26630: Merged HEAD to V3.4-BUG-FIX 26620: Modified to allow for multiple mime-types for Alfresco 3.3+. Related to ALF-4027. 26629: ALF-4027: Kofax Binaries corresponding to 26620 26650: Merged SWIFT to V3.4-BUG-FIX 26093: Workaround to the fact that the Solr classpath has got too large to include on a Windows command line! (32K) 26683: ALF-8045: VersionableAspect now properly resolves the namespaces of the QNames registered with excludedOnUpdateProps 26684: Resolve ALF-7515: CMIS operation getObjectRelationships() is not spec compliant 26689: Change the status code for the CIFS Trans2QueryPath response when the file does not exist. Possible fix for ALF-6727. 26691: Merged DEV/TEMPORARY to V3.4-BUG-FIX 26681: ALF-1871: FileLink and FolderLink items do not appear in WebDav Modify PropFindMethod to show file/folder links and return href of original node. Modify GetMethod to allow browser deal with file/folder links. 26692: Merged DEV/TEMPORARY to V3.4-BUG-FIX 26558: ALF-7910: It's impossible to delete folder with accentuated letter via IMAP from Outlook 2010 Call "AlfrescoImapFolder sourceNode = getFolder(user, oldMailboxName);" before decoding oldMailboxName in ImapServiceImpl.renameMailbox() method. Update JavaDoc in AlfrescoImapService. Add testRenameAccentedMailbox() test. 26693: Merged DEV/TEMPORARY to V3.4-BUG-FIX 26544: ALF-7911: Cannot contribute via IMAP if another user with only Consumer permissions has logged in first Dynamically check readOnly in AlfrescoImapFolder.isReadOnly() method. 26694: Merged DEV/TEMPORARY to V3.4-BUG-FIX (with corrections) 26343: ALF-6945 Failed Kerberos SSO auth returns HTML web page with wrong text/plain MIME type Setting content-type to text/html added for page used for failed Kerberos and NTLM authentications. 26695: Resolve ALF-7538: CMIS AtomPub: Not possible to retrieve associations defined via an Aspect. 26696: ALF-6132: Correction to handling of optional elements by Pavel 26701: Fixes ALF-8064: Ensure Windows installer respects manual service startup selection 26706: Resolve ALF-7759: MTOM is not enabled for all CMIS Web Services 26713: Resolve ALF-7994: Custom behavior is not triggered when creating content via CMIS 26717: Resolve ALF-6848: CMIS Rest: Properties Filter Parameter incorrectly functioning. 26720: Fix ALF-7977: Webform validation on change is always passing 26726: ALF-7086: Root folder has wrong Allowable Actions 26727: Resolve ALF-6266: Incorrect exception thrown when deleting a non-existing document (web-services binding) 26728: WQS: Performance enhancements. Local max throughput increased from 11 PIs/sec to 24 PIs/sec with 15 concurrent users (CPU utilization dropped from 100% to 70%) 26729: ALF-8045: Fix VersionServiceImplTest 26735: Merged DEV/TEMPORARY to V3.4-BUG-FIX 26725: ALF-3919 : WCM - JSF does not return an appropriate warning when creating content with ' ; ' character 1. The AVMNodeConverter class was modified to allow ';' character usage in web content names. 26736: Merged V3.4 to V3.4-BUG-FIX 26411: Fixes: ALF-7292 and ALF-7289, removes "· " from after Web and before Alfresco. 26413: Fixes: ALF-7765 - ensures naming consistency 26414: Fixes: ALF-7697 - Rewording the URL help text on the create site dialogue 26417: Fixes: ALF-7414, confused and hardcoded date-formatting & date formatting translations fixed. 26610: Fix for: ALF-8007: Lucene index not coherent or not up to date or we can not rely on it to check that a working copy exist. 26739: ALF-8085 - DMDeploymentTarget uses System.out 26748: ALF-7929: Script error on Web Form Details window - IE6/ IE7 - Fix up to CHK-10095 reviewed by Kev 26749: ALF-7557: Display full paths of categories in Explorer (reviewed by Kev) 26751: ALF-8079: NPE in ContentDiskDriver 26754: Fixes: ALF-2984. parseInt octal bug, so forcing dec. 26761: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 26760: Merged V3.4-BUG-FIX to V3.4 26759: Merged V3.4-BUG-FIX to V3.4 (3.4.2) 26762: ALF-8028 ResultSet not closed in TransferServiceImpl2 try...finally pattern was added to search operation. 26764: Further fixes to teh patch for: ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs 26765: ALF-634, ALF-7103: Possible fix to JBPM regressions introduced by r26460 26788: Further fixes to the patch for: ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs - fix type that would have missed a minor error (for unused shared ACLs) 26815: ALF-5500: Support site subtypes in SPP 26863: Merged DEV/TEMPORARY to V3.4-BUG-FIX 26853: ALF-3792: Copy Access Should Be More Restrictive Checking permissions for “Copy” was added action. Security settings for FileFolderService.copy operations were made more strict for Alfresco and RM. 26890: Merged HEAD to V3.4-BUG-FIX 26856: Fixed ClientInfo is null in sessionLoggedOn event. JLAN-121. 26867: Fix for wildcard search handling returning dot and dot-dot file entries. ALF-4960. 26868: Fix for wildcard search handling returning dot and dot-dot file entries, repo filesystem. ALF-4960. 26888: CIFS path broken when ß (German sz) char is in folder name. ALF-7186. 26909: AVMRepository: add missing error info - report store name (if not found) 26934: Fixed ALF-6532: Upload new version fails in Share (checkout) when using ContentStoreSelector - Includes investigative tests from DEV rev 26902 - Fixed safeCopyContent to cater for first-time setting of property where content is already in new store (copy operations) - Tested XAM use-case as well 26996: Fix for ALF-8229. patch.webSiteAddModerated upgrade error. Trivial fix sanctioned for check-in on 3.4.2 by SteveR. 26997: Undoing accidental check-in of eclipse project files changes. 27045: Change to CIFS session setup exception processing as per ALF-229. 27069: ALF-3871: Global properties now visible through JMX 27108: Merged PATCHES/V3.3.3 to V3.4-BUG-FIX 27107: ALF-8388: Merged PATCHES/V3.3.4 to PATCHES/V3.3.3 26894: ALF-7237: Further diagnostics for maxChecks and maxCheckTime 27110: Merge DEV to V3.4-BUG-FIX 26859 : ALF-6546 - JCR export fails when node has a null property value 27116: ALF-8190 - Minor version labels non-intuitive now the minor version will start at 0.1 rather than 1.0 27121: Fixed ALF-8307: Audit query template in 3.4.0 should quote key values for application and username 27332: Follow on test corrections from the fix to ALF-8190. 27508: Merge Dev to V3.4-BUG-FIX 27153 : ALF-5496 Commenting on a Space creates an Empty Folder via CIFS 27575: Merged DEV/TEMPORARY to V3.4-BUG-FIX 27070: ALF-4954: when cookies are disabled, Share enters into a loop, Explorer outputs a java.lang.NullPointerException exception, Firefox 1. SSOAuthenticationFilter and login page for Share application was modified to handle lack of cookies in a manner web-client do that. 27586: Ignore default build directory for virtual server 27587: Fix for ALF-8188: Share - Search returns no result when using special characters - not really a bug .... added implementation to support \u0000 style encoding in the parser but not the impl 27590: Merged DEV to V3.4-BUG-FIX 27147: ALF-7979 : Metadata extracters should log a warning/error when type conversion of field values fails 1. Adding additional logging for type conversion failure during metadata extraction. - Additionally removed some false TODOs and fixed generics in class 27593: Fix for: ALF-7827: CMIS Contains does not support TEXT, ALL, d:content etc as would be expected - added to match Alfresco FTS 27595: Fix for: ALF-8073: Property value not stored in Lucene index if stored=true and tokenized=false - if stored is selected the value will be stored in the plain property entry 27599: Merged V3.3 to V3.4-BUG-FIX 27130: Merged DEV/TEMPORARY to V3.3 27129: ALF-8141: Using the copy/move action causes the Path QName to change to 'copy' or 'move' MoveActionExecuter: Remove PARAM_ASSOC_TYPE_QNAME and PARAM_ASSOC_QNAME(Also remove it from classes that use them). Use FileFolderService for move operation. CopyActionExecuter: Remove PARAM_ASSOC_TYPE_QNAME and PARAM_ASSOC_QNAME(Also remove it from classes that use them). Use CopyService with original assocTypeQName and assocQName(Don't use FileFolderService here because it doesn't respect deep copy flag). 27155: ALF-8141: Fix up unit tests plus RESTful calls to RuleService 27601: Fix up unit tests following merge of ALF-8141 27604: Fix for ALF-7738: Hyphen not handled correctly in cmis-alfresco search for Aspects/types : " no viable alternative at character 'a' " - query names are now escaped where required 27613: Upgrade Tika and POI for ALF-7978 27618: ALF-1813 Fixed security issue where tasks could be edited by a user who did not have acess tot he task. 27637: Merged DEV/TEMPORARY to V3.4-BUG-FIX 26965: ALF-8258: sharedLockTokens property duplicated many times Changed LockInfo.sharedLockTokens from LinkedList to HashSet because in RFC "Lock token URIs MUST be unique across all resources for all time.", and therefore sharedLockTokens should contain non-repeatable values. 27662: ALF-8549: activities.getFeedControls() does not return a scriptable object in Javascript - also fix REST call (/api/activities/feed/controls) to return JSON 27663: Perf improvement: cache User Feed Controls (for generator job run) - note: activity feed controls are not currently exposed via Share UI 27668: ALF-8413: Share Feed Generator on Oracle generates NPE (when commenting in repo view) - fix NPE (note: in general Share does not post activities outside of site context + feed generator is currently based on site members) 27669: ALF-8549: activities.getFeedControls() does not return a scriptable object in Javascript - quick test fix for PostgreSQL (follow-on from r27662) 27697: ALF-8581: User activities are displayed twice in My Activities dashlet (in cluster env) - add cluster job lock service (SLNG-770) 27776: ALF-8581: Reverted changes to FeedGeneratorJob 27806: Merged DEV to V3.4-BUG-FIX 27793: ALF-8351 : JBPM Tables in Oracle missing index on Foreign Keys leading to table Locks 1. Sql script that creates indexes for foreign keys in jbpm tables was implemented. This script synchronizes jbpm indexes with mysql version. Merge changes: Changed 4.0 references to 3.4; Incremented schema number. 27808: Fixed ALF-7510: Share - Workflow 'due date' field date validation doesn't work properly 27811: Fixed ALF-6179: WebDAV has problems if username contains spaces 27812: Partial fix for ALF-7032: Alfresco doesn't escape special XML characters in AtomPub 27815: Switched to use ?xml instead of ?html in partial fix for ALF-7032: Alfresco doesn't escape special XML characters in AtomPub 27825: ALF-8489 Fixed issue by removing inappropriate 'requiredApprovePercent' field. 27852: Fix for ALF-7845 index.recovery.mode=AUTO doesn't rebuild avm index - applied provided patch 27857: Fix for ALF-868: Large Table Data causes TinyMCE to drop below Alfresco Footer in Web Form - IE7 only 27860: Fixes: ALF-2199 Errors in CSS files. 27866: Fixes: ALF-1327 - truncation issues in the calendar. 27881: Fixes bug in Chrome introduced with r27866 27898: CIFS on Windows fails to start under certain conditions. ALF-8723 27901: Merged DEV to V3.4-BUG-FIX 27891: ALF-7421: An opensolaris NFS client cannot see folders renamed using the web UI after two minutes. NFS server cache updating policy handler was implemented: - NfsServerNodeMonitor.java’ – new policy handler for NFS server; - NFSServerBean.java’ was modified to configure implemented node monitor with NFS server instance during server start up; - file-servers.properties’ was expanded with new properties for new node monitor which allows controlling node monitor 'enabled' state; - file-servers-context.xml’ was expanded with bean configuration for new node monitor and with configuration for NFS server bean to accept newly configured node monitor bean; - ShareDetailsHash.java’ was modified to externalize hashtable of the cache; - NFSServer.java’ was modified to externalize its cache for public access 27902: ALF-8744 - Untransalted strings in Recent shapshot 27903: Fixes: ALF-5717 Issues with non i18n/L10N Data List form fields. 27922: Fixes: ALF-8726 by back porting some Team usability fixes. *Do Not Merge* 27923: Fixes: ALF-8429 - Replaces hard coded English tooltip with a pre-existing i18n string. 27929: Fixed ALF-8768: Wrong path in comment for wcm-bootstrap-context.xml 27938: Partial Fix for: ALF-8720: Adds missing spaces. 27940: Merged V3.3 to V3.4-BUG-FIX 27851: Fix for ALF-8476:CLONE -Query consuming all heap and receiving an OOM exception - actually fixes stack overflow with skipTo when there are lots of deleted docs in an index in a row (<10000 on the default settings) ---- Modified : /alfresco/BRANCHES/DEV/V3.4-BUG-FIX Modified : /alfresco/BRANCHES/DEV/V3.4-BUG-FIX/root/projects/repository/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java Modified : /alfresco/BRANCHES/DEV/V3.4-BUG-FIX/root/projects/repository/source/java/org/alfresco/repo/search/impl/lucene/FilterIndexReaderByStringId.java 27942: Merged V3.4 to V3.4-BUG-FIX 26772: Fix for ALF-7843 - Created via SPP all-day event displays incorrectly 26775: Fix for ALF-3374 - Reverting a file in workflow causes a Successful error message 26778: Fix message Failed to find I18N message key: reset_categories for locale: en_US 26781: Fix for ALF-6488 - LangPack FR - [Site's Wiki] Renaming a wiki's page - special chars handling 26783: Fixed ALF-7421: An opensolaris NFS client cannot see folders renamed using the web UI after two minutes. - De-Hibernate DAO refactor missed implementing 'system.enableTimestampPropagation' - Set 'system.enableTimestampPropagation=true' in alfresco-global.properties - Timestamps will be written to immediate parent folder and will therefore not drop out of the filestate cache after 2 min 26785: Services-layer fix for ALF-8036. Incorrect permissions copied when copying folder with permissions from one site to another. UI will have to make changes in the UI layer in order to use new Services methods, thus completing the fix. This check-in adds support in the SiteService for moving and copying site-contained nodes. New move/copy methods are available in the Java Foundation API and in the JavaScript API which mimic the signatures of those in the NodeService and CopyService respectively. These methods simply delegate to the back-end services and so behaviours should be the same as before if they are used in place of the node and copy service methods. With one exception: The SiteService wrapper methods detect when the relocated node has been copied/moved between two different Share sites and clears permissions from the relocated node (and its primary descendants) that refer to the previous site. This has not been implemented using policies/behaviours as we can't bind the behaviour to any particular content class. Nodes of any type could be copied/moved between sites. 26787: Removed erroneous import from StreamContent - incorrect dependency on de.schlichtherle.io.FileOutputStream 26803: Fixes: ALF-8138, adds a i18n property for a ToDo list's attachment title. 26806: Fixed ALF-8154: Shorten the node path as prefix-only path - Use Path.toPrefixString instead of Path.toString - Provides improved fix for ALF-7804 26824: Fixed ALF-7012: WCM - Schema error "xs:enumeration full" select button group shows "Please select..." 26832: UI-layer fix component for ALF-8036 and a refactoring of the Services-layer fix component. Rather than add various facade methods to the SiteService for all the copy & move variants in NodeService, CopyService, FileFolderService etc, I have added a single new method to the SiteService cleanSitePermissions(). This removes all out-of-date site permissions after a node has been moved or copied to a new site. Also changed the slingshot action webscripts for move-to and copy-to to call this cleanUp method. 26838: Rewording a misleading code comment. Related to ALF-8036 changes. 26847: ALF-6727: File server protocols don't report the read only attribute for folders unless new configuration setting filesystem.setReadOnlyFlagOnFolders is true - Default is false - On windows, the read only attribute doesn't mean the folder is read only - it means "this folder has been customized - please fetch a desktop.ini". - This results in poor performance for non-admin users due to lots of secondary fetches for configuration information. - See the bug for more details. 26855: ALF-6727: Missing files from last check in 26858: Merged V3.4-TEAM to V3.4 26841: Fix for ALF-1044. (Searching for groups whose names contain regex reserved chars.) The fix was to add [] as reserved chars to the RegEx SimpleLanguageDef. Thanks AndyH. 26860: ALF-7101 and ALF-7866 - don't show the rules options to collaborators, as they shouldn't be able to create/manage rules 26861: Merged DEV/TEMPORARY to V3.4 (with corrections) 26157: ALF-1544: Server won't start on JBoss: Unable to resolve drag and drop application as a file, class path resource [alfresco/desktop/Alfresco.exe] DesktopAction uses Resource’s InputStream for drug-n-drop files representation. 26870: ALF-6727: Fix up ContentDiskDriverTest 26898: Fix ALF-8219: Deploying WQS in the same container as Alfresco causes startup to stall 26899: Possible installer build fix - uncomment project.readmeFile - set failifexecutionfails="true" on installer build targets so we know if installer building failed! 26900: ALF-8180: The installer shouldn't randomly delete a directory called tomcat that it didn't create - Fix provided by Bitrock 26919: Backing out 3 changes related to ALF-8036 due to uncertainty over fix approach. I'm reverse-merging revisions 26785, 26832 and 26838 out of this 3.4.2 branch. The fix version for ALF-8036 has been changed to 3.4.3 and so we don't want an unfinished fix on 3.4.2. In fact, this fix may be finished, but there is some uncertainty now over the approach to adopt (strip permissions vs. prevert copying of permissions). This fix will go to Team and 3.4.3 instead. 26932: Fixed a couple of non-unicode French characters that were messing up my scripts and: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4: 26911: Latest updates from translators (based on rev26710) 26944: ALF-3569 - Alfresco repository CIFS driver not setting timestamps. 26952: Finishes the completeness tests & fixes several L10N bugs. 26972: Fixes ALF-8272: Alfresco cannot be started after fresh install 26980: ALF-8287 - All buttons are disabled on Data Lists page. 27039: Merged BRANCHES/DEV/dwebsterV34 to BRANCHES/V3.4: - Update from Translators (based on r26837). 27059: Merged PATCHES/V3.4.1 to V3.4 26959: ALF-8261: 3.4 JSF performance regression introduced by WebProjectServiceImpl.hasWebProjectsRoot() (ALF-3085) 27020: ALF-8281: CLONE -'Move To' operation for categories, folders and records doesn't work ESCALATION 27061: Merged PATCHES/V3.3.4 to V3.4 27032: ALF-8289: Merged DEV to PATCHES/V3.3.4 27028: ALF-8289: Occasionally, web form complains of missing required fields when the fields are indeed populated 27068: Merged DEV to V3.4 27067: ALF-3774 : Unable to disable listening on port 7500 (JGroups) 1. DummyProtocol was changed to rewrite default configuration. This changes turn off diagnostic probing for DummyChannel. 27071: Fixed ALF-8363: BadSqlGrammarException during patch.fixAclInheritance on Oracle - Using '... = true' does not work for Oracle. - Replaced with parameterClass="boolean" and #trueOrFalse# - Tested against limited dataset so some condition paths might be missed. 27083: ALF-8124: Corrected ${} placeholders in Japanese installer strings 27088: Fixed ALF-8377: Generic KeywordSearch is not resilient to stale Lucene indexes - Cleaned up PersonSearchTest - Added exists check to KeywordSearch - Rationalized related bean declarations 27113: Fixed ALF-1322 "Creating user with username containing spaces works incorrectly" 27127: ALF-8346 - 'Complete event' button for folders is disabled in IE 27136: Installer string updates from Gloria 27173: Fix for: ALF-7834: CLONE - ACL Propagation issue for large number of users/ACLs - manually fix up the cache when changing inheritance 27503: Fix for ALF-8345 - Extra icons on the form of adding translation without content(IE specific) 27504: Fix for ALF-6917 - A system error happens when user attempted press toggle 'Version History' 27505: ALF-6215 - French Language pack - It's incorrect layout in Document List component 27509: ALF-8451: Port AVM-rename-dupes.sql to DB2 and SQL Server 27511: ALF-7165: User with contributor role cannot view content 27512: Installer string updates from Gloria - Corrections to msgid Installer.ReadmeFile.View 27557: case sensitivity issues with terminfo database building from Windows 27563: Merged DEV to V3.4 27558: ALF-8408: Impossible to upload a new file by contributor to subspace when rule is applied to subspaces Retrieving of rule was surrounded in RunAs(System username) block. It allows to retrieve rule node and its actions if user has no read permissions to rule node and to rule's actions. JUnit test "PermissionsForPropagatedRules_ALF_8408" was added. 27602: Fix for ALF-5625 - When viewing properties in version history hitting close results in loop (V3.4.2) 27622: ALF-5607: Remove bundled postgres data directory on installation abort on Linux 27639: Fix for ALF-6488 - Decode HTML content before creating page url argument for wiki 27647: Fix for ALF-8552 27672: ALF-8553: PatchService didn't recurse on dependents of already applied patches - Hence patch ordering was wrong on V3.4 upgrade 27684: ALF-8553, ALF-8602: set batchMaxQueryRange on patch.fixNameCrcValues-2 to avoid OOM 27687: Merge DEV to V3.4 27674 : ALF-8453 CIFS Failed to save versionable MS Word content as collaborator 27690: Merged DEV/TEMPORARY to V3.4 27688: ALF-7822 : AVM projects unavailable after upgrade to 3.4.1 script was modified to prevent data corruption 27775: Fixes ALF-8654: Add removed quotes back into .po files 27805: ALF-2935: Properly control RMI port in Bitrock installer - order repository-properties before shared-properties so that you can specify the port in alfresco-global.properties if you want to - include a tokenized alfresco-shared.properties in the WCM installation files 27807: Merged V3.4-TEAM to V3.4 27756: ALF-8207 - ALL LANG - Themes are not translated 27840: ALF-8687: No items display for series when opening it from library list 27853: Fixes: ALF-7465 - Removes some of the differences between the Add Event and Remove Event dialogues & reuses existing TagLibrary component to avoid conflicts. 27856: ALF-8687: No items display for series when opening it from library list. Slight refactor to better match non-RM doclib code. 27871: Fixes ALF-8124: Ensure Spanish locale for installer shows product name correctly 27932: Fixes ALF-5519: alfresco-enterprise-wcmqs-3.3.3.zip does not contain awe.war - Added awe.war to WQS zip file 27944: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 26766: Merged V3.4-BUG-FIX to V3.4 26761: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 26760: Merged V3.4-BUG-FIX to V3.4 26759: Merged V3.4-BUG-FIX to V3.4 (3.4.2) 26762: ALF-8028 ResultSet not closed in TransferServiceImpl2 try...finally pattern was added to search operation. 26764: Further fixes to the patch for: ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs 26765: ALF-634, ALF-7103: Possible fix to JBPM regressions introduced by r26460 26831: Merged V3.4-BUG-FIX to V3.4 26788: Further fixes to the patch for: ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs - fix type that would have missed a minor error (for unused shared ACLs) 27016: Merged V3.4-BUG-FIX to V3.4 26996: Fix for ALF-8229. patch.webSiteAddModerated upgrade error Trivial fix sanctioned for check-in on 3.4.2 by SteveR 26997: Undoing accidental check-in of eclipse project files changes 27859: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4: 27857: Fix for ALF-868: Large Table Data causes TinyMCE to drop below Alfresco Footer in Web Form - IE7 only git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@27948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
1045 lines
35 KiB
Java
1045 lines
35 KiB
Java
/*
|
|
* 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.web.bean.content;
|
|
|
|
import java.io.Serializable;
|
|
import java.text.MessageFormat;
|
|
import java.util.ArrayList;
|
|
import java.util.Collection;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.Locale;
|
|
import java.util.Map;
|
|
import java.util.Stack;
|
|
|
|
import javax.faces.application.FacesMessage;
|
|
import javax.faces.component.UIComponent;
|
|
import javax.faces.context.FacesContext;
|
|
import javax.faces.event.ActionEvent;
|
|
|
|
import org.alfresco.model.ApplicationModel;
|
|
import org.alfresco.model.ContentModel;
|
|
import org.alfresco.repo.content.MimetypeMap;
|
|
import org.alfresco.repo.transaction.RetryingTransactionHelper;
|
|
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
|
import org.alfresco.service.cmr.coci.CheckOutCheckInService;
|
|
import org.alfresco.service.cmr.lock.LockService;
|
|
import org.alfresco.service.cmr.ml.ContentFilterLanguagesService;
|
|
import org.alfresco.service.cmr.ml.EditionService;
|
|
import org.alfresco.service.cmr.ml.MultilingualContentService;
|
|
import org.alfresco.service.cmr.repository.ContentData;
|
|
import org.alfresco.service.cmr.repository.NodeRef;
|
|
import org.alfresco.service.cmr.repository.TemplateService;
|
|
import org.alfresco.service.cmr.security.PermissionService;
|
|
import org.alfresco.service.cmr.version.Version;
|
|
import org.alfresco.service.cmr.version.VersionHistory;
|
|
import org.alfresco.service.cmr.version.VersionService;
|
|
import org.alfresco.service.namespace.QName;
|
|
import org.alfresco.web.app.Application;
|
|
import org.alfresco.web.app.servlet.DownloadContentServlet;
|
|
import org.alfresco.web.bean.BaseDetailsBean;
|
|
import org.alfresco.web.bean.dialog.NavigationSupport;
|
|
import org.alfresco.web.bean.ml.SingleEditionBean;
|
|
import org.alfresco.web.bean.repository.MapNode;
|
|
import org.alfresco.web.bean.repository.Node;
|
|
import org.alfresco.web.bean.repository.Repository;
|
|
import org.alfresco.web.ui.common.ReportedException;
|
|
import org.alfresco.web.ui.common.Utils;
|
|
import org.alfresco.web.ui.common.Utils.URLMode;
|
|
import org.alfresco.web.ui.common.component.UIActionLink;
|
|
|
|
/**
|
|
* Backing bean providing access to the details of a document
|
|
*
|
|
* @author gavinc
|
|
*/
|
|
public class DocumentDetailsDialog extends BaseDetailsBean implements NavigationSupport
|
|
{
|
|
private static final long serialVersionUID = -8579599071702546214L;
|
|
|
|
private static final String OUTCOME_RETURN = null;
|
|
|
|
private static final String MSG_HAS_FOLLOWING_CATEGORIES = "has_following_categories";
|
|
private static final String MSG_NO_CATEGORIES_APPLIED = "no_categories_applied";
|
|
private static final String MSG_SUCCESS_UNLOCK = "success_unlock";
|
|
private static final String MSG_CURRENT = "current";
|
|
private static final String MSG_ERROR_ASPECT_INLINEEDITABLE = "error_aspect_inlineeditable";
|
|
private static final String MSG_ERROR_ASPECT_VERSIONING = "error_aspect_versioning";
|
|
private static final String MSG_ERROR_ASPECT_CLASSIFY = "error_aspect_classify";
|
|
private static final String MSG_DETAILS_OF = "details_of";
|
|
private static final String MSG_LOCATION = "location";
|
|
private final static String MSG_LEFT_QUOTE = "left_qoute";
|
|
private final static String MSG_RIGHT_QUOTE = "right_quote";
|
|
private final static String MSG_CLOSE = "close";
|
|
|
|
private static final String ML_VERSION_PANEL_ID = "ml-versions-panel";
|
|
|
|
private final static String DOC_DETAILS_STACK = "_alfDocDetailsStack";
|
|
|
|
transient protected LockService lockService;
|
|
transient protected VersionService versionService;
|
|
transient protected CheckOutCheckInService cociService;
|
|
transient protected MultilingualContentService multilingualContentService;
|
|
transient protected ContentFilterLanguagesService contentFilterLanguagesService;
|
|
transient protected EditionService editionService;
|
|
|
|
private Node translationDocument;
|
|
|
|
/** List of client light weight edition histories */
|
|
private List<SingleEditionBean> editionHistory = null;
|
|
|
|
/** For the client side iteration on the edition hitories list, it represents the index of the list */
|
|
private int currentEditionCursorPosition;
|
|
|
|
|
|
// ------------------------------------------------------------------------------
|
|
// Construction
|
|
|
|
/**
|
|
* Default constructor
|
|
*/
|
|
public DocumentDetailsDialog()
|
|
{
|
|
// initial state of some panels that don't use the default
|
|
panels.put("version-history-panel", false);
|
|
panels.put("ml-info-panel", false);
|
|
panels.put("related-translation-panel", false);
|
|
}
|
|
|
|
|
|
// ------------------------------------------------------------------------------
|
|
// Bean property getters and setters
|
|
|
|
/**
|
|
* Resets any state that may be held by this bean
|
|
*/
|
|
public void reset()
|
|
{
|
|
// reset the workflow cache
|
|
this.workflowProperties = null;
|
|
}
|
|
|
|
@Override
|
|
@SuppressWarnings("unchecked")
|
|
public void init(Map<String, String> parameters)
|
|
{
|
|
super.init(parameters);
|
|
//Remember active node.
|
|
Stack stack = getRecentNodeRefsStack();
|
|
stack.push(getNode().getNodeRef().getId());
|
|
}
|
|
|
|
@Override
|
|
@SuppressWarnings("unchecked")
|
|
public void restored()
|
|
{
|
|
super.restored();
|
|
Stack stack = getRecentNodeRefsStack();
|
|
if (stack.isEmpty() == false)
|
|
{
|
|
browseBean.setupContentAction((String) stack.peek(), true);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
@SuppressWarnings("unchecked")
|
|
public String cancel()
|
|
{
|
|
Stack stack = getRecentNodeRefsStack();
|
|
if (stack.isEmpty() == false)
|
|
{
|
|
stack.pop();
|
|
}
|
|
return super.cancel();
|
|
}
|
|
|
|
@SuppressWarnings("unchecked")
|
|
private Stack getRecentNodeRefsStack()
|
|
{
|
|
FacesContext fc = FacesContext.getCurrentInstance();
|
|
Stack stack = (Stack) fc.getExternalContext().getSessionMap().get(DOC_DETAILS_STACK);
|
|
if (stack == null)
|
|
{
|
|
stack = new Stack();
|
|
fc.getExternalContext().getSessionMap().put(DOC_DETAILS_STACK, stack);
|
|
}
|
|
return stack;
|
|
}
|
|
|
|
/**
|
|
* Returns the URL to download content for the current document
|
|
*
|
|
* @return Content url to download the current document
|
|
*/
|
|
public String getUrl()
|
|
{
|
|
return (String)getDocument().getProperties().get("url");
|
|
}
|
|
|
|
/**
|
|
* @return the translation document for this node
|
|
*/
|
|
public Node getTranslationDocument()
|
|
{
|
|
return translationDocument;
|
|
}
|
|
|
|
/**
|
|
* Before opening the ml container details, remeber the translation
|
|
* from which the action comes.
|
|
*
|
|
* @param node
|
|
*/
|
|
public void setTranslationDocument(Node node)
|
|
{
|
|
this.translationDocument = node;
|
|
}
|
|
|
|
/**
|
|
* Returns the URL to the content for the current document
|
|
*
|
|
* @return Content url to the current document
|
|
*/
|
|
public String getBrowserUrl()
|
|
{
|
|
Node doc = getLinkResolvedNode();
|
|
return Utils.generateURL(FacesContext.getCurrentInstance(), doc, URLMode.HTTP_INLINE);
|
|
}
|
|
|
|
/**
|
|
* Returns the download URL to the content for the current document
|
|
*
|
|
* @return Download url to the current document
|
|
*/
|
|
public String getDownloadUrl()
|
|
{
|
|
Node doc = getLinkResolvedNode();
|
|
return Utils.generateURL(FacesContext.getCurrentInstance(), doc, URLMode.HTTP_DOWNLOAD);
|
|
}
|
|
|
|
/**
|
|
* Resolve the actual document Node from any Link object that may be proxying it
|
|
*
|
|
* @return current document Node or document Node resolved from any Link object
|
|
*/
|
|
protected Node getLinkResolvedNode()
|
|
{
|
|
Node document = getDocument();
|
|
if (ApplicationModel.TYPE_FILELINK.equals(document.getType()))
|
|
{
|
|
NodeRef destRef = (NodeRef)document.getProperties().get(ContentModel.PROP_LINK_DESTINATION);
|
|
if (getNodeService().exists(destRef))
|
|
{
|
|
document = new Node(destRef);
|
|
}
|
|
}
|
|
return document;
|
|
}
|
|
|
|
/**
|
|
* Determines whether the current document is versionable
|
|
*
|
|
* @return true if the document has the versionable aspect
|
|
*/
|
|
public boolean isVersionable()
|
|
{
|
|
return getDocument().hasAspect(ContentModel.ASPECT_VERSIONABLE);
|
|
}
|
|
|
|
/**
|
|
* @return true if the current document has the 'inlineeditable' aspect applied
|
|
*/
|
|
public boolean isInlineEditable()
|
|
{
|
|
return getDocument().hasAspect(ApplicationModel.ASPECT_INLINEEDITABLE);
|
|
}
|
|
|
|
/**
|
|
* @return true if the current document has the 'inlineeditable' aspect applied
|
|
*/
|
|
public boolean isMultilingual()
|
|
{
|
|
return getDocument().hasAspect(ContentModel.ASPECT_MULTILINGUAL_DOCUMENT);
|
|
}
|
|
|
|
/**
|
|
* Fixes an issue reported in https://issues.alfresco.com/jira/browse/ETWOONE-92
|
|
*
|
|
* @return Returns action
|
|
*/
|
|
public String editContentProperties()
|
|
{
|
|
NodeRef nodeRef = getDocument().getNodeRef();
|
|
if (this.getNodeService().exists(nodeRef))
|
|
{
|
|
navigator.setupDispatchContext(getDocument());
|
|
return "dialog:editContentProperties";
|
|
}
|
|
else
|
|
{
|
|
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
|
|
FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {nodeRef}) );
|
|
return "browse";
|
|
}
|
|
|
|
}
|
|
|
|
/**
|
|
* Save the state of the panel that was expanded/collapsed
|
|
*/
|
|
public void expandPanel(ActionEvent event)
|
|
{
|
|
super.expandPanel(event);
|
|
String id = event.getComponent().getId();
|
|
|
|
if(id.startsWith(ML_VERSION_PANEL_ID))
|
|
{
|
|
this.currentEditionCursorPosition = Integer.parseInt(id.substring("ml-versions-panel".length())) - 1;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns a list of objects representing the versions of the
|
|
* current document
|
|
*
|
|
* @return List of previous versions
|
|
*/
|
|
public List getVersionHistory()
|
|
{
|
|
List<MapNode> versions = new ArrayList<MapNode>();
|
|
|
|
if (getDocument().hasAspect(ContentModel.ASPECT_VERSIONABLE))
|
|
{
|
|
VersionHistory history = this.getVersionService().getVersionHistory(getDocument().getNodeRef());
|
|
|
|
if (history != null)
|
|
{
|
|
for (Version version : history.getAllVersions())
|
|
{
|
|
// create a map node representation of the version
|
|
MapNode clientVersion = new MapNode(version.getFrozenStateNodeRef());
|
|
clientVersion.put("versionLabel", version.getVersionLabel());
|
|
clientVersion.put("notes", version.getDescription());
|
|
clientVersion.put("author", version.getCreator());
|
|
clientVersion.put("versionDate", version.getCreatedDate());
|
|
|
|
if(getDocument().hasAspect(ContentModel.ASPECT_MULTILINGUAL_EMPTY_TRANSLATION))
|
|
{
|
|
clientVersion.put("url", null);
|
|
}
|
|
else
|
|
{
|
|
clientVersion.put("url", DownloadContentServlet.generateBrowserURL(version.getFrozenStateNodeRef(),
|
|
clientVersion.getName()));
|
|
}
|
|
|
|
|
|
// add the client side version to the list
|
|
versions.add(clientVersion);
|
|
}
|
|
}
|
|
}
|
|
|
|
return versions;
|
|
}
|
|
|
|
/**
|
|
* For the client side iteration on the edition hitories list,
|
|
* return the next edition history.
|
|
*
|
|
* @return a light weight representation of an edition history
|
|
*/
|
|
public SingleEditionBean getNextSingleEditionBean()
|
|
{
|
|
currentEditionCursorPosition++;
|
|
|
|
return getCurrentSingleEditionBean();
|
|
}
|
|
|
|
/**
|
|
* For the client side iteration on the edition hitories list,
|
|
* return the current edition history.
|
|
*
|
|
* @return a light weight representation of an edition history
|
|
*/
|
|
public SingleEditionBean getCurrentSingleEditionBean()
|
|
{
|
|
return editionHistory.get(currentEditionCursorPosition);
|
|
}
|
|
|
|
/**
|
|
* Constructs a list of objects representing the editions of the
|
|
* logical document
|
|
*
|
|
* @return List of editions
|
|
*/
|
|
@SuppressWarnings("unused")
|
|
private List<SingleEditionBean> initEditionHistory()
|
|
{
|
|
// get the mlContainer
|
|
NodeRef mlContainer = getDocumentMlContainer().getNodeRef();
|
|
|
|
// get all editions (in descending order - ie. most recent first)
|
|
List<Version> orderedEditionList = new ArrayList<Version>(getEditionService().getEditions(mlContainer).getAllVersions());
|
|
|
|
// the list of Single Edition Bean to return
|
|
editionHistory = new ArrayList<SingleEditionBean>(orderedEditionList.size());
|
|
|
|
boolean firstEdition = true;
|
|
|
|
// for each edition, init a SingleEditionBean
|
|
for (Version edition : orderedEditionList)
|
|
{
|
|
SingleEditionBean editionBean = new SingleEditionBean();
|
|
|
|
MapNode clientEdition = new MapNode(edition.getFrozenStateNodeRef());
|
|
|
|
String editionLabel = edition.getVersionLabel();
|
|
if (firstEdition)
|
|
{
|
|
editionLabel += " (" + Application.getMessage(FacesContext.getCurrentInstance(), MSG_CURRENT) + ")";
|
|
}
|
|
|
|
clientEdition.put("editionLabel", editionLabel);
|
|
clientEdition.put("editionNotes", edition.getDescription());
|
|
clientEdition.put("editionAuthor", edition.getCreator());
|
|
clientEdition.put("editionDate", edition.getCreatedDate());
|
|
|
|
// Set the edition of the edition bean
|
|
editionBean.setEdition(clientEdition);
|
|
|
|
// get translations
|
|
List<VersionHistory> translationHistories = null;
|
|
|
|
if (firstEdition)
|
|
{
|
|
// Get the translations because the current edition doesn't content link with its
|
|
// translation in the version store.
|
|
Map<Locale, NodeRef> translations = getMultilingualContentService().getTranslations(mlContainer);
|
|
translationHistories = new ArrayList<VersionHistory>(translations.size());
|
|
for (NodeRef translation : translations.values())
|
|
{
|
|
translationHistories.add(getVersionService().getVersionHistory(translation));
|
|
}
|
|
}
|
|
else
|
|
{
|
|
translationHistories = getEditionService().getVersionedTranslations(edition);
|
|
}
|
|
|
|
// add each translation in the SingleEditionBean
|
|
for (VersionHistory versionHistory : translationHistories)
|
|
{
|
|
// get the list of versions (in descending order - ie. most recent first)
|
|
List<Version> orderedVersions = new ArrayList<Version>(versionHistory.getAllVersions());
|
|
|
|
// the last version (ie. most recent) is the first version of the list
|
|
Version lastVersion = orderedVersions.get(0);
|
|
|
|
// get the properties of the lastVersion
|
|
Map<QName, Serializable> lastVersionProperties = getEditionService().getVersionedMetadatas(lastVersion);
|
|
Locale language = (Locale) lastVersionProperties.get(ContentModel.PROP_LOCALE);
|
|
|
|
// create a map node representation of the last version
|
|
MapNode clientLastVersion = new MapNode(lastVersion.getFrozenStateNodeRef());
|
|
|
|
clientLastVersion.put("versionName", lastVersionProperties.get(ContentModel.PROP_NAME));
|
|
// use the node service for the description to ensure that the returned value is a text and not a MLText
|
|
clientLastVersion.put("versionDescription", getNodeService().getProperty(lastVersion.getFrozenStateNodeRef(), ContentModel.PROP_DESCRIPTION));
|
|
clientLastVersion.put("versionAuthor", lastVersionProperties.get(ContentModel.PROP_AUTHOR));
|
|
clientLastVersion.put("versionCreatedDate", lastVersionProperties.get(ContentModel.PROP_CREATED));
|
|
clientLastVersion.put("versionModifiedDate", lastVersionProperties.get(ContentModel.PROP_MODIFIED));
|
|
clientLastVersion.put("versionLanguage", this.getContentFilterLanguagesService().convertToNewISOCode(language.getLanguage()).toUpperCase());
|
|
|
|
if(getNodeService().hasAspect(lastVersion.getFrozenStateNodeRef(), ContentModel.ASPECT_MULTILINGUAL_EMPTY_TRANSLATION))
|
|
{
|
|
clientLastVersion.put("versionUrl", null);
|
|
}
|
|
else
|
|
{
|
|
clientLastVersion.put("versionUrl", DownloadContentServlet.generateBrowserURL(lastVersion.getFrozenStateNodeRef(), clientLastVersion.getName()));
|
|
}
|
|
|
|
// add a translation of the editionBean
|
|
editionBean.addTranslations(clientLastVersion);
|
|
}
|
|
editionHistory.add(editionBean);
|
|
firstEdition = false;
|
|
}
|
|
|
|
return editionHistory;
|
|
}
|
|
|
|
|
|
/**
|
|
* Determines whether the current document has any categories applied
|
|
*
|
|
* @return true if the document has categories attached
|
|
*/
|
|
public boolean isCategorised()
|
|
{
|
|
return getDocument().hasAspect(ContentModel.ASPECT_GEN_CLASSIFIABLE);
|
|
}
|
|
|
|
/**
|
|
* Returns a list of objects representing the categories applied to the
|
|
* current document
|
|
*
|
|
* @return List of categories
|
|
*/
|
|
public String getCategoriesOverviewHTML()
|
|
{
|
|
String html = null;
|
|
|
|
if (isCategorised())
|
|
{
|
|
// we know for now that the general classifiable aspect only will be
|
|
// applied so we can retrive the categories property direclty
|
|
Collection<NodeRef> categories = (Collection<NodeRef>)this.getNodeService().getProperty(
|
|
getDocument().getNodeRef(), ContentModel.PROP_CATEGORIES);
|
|
|
|
if (categories == null || categories.size() == 0)
|
|
{
|
|
html = Application.getMessage(FacesContext.getCurrentInstance(), MSG_NO_CATEGORIES_APPLIED);
|
|
}
|
|
else
|
|
{
|
|
StringBuilder builder = new StringBuilder(Application.getMessage(FacesContext.getCurrentInstance(),
|
|
MSG_HAS_FOLLOWING_CATEGORIES));
|
|
|
|
builder.append("<ul>");
|
|
for (NodeRef ref : categories)
|
|
{
|
|
if (this.getNodeService().exists(ref))
|
|
{
|
|
builder.append("<li>");
|
|
builder.append(Utils.encode(Repository.getNameForCategoryNode(this.getNodeService(), ref)));
|
|
builder.append("</li>");
|
|
}
|
|
}
|
|
builder.append("</ul>");
|
|
|
|
html = builder.toString();
|
|
}
|
|
}
|
|
|
|
return html;
|
|
}
|
|
|
|
/**
|
|
* Applies the classifiable aspect to the current document
|
|
*/
|
|
public void applyClassifiable()
|
|
{
|
|
try
|
|
{
|
|
RetryingTransactionHelper txnHelper = Repository.getRetryingTransactionHelper(FacesContext.getCurrentInstance());
|
|
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
|
|
{
|
|
public Object execute() throws Throwable
|
|
{
|
|
// add the general classifiable aspect to the node
|
|
getNodeService().addAspect(getDocument().getNodeRef(), ContentModel.ASPECT_GEN_CLASSIFIABLE, null);
|
|
return null;
|
|
}
|
|
};
|
|
txnHelper.doInTransaction(callback);
|
|
|
|
// reset the state of the current document
|
|
getDocument().reset();
|
|
}
|
|
catch (Throwable e)
|
|
{
|
|
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
|
|
FacesContext.getCurrentInstance(), MSG_ERROR_ASPECT_CLASSIFY), e.getMessage()), e);
|
|
ReportedException.throwIfNecessary(e);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Applies the versionable aspect to the current document
|
|
*/
|
|
public void applyVersionable()
|
|
{
|
|
try
|
|
{
|
|
FacesContext context = FacesContext.getCurrentInstance();
|
|
RetryingTransactionHelper txnHelper = Repository.getRetryingTransactionHelper(context);
|
|
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
|
|
{
|
|
public Object execute() throws Throwable
|
|
{
|
|
// add the versionable aspect to the node
|
|
getNodeService().addAspect(getDocument().getNodeRef(), ContentModel.ASPECT_VERSIONABLE, null);
|
|
return null;
|
|
}
|
|
};
|
|
txnHelper.doInTransaction(callback);
|
|
|
|
// reset the state of the current document
|
|
getDocument().reset();
|
|
|
|
// get hold of the main property sheet on the page and remove the children to force a refresh
|
|
UIComponent comp = context.getViewRoot().findComponent("dialog:dialog-body:document-props");
|
|
if (comp != null)
|
|
{
|
|
comp.getChildren().clear();
|
|
}
|
|
}
|
|
catch (Throwable e)
|
|
{
|
|
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
|
|
FacesContext.getCurrentInstance(), MSG_ERROR_ASPECT_VERSIONING), e.getMessage()), e);
|
|
ReportedException.throwIfNecessary(e);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Action Handler to unlock a locked document
|
|
*/
|
|
public void unlock(final ActionEvent event)
|
|
{
|
|
final FacesContext fc = FacesContext.getCurrentInstance();
|
|
|
|
try
|
|
{
|
|
RetryingTransactionHelper txnHelper = Repository.getRetryingTransactionHelper(FacesContext.getCurrentInstance());
|
|
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
|
|
{
|
|
public Object execute() throws Throwable
|
|
{
|
|
getLockService().unlock(getNode().getNodeRef());
|
|
|
|
String msg = Application.getMessage(fc, MSG_SUCCESS_UNLOCK);
|
|
FacesMessage facesMsg = new FacesMessage(FacesMessage.SEVERITY_INFO, msg, msg);
|
|
String formId = Utils.getParentForm(fc, event.getComponent()).getClientId(fc);
|
|
fc.addMessage(formId + ':' + getPropertiesPanelId(), facesMsg);
|
|
|
|
getNode().reset();
|
|
return null;
|
|
}
|
|
};
|
|
txnHelper.doInTransaction(callback);
|
|
}
|
|
catch (Throwable e)
|
|
{
|
|
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
|
|
fc, Repository.ERROR_GENERIC), e.getMessage()), e);
|
|
ReportedException.throwIfNecessary(e);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Applies the inlineeditable aspect to the current document
|
|
*/
|
|
public String applyInlineEditable()
|
|
{
|
|
try
|
|
{
|
|
RetryingTransactionHelper txnHelper = Repository.getRetryingTransactionHelper(FacesContext.getCurrentInstance());
|
|
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
|
|
{
|
|
public Object execute() throws Throwable
|
|
{
|
|
// add the inlineeditable aspect to the node
|
|
Map<QName, Serializable> props = new HashMap<QName, Serializable>(1, 1.0f);
|
|
String contentType = null;
|
|
ContentData contentData = (ContentData)getDocument().getProperties().get(ContentModel.PROP_CONTENT);
|
|
if (contentData != null)
|
|
{
|
|
contentType = contentData.getMimetype();
|
|
}
|
|
if (contentType != null)
|
|
{
|
|
// set the property to true by default if the filetype is a known content type
|
|
if (MimetypeMap.MIMETYPE_HTML.equals(contentType) ||
|
|
MimetypeMap.MIMETYPE_TEXT_PLAIN.equals(contentType) ||
|
|
MimetypeMap.MIMETYPE_XML.equals(contentType) ||
|
|
MimetypeMap.MIMETYPE_TEXT_CSS.equals(contentType) ||
|
|
MimetypeMap.MIMETYPE_JAVASCRIPT.equals(contentType))
|
|
{
|
|
props.put(ApplicationModel.PROP_EDITINLINE, true);
|
|
}
|
|
}
|
|
getNodeService().addAspect(getDocument().getNodeRef(), ApplicationModel.ASPECT_INLINEEDITABLE, props);
|
|
|
|
return null;
|
|
}
|
|
};
|
|
txnHelper.doInTransaction(callback);
|
|
|
|
// reset the state of the current document
|
|
getDocument().reset();
|
|
}
|
|
catch (Throwable e)
|
|
{
|
|
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
|
|
FacesContext.getCurrentInstance(), MSG_ERROR_ASPECT_INLINEEDITABLE), e.getMessage()), e);
|
|
ReportedException.throwIfNecessary(e);
|
|
}
|
|
|
|
// force recreation of the details view - this means the properties sheet component will reinit
|
|
return OUTCOME_RETURN;
|
|
}
|
|
|
|
/**
|
|
* Navigates to next item in the list of content for the current Space
|
|
*/
|
|
public void nextItem(ActionEvent event)
|
|
{
|
|
UIActionLink link = (UIActionLink)event.getComponent();
|
|
Map<String, String> params = link.getParameterMap();
|
|
String id = params.get("id");
|
|
if (id != null && id.length() != 0)
|
|
{
|
|
List<Node> nodes = this.browseBean.getContent();
|
|
if (nodes.size() > 1)
|
|
{
|
|
// perform a linear search - this is slow but stateless
|
|
// otherwise we would have to manage state of last selected node
|
|
// this gets very tricky as this bean is instantiated once and never
|
|
// reset - it does not know when the document has changed etc.
|
|
for (int i=0; i<nodes.size(); i++)
|
|
{
|
|
if (id.equals(nodes.get(i).getId()) == true)
|
|
{
|
|
Node next;
|
|
// found our item - navigate to next
|
|
if (i != nodes.size() - 1)
|
|
{
|
|
next = nodes.get(i + 1);
|
|
}
|
|
else
|
|
{
|
|
// handle wrapping case
|
|
next = nodes.get(0);
|
|
}
|
|
|
|
// prepare for showing details for this node
|
|
getRecentNodeRefsStack().clear();
|
|
this.browseBean.setupContentAction(next.getId(), false);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Navigates to the previous item in the list of content for the current Space
|
|
*/
|
|
public void previousItem(ActionEvent event)
|
|
{
|
|
UIActionLink link = (UIActionLink)event.getComponent();
|
|
Map<String, String> params = link.getParameterMap();
|
|
String id = params.get("id");
|
|
if (id != null && id.length() != 0)
|
|
{
|
|
List<Node> nodes = this.browseBean.getContent();
|
|
if (nodes.size() > 1)
|
|
{
|
|
// see above
|
|
for (int i=0; i<nodes.size(); i++)
|
|
{
|
|
if (id.equals(nodes.get(i).getId()) == true)
|
|
{
|
|
Node previous;
|
|
// found our item - navigate to previous
|
|
if (i != 0)
|
|
{
|
|
previous = nodes.get(i - 1);
|
|
}
|
|
else
|
|
{
|
|
// handle wrapping case
|
|
previous = nodes.get(nodes.size() - 1);
|
|
}
|
|
|
|
// prepare for showing details for this node
|
|
getRecentNodeRefsStack().clear();
|
|
this.browseBean.setupContentAction(previous.getId(), false);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @see org.alfresco.web.bean.BaseDetailsBean#getPropertiesPanelId()
|
|
*/
|
|
protected String getPropertiesPanelId()
|
|
{
|
|
return "document-props";
|
|
}
|
|
|
|
/**
|
|
* Returns a model for use by a template on the Document Details page.
|
|
*
|
|
* @return model containing current document and current space info.
|
|
*/
|
|
public Map getTemplateModel()
|
|
{
|
|
Map<String, Object> model = new HashMap<String, Object>(2, 1.0f);
|
|
|
|
model.put("document", getDocument().getNodeRef());
|
|
model.put("space", this.navigator.getCurrentNode().getNodeRef());
|
|
model.put(TemplateService.KEY_IMAGE_RESOLVER, imageResolver);
|
|
|
|
return model;
|
|
}
|
|
|
|
/**
|
|
* Returns whether the current document is locked
|
|
*
|
|
* @return true if the document is checked out
|
|
*/
|
|
public boolean isLocked()
|
|
{
|
|
return getDocument().isLocked();
|
|
}
|
|
|
|
/**
|
|
* Returns whether the current document is a working copy
|
|
*
|
|
* @return true if the document is a working copy
|
|
*/
|
|
public boolean isWorkingCopy()
|
|
{
|
|
return getDocument().hasAspect(ContentModel.ASPECT_WORKING_COPY);
|
|
}
|
|
|
|
/**
|
|
* @return the working copy document Node for this document if found and the
|
|
* current has permission or null if not
|
|
*/
|
|
public Node getWorkingCopyDocument()
|
|
{
|
|
Node workingCopyNode = null;
|
|
|
|
if (isLocked())
|
|
{
|
|
NodeRef workingCopyRef = this.getCheckOutCheckInService().getWorkingCopy(getDocument().getNodeRef());
|
|
if (workingCopyRef != null)
|
|
{
|
|
workingCopyNode = new Node(workingCopyRef);
|
|
|
|
// if the current user does not have read permission on
|
|
// working copy return null
|
|
if (workingCopyNode.hasPermission(PermissionService.READ) == false)
|
|
{
|
|
workingCopyNode = null;
|
|
}
|
|
}
|
|
}
|
|
|
|
return workingCopyNode;
|
|
}
|
|
|
|
/**
|
|
* Returns whether the current document is a working copy owned by the current User
|
|
*
|
|
* @return true if the document is a working copy owner by the current User
|
|
*/
|
|
public boolean isOwner()
|
|
{
|
|
return getDocument().isWorkingCopyOwner();
|
|
}
|
|
|
|
/**
|
|
* Returns the Node this bean is currently representing
|
|
*
|
|
* @return The Node
|
|
*/
|
|
public Node getNode()
|
|
{
|
|
return this.browseBean.getDocument();
|
|
}
|
|
|
|
/**
|
|
* Returns the document this bean is currently representing
|
|
*
|
|
* @return The document Node
|
|
*/
|
|
public Node getDocument()
|
|
{
|
|
return this.getNode();
|
|
}
|
|
|
|
/**
|
|
* Returns the ml container of the document this bean is currently representing
|
|
*
|
|
* @return The document multilingual container NodeRef
|
|
*/
|
|
public Node getDocumentMlContainer()
|
|
{
|
|
Node currentNode = getNode();
|
|
|
|
if(ContentModel.TYPE_MULTILINGUAL_CONTAINER.equals(currentNode.getType()))
|
|
{
|
|
return currentNode;
|
|
}
|
|
else
|
|
{
|
|
NodeRef nodeRef = getNode().getNodeRef();
|
|
|
|
return new Node(getMultilingualContentService().getTranslationContainer(nodeRef));
|
|
}
|
|
}
|
|
/**
|
|
* Sets the lock service instance the bean should use
|
|
*
|
|
* @param lockService The LockService
|
|
*/
|
|
public void setLockService(LockService lockService)
|
|
{
|
|
this.lockService = lockService;
|
|
}
|
|
|
|
protected LockService getLockService()
|
|
{
|
|
if (lockService == null)
|
|
{
|
|
lockService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getLockService();
|
|
}
|
|
return lockService;
|
|
}
|
|
|
|
/**
|
|
* Sets the version service instance the bean should use
|
|
*
|
|
* @param versionService The VersionService
|
|
*/
|
|
public void setVersionService(VersionService versionService)
|
|
{
|
|
this.versionService = versionService;
|
|
}
|
|
|
|
protected VersionService getVersionService()
|
|
{
|
|
if (versionService == null)
|
|
{
|
|
versionService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getVersionService();
|
|
}
|
|
return versionService;
|
|
}
|
|
|
|
/**
|
|
* Sets the checkincheckout service instance the bean should use
|
|
*
|
|
* @param cociService The CheckOutCheckInService
|
|
*/
|
|
public void setCheckOutCheckInService(CheckOutCheckInService cociService)
|
|
{
|
|
this.cociService = cociService;
|
|
}
|
|
|
|
protected CheckOutCheckInService getCheckOutCheckInService()
|
|
{
|
|
if (cociService == null)
|
|
{
|
|
cociService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getCheckOutCheckInService();
|
|
}
|
|
return cociService;
|
|
}
|
|
|
|
/**
|
|
* @param multilingualContentService the multilingual ContentService to set
|
|
*/
|
|
public void setMultilingualContentService(MultilingualContentService multilingualContentService)
|
|
{
|
|
this.multilingualContentService = multilingualContentService;
|
|
}
|
|
|
|
protected MultilingualContentService getMultilingualContentService()
|
|
{
|
|
if (multilingualContentService == null)
|
|
{
|
|
multilingualContentService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getMultilingualContentService();
|
|
}
|
|
return multilingualContentService;
|
|
}
|
|
|
|
/**
|
|
* @param contentFilterLanguagesService The Content Filter Languages Service to set.
|
|
*/
|
|
public void setContentFilterLanguagesService(ContentFilterLanguagesService contentFilterLanguagesService)
|
|
{
|
|
this.contentFilterLanguagesService = contentFilterLanguagesService;
|
|
}
|
|
|
|
protected ContentFilterLanguagesService getContentFilterLanguagesService()
|
|
{
|
|
if (contentFilterLanguagesService == null)
|
|
{
|
|
contentFilterLanguagesService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getContentFilterLanguagesService();
|
|
}
|
|
return contentFilterLanguagesService;
|
|
}
|
|
|
|
/**
|
|
* @param EditionService The Edition Service to set.
|
|
*/
|
|
public void setEditionService(EditionService editionService)
|
|
{
|
|
this.editionService = editionService;
|
|
}
|
|
|
|
protected EditionService getEditionService()
|
|
{
|
|
if (editionService == null)
|
|
{
|
|
editionService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getEditionService();
|
|
}
|
|
return editionService;
|
|
}
|
|
|
|
public String getCancelButtonLabel()
|
|
{
|
|
return Application.getMessage(FacesContext.getCurrentInstance(), MSG_CLOSE);
|
|
}
|
|
|
|
public String getContainerSubTitle()
|
|
{
|
|
return Application.getMessage(FacesContext.getCurrentInstance(), MSG_LOCATION) + ": " +
|
|
getDocument().getNodePath().toDisplayPath(getNodeService(), getPermissionService());
|
|
}
|
|
|
|
public String getContainerTitle()
|
|
{
|
|
FacesContext fc = FacesContext.getCurrentInstance();
|
|
return Application.getMessage(fc, MSG_DETAILS_OF) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE);
|
|
}
|
|
|
|
public String getCurrentItemId()
|
|
{
|
|
return getId();
|
|
}
|
|
|
|
protected String finishImpl(FacesContext context, String outcome) throws Exception
|
|
{
|
|
return null;
|
|
}
|
|
|
|
public String getOutcome()
|
|
{
|
|
return "dialog:close:dialog:showDocDetails";
|
|
}
|
|
}
|