mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
22 Commits
Author | SHA1 | Message | Date | |
---|---|---|---|---|
|
50ad2d600c |
ALF-11539: CIFS NodeMonitor is started even when CIFS and FTP are disabled
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32107 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
e18ab791d7 |
Merged V3.4-BUG-FIX to HEAD
31072: Incremented version.revision for 3.4.7 31082: Merged DEV to V3.4-BUG-FIX 31077: ALF-9661: Adding or removing associations does not trigger 'update' rule. 1. Unit test for replicating. 2. SingleAssocRefPolicyRuleTrigger now handles trigger of the rules on the list of parents. 31115: Merged DEV/TEMPORARY to V3.4-BUG-FIX 30992: ALF-10029 : Webdav error when document type is missing Correcting directory listing. Display reader's mimetype if display label for mimetype couldn't be found. 31116: Merged DEV/TEMPORARY to V3.4-BUG-FIX 31114: ALF-10309 : CLONE -WebDAV - Canceling "save as" upload will create 0 byte content Logic was added to PutMethod that removes empty files if a save operation is cancelled or fails. 31157: ALF-10757: Merged HEAD to V3.4-BUG-FIX 31154: Synchronize file writes from CIFS. ALF-10721. 31188: Merged DEV/TEMPORARY to V3.4-BUG-FIX 31176: ALF-9979: Error thrown when adding user(s) to group in explorer if user already exists in group Implemented checking of the user presence in the particular group using getAuthService().getContainedAuthorities() 31189: Merged DEV/TEMPORARY to V3.4-BUG-FIX 31174: ALF-9684: CMIS AtomPub: The combination of includeRelationships=both and returnVersion=latestmajor returns an internal server error Try-catch block was added for nodeService.getSourceAssocs(node, RegexQNamePattern.MATCH_ALL) operation. This operation is not supported for a version store. 31190: Merged DEV/TEMPORARY to V3.4-BUG-FIX 20694: ALF-925: "title" property always gets populated with the name of a file when content without a file extension is added via Webdav. When user creates file through webdav, "title" property was populated with "name" property value. The code that was doing it has been removed. Now the title will be empty in such a case. This makes things consistent with CIFS and FTP, where you have to create a rule with action "Extract common metadata fields from content". 31217: ALF-10807: Share document download with SSL - Fix from Bitrock 31226: ALF-10632: Added a sample configuration fragment for war-deployers-jboss-beans.xml because it's rather tricky to publish the correct configuration in the docs! 31265: ALF-9999 Cannot search pdf files, which are written vertically. Sample configures PdfMiner as the pdf -> text and ??? -> pdf -> text transformer rather than PDFBox. PdfMiner is slower but does handle vertical text. 31268: ALF-9093 Alfresco incapable of previewing text files including non Western European characters Sample file that configures OpenOffice as the default handler for text to PDF conversions 31304: Merged BRANCHES/DEV/BELARUS/HEAD-2011_10_05 to BRANCHES/DEV/V3.4-BUG-FIX: 31291: ALF-9460 : Archived discussion posts break display of the discussed node when users do not have access to the trash can 31313: Fix for JBPM security issues with timers and async tasks. ALF-10776: Workflow timer fires a policy that causes a AuthenticationCredentialsNotFoundException ALF-6405: SecureContext issue if task node async property is set to "true" 31314: Fixed ALF-10373 "There is no path to the folder for "Move" action inside the rule's description." 31361: Fixed ALF-10930. Incorrect description of 'xam.archive.forceBackgroundStoreMove' 31366: ALF-3756 - original fix didn't cope with existing MLText having one or more language variants. ...upgrading to the fix would therefore not solve the problem properly. For example, if a property has en_GB text in it, then 'updating' that property with a locale of en_US will result in the addition of the en_US text rather than a true update (they're both English, and using two slightly differently configured browsers in this way leads to confusion). 31387: ALF-10740: Flash upload - Working Copy label not removed on check in if non english locale is used in Share client Two separate problems were fixed: * Locale string as supplied by the flash uploader was being placed into the language portion of the Locale object in java, therefore no proper match was made when looking up the working copy label (e.g. "(Working Copy)") - fixed by using a proper locale string parser as supplied by Surf. * Working copy label could still fail to be removed if document was checked out under one locale and checked in using another. Fix provided by recording the *original* working copy label against the cm:workingcopy aspect. 31395: ALF-3756: fixes broken FullNodeServiceTest 31399: ALF-3756: fixing build failures from -c31366 (VersionServiceImplText.testRevert()) A ConcurrentModificationException was being thrown, have changed the way that the hashmap is processed to avoid this. 31401: Fix for ALF-2980 31410: Fix for ALF-10961 - Share - Sites not displayed on dashboard 31418: ALF-10768 Environment variables are being used to replace property placeholders in xml configuration files Modified ALL spring beans that are a PropertyPlaceholderConfigurer (including sub classes) and the PropertyPlaceholderConfigurer created ChildApplicationContextFactory so that OS environment variables are not used in property place holder substitutions. Spring 3 started allowing OS environment variables to be used by default. This may explain why we have so many install problems. 31420: ALF-3756 another compile error: This time StoreSelectorAspectContentStoreTest 31425: ALF-10740: Fix from -c 31387 (compilation error) This fix is in addition to -c31420. The compilation error was due to me not having the bug fix branch configured as an enterprise project. 31458: Fix for ALF-10916 31459: Fix for ALF-10915 31482: ALF-10915 - Fix build 31491: Various oplock, access mode and CIFS protocol fixes ported from v4/HEAD. ALF-10331. 31492: File open access mode checks ported from v4/HEAD. ALF-10331. 31529: ALF-11144: NPE during incremental LDAP sync 31530: Fixed ALF-11139: Audit concurrency exceptions do not trigger transaction retries - AuditMethodInterceptor allows audit exceptions to propagate out 31606: ALF-10309 CLONE -WebDAV - Cancelling "save as" upload will create 0 byte content Changed name of aspect to be WebDAV specific (rather than using a CIFS value), so that it might be possible to tidy these up in future. 31638: Fix for ALF-10597 - Share - Upload new version issue - OK button displayed during refresh 31639: Fix for ALF-10297 JSF - Sort by First/Last Name in Groups Management not working 31641: ALF-9776 - Fix for WCM - it allows users to submit contents to Staging with past Launch and Expiration Date 31653: ALF-8906: Ensure entire IMAP service startup transaction runs as system, to allow for any auto-aspect adding / versioning during cache warming 31654: Merged V3.4 to V3.4-BUG-FIX 31327: ALF-10878 Merged HEAD to V3.4 30225: ALF-10001 Update SiteService.listMembers to check group display names as well as group names, plus test 31329: Merged V3.4-BUG-FIX (3.4.7) to V3.4 (3.4.6) 30992: ALF-10029 : Webdav error when document type is missing Correcting directory listing. Display reader's mimetype if display label for mimetype couldn't be found. 31462: ALF-10010 Document can not be found even after a full reindex. Sample configures xpdf as the pdf -> text and ??? -> pdf -> text transformer rather than PDFBox. 31478: Merged BELARUS/V3.4-BUG-FIX-2011_10_13 to V3.4 (3.4.6) 31460: ALF-10952: User is unable to edit own profile using Alfresco Share To compare two objects it needs to use equals() method instead of ==. Such a check was changed in UsageQuotaProtector.onUpdateProperties() method. 31502: ALF-10324 Cannot disable Home Folder Creation 2nd part to the problem. Folders were being created when "Show all" was pressed in the UI 31504: Fix for ALF-9589 - Share - Advanced Search is not IE7 compatible for other themes 31531: ALF-10324 Cannot disable Home Folder Creation There is a knock on effect to ContentUsageService when the user does not exist and we are not allowed to create missing users. Resulted in 2 DMDeploymentTargetTest failures 31532: ALF-10955 No pooled task created for moderated site managers if any user requested to join Going with David Wards suggestion of still using getContainingAuthoritiesInZone with a null zone and a cut off at 100. The 100 might be too small, but probably is okay. 31655: ALF-10187: Merged V3.3 to V3.4-BUG-FIX 31180: ALF-9898: CIFS packet pool leaks - File state manager op lock break expiry thread was never getting started so some deferred packets were never getting released! - Synchronize around m_borrowed to prevent ConcurrentModificationExceptions in diagnostics - Synchronize around m_selector.keys() to prevent ConcurrentModificationExceptions during session reaping 31244: Merged DEV/BELARUS/V3.4-BUG-FIX-2011_09_29_CIFS to V3.3 ALF-10831: CIFS concurrency issues under load - Atomic synchronized write AND read operations in FileStateCache, TreeConnection, SrvSessionList, VirtualCircuit, VirtualCircuitList, ContentQuotaManager 31245: Merged DEV/BELARUS/V3.4-BUG-FIX-2011_09_29_CIFS to V3.3 ALF-9540: copy from drive to CIFS is slower than direct drive to drive copy by a factor of ~ 15 - batchRemoveRequest added to ThreadRequestQueue, meaning that not all incoming packets are scatter-gunned across different worker threads and reducing context switching - Arseny's tests show that combined with 3.4.6 changes, the factor is now under 2! 31246: ALF-9898: Merged HEAD to V3.3 31154: Synchronize file writes from CIFS. ALF-10721. 31233: Fixed a possible memory leak in the CIFS oplock timeout handler. 31273: ALF-9540: Reversed batchRemoveRequest changes - Review by Gary. Thread pool may not be utilized properly when multiple virtual connections are being handled at once. 31576: Changes to the CIFS idle session reaper so that it runs in the main socket event thread. ALF-9898. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
318cfae1b1 |
Filesystem changes.
a) Fixed bug if IOControlHandler threw IOControlNotImplementedException b) Cluster cache initialisation for all filesystem contexts. c) Don't attempt to start the filesystem if the cluster config fails. d) addition of new property for cluster debug (filesystem.cluster.debugFlags) e) Changed the property name from filesystem.cluster.config to filesystem.cluster.configFile git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29946 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
021a93f5c3 |
First cut of Hazelcast cache initialisation
need to set filesystem.cluster.enabled=true filesystem.cluster.config=c:\\temp\\hazelcastConfig.xml ALF-9966 - Locking wrong with OpLockManager and LockManager ContentDiskDriver error. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
988f40fc96 |
ALF-9779 - FTP: Failed to retrieve directory listing for tenant user
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29792 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
f8f02a9f95 |
Short term fixes to repo/AVM filesystems and a few other bits affected by the Alfresco JLAN cluster changes.
Hard code a standalone state cache into the repo/AVM filesystems. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
5346073135 |
Merged V3.4-BUG-FIX to HEAD
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 |
||
|
477cd0583e |
Merged V3.3-BUG-FIX to HEAD
22215: Fix compilation error 22240: ALF-4207: Download servlets show error page with permissions error rather than login page when non-guest user has insufficient permissions 22241: ALF-4469: External Access Servlet should also show status 403 errors to non-guest users, as in ALF-4207 22244: ALF-4599: CIFS access to alfresco with Kerberos authentication creates wrong users with domain suffix ALF-4395: recognize Kerberos machine accounts with lower case names 22247: ALF-4397: Properly handle null values in SortableSelectItem.compareTo() 22248: Merged DEV/TEMPORARY to V3.3-BUG-FIX 21963: ALF-4390: ModuleManagementTool is not returning error code in case of failure Error code constants and appropriate System.exit(code) invokations were added. 22260: ALF-4597: InviteContentUsersWizard was caching permissions in a non-type-specific cache - removed the cache - didn't allow for dynamic model updates either 22269: Merged V3.3 to V3.3-BUG-FIX (RECORD ONLY) 22268: Merged V3.3-BUG-FIX to V3.3 - Merged across all differences from V3.3-BUG-FIX 22270: Incremented revision number 22467: Merge from V3.3 to V3.3BUG-FIX. Fix for ALF-4741. V3.3: 22466 Merge from V3.2 to V3.3. Fix for ALF-4741. V3.2: 22465 Fix for ALF-4741. Repository Web Scripts can produce a corrupted response after a transaction collision/retry. 22667: Merged DEV/TEMPORARY to V3.3-BUG-FIX 22665: ALF-4825: Unlocking checked out content cause both original & working copy un-usable. Do not include unlock in the actions list when a node has a working copy. 22691: Add missing "logAbandoned" (= false) prop to config - follow on to r15133 (related to ALF-4020 / ETWOTWO-562) 22710: ALF-3948 - from time to time we have exception "Failed to init dictionaryRegistry" 22718: Merge from V3.3 to V3.3-BUG-FIX r 22715 Merge from V3.2 to V3.3 r 22713 Fix for ALF-4946 Possible NullPointerException during creation of thumbnails whose names are null-valued. 22722: Merged V3.3 to V3.3-BUG-FIX 22271: ALF-3712: Merged HEAD to V3.3 22249: Bin contents were not being packaged. 22272: Merged DEV/TEMPORARY to V3.3 22067: ALF-4479: when using webdav inline edit on webdav + MS Word 2003 +IE6, one gets: Unable to check in Content Node due to system error. Access Denied. You do not have the appropriate permissions to perform this operation. - Do not unlock a working copy. 22273: Merged DEV/TEMPORARY to V3.3 21729: ALF-3112: Property parameterTemplates not resolved correctly for SimpleTemplateActionDefinition The temporary fix for unconfigurable valueSeparator property. https://jira.springframework.org/browse/SPR-7429 22274: Merged DEV/TEMPORARY to V3.3 21993: ALF-4396: webdav "supportedlock" propfind request returns malformed response WebDAV supported lock elements were wrapped by “lockentry” elements according to the WebDAV specification. 22276: ALF-3890: FTP Change Working Directory (CWD) command works with root-relative paths with more than one component 22277: Merged DEV/TEMPORARY to V3.3 22076: ALF-3579: Open the Details Page URL removes the header, navigation bar etc The identifiers for modify action tag and details' actions tag should be different in the details pages. For documents: in the filelink-details.jsp and document-details.jsp. For spaces: in the space-details.jsp and spacelink-details.jsp. 22285: Merged HEAD to V3.3 22284: Fix for ALF-3063 "Incorrect behaviour on filtering by tag in Repository". Labels updated to more accurately reflect behaviour. 22299: Fix for ALF-3893: lucene.indexer.mergerTargetIndexCount is redundant - this property is now used to control the merging of indexes as was intended 22309: Merged DEV/TEMPORARY to V3.3 (Approved by Roy) 21035: ALF-2588: RM: Export and import of file plan causes disposition errors When content is imported from acp the actionId that points to the action NodeRef is old in the imported content and NullPointerExcepption appears. To avoid this we changed DispositionScheduleImpl. Now it stores the action that has different name and ID (when action is create it name equals id) in a separate map. And when getDispositionActionDefinition(String id) method is called it tries to retrieve the action from this map, if it hasn’t been found earlier. 22325: Fix for ALF-4428: Incorrect behaviour of Consumer and Contributor permissions with Quickr - unit test pass 22334: Merged HEAD to V3.3 22331: Fixes: ALF-3558: Input and variable encoding issues in Share Calendar & API JSON data. 22355: ALF-4489: Special Characters Create Stack Overflow Exception in the Group Admin Console for Share in Internet Explorer. Fixed missing encoding and also added guard code to prevent stack overflow problem in case of future error. 22356: Fix for ALF-4384 - missing JSP page directive 22360: Fix for ALF-4428: Incorrect behaviour of Consumer and Contributor permissions with Quickr - unit test pass - no abstain allowed 22365: Merged DEV/TEMPORARY to V3.3 21874: ALF-2641: WebDav Permission Issues - MAC OSX Finder The createExclusive field was introduced instead of m_scope. New algorithm of lockscope determination was added. Also ALF-4008 compliant fix provided with this. 21812: ALF-4008: save a MS Word change over webdav after a 2-3 minutes delay causes the error 'XXX.doc is currently in use. Please try again later.' Modified LOCK method, it gets a scope from NodeRef property if m_scope field is not defined. 22367: Merged DEV/TEMPORARY to V3.3 21442: ALF-2587: WEBDAV error in Windows 7 - variant generateLockDiscoveryXML methods were factored into a single one capable of generating a namespaced LOCK response compatible with Windows 7 when its user agent header is detected. 22368: Merged DEV/TEMPORARY to V3.3 20919: ALF-2834: All day events created in Outlook not appearing in Meeting Workspace Different date format is used by Outlook when creating all day meeting request and meeting request specifying date and time. The code was changed to handle both situations accordingly. 22369: Merged DEV/TEMPORARY to V3.3 (With simplifications) 21470: ALF-3796: Locale is not always set/reset on every request thread - A GlobalLocalizationFilter sits in front of ALL requests and sets a default fallback locale on I18NUtil - Moved BaseServlet.setLanguageFromRequestHeader into this filter and made sure it always falls back to a default locale - Subsequent filters / servlets in faces chain may override this with user preferred locale after authentication 22370: ALF-3868: Fix for compatibility with Sun Directory Server 22371: Merged DEV/TEMPORARY to V3.3 21811: ALF-4067: Display Value for Action Constraint breaking a java eval in Share When a node doesn't have a ContentModel.PROP_TITLE property it is added to AllowableValues with PROP_NAME value. 21795: ALF-4067: Display Value for Action Constraint breaking a java eval in Share The fix introduces the code which doesn't add a node to AllowableValues if it doesn't have a ContentModel.PROP_TITLE property. 22378: ALF-3796: Fixed compilation error - BaseServlet.setLanguageFromRequestHeader replaced by global filter 22380: ALF-3761: War bundles + extension samples now include alfresco-global.properties in correct position in hierarchy 22386: ALF-3887: Two versions of geronimo-activation are shipped - Removed the older version 22402: WCM - add more debug logging only 22405: Change notification handler not enabled by the server configuration bean. ALF-4715. 22407: Merged DEV/TEMPORARY to V3.3 22231: ALF-4096: Share point module is causing file descriptor leaks. The following changes were added to VtiIfHeaderAction and GetDocumentMethod: - code that copies data between streams was replaced by org.apache.commons.io.IOUtils.copy() - correct stream closing was added for all cases including exceptions while copying 22411: Merged DEV/TEMPORARY to V3.3 21864: ALF-4371: Error occurs if user try to find event from meeting place Replaced incorrect NamespaceService.CONTENT_MODEL_PREFIX with NamespaceService.CONTENT_MODEL_1_0_URI in QName creation. 22412: Merged DEV/TEMPORARY to V3.3 22018: ALF-4403: Search on users in JSF client and SHARE do not specify "cm:person" type clause in the query leading to incorrect results in user searching. People searches in Alfresco and share are restricted by “cm:person” type. 21988: ALF-4403: Search on users in JSF client and SHARE do not specify "cm:person" type clause in the query leading to incorrect results in user searching. People searches in Alfresco and share are restricted by “cm:person” type. 22418: ALF-4578: Avoid ConcurrentModificationException in AVMDeploymentTarget 22420: Fixed ALF-958: Target associations aren't copied - Added CopyBehaviourCallback. getAssociationCopyAction - Default behaviour: - Remove existing associations of same type when copying OVER an existing node (e.g. check-in) - Copy the association using a new target if the target is copied in the same call - Copy the association to the original target if the target is not copied in the same call - Abstract behaviour (for those that have implemented a CopyBehaviourCallback): - Remove existing associations of same type when copying OVER an existing node (e.g. check-in) - Only copy the association to a new target if the original target is copied 22421: ALF-4641: Strip ticket parameter on login page redirect to avoid endless redirect loop 22422: Merged DEV/TEMPORARY to V3.3 21201: ALF-1804: Passthru server check gets confused when a server goes offline 22423: Merged DEV/TEMPORARY to V3.3 21891: ALF-3356: Error changing own user role from coordinator to consumer When a user changes the Roles, all Permissions are immediately deleted and new selected permissions are created. If all permissions are deleted then the user doesn't have access for permissions creation. If the user currently has permission change permission the currently set of permissions is cleared and new permissions are added from a System User authority. 22424: Merged DEV/TEMPORARY to V3.3 21182: ALF-1786: Remote Opensearch request mimetype missing SearchProxy was changed to provide original User-Agent header. HTTPProxy was extended to set request headers. New overridable method setRequestHeaders was added to provide ability of setting headers. 22425: Merged DEV/TEMPORARY to V3.3 22165: ALF-197: When returning to the first step of Advanced Workflow creation from second or third steps it's always Adhoc Task chosen there The selectedWorkflow variable was reseting every time on "Choose Workflow" step 22426:Merged DEV/TEMPORARY to V3.3 21323: ALF-687: Error when invoking webservices via SSL repository location url. Add a new overload of ContentUtils.putContent() method with the isSSL argument at the end. If this parameter value is true then SSLSocket is used and Socket otherwise. 22428: ALF-3490: Unfriendly error messages from WebDAV when content doesn't exist - Generalized ALF-4207 solution so that the error page instead displays a status 404 message 22429: Merged DEV/TEMPORARY to V3.3 21325: ALF-3502: Logging in FacesHelper.getManagedBean on failure to create bean Detailed logging of the EvaluationException for ValueBinding was added. 22430: Merged DEV/TEMPORARY to V3.3 20974: ALF-2695: mimetypes-extension-context.xml.sample does not use the correct classes Changed the type of the bean id="mimetypeConfigService" from “"org.alfresco.config.xml.XMLConfigService” to “org.springframework.extensions.config.xml.XMLConfigService” Renamed mimetypes-extension-context.xml.sample file to file mimetypes-extension.xml.sample. The file mimetypes-extension-context.xml.sample was interpreted like spring context file. It wasn’t correct. 22431: Merged DEV/TEMPORARY to V3.3 21099: ALF-3046: UI - Import feature not available to contributor user The fix also covers related bug ALF-2802. Permission ‘Write’ was replaced by ‘CreateChildren’ for import action because contributor has ‘AddChildren’ (not ‘Write’) permission. 22432: Merged DEV/TEMPORARY to V3.3 20973: ALF-3244: alfresco-sample-website.war does not deploy to bundled Tomcat The cause of the corrupted alfresco-sample-website.war deployment is the usage of the SSIFilter in the application. Only Contexts which are marked as privileged may use SSI features. For this reason, the context has been marked as privileged in META-INF/context.xml 22433: Merged DEV/TEMPORARY to V3.3 21190: ALF-3751: Unintentional copy/remove of 'Web Forms' space removes form associations in Web Projects Parent validation before deleting was added. Now deleted web form is removed from Web Project only if this form is located in original Web Form folder. 22434: Merged DEV/TEMPORARY to V3.3 21490: ALF-4099: Customer concern about String comparison operators == vs equals Comparison operator was replaced by equals/EqualsHelper.nullSafeEquals in the ContentFilterLanguagesMap DocumentNavigator UIAjaxTagPicker Presence classes. DocumentNavigator.getAttributeName() method was changed because the previous method's logic always returned escapedLocalName in any case. 22436: Merged DEV/TEMPORARY to V3.3 22063: ALF-4494 : Share show error if versionable document has no version history. 1. evaluator.lib.js was modified to prevent NPE if no version history exists for document. 2. Result was manually tested. 22437: ALF-2796: java.naming.referral is set to "follow" in the LDAP contexts to avoid PartialResultExceptions on LDAP sync 22466: Merge from V3.2 to V3.3. Fix for ALF-4741. V3.2: 22465 Fix for ALF-4741. Repository Web Scripts can produce a corrupted response after a transaction collision/retry. 22469: Fix for CIFS long directory path results in duplicate folder displays. ALF-3938. Removed (hopefully) last of the hardcoded buffer length limits. 22472: Fixed ALF-4670: XAM retainUntil value does not propagate down the space hierarchy 22473: Fixed ALF-4656: Deleted Content Backup should ignore unrecognised URLs - Also fixes ALF-4657: Content stored on XAM is not cleaned up correctly - Errors in the listeners are logged only - ContentStoreCleanerListener checks and warns if the URL is unsupported 22474: Fix to web.xml to correctly validate and therefore deploy on JBoss5.1.0 22485: Fix for NFS losing contents during edit or copy. ALF-4737. 22492: ALF-4652 XAM bug fixes and improvements: Respect 0 'retentionPeriodDays' 22501: Fixed ALF-4763 XAM-enabled nodes must not go to the archive://SpacesStore 22504: Fix for MS Word mimetype is changed when editing via CIFS. ALF-3772. 22520: ALF-4768: WCM (w/ virt svr) - submit (no need to virtualize direct submit workflows) 22526: Externalised setting of BINARIES, plus added bin with jars and dlls 22561: ALF-4792: WCM virt svr - add experimental option for lazy deployment (defer startup of dependent webapps until accessed) 22611: Fixed ALF-1893: Windows 7 SSP Read-only. Note: Relies on the patched Excel and PowerPoint mimetypes, but also falls back to file exension. 22612: Merged HEAD to BRANCHES/V3.3: 22609: Resolve ALF4822, ALF4818 22628: ALF-3239: Added encoding elements to mysql db url 22656: Fix for Solaris/Gedit problem, keep a mapping for the original file handle to the new path after a rename. ALF-4843. 22673: ALF-4845: Person and Group member deletion performance fix - Don't batch load all a group's members when trying to delete one of them! - Can result in infeasibly large hibernate sessions when trying to delete a person / LDAP sync in a repository with very large groups - Switched off batch loading in NodeService.removeChild() - Avoided unnecessary use of removeAuthority in PersonService.deletePerson() 22674: Merged DEV/TEMPORARY to V3.3 22653: ALF-661: There is no way to determine the protocol, hostname and port from a javascript kicked off by JBPM These variables are now available for use in workflow and action javascript and they are wired to the corresponding parameters that already exist in the sysAdmin subsystem. urls.alfresco.protocol urls.alfresco.host urls.alfresco.port urls.alfresco.context urls.share.protocol urls.share.host urls.share.port urls.share.context See bug for example usage 22676: Merged HEAD to V3.3: 20306: Google Doc integration fixes: - Fixed up inconsistancies in powerpoint and excel mimetypes set throughout the code - Unit tests failures for excel sheets fixed - Able to now create and checkout docs, sheets and presentations successfullly - Docs, sheets and presentations downloadable and viewable - Fixed ALF-2700 (See ALF-4827) 22715: Merge from V3.2 to V3.3. r. 22713. Fix for ALF-4946 Possible NullPointerException during creation of thumbnails whose names are null-valued. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
853efa586a |
FTP over SSL/TLS configuration additions.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22185 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
0097d5a092 |
Merged V3.3 to HEAD
20128: Reverse part of previous build fix that breaks other tests ... 20129: ALF-202, ALF-1488: Fixed portlets in alfresco.war - Stop excluding portlet.xml from alfresco.war - Used JSR 286 ResourceURL solution to get upload iframes to work in portlets - Removed horrific hacks concerning faces session map resolution in portlets and upload servlet - WebClientPortletAuthenticator now dispatches to a helper servlet, AuthenticatorServlet, allowing it to use identical servlet mechanisms to authenticate / sign-on the user - Portlet Authenticated user now set consistently in application-scoped attribute, so web client, web script portlets and client portlet share same notion of user ID - Application.inPortalServer flag now thread local (and thread safe!) 20130: Merged BRANCHES/V2.2 to BRANCHES/V3.3 13819: *RECORD ONLY* ACT-6420 - Office 2003 "Install for all users" - DO NOT MERGE 20131: Merged BRANCHES/V3.1 to BRANCHES/V3.3 19600: *RECORD ONLY* ALF-2205 - CLONE: Office Plugin: filename overlaps the plugin UI if longer than 40 characters without spaces Merged V3.2 to V3.1 (Adobe) 17499: ETHREEOH-2322 - Office Plugin: filename overlaps the plugin UI if longer than 40 characters without spaces 19443: ALF-2131 - Office webscripts: Missing close brace, '}' 20132: ALF-2749 - temporarily skip couple of -ve checks (for MS SQL Server only) 20133: Merged BRANCHES/V3.2 to BRANCHES/V3.3 19550: *RECORD ONLY* ALF-1091 - Only 15 tags displayed in Tags section in Browser pane 20134: Adding files missed during first commit of Meeting Workspace code 20135: Merged V3.2 to V3.3 19814: *RECORD ONLY* Fix for ALF-2322 - discussion topic containing non-ascii characters cannot be saved 19934: *RECORD ONLY* Fix for ALF-2512 - ability to execute JavaScript via cmd servlet by a non-admin user disabled by default. - user script execution privileges can be reactivated if required via web-client-config flag <allow-user-script-execute> 19935: *RECORD ONLY* Corrected imports for 3.2 compatability 20136: Merge Dev to V3.3 20104 : ALF-676 - imapFolders patch fails if versionable aspect is mandatory on cm:content 20137: Workaround for ALF-2639: Sharepoint: Share Edit Online uses Share protocol rather than Alfresco protocol to build link - Replace "https:" protocol with "http:" when generating "Edit Online" URL 20138: Merged V3.1 to V3.3 18204: *RECORD ONLY* Merged DEV/TEMPORARY to 3.1 17837: ETHREEOH-3801: Creating users via the api does not add them to the user store 18577: *RECORD ONLY* Fix for ETHREEOH-4117, based on CHK-11154 19373: *RECORD ONLY* Merged V3.2 to V3.1 19216: ENH-506 - allow script compilation to be disabled for repository tier. Fix to unreported issue with return aspect array from a ScriptNode. 20139: Merged V2.2 to V3.3 18518: *RECORD ONLY* Fix for ETWOTWO-1375 18522: *RECORD ONLY* Merged DEV-TEMPORARY to V2.2 18440: TinyMCE HTML Image gets invalid path 18503: ETWOTWO-1035: Error message when bypassing the 'close' and directly clicking on breadcrumb link after a deployment 18504: ETWOTWO-1035: Error message when bypassing the 'close' and directly clicking on breadcrumb link after a deployment 18578: Merged DEV-TEMPORARY to V2.2 18528: ETWOTWO-1114: Missing 'Required' items are not highlighted in the error when missed 19094: *RECORD ONLY* Merged V3.1 to V2.2 14015: Fixes for ETHREEOH-1864 and ETHREEOH-1840 20140: Remove unwanted @overide 20141: Lazy schema introspection to shave off a few seconds on startup - Saves about 5s on dev machine - Hibernate still has to look at the DB metadata, though 20144: Merged V2.2 to V3.3 18859: (RECORD ONLY) ALF-1882: Merged V3.2 to V2.2 17292: ETHREEOH-1842: Ticket association with HttpSession IDs tracked so that we don't invalidate a ticket in use by multiple sessions prematurely - AuthenticationService validate, getCurrentTicket, etc. methods now take optional sessionId arguments 18864: (RECORD ONLY) ALF-1882: Fixed compilation error from previous checkin. 20145: Merged V3,1 to V3.3 19584: (RECORD ONLY) ALF-2207: Merged V3.2 to V3.1 (Adobe) 18277: Merged DEV_TEMPORARY to V3.2 18178: ETHREEOH-3222: ERROR [org.alfresco.webdav.protocol] WebDAV method not implemented - PROPPATCH 19660: (RECORD ONLY) ALF-2266: Merged V3.2 to V3.1 (Adobe) 19562: Merged DEV/BELARUS/V3.2-2010_02_24 to V3.2 19244: ALF-1816: Email templates can no longer be selected when creating a rule for the action 'Send email to specified users' following an upgrade - New patch has been created to create invite email templates and notify email templates folders if those are absent. Also it moves default notify and invite templates into appropriate folders. 19662: (RECORD ONLY) Incremented version label 19663: (RECORD ONLY) Corrected version label 19779: (RECORD ONLY) Incremented version label 20148: Merged PATCHES/V3.2.r to V3.3 20029: ALF-2624: Avoid NPE in LDAP sync when there are dangling references and improve logging 20053: (RECORD ONLY) Incremented version number 20151: ALF-2749 - unit test fix (re-arranged -ve checks for txn boundaries, functionally equivalent) 20152: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY) 20050: Fix ALF-2637: objectTypeId updatability reported as "readonly" rather then "oncreate" 20051: Fix for ALF-2609: CMIS ACL mapping improvements 20052: Fix for ALF-2609: CMIS ACL mapping improvements 20086: Fix re-opened ALF-2637: "objectTypeId" updatability reported as "readonly" rather then "oncreate" 20125: Fix ALF-2728: AtomPub renditions are not rendered as part of cmis:object, although their rel links are. 20153: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY) 20067: Fix ALF-2691: Choice display names in Type Definition are not escaped properly in AtomPub binding 20154: ALF-1598: Share - Edit online missing on preview page - Note: The details page doesn't know when Office opens the file, so may show stale information. 20156: Build/unit test - comment-out force re-index (IndexCheckServiceImplTest) 20157: Office add-in: Missing i18n string found whilst investigating ALF-605: Script error appears when start typing not-existent user in "Assign to" filed - Changed behaviour slightly so that "start workflow" panel remains if error occurred during submit 20164: Fix trailing commas that MSIE doesn't like. Plus fix for renamed webscript reference. 20168: Attempting to fix failing test in ThumbnailService. The change adds some extra logging and exception info too. 20169: Build/unit test - temporarily put back "force re-index" (IndexCheckServiceImplTest) - TODO: re-work test for build env 20170: Fix NPE (AVMStoreImpl.createSnapshot) - see DBC-HEADPOSTGRESQL-34 20173: Propagate IOExceptions from retryable write transactions in AlfrescoDiskDriver 20176: Merge from V3.2 to V3.3. Merge ok'ed by Steve. 20175: JMX configuration of enterprise logging broken 20178: JodConverter loggers are now exposed in JMX. This follows on from check-ins 20175 (on V32) and 20176 (on V33) which fixed the JMX logging for enterprise code. 20180: Fixes ALF-2021 by adding new date format properties and exposing YUI widget options. 20185: Various core fixes and additional debug output. Part of ALF-1554. 20186: Fix for OpenOffice multiple versions per edit problem. ALF-1554. 20187: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20181: IndexCheckServiceImplTest - by default, check test store only (reduces current ent build time by nearly 1 hour !) 20188: Fix -exploded build target for Share to copy core classes folder 20191: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY) 20190: Fix ALF-2774: Atompub createDocument with versioningState=checkedout followed by checkin does not create major version, Fix ALF-2782: AtomPub binding incorrectly handles atom:title when no value is provided (often done for compliant atom entry) 20193: Merge 3.2 to 3.3: 19759: Fix for CIFS/CheckInOut.exe save of working copy breaks lock on original file. ALF-2028. (Record-only) 19760: Fix for working copy checked out via CIFS is not accessible until FileStateReaper expires file state. ALF-962. (Record-only) 20195: Form fields for numbers are now rendered much smaller that text fields following feedback from meetups. Must be included in 3.3 as requested by Paul. 20197: Rules: Size property is now more userfriendly & IE bugs are solved - Numbers and booleans where posted as strings to the server making property comparisons against properties such as "Size" to fail on the server - Size, encoding & mimetype are now options by default in the "IF/Unless" drop downs - When comparing Size properties a "bytes" label is placed to the right of the text field - "Show more..." menu now displays aspect/type ids on mouse hover in the tree - "Show more..." menu now displays a new column for the property name in the list next to the property displayLabel - The list in the "Show more..." menu now stays in its place instead of being pushed down in some browsers - IE css fixes to make rules look good in IE 6, 7 & 8 - Fixed IE 6 & 7 issue with generateDomId & getAttribute("id") not being in sync - Fixed IE 6 & 7 issue where Selector.query only worked with "id" as root attribute 20199: Merge 3.1 to 3.3 (All record-only): 14483: Merged HEAD to v3.1: 13942 Added FTP IPv6 support. MOB-714. 14484: Merged HEAD to v3.1: 13943 Added FTP IPv6 configuration. Added the ftp.ipv6 property. MOB-714. 14523: Add trailing 'A' to CIFS server name, removed by recent checkin. 14916: Fixes for local domain lookup when WINS is configured. ETHREEOH-2263. 14921: Merge HEAD to V3.1: 14599: Fixes to file server ACL parsing, part of ETHREEOH-2177 14930: Updated svn:mergeinfo 15231: Fix for cut/paste file between folders on CIFS. ETHREEOH-2323. 15570: Merge 3.2 to 3.1: 15548: CIFS server memory leak fixes (clear auth context, session close). ETHREEOH-2538 15571: Merge 3.2 to 3.1: 15549: Check for null ClientInfo in the setCurrentUser() method and clear the auth context. Part of ETHREEOH-2538. 15550: Fixed performance issue in the continue search code, add warn level output of folder search timing. 15572: Update svn:mergeinfo 15627: Merge 3.2 to 3.1: 15626: Fixed NetBIOS reports an invalid packet during session connection, and connection stalls for a while. JLAN-86. 15628: Update svn:mergeinfo 15780: Fix for MS Office document locking issue. ETHREEOH-2579. 15827: Fixed bug in delete node event processing. 16160: Minor change to debug output 16162: Add support for the . and .. pseudo entries in a folder search. 16163: Added timstamp tracking via the file state cache, blend cached timestamps into file info/folder search results. 16555: Fix for processing of NetBIOS packets over 64K in the older JNI code. Part of ETHREEOH-2882. 16556: Fix for CIFS session leak and 100% CPU when connect/disconnecting quickly. ETHREEOH-2881. 16559: Fix for ACL parsing in the standalone JLAN Server build. JLAN-89. 16666: Fix for CIFS cannot handle requests over 64K in JNI code, causes session disconnect, standalone server. JLAN-91. 16709: Fixed the FTP not logged on status return code, now uses reply code 530. JLAN-90. 16710: Added CIFS NT status code/text for the 'account locked' status, 0xC0000234. ETHREEOH-2897. 16717: Fixed setAllowConsoleShutdown setting in standalone server can cause infinite loop. JLAN-38. 16718: Fix for Alfresco and AVM spaces are empty when viewed by FTP and Alfresco is run as non-root. ETHREEOH-2652. 16727: Fix for unable to connect via FTP via Firefox (when anonymous logons are not enabled). ETHREEOH-2012. 16987: Merge 2.2 to 3.1: 13089: (record-only) Fix "Read-Write transaction" exception, when the user does not exist. ETWOTWO-1055. 13091: (record-only) Fix for NFS server "Read-Write transaction started within read-only transaction" exception. ETWOTWO-1054. 14190: (record-only) Fix for cut/paste a folder from Alfresco CIFS to local drive loses folder contents. ETWOTWO-1159. 14191: (record-only) Additional fix for CIFS 'No more connections' error. ETWOTWO-556 14199: (record-only) Fix for NFS problem with Solaris doing an Access check on the share level handle. ETWOTWO-1225. 14210: (record-only) Added support for FTP EPRT and EPSV commands, on IPv4 only. ETWOTWO-325. 14216: (record-only) Fixed FTP character encoding, ported UTF8 normalizer code from v3.x. ETWOTWO-1151. 14229: (record-only) Remove unused import. 14655: (record-only) Convert content I/O exceptions to file server exceptions during write and truncate. ETWOTWO-1241. 14825: (record-only) Add support for the extended response to the CIFS NTCreateAndX call, back port of ETWOTWO-1232. 15869: (record-only) Port of desktop action client side EXE fixes from v3.x. ETWOTWO-1374. 17130: Fix for cannot delete file via CIFS that has a thumbnail associated with it. ETHREEOH-3143 and ETHREEOH-3115. 17359: Fix for CIFS/Kerberos/SPNEGO logon problem with Win2008/Win7 client. ETHREEOH-3225. 17839: Rewrite the rename file logic to handle MS Office file rename patterns. ETHREEOH-1951. 17842: Missing file from previous checkin. 17843: Re-use open files for the same session/process id so that writes on each file handle go to the same file. Port of ETWOTWO-1250. 17861: Merge 2.2 to 3.1: 17803: Re-use open files for the same session/process id so that writes on each file handle go to the same file. ETWOTWO-1250. (Record-only) 18432: Added FTP data port range configuration via <dataPorts>n:n</dataPorts> config value. ETHREEOH-4103. 18451: Fixed incorrect FTP debug level name. 20200: Merge PATCHES/V3.2.1 to 3.3: 20142: Added debug output to dump the restart file name for FindFirst/FindNext folder searches (via the 'Search' debug output level). 20201: Merge PATCHES/V3.2.1 to 3.3: 20143: Fix for files being skipped during a long folder listing via CIFS, ALF-2730. 20202: Update svn:mergeinfo 20219: Fix for ALF-2791 - correction to changes in rev 20129 so the upload file servlet path is generated for all cases. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
c18a123228 |
Refactor of the file state cache code. (Part 2 of 2).
Removed the repo specific file state cache code. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19949 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
b9ae66b146 |
Added RPCRegisterPort configuration value, and nfs.rpcRegisterPort property.
Defaults to zero to use next free unprivileged port when registering the NFS/mount servers with the portmapper. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19376 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
4eeef21b55 |
Merge 3.2 to HEAD:
17444: (record-only) 18955: If CIFS is not enabled then do not create the thread/memory pools during startup. ALF-585. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19138 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
cefda8c965 |
Updated header to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
43e93f3c14 |
Updated header to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18926 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
69568f130e |
Merge 3.2 to HEAD:
18450: Port of FTP data port configuration values. ETHREEOH-4103. 18559: NFS fixes, NFS/FTP/CIFS config properties. ETHREEOH-4102, ETHREEOH-4101, ETHREEOH-4104 (partial) 18642: Do not allow null NFS authentication type, core NFS/mount server code now allows null requests with null authentication type. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18654 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
b726c4d6db |
Merged DEV/TEMPORARY to HEAD
17667: Branch for SpringSurf integration - from HEAD r17665 17668: Fix to ensure included scripts files are not loaded from a cached classpath loader. 17670: Part 1 of SpringSurf integration - changes relating to spring-surf-core-1.0.0.CI-SNAPSHOT.jar 17674: Part 2 of SpringSurf integration - changes relating to spring-surf-core-configservice-1.0.0.CI-SNAPSHOT.jar git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
4634d889c8 |
MOB-820: IMAP as configurable subsystem + MOB-817: NFS RPC user mappings + MOB-816: File server domain and global ACL mappings
- JLAN changes: revert previous changes and make AccessControl constructors public git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14353 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
e41bdeffea |
Fix handling of org.alfresco.filesys.config.CIFSConfigBean.getBindToAddress(). An empty string value should be treated equivalent to null.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14068 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
a68ce953a0 |
Synchronize default file server configuration (file-servers-context.xml) with changes made to file-servers.xml in revision 13943
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14033 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
d2180c5eaa |
Refactor subsystems for authentication chaining
- An authentication chain of size 1 configured by default - DefaultChildApplicationContextManager supports dynamic configuration of the authentication chain via Spring or JMX. Any number of instances of any type allowed in chain. - SubsystemChainingAuthenticationComponent and SubsystemChainingAuthenticationService iterate across configured chain for Authentication - SSO (NTLM / Kerberos) and CIFS authentication independently activatable for any component in chain (where supported). - SubsystemChainingProxyFactory used to proxy directly to first active CIFS authenticator or SSO filter in the chain - CIFS server knows not to bother starting if authentication chain doesn't have an active CIFS authenticator (e.g. LDAP only) - Rationalization of subsystem configuration folder structure and JMX object naming - Classpath based extension mechanism for community edition - alfresco/extension/subsystems/<category>/<typeName>/<id>/*.properties in classpath can be used to configure specific subsystem instances - Simplification of JMX infrastructure. No longer Spring bean definition based, thus allowing dynamic creation/registration of new instances at runtime. - New AuthenticationChainTest unit test git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
972dd9a4ba |
MOB-651: Decouple File Servers from Config Service and Authenticators
- Minor JLAN changes (backward compatible) - CIFSAuthenticator implements an interface (to allow dynamic proxying to authentication subsystem) - CIFSAuthenticator accesses ServerConfiguration via ServerConfigurationAccessor interface and doesn't retain references to config sections (again to allow dynamic proxying and hot swapping) - ConfigSections have way of directly setting container initialised authenticators, sharemappers, etc. - Authenticators, etc. still support initialisation from config service in backward compatible manner. - Most of ServerConfigurationBean moved to AbstractServerConfigurationBean superclass. - New org.alfresco.filesys.config package with ServerConfigurationBean implementation and supporting classes that can be initialised by a Spring container. - File server authenticators moved into authentication subsystem. TODO: Kerberos and NTLM git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13795 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |