Dave Ward 4ef5672f4a Merged V3.4 to HEAD
23336: Created a branch for 3.4 Enterprise releases
   23344: replaced some un-neccessary non latin chars in variable name.
   23347: Fix ALF-3200 - add a policy to Sites, which stops renames occuring (renames breaks things as the name is used in various association patterns). Includes unit tests
   23349: Merged BRANCHES/DEV/BELARUS/HEAD-2010_03_30 to BRANCHES/V3.4
   20198: ALF-2176: Incorrect pagination for resources on Advanced Workflow Wizard
   The javascript onkeyup event was changed to onkeypress event in UIDataPager. 
   It prevents a form submission before js action.
   23351: ALF-5109 transfer service : replace content results in "orphans exist" failure.
   23352: New (currently disabled) unit test to check that multiple threads writing to different properties via the node service on the same node don't loose updates. Test disabled pending caching fix
   Also tweak the tagging multi threaded test (currently disabled) to make it try a few more tags in parallel
   23366: Audit method interceptor switches to pass-through if the server is read-only (ALF-5424)
   23375: Fixed ALF-2825 "Display problem on Rules page when rule has a long description" & more
   - ALF-2825 "Display problem on Rules page when rule has a long description"
   - Made drag and drop adjust the "empty space" to the dragged elements height
   - $html alias was missing on linked to folder page after a previous merge
   23376: Fix for  ALF-5401: CMIS: When specifying "cmis:objectTypeId=Dyz" in the WHERE clause, nodes of subtypes of x:yz are also returned
   - now only returns the specific type
   - unit test included
   23377: Merged V3.3-BUG-FIX to V3.4
      23353: Merged DEV-TEMPORARY to V3.3-BUG-FIX
         20930: Fix ALF-2564 "MS office addin does not work with kerberos and cifs". Also added to Excel and PowerPoint add-ins (supplied fix was for Word only).
   
   Also updated help URLs to Enterprise.
   23378: Fix ALF-4786: Update the Web Editor Help URL for 3.4 Enterprise Beta and Enterprise
   23380: Fixes:
   - ALF-5431	WQS: latest blog article component throws an exception if the description field is empty
   - ALF-5426	Using double-quotes in either the title or description of an asset collection causes an error
   23381: Fixed ALF-4702 "The 'Most Recently Completed Task' area should also include a Completed By: label"
   23382: Made sure "empty list message" gets padding in object-finder's "list" mode
   23383: WQS: Merged CSS fix from HEAD
   
   $ svn merge https://svn.alfresco.com/repos/enterprise/alfresco/HEAD
   --- Merging r23336 through r23382 into '.':
   23384: Fix for: ALF-3164 rename LuceneQueryLanguageSPI.executQuery(..) to executeQuery
   23385: Fix for ALF-5166: After restore of indexes - AUTO hangs
   - bulk deletes are now handled as such during index tracking and rebuild (as they are normally)
   23388: Merged V3.3-BUG-FIX to V3.4
      23387: Merged V3.3 to V3.3-BUG-FIX
         23370: Fix ALF-5277: Excel 2007 xlsx icon not displayed in Alfresco Explorer.
            Re-Merged V2.1 to V3.3
               6464: Added Office 2007 document mimetypes and icons
         23386: Fix ALF-5427: ALF-2639 causes Edit Online button in Share to only handle http not https
   23389: Fixes:
   - ALF-5211	Error on search with wildcards
   23390: Fixed ALF-4835 "Incorrect behaviour of Cancel action"
   23392: Partly fixed ALF-4678 "Incorrect workflow details if creator or assgnee was deleted"
   - If the assignee has been deleted the username is still displayed (but only as text and not as a link)
   23394: Fix for ALF-2780 - Share/Surf don't invalidate Alfresco tickets
   23396: Removed direct System.err output in ArchiveContentTransformer
   23399: Fix ALF-4321: use of Ajax technology in share leeds to a stuck interface as ajax code does not handle end of sessions cases when using CAS (external) authentication
   23402: Fixed ALF-5456: IP address change can cause read-write errors on startup
    - Simply avoid writing in a read-only transaction
   23411: Added web-tier cluster sample config (ALF-3873 related)
   23412: Fixes ALF-5373: Duplicate date displayed at end of summer time.
   23413: Fixes: ALF-4924 by displaying more data about an event in the Dashlets if the event doesn't finish on the same day, or is an all day event.
   23415: Merged V3.3-BUG-FIX to V3.4
      23414: Fix for ALF-5414 - IE6 specific fixes
   23417: Added a unit test to JbpmEngineTest while investigating ALF-1557. Test is commented out/disabled as it relies on a specific process definition that might be added to the list of available process definitions int he main app.
   23418: Fix for ALF-5451 - Typo in webclient.properties
   23420: Merged V3.3-BUG-FIX to V3.4
      23419: Fix for ALF-4533 - corrected list of email templates shown - other issues mentioned CNR
   23422: Fixes: ALF-5374 - add support for displaying events that span multiple months.
   23424: Fixes: ALF-2989 - Incorrect sideId reference in URL for event in Site Calendar Dashlet
   Adds support for displaying events that start in the past but finish in the future (previously only events that start in the future were shown)
   23425: Fix for ALF-5256 - Change Password link under user's name pulldown in 3.4 shows when using AD authentication
   23441: Fixes: ALF-5267 - CSS Background colour for current day was getting lost in the Month View, due to a style overriding it with a paler colour that wasn't much of a contrast to the usual colour.
   23442: Fixed bug ALF-4988 and also fixed several disabled unit tests.
   23444: Re-enabled and fixed some failing/disabled tests in AbstractRenderingEngineTest.
   23447: Temp comment out new TransferServiceImplTest with greek paths.
   23459: Fixed failing RenditionServiceIntegrationTest.testRenditionPlacement()
   23461: ALF-5224: Edit Online action doesn't work for invited coordinator
   
   23462: Fixing failing test RenditionServiceIntegrationTest.testRenditionPlacement().
   23468: Merged V3.3-BUG-FIX to V3.4
      23463: Merged V3.3 to V3.3-BUG-FIX
         23323: Fixed PostgreSQL upgrade from V3.2.2 to V3.3.4 (Addresses ALF-5344)
   23472: Fixed ALF-5408: SQL Server missing ON DELETE CASCADE declarations
   23479: ALF-2643 - Deployment Service does not protect itself from poorly implemented custom DeploymentTargets
   23489: Fix for ALF-4214 allowing generation of Thumbnails using RuntimeExecutableTransformationOptions. Note that this fix does not pass any execution options specified in the thumbnail definition to the content transformer, instead default transformation options are used.
   To fix this we will either need to define a new RenderingEngine type or modify the ReformatRenderingEngine to become aware of RuntimeExecutableTransformationOptions.
   23492: Fixed ALF-5550: DB2: Unable to insert values into alf_string_value
   23506: Merged V3.3-BUG-FIX to V3.4
      23500: Merged V3.3 to V3.3-BUG-FIX
         23499: Additional change after fix for ALF-5403 to ensure Session is not created before login page auth is successfully processed
   23507: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
      23504: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
           23297: Fixed ALF-5146: Share - Content model issue with 'dot' in a property name
   
   Also added tests for a property with a dot in the name to the FDK.
   23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs
    - Problem is present when the 'unfilteredFor' property is added to 'afterAcl' bean
    - Reproduced specific issue with unit tests and found several other failures
    - Currently only affects installations that include the DOD5015 module
   23512: Fixed ALF-5192: Pivot translation isn't changed after modifying
   23513: Merged DEV to V3.4
     23511 : ALF-4200 IMAP - LSUB failed. Access Denied
   23516: Added a test to test_renditionService.js to confirm RenditionService.render() is working properly.
   23519: Merged V3.3-BUG-FIX to V3.4
      23518: Merged V3.3 to V3.3-BUG-FIX
         23517: Fix for ALF-5552 - Search based javascript APIs now handle missing nodes returned from search indexes.
   23521: Fixed ALF-5529 "Incorrect behavior of tab stop indexes at Edit Metadata page for images"
   - ...also makes date text selection work for date field after tabbing to it, enter strokes trigger help and calendar, focus outline being displayed on icon and focus being returned after calender select  
   - ...also fixed bug in advanced search form for date range (the hidden field was never set if from/to values were cleared)
   23526: Fixed ALF-4299: NodeService: review comment vs code for setting unique name on child assoc
   23530: Fix for ALF-5482: "Some patches are not being executed during an upgrade"
   23531: ALF-5272: Update rule works incorrecly
   
   23539: Partial fix for ALF-439: "My Completed Tasks" dashlet doesn't scale in the presence of large numbers of completed tasks
   
   Added ability to limit the result set size of a workflow task query so it can be used by the UI to limit the number of completed tasks shown in the dashlet.
   23542: ALF-4993 : prevent transfer to self.
   23544: Updated to latest revision, following updates required for ALF-4655 (IE8 CSS issues)
   23546: Fixed ALF-5501 "W3C : Incorrect tab stop indexes at Start workflow page"
   - Alfresco.util.createYUIButton now also handles enter keys when menu is used
   - Fixed bug when forms are loaded using ajax (the help toggle didn't work)
   23547: Made keyboard events possible in advanced search menu
   23549: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_06 to BRANCHES/V3.4:
      23210: ALF-4378: Lotus Quickr connector does not work with IBM Lotus Symphony
   23550: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_21 to BRANCHES/V3.4:
      23443: ALF-5098: SPP Module creates documents using the wrong mimetype (Octet Stream)
   23551: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_21 to BRANCHES/V3.4:
      23474: ALF-5490: The Subsystems configuration folder does not seem to be read when Alfresco is deployed to later versions of JBoss
   23552: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_21 to BRANCHES/V3.4:
      23543: ALF-5402: mailService bean should not set username or password properties when mail.smtp.auth is false
   23554: Fix ALF-5170 - when you don't have permission to change a user's password (either because you're not an admin, or you mis-typed your own password), give a friendly message rather than an error stacktrace
   23558: Fixed ALF-5513 "Incorrect behavior of tab stop indexes at Create Site page"
   23559: Fixed ALF-5136 "My Tasks dashlet: Incorrect capitalization on mouseover text"
   23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size.
   Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call)
   23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events.
   23571: Improvements to missing page and general server 500 error handling in Share.
   23572: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
      23570: Resolve ALF-5355: ClassCastException on server side when calling SCORE() predicate (web services binding)
   23573: Fix for ALF-4840: Create Job button is enabled when Start Date isn't specified
   23580: ALF-3586 Verified that RenderingEngine Actions are not displayed as available actions in Share and Exporer. Now publicAction defaults to false for all RenderingEngine actions, so future RenderingEngines should be hidden in the UI by default.
   23582: Fixed (Explorer) ALF-439 "My Completed Tasks" dashlet doesn't scale in the presence of large numbers of completed tasks
   23584: DateTime analysis related fixes:
       Fix for: (ALF-4056) Content with DateTime property with the time set to 00:00:00.000 will not be found in lucene search when search is run from 00:00:00 to 23:59:29 for the same date.
          - bug generating range query start queries
       Fix tests and test models
       CMIS and normal query tests all run with the date and  datetime analysers configured for datetime properties
       Fixed unreported issue with CMIS range queries for dates when using the date time analyser
   23585: Fixed ALF-5372 "JavaScript error on Groups management dialog with IE8 : document.getElementById is null"
   23590: MERGED V3.3 to V3.4
   23545: Fixes: ALF-6568 - Broken images caused by missing URL Rewrite rule. Updated existing rules from ** to (.*) following earlier bug fix.
   23591: Probable fix for ALF-4440. Renditions are not updated for working copy.
     As suggested in the issue, we have relaxed the restriction such that working copies now have their renditions updated in the normal way. Therefore, updates to draft (working copies) in Quickr should now cause (asynchronous) updates to any webpreview and doclib thumbnails in the normal way.
     As part of this change, we have also changed the behaviour so that renditions are no longer copied when a node is copied. This is relevant as when a document is checked out, a copy is made (the working copy). In order to avoid potential problems with copied rendition children being updated separately from the rendition children on the original copy, we no longer copy renditions - they will be regenerated separately for the working copies.
   
   This fix needs to be verified by a tester who has access to a running Alfresco-Quickr integration module.
   23592: ALF-4350 Fix for SiteService.updateSite() regarding Site Visibility change
     site:siteVisibility is a d:text property and is treated as a String in all places apart from within updateSite where a Java enum is written into the db. This seems to cause a problem on the DB specified in the issue.
   23608: Merge from V3.3-BUG-FIX to V3.4
      23606 Dmitry/Erik's fix for ALF-1052. Webpreview of swf files.
   23610: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
      23579: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
           23576: Merged BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_06_24 to BRANCHES/V3.3:
                20998: ALF-3764: Filepicker be able to select URLs
                
      23609: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_06 to BRANCHES/DEV/V3.3-BUG-FIX:
           23158: ALF-1838: Need to support relative url for WCM TinyMCE Filepicker.
   
   Also fixes ALF-866 (cloned version of ALF-1838).
   23612: Fix for ALF-3677: Editing inline html content
   23615: Resolve ALF-5044: Alfresco 3.4 fails to start on Webshere 7 with org.alfresco.service.cmr.repository.MLText ClassNotFoundException
   23621: Merged V3.3-BUG-FIX to V3.4
      23620: Merged V3.3 to V3.3-BUG-FIX
         23619: Fix for ALF-1537 - Presentation Tier JS processor now correctly outputs different messages for when scripts:
                a) load incorrectly, i.e. error resolving imports or import syntax error "Failed to load script..."
                b) runtime execution error "Failed to execute script..."
                 
                Performance improvements
                Cache test delay fix
   23625: Fix ALF-629 - Allow the thread pool size to increase to the maximum when the queue starts to fill up, rather than only when it gets full (which is rarely will, as we want a very large queue size to avoid dropping work)
   23626: Fix for ALF-906: "Impossible to create web project if rule with Copy action was applied"
      o ensure that WCM web projects do not inherit DM rules
   23632: ALF-906: "Impossible to create web project if rule with Copy action was applied"
     - added missing file
   23635: Merge DEV to V3.4
       23627 : ALF-4947 - EML files not showing up in folder list
   23636: Reverse merged HEAD to V3.4
      23195: Temp comment out of ImapMessageTest (The test or the code is not wrong but the IMAP server is not running in the automated build.)
   23637: Merged V3.3-BUG-FIX to V3.4 (RECORD ONLY)
      23314: Merge from V3.3 to V3.3-BUG-FIX
         r 23311: Further fix for ALF-3991. Renditions/thumbnails cause update to modifier property.
         This is a reimplementation of r 23290 which was checked in on HEAD earlier.
         The RenditionService has been refactored between 3.3 and 3.4 and straight merges are not always possible.
      23355: Merged DEV/V3.3-DOCLIB-PORTLET to V3.3-BUG-FIX
         20814: Share host portlet detection and portlet action URL template and associated client-side constants. Latest SpringSurf libs to bring branch up-to-date.
         20995: DocLib Portlet checkpoint: URL encoding fixes, CSS fixes, Portlet URL links generators as client-side JavaScript & Freemarker macro. "My Document Libraries" landing page.
         21008: DocLib Portlet: Login page recognizes portlet mode, replaces input boxes with message "Please login via your portal.". When portlet mode detected, JSESSIONID cookie for path=/share is removed to prevent ALF-3749. URL encoding fixes. CSS fixes. Reverted patch to YUI history module.
         21047: DocLib Portlet: Site title shown on all Site pages for better usability. More CSS fixes to replace some default Liferay overrides.
         21078: DocLib Portlet: User profile links related to DocLib are not rendered if in portlet mode. Client-side generated links all now use one central function.
         21106: DocLib Portlet: Fix missing alias
         21152: DocLib Portlet: Missed a URL translation step on Rules page and default path render. URL encoding fix for file highlight parameter (double encoding issue). Fix for IE7 "empty DIV" bug relating to panel resizer & footer placement.
         21171: DocLib Portlet: Fix missing Freemarker macro include
         21435: Fix variable alias typo ($userProfile on details page for locked document)
         21698: *RECORD ONLY* New portal distribution zip target (to create alfresco-enterprise-war-3.3-portal.zip) and draft README.txt file. * DO NOT MERGE *
         21712: *RECORD ONLY* Updated README.txt  * DO NOT MERGE *
         22600: DocLib Portlet: New "Site constrained" portlet added where site is configured via portlet preferences. Removed CMIS portlet.
         23023: Fix Share DocLib Portlet CSS issues for Liferay 6. YUI Buttons back to normal. Background now set as white. Login page no longer sets background colo(u)r of body tag. Toolbar separator styling fix.
         23050: Fix "My Document Libraries" page template mapping & css tweak
      23522: Merged V3.3 to V3.3-BUGFIX
         23346: Brought WebQS module in (including build process but not installer elements yet)
      23524: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
         23371: "Simply" added wcmqs to installer
      23567: Merged HEAD to BRANCHES/DEV/V3.3-BUG-FIX:
         22837: Resolve ALF-5042: Default root folder path '/Company Home' not found
         22845: Fix regression from resolving ALF-5042 (Default root folder path '/Company Home' not found)
      23596: Merged HEAD to BRANCHES/DEV/V3.3-BUG-FIX:
         20636: ALF-3157 - Conflict between IMAP and Audit
         20638: ALF-3157 - Conflict between IMAP and Audit
           - part II update the auditConfig.xml
      23634: Merged V3.3 to V3.3-BUG-FIX
         23259: Merged HEAD to V3.3
            23256: Fix ALF-4573: Start Workflow action is absent for edited document and working copy in Share
         23391: ALF-5367: Copy dlls into tomcat/bin as appropriate.
         23485: Merged V3.4 to V3.3 (fix backported for V3.3.x lines)
            23472: Fixed ALF-5408: SQL Server missing ON DELETE CASCADE declarations
         23535: Merged V3.4 to V3.3 (complements 23517: ALF-5552)
            23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs
         23586: MERGED V3.4 to V3.3
            22864: Fix for ALF-5005: "Create and edit functions on AWE become "confused""
            23042: Fix ALF-5127: Impossible to create an article/blog (WCMQS) [Must clear panel hideEvent handler if manually hiding a YUI panel]
            23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size. 
                Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call)
            23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events.
         23630: Backport of installer
         23631: Added 64-bit & deployment installers
   23639: Fix for ALF-5670: "Repository fails to start when applying patch.wcmRuleInheritance if WCM is not enabled "
      - removed patch, replaced with check in WebPorjectServiceImpl.getWebProjectsRoot instead
   23640: Merged V3.3-BUG-FIX to V3.4
      23199: Over-ride the spring config and bring up the IMAP server in the unit test start-up.
      23235: Merged V3.3 to V3.3 BUG FIX
         23226 : RECORD ONLY fix up of unit test
      23315: (RECORD ONLY) Merge from V3.3 to V3.3-BUG-FIX
        r 23312: Adding explicit test case for ALF-3991.
        r 23313: Adding some new test classes to the convenience suite AllRenditionTests.java
      23423: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
         - ALF-5027: When node has been created and checked out in same transaction (e.g. via CMIS or Quickr) content rules will fail
      23460: Added better logging of errors when mapping NFS users to Alfresco users.
         Use database node id counter field value as the file id. Part of ALF-4883 and ALF-5386.
      23587: MERGED V3.3 to V3.3-BUG-FIX 
         22864: Fix for ALF-5005: "Create and edit functions on AWE become "confused"" 
         23042: Fix ALF-5127: Impossible to create an article/blog (WCMQS) [Must clear panel hideEvent handler if manually hiding a YUI panel] 
         23545: Fixes: ALF-4568 - Broken images caused by missing URL Rewrite rule. Updated existing rules from ** to (.*) following earlier bug fix.
         23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size. 
         Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call) 
         23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events.
      23616: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
         23614: Fix ALF-5627: Transfer Service not processing deleted nodes correctly. Causing NullPointerException in receiver.
   23643: Speed up AuditMethodInterceptor when it is not used
    - Check path matching early in interceptor
   23644: Merged V3.3-BUG-FIX to V3.4
      23638: ALF-2731 - hash collision in TransactionBehaviorQueue
      23642: Merged V3.3 to V3.3-BUG-FIX
         23261: Fix for ALF-3385 - NullPointerException printed when new browser session opens to /alfresco/faces/jsp/dialog/container.jsp#
         23291: Fix ALF-5189: JSF - Links to different spaces in my Company Home are not diplayed in MS Office Add-in
         23295: Fix for ALF-481 - handle both missing surname and givenname from LDAP sync in Explorer client
         23296: Fix for ALF-1881 - Alfresco doesn't have protection against double clicking (merge of port from 2.2)
         23302: Fix for ALF-284 - Incorrect behaviour of radio buttons on Check Out page
         23311: Further fix for ALF-3991. Renditions/thumbnails cause update to modifier property.
            This is a reimplementation of r 23290 which was checked in on HEAD earlier.
            The RenditionService has been refactored between 3.3 and 3.4 and straight merges are not always possible.
         23312: Adding explicit test case for ALF-3991.
            This is a separate check-in to 23311 a moment ago as I want to merge this test class through to HEAD but I do not want to merge 23311 to HEAD.
         23313: Adding some new test classes to the convenience suite AllRenditionTests.java
         23325: Fix for ALF-2098 - Incorrect work of Close button inside of created group
         23327: Fix for ALF-5383 - Wiki html page viewer does not render indentation properly
         23328: Merged BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_06_24 to V3.3 
            21094: Workaround provided in issue description can be used as fix because of folowing code: 
               - Object[] params = new Object[] {action, approveFolderName, Utils.encode(approveStepName)}; 
               - out.write(Utils.encode(MessageFormat.format(actionPattern, params)));
               - Utils.encode method is called twice when generating output. One of this call can be removed as unnecessary.
         23337: Fixed ALF-26 "Audit Tool: Event filter doesn't work"
            - Commented out ui controls for "Event" & "Property" log-filters (which is implemented in the REST API but NOT in RecordsManagementAuditServiceImpl and therefore didn't work)
         23342: Resolve ALF-4703: Share Unable to Edit Metadata more than Once with Auditing Enabled
            - if audit internal is enabled, then category service methods missing audit tags fail (also, there's an audit service method missing a tag too)
         23354: Fixed ALF-5026: Change XAM property names to XAM standards
            - Global prefix: xam.archive.globalPropertiesPrefix=vnd.com.alfresco.
            - Node property prefix: xam.archive.nodePropertiesPrefix=xam.archive.node.
            - e.g.'vnd.com.alfresco.xam.archive.node.cm:created'
         23357: ALF-4745: Removed tomcat bundles as these were incomplete and 32/64 bit specific. Installation docs already updated.
         23401: Fixed ALF-4659 (ALF-4652): Configurable XAM Bindings
            - Added property: xam.archive.bindingPropertiesPattern=vnd\\.com\\.alfresco\\..*
            - Properties are non-binding unless they match pattern defined
            - Content property (vnd.com.alfresco.content) is always binding
         23410: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_10_04 to V3.3
            23162: ALF-4934 Problem creating a folder using CIFS with permissions Contributor
         23467: ALF-2762 : Customer-provided fix to 3.2R-SQLServer-Microsoft JDBC driver issue
            1. Support of Microsoft JDBC driver was implemented.
            2. Classpath was updated (jtds driver was removed Microsoft jdbc driver was added).
         23471: Forget to remove old jdbc driver
         23473: Fixed compile error after merge
         23483: Removed MS SQL JDBC driver following rev 23467 fixing ALF-2762
         23484: Re-added JTDS driver following rev 23471 fixing ALF-2762
         23491: Merge DEV to V3.3
            23486 : ALF-5389 - If we contribute via IMAP in outlook or outlook express,an EML file, which has embedded images and attachments, has not his body content indexed
         23537: Fix to RM module since changes to action service config.
         23545: Fixes: ALF-6568 - Broken images caused by missing URL Rewrite rule. Updated existing rules from ** to (.*) following earlier bug fix.
         23566: Fixed ALF-5545: XAM connector xam.archive.node.* properties not set
         23623: Merged PATCHES/V3.3.3 to V3.3
            23622: ALF-5611: Fix calendar page by bracketing freemarker default operator to avoid any ambiguity. See http://freemarker.sourceforge.net/docs/dgui_template_exp.html#dgui_template_exp_precedence
         23624: Merged BRANCHES/DEV/BELARUS/V3.3-2010_11_10 to BRANCHES/V3.3:
            23602: ALF-5517: Webdav "supportedlock" propfind request fails if locking enabled
   23646: Merged V3.3-BUG-FIX to V3.4
      23430: Merged V3.3 to V3.3-BUG-FIX
         23429: Merged PATCHES/V3.2.0 to V3.3
            23428: ALF-5141: Further refinement of transaction limiting behaviour
               - Once accepted a transaction will be retried until it succeeds or the retry limit is exceeded. No limiting of retries by time as otherwise likelihood of any transaction succeeding under load is small
               - Default web transaction threshold is now 20 seconds to avoid problems on non-loaded systems
               - Record stack traces of tracked transactions to help debug slow transactions
      23645: (RECORD ONLY) Merged V3.3 to V3.3-BUG-FIX
         23515: Merged PATCHES/V3.2.0 to V3.3
            23514: ALF-5554: Merged HEAD to V3.2.0
               23153: When updating tag scopes following system shutdown/restore, be smarter about quickly skipping tag scopes that another (new) thread is currently working on
               23283: More debugging level logging for tagging updates, to help identify the problem with periodic multi-threaded test failures on bamboo
         23564: ALF-5600: Merged V3.4 to V3.3
            23424: Fixes: ALF-2989 - Incorrect sideId reference in URL for event in Site Calendar Dashlet
               Adds support for displaying events that start in the past but finish in the future (previously only events that start in the future were shown)
   23648: Update Tika + dependencies (including PDFBox to 1.3.1, and a slightly newer POI). Fixes ALF-5645 and ALF-5646
   23649: ALF-5648 - When rendering word to html in body contents only mode, don't include the xml definition
   23653: Performance improvements:
    - reduce calls to servlet container getResource() method during REST heavy apps
    - improve audit interceptor (Derek supplied 1st part of improvements in rev 23643)
   
   Overall 20% improvement since performance issues noted a few days ago.
   Share multi-user read tests with x20 users.
   Performance is now slightly better than previous record from 3.4 on 5/7/10.
   
   ENT 3.4.0E 11/11/10
   10 users x5 rep, 10sec so - time 3rd run
   - 80ms,
   20 users x5 rep, 10sec so - time 2rd run
   - 168ms
   
   ENT 3.4.0E 15/11/10 (after performance tweaks)
   10 users x5 rep, 10sec so - time 3rd run
   - 55ms
   20 users x5 rep, 10sec so - time 2rd run
   - 125ms
   23655: Add more tests for name and role filtering when listing site membership (Related to ALF-5314)
   23656: Fix for ALF-5674: The association picker control allows content nodes with children to be navigated
   23657: Fix ALF-5314 - expose the siteService flag of collapseGroups from listMembers to the listMembers method on the site object itself, and make use of this when searching for people who are site members in Share
   23658: Follow-up to r23644: Add reference to validation.js in Enterprise overlay file
   23659: Fix for ALF-906: "Impossible to create web project if rule with Copy action was applied"
      - moved add aspect to createWebProject method
   23660: Fixes ALF-3783: When searching in Advanced Search, russian letters are encoded incorrectly.
   Mootools replaced with uncompressed source copy with annotated modifications. Then YUICompressed at build-time to generate mootools-v1.11.js
   23663: Fixed ALF-5462 "The workflow details doesn't/can't display the group the current task is assigned to when it is pooled and not claimed"
   23665: Fixed ALF-4556 "Error occurs on search by wildcards"
   23667: Push the logging log4j definition bean out into another context file, included from core-services-context.xml (rather than being defined directly in it). This allows you to write a unit test without the main context, but still with our log4j settings
   23668: Tweak DynamicallySizedThreadPoolExecutor logging, and have log4j settings used by DynamicallySizedThreadPoolExecutorTest even if the full repo context isn't loaded
   23670: Fix ALF-5609: Incorrect behavior of messages mimetype for Share and Quickr connector
   23671: Merged /BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
     23666 (record-only): Fixes ALF-5691: TransferService: Multi-byte characters are not encoded correctly
   23673: RM Audit:
     - ALF-5307: Audit doesn't work for RMA
     - Buttons on audit console now reflect the current state and are initialised correctly when the console is first shown.
     - ALF-5616: Start and stop date are not being set correctly
   
   23675: Fix for ALF-5244: Issues with selectmany.ftl control
   
   Option and label separators can now be configured like selectone, the control now also shows the label (when present) not the raw value in view mode. Also fixed a couple of selection bugs.
   23677: Merged V3.3-BUG-FIX to V3.4
      23676: Fix ALF-4035: Properties with underscores are not displayed in datalists
   23678: Fix transformationOptionOverrides related warnings for the includeEmbedded, by converting the string to boolean before setting the bean property if needed
   23679: Fixes: ALF-5595 - updated files to reflect supported language packs & added the file to the enterprise overlays build/clean targets
   23680: If thumbnailing cannot be performed either due to no transformer existing, or the transformer being unavailable, deliver more helpful log messages than before (but at the same priority). Related to ALF-5158
   23685: Fixed ALF-4744 "Selectable resources aren't limited to the current site in case workflow is started from details page"
   - added "item.location.parent.nodeRef" in remote-api slingshot webscript
   23686: Merged BRANCHES/DEV/BELARUS/V3.4-2010_11_11 to BRANCHES/V3.4:
      23672: ALF-5597: Nodref is a mandatory parameter notification pops up when Sites is selected (Quickr connector v 8.1.1.175).
   23688: ALF-5405: Strange behavior with long names
   
   - Now if at NodeService enters invalid QName will occur IllegalArgumentException  instead of DuplicateChildNodeNameException
   - Method QName createValidLocalName(   ) is override
   - It is added jUnit test
   Such behavior allows to avoid an undesirable situation
   
   23693: Fixing bug introduced when fixing ALF-5529 (r23546)
   - Enter key & mouse click events from Alfresco.util.useAsButton returned different parameters to the same callback, now fixed
   23698: Use the smaller netcdf jar to avoid SFLJ warnings
   23699: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
     23697 (record-only): Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
        23695: Fixed bug exposed after fixing ALF-5699. Parsing of MLText properties out of the transfer snapshot file was incorrect, and that was causing multi-lingual property values to be duplicated
   23700: ALF-3084 Checking out documents no longer updates the modifier/modified date.
   23702: Fixes ALF-5671: TransferService: BeforeStartInboundTransferPolicy now being fired *after* the transfer lock has been taken
   23703: Fixes: ALF-5633 - Date string not localisable in Blog Archives list
   23710: Fix for ALF-4678: Incorrect workflow details if creator or assignee was deleted
   23715: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
     23713 (record-only): Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
       23709: ALF-5699: Fix NPE in ManifestIntegrationTest
   23719: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
      23717: Fix for ALF-5703: Error when creating a folder within a container using Webscript
   23720: Merged BRANCHES/DEV/BELARUS/V3.4-2010_11_11 to BRANCHES/V3.4:
      23669: ALF-4357: Bitrock Installer: Remote JMX connections fail
   23721: ALF-3044: Audit log is incorrect when trying to filed it as record
   
   23722: ALF-5405: Strange behavior with long names
   
   Code justify in according to coding conventions: 
   - 4 spaces for a tab 
   - Braces on new new line 
   - 120 char line lengths 
   
   23723: Declare all Share UI support webscripts as "internal" lifecycle
   23724: Remove unnecessary css include from RM-audit component
   23729: Fixed ALF-5087 "My Sites Dashlet does not persist the filter setting for All Sites | Sites | Favorite Sites etc"
   - Filter is now persisted as property
   - Calls to get sites & preferences was implemented both server and client side, now client only. 
   - Cell renderers has been refactored from inline to member methods
   - Native button/dropdown are hidden until yui components is created to avoid ui jumping around...
   - ...which also causes the annoying "gap" when resizing which now has been fixed for both My Tasks & My Sites
   23730: ALF-2598 - temp disable Imap Cache - will murder performance but pass unit tests.
   23732: Fix to output of error message in doc summary and image dashlet
   23733: Performance tweak
   23736: Merged V3.3-BUG-FIX to V3.4
      23735: *RECORD ONLY* Merged V3.3 to V3.3-BUG-FIX
         23734: Merged V3.4 to V3.3
            23731: Fixes for ALF-3098 and ALF-3097
                   - Share - Security check on Personal Dashboard - only the owning user can view a user dashboard page
                   - Share - Security issue on Customize Site Dashboard - private and moderated site dashboard pages no longer visible to non-members, customise site and dashboard pages only accessible to SiteManager
   23739: A bit more logging to try to spot why bamboo is different, and add another test
   23741: ALF-4947 - EML files not showing up in folder list
   23749: Fixed formatting: Removed tabs (ALF-5405 fix follow-up)
   23750: Fix unit test (ALF-5405) to check for expected exception
   23751: Prepare for ALF-5575: Remove redundant cache config entries and fix typos
   23753: Fixed ALF-5087 "My Sites Dashlet does not persist the filter setting for All Sites | Sites | Favorite Sites etc" part 2
   - My Tasks dashlets second toolbar became a bit to high, now fixed
   23754: Fixed ALF-2975 "Layout is broken for Audit in IE"
   23755: Work around the fact that some JVMs fail to properly implement the ThreadPoolExecutor specification, and consequently sometimes kill off threads that are in the core pool. Tests now look for either the specification required behaviour, or the broken behaviour
   23756: Change to test code for DynamicallySizedThreadPoolExecuter. Removed unecessary assert which fails on some OSes. Nick B.
   23763: Clean-up login template controller script
   23764: Fixing a typo in test include/exclude spec which meant that WebScriptTestSuite was not being run.
   23766: Fixed ALF-3823 "Share: RSS feed can't be read: http://cds-srv.sun.com:8700/rss/update/public/sunalert_update.xml - ok with other RSS client."
   23768: Add new unit test for international category names. Shows that english, spanish  and french works fine, but that there's something a little iffy with japenses
   23773: Fix for ALF-5240: Something odd happens in My Content page on adding comment
   23785: Fix for ALF-1728: User with administrative rights can paste content into staging.
   23788: Method naming fix (ALF-5405 follow-up)
   23793: Merge from V3.3-BUG-FIX to V3.4
     r. 23791 Fix for failing test cases SiteServiceTest and InviteServiceTest.
              I have used susbsystem bean overriding to turn off emails on the MailActionExecuter bean.
   23800: Fix for ALF-5569: Error trying to change discussion's name
   23805: Add a pure nodeService test for the Japanese write/read issue in ALF-5594. This test will almost certainly break on some db flavour builds on panda, but we want to know which systems are affected (before commenting it out pending the fix)
   23806: ALF-5087 "My Sites Dashlet does not persist the filter setting for All Sites | Sites | Favorite Sites etc" part 2
   - Now provides default filter if not set
   23810: Merged from V3.3-BUG-FIX to V3.4 (RECORD ONLY)
   23809: Merged from V3.3 to V3.3-BUG-FIX 
      23790: Fixed ALF-3823 "Share: RSS feed can't be read: http://cds-srv.sun.com:8700/rss/update/public/sunalert_update.xml - ok with other RSS client."
   23818: Merge from V3.3-BUG-FIX to V3.4
     r. 23817: Further fix for InviteServiceTest failing tests.
   23825: ALF-3066: Google docs - Document not deleted when checked in
   
   23826: Prevent 'nodeOwner' cache invalidation during node creation
   23827: Prevent cache case flip-flopping on encoding strings
   23828: Removed some TODO notes
   23829: Single minor format
   23830: Generics warnings
   23831: Added 60s timeout on mutable node-related caches (ALF-5575)
   23832: Trimming on cache invalidation during put
   23833: Fixed ALF-5575: Enable ConcurrentNodeServiceTest.testMultiThreadedNodePropertiesWrites
    - Prevent read txns from adding stale data to caches while writes are in progress
    - Added cache tests for mutable caches and read-only transactions
   23834: Fixed ALF-5763: Corrected capitalization.
   23838: Corrected an overzealous method rename refactor in QName to not throw a null-ptr-exception.
   23839: Merge from V3.3-BUG-FIX to V3.4
     r.23837: Reimplementation of the build fix for InviteServiceTest. This one won't send emails.
   23840: Merge from V3.3-BUG-FIX to V3.4
     r.23837 Reimplementation of the build fix for InviteServiceTest. This one won't send emails.
   This check-in is merge properties on root. Couldn't check in previously (23839).
   23843: Added debug output for failing workflow REST API test as it works fine on my local machine.
   23852: Fix for ALF-5664: Aspect Mandatory Aspect leads to failed to find property/association definition for property/association
   23856: Added explicit failure for dangling test transactions
   23858: Fix ALF-4277: Link with a long description is displayed incorrectly
   23861: Fail on dangling transactions
   23869: Added system property 'system.cache.disableMutableSharedCaches' (false by default)
    - Equivalent to disabling Hibernate L2 cache
    - Can be used as a diagnostic feature to quickly check for cache problems
   23871: Merged DEV/TEMPORARY to V3.4
      23759: ALF-4357: Bitrock Installer: Remote JMX connections fail
         1. Default RMI bind to all interfaces via alfresco.rmi.services.host 
         2. New property alfresco.rmi.services.external.host with default value ${localname}. This represents the externally-resolvable host name of the RMI server that should be published in the stubs. 
         3. jmxUrl gets a hostname from sysAdminParams
      23770: ALF-4357: Bitrock Installer: Remote JMX connections fail
         Additional jmx.remote.rmi.server.socket.factory configuration for ConnectorServerFactoryBean
      23781: ALF-4357: Bitrock Installer: Remote JMX connections fail
         Configuration of alfresco-virtserver-context for use a alfresco.rmi.services.external.host property
      23783: ALF-4357: Bitrock Installer: Remote JMX connections fail
         Configuration of alfresco-virtserver-context for use a alfresco.rmi.services.external.host property
   23879: Fixed ALF-4687 "Folder with name 'null' is created in the site space"
   23882: Merged V3.3 to V3.4
      23860: Improved fix for ALF-5448 
             - Pickers no longer return hasChildren information. This reduces the number of getChildAssoc() calls required from N+1 to 1. 
             - Cleaned up and improved hasChildren() methods on ScriptNode and BaseContentNode. 
             - Fixed up Share pickers to not expect hasChildren info
   Fix for ALF-5848 - object picker now allows navigation down into cm:category objects
   23884: When testing the Replication Service and the underlying Transfer Service blows up, tidy up the transactions before reporting the problem. This allows all the tests to run even if some are failing (which they currently are, due to a TransferService regression)
   23888: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
     23886 (record-only): Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
       23883: Fixes ALF-5759: WQS: Attempt to copy a website section fails
   23890: Fixes for date time 
    ALF-695: Date time tokeniser will include all parts of date and time - even when searching with just date - so lenient dates fail
    Fixed CMIS date ranges (with unit test)
    Other unreported date-time fixes
   23892: Upgrade Tika and POI, so we get lower memory parsing of .xlsx files (switches from DOM based to SAX based). Custom build containing TIKA-521
   23893: Fix for ALF-466: Impossible to 'remove' association in a workflow (Explorer client)
   23894: Merged V3.3-BUG-FIX to 3.4
      23872: Merged V3.3 to V3.3-BUG-FIX
         23868: Merged PATCHES/V3.3 to V3.3
            23848: (RECORD ONLY) Merged DEV/TEMPORARY to PATCHES/V3.3.3
               23847: ALF-5448 Cannot upload attachments to data lists (https://issues.alfresco.com/jira/browse/ALF-5448)
                  Additional property hasChildren and corresponding getter method was added to ScriptNode and BaseContentNode.
            23860: (RECORD ONLY) Improved fix for ALF-5448
               - Pickers no longer return hasChildren information. This reduces the number of getChildAssoc() calls required from N+1 to 1.
               - Cleaned up and improved hasChildren() methods on ScriptNode and BaseContentNode.
               - Fixed up Share pickers to not expect hasChildren info
            23863: Fix PolicyTest
   23899: When trying to figure out the encoding of a piece of text, if the current guesser doesn't know, try Tika before giving up and going for the default. (ALF-2534)
   Also adds some more tests for encoding detection
   23908: ALF-5435: Declare as record action is missing for emails
   
   23914: Merged V3.3-BUG-FIX to V3.4
      23913: Fix ALF-3067: Script error at the 'View Details' for record
   23916: Fix ALF-3173: Favorite sites a user is not a member of cannot be removed from the Sites dropdown.
   23918: Fix up transfer unit tests and wcm quickstart following ALF-5575
   23925: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
      23911: Fix for ALF-5621: "Long-running patches can result in a database connection closed exception"
           - added requiresTransaction flag to patch-services-context
           - refactoring to allow a patch to be called with no enclosing transaction if requiresTransaction == false
     23915: Fix for ALF-5621: "Long-running patches can result in a database connection closed exception"
          - added missing file
   23928: Merged V3.3-BUG-FIX to V3.4 
      23927: Fix for ALF-5867 - Forms dependencies (CSS and JS) not getting loaded by Forms UI
   23932: Merging from V3.3-BUG-FIX to V3.4
   r23903: ALF-5385 Now paging is enabled on groups GET REST API. Also fixed an issue where GroupsTest.testSearchGroups() was failing.
   23933: Follow-up fix to r23908
   23940: Fix for ALF-5880
   23944: Merged V3.3-BUG-FIX to V3.4
      23943: Fix ALF-5316: Event isn't removed after re-scheduling disposition. Also fixes tree not updating when new containers are created.
   23950: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
      23942: Fix for ALF-5783: Not possible to override the output path pattern anymore when a webform is edited for a specific website
   23951: Backing out previous change as the solution needs re-implementing for the 3.4 branch
   23954: Merged V3.3-BUG-FIX to V3.4
   23953: Fixed ALF-2830FOR "REVIEW: In mytasks(panel) webscript, "Task Done" button hidden in French" part 2
   23949: Fixed ALF-2830 "FOR REVIEW: In mytasks(panel) webscript, "Task Done" button hidden in French"
      * Removed hardcoded width
   
   23955: When the Text to PDF content transformer is reading in the text file, pay attention to the encoding of the file when constructing the InputStreamReader. Also includes a disabled unit test, which seems to show up a PDFBox bug. (ALF-2534)
   23960: Merged DEV/BELARUS/V3.4-2010_11_11 to V3.4
      23910: WCM: upgrade / re-index can fail on 3.4 if link validation (now removed) was previously being used
      - Incremented schema number as well
   23963: Merged V3.3-BUG-FIX to V3.4
   23962: (RECORD-ONLY) Merged V3.3 to V3.3-BUG-FIX
      23961: Fixed ALF-5686 "Incorrect behaviour of "All" filter in "My Tasks" dashlet"
   
   23967: Merged V3.3-BUG-FIX to V3.3
     - 23966: DOCLIB: Tags are not displayed
     
   23969: Removed case sensitivity for UTF-8 encoding
   23972: Fix for ALF-5798: "Quartz 1.7.3 and higher phones home"
      - added a flag to quartz.properties to stop the phone home
   23975: ALF-5346 Added a unit test to AlfrescoJavaScriptIntegrationTest.
   23980: Merged: From V3.3-BUG-FIX to V3.4
      23979: Merged From V3.3 to V3.3-BUG-FIX
         23970: Fixes: ALF-5858 (Javascript error caused by files 404'ing) - URLRewriting bug introduced in r23545
   23986: Fix for ALF-4646: Workflow REST API webscripts do not have sufficient documentation
   23992: Enhanced the select controls to allow a default, initial selection to be specified either in component binding properties or on the URL. The value is ignored if a value is already set for the property.
   
   To use this feature use the new "defaultValueContextProperty" control parameter, for example:
   
   <field id="ws:language"> 
      <control template="/org/alfresco/components/form/controls/selectone.ftl">
         <control-param name="options">en|English,fr|French,de|German,es|Spanish,it|Italian</control-param>
         <control-param name="defaultValueContextProperty">localeId</control-param>
      </control>
   </field>
   23993: Building blocks for ALF-5084. A new ActionConditionEvaluator for has-child.
   23997: Fix ALF-5731: Saving a doc from Office 2003 via WebDAV fails
   24003: BatchProcessor always calls afterProcess now (as per Javadoc)
   24004: Undid rev 23827: Prevent cache case flip-flopping on encoding strings
   24006: Merged V3.3-BUG-FIX to V3.4
      24005: Fix ALF-4368: Share - File menu not loading properly on IE
   24010: Merged V3.3-BUG-FIX to V3.4
      24009: *RECORD ONLY* Fix ALF-3155: Site Calendar dashboard works incorrectly
   24015: Merged V3.3-BUG-FIX to V3.4
      24014: Merged V3.3 to V3.3-BUG-FIX
         24013: Fix for ALF-5897 - AWE - HTTP authentication requested when page loaded - AWE login fails 
   24018: Avoid a NullPointerException if the action lacks a noderef
   24024: ALF-4066: Creating RM Folders via IMAP in email client throws errors
   
   - Adding a folder to a category now automatically downcast the folder to a record folder
   
   24026: Fix ALF-5567: TinyMCE language fails to load custom language in forms engine. Also code standards for some related code.
   24028: Fix for ALF-5788: Outlook 2003: event isn't deleted in Share if it was deleted in Outlook
   24032: Fixes ALF-5885: Inserting document to wiki page causes an error
   24048: Fix for ALF-5897 - updated surf.xml to set correct user factory
   24051: Removed 'Delete All Items' from trashcan dialog' (part of ALF-1990)
   24052: Fixed ALF-1990: Trashcan "Delete All Items" button might not delete all items
    - Pulls back all items for batch-processing
    - Fixes bug but needs enhancement to use pageable node query
   24056: Fixed SAIL-367 "REfactor header.css to avoid needing a ie8.css"
   24057: Fix for ALF-5620 sitePreset filter in siteService.listSites not working
   24068: Merged V3.3-BUG-FIX to V3.4
      24067: *RECORD ONLY* Fix ALF-5973: Web QuickStart module breaks Share DocLib since Portlet merges
   24069: Merged BRANCHES/DEV/BELARUS/V3.4-2010_11_11 to BRANCHES/V3.4:
      24045: ALF-5781: Non-recurrent event is displayed with "Recurring" label
   24090: Fixed ALF-4972 "Custom workflow is not sorted in workflow list"
   - now ignoring case and falls back to name if title isn't present
   24097: Fix for ALF-5802 - comment based discussions removed from repository search results.
   24098: Add user/permissions related copy test. Currently disabled as something relating to ALF-5288 seems to be wrong
   24099: Fix for ALF-5976: Email Notify Templates not being picked up in Share Rules Send Email UI (requires server restart)
   
   The allowable values of parameter constraints were indeed being cached, I have added a new property on BaseParameterConstraint which allows the caching to be turned off as follows:
   
   <property name="cacheAllowableValues" value="false" />
   24100: ALF-4357: Fix random unit test failures due to RMI registry lookup
   - Implement equals() and hashCode() methods in HostConfigurableSocketFactory!
   - Don't ask me how many hours I wasted on this!
   24102: Further ALF-1990: Removed redundant permission check and fixed tests to check failure reports properly
   24103: Encoding DAO returns uppercase values; internally, DB was always using lowercase
   24104: More put and set trimming to avoid cache remove calls
   24105: Fixed unit test to explicitly recognisable UTF-8 characters
    - Tika was interpreting lame text as ISO-8859-1
    - EncodingDAO case-sensitivity fix got past first failure and onto second, thus obfuscating the root cause
   24114: Fix for ALF-2309: "FTP server can retrieve and overwrite files already moved away from current folder"
      - node paths were inconsistent for moveNode. Fixed them to be consistent.
   24115: Fix failing unit test. In WorkflowTestSuite, shut down the application context used by the other tests before starting JBPMEngineUnitTest. Also reset the WorkflowTaskInstance singleton.
   24123: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
      24122: (RECORD ONLY) Fix for ALF-5710: It is impossible to create category in RM with FDK installed
   24126: Fixes: ALF-4775: UI Spelling mistake corrections
   24140: ALF-170: The user has all rights for audit once "Access Audit" capability is added to him
   
     - Capabilities added to the underlying audit service blocking access to audit functions as expected
     - TODO UI still needs updating
     - TODO export fn still needs isolating
   
   24142: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
      24141: (RECORD ONLY) Build fix
   24144: Removed tabs
   24145: Fixed test to use 'system' user after permissions were tightened around RM audit (ALF-170)
   24146: Correctly disable a supposedly disabled test, pending a proper fix for the underlying issue (ALF-5288)
   24154: Merged V3.3-BUG-FIX to V3.4
      24152: Merged V3.3 to V3.3-BUG-FIX
         24151: Merged V3.3.3 to V3.3
            24150: Further fix for links list issue identified in ALF-5966
   24163: Fix for ALF-5954 - username uri encoding
   24164: Put tearDown deletes in transaction
   24174: Added 3rd-party license
   24180: 
   24186: Fix for ALF-438: Error appears after adding a content to space where content rule 'Check Out in the current space' was created.
   24187: ALF-5400: Merged V3.3 to V3.4
      23650: Switch off transaction limiting for now, pending further investigation
   24191: MERGED V3.3-BUG-FIX to V3.4
     23864:Merge BRANCHES/DEV/BELARUS/V3.3-2010_10_22 to V3.3_BUG_FIX
       23229 : ALF-5239 WebDAV shows incorrect creation date
     23652 : ALF-4902 - MS Word 2003 stuck and exception org.alfresco.jlan.server.filesys.AccessDeniedException: Get file information
   24192: Performance and scalability improvements related to thread blocking in FreeMarker related classes
    - replacement of single ObjectWrapper related class with threadlocal version
    - replacement of MRU cache implementation (synchronized) with concurrent version
   24193: Removed svn:mergeinfo again.  Please read: https://ts.alfresco.com/share/page/site/eng/wiki-page?title=Merging_Guide
   24194: Merged V3.3-BUG-FIX to V3.4
      24138: Fix bootstrap ordering so that modules can override Enterprise-only beans (ALF-6010)
      24139: Fixed ALF-6010: Content URL recognition errors during bootstrap re-indexing
      24170: XAM: Removed more hacks (ALF-6010)
   24196: Test refactoring as part of investigation into ALF-5969.
   JodConverter-based transformation/extraction tests now pass if OOo is not available on the machine running the test.
   Also some minor refactoring of the temporary node tidy-up code.
   And I've enabled these tests in the build.
   24197: Merge V3.3-BUG-FIX to V3.4
     23742 : Merge DEV to V3.3_BUG_FIX
       23738 : ALF-5520 - IMAP metadata extractor fails to extract dates spanned on two lines
     23865 : Merge V3.3-BUG-FIX-2010_07_13 to V3.3_BUG_FIX
       21263 : ALF-2880: Share - Exception when making a site "moderated".
     23866 : Merge V3.3-BUG-FIX-2010_09_20 to V3.3_BUG_FIX
       22634 : ALF-3859 Module Management Tool stops applying amps if one amp fails when using the -directory option.
     24031 : ALF-5553 - Email preview style lost on Outlook 2007
     24085 : ALF-5928 - Undeclared email can't be copied
     24092 : Fix unit test following change for ALF-3859
     24169 : ALF-5919 - Error on start Alfresco page in read-only mode (NTLM specific)
   24198: Merged V3.3-BUG-FIX to V3.4
      23758: (RECORD ONLY) Merged V3.4 to V3.3-BUG-FIX
      23787: ContentStoreCleaner exits silenty if it can't get the job lock
      23906: Fixed ALF-5119 (ALF-4652): Prevent lock and archive removal until retention period has passed
      23934: (RECORD ONLY) Merged V3.3 to V3.3-BUG-FIX
      24002: CreateNodeRuleTrigger was not doing anything when cm:noContent aspect was added
   24201: Merged V3.3-BUG-FIX to V3.4
      24172: Orphan cleanup code is more sensitive to unsupported URLs (helps ALF-5533)
      24173: Part 1 of ALF-5533: XAM orphan cleanup after rollback or retention job cleanup
      24175: Part 2 of ALF-5533: XAM orphan cleanup after rollback or retention job cleanup
   24210: Merged V3.3-BUG-FIX to V3.4
     23956 : Merged DEV TO V3.3_BUG_FIX 
       ALF-4546 : Moving a secondary child node using a file protocol adapter (such as CIFS) moves the primary child node
   24214: When the tagging service updates the tag scope values in the background, don't fire behaviours for the change as it's an internal system task. Adds a unit test for this, and for general permissions + tagging for ALF-5504
   24217: Put deletes into transaction in tearDown()
   24218: Merge V3.3-BUG-FIX to V3.4
     24017 : ALF-5647 : Empty 'addressee(s)' metadata in share when a mail rfc822 is pushed using IMAP
     24027 : ALF-4647 - missed check in from 24017
     Merged DEV/BELARUS/V3.3-BUG-FIX-2010_11_09 to V3.3_BUG_FIX 
       24086: ALF-5495 - IMAP encoding bug: pushing-poping a message with Content-Transfer-Encoding: 8bit to IMAP server corrupts encoding
     Merged BELARUS/V3.3-BUG-FIX-2010_11_09 to V3.3-BUF_FIX
       24121 : ALF-5647 - Empty 'addressee(s)' metadata in share when a mail rfc822 is pushed using IMAP
   24219: removed file that should not have been added.
   24220: Fix ALF-5568: Shortcoming of export/import mechanism
   24221: Patched build of JodConverter. Hopefully this will help with ALF-5969.
   I have added logging during JodConverter init and during soffice process init.
   24222: Fix typo in message bundle whilst investigating ALF-5650
   24223: Null pointer exception in ImapFolderSecurityInterceptor
   24224: Fix for ALF-219. Impossible to transform from .html to .pdf for empty files
     This was due to a bug within JooConverter - the Community Edition 3rd party lib for OOo connection.
     It handles zero-length files a little unpredictably, producing NullPointers, unreadable PDF docs and someties crashing the soffice process depending on input.
     OOo seems to do a good job itself with empty files, so OOo is not the problem.
   
     I have added a workaround whereby for zero-length files that are going to OOo via JooConverter for transformation, instead of using OOo
     we use Apache PDFBox to produce an empty PDF file.
   
   24225: Excluding **OOoTest from the JUnit test patterns as they are causing the build to hang.
   They work fine on my machine. Honest! Will investigate more closely on Windows OS next week.
   24226: Added an impl comment about a potential future pdfbox improvement.
   24229: Fixes: ALF-5991 - Removed space to fix JDK specific issues w/ string.
   24231: Custom build of JodConverter.
     Added logging to WindowsProcessManager.
     Removed an unnecessary executor.shutDown() call from ManagedOfficeProcess.
   24232: Completed fix for ALF-5802 - comments filtered for document library items as well as repository items
   24233: Removed svn:mergeinfo on root
   24235: Merge V3.3_BUG-FIX to V3.4
     24234 : ALF-5844 - Defining the Lockable aspect as mandatory causes UnsupportedOperationException when checking out content
   24236: Fix for ALF-3941: SSO Share with CAS - external-auth and SSOAuthenticationFilter
   - SSOAuthenticationFilter uses Kerberos example condition - its name has been changed so you have to rename it into scope.
   - Added supporting comments to both sections
   24240: Fixed ALF-5999: Alfresco 3.4 startup fails with XAM connector module
    - Enterprise modules were not being built (Kofax and XAM)
    - Added release version number to AMP files as well as XAM jar
   24241: Merged V3.3-BUG-FIX to V3.4
      24077: ALF-5471 part 1: 'authorityMigration' patch can report 'Node does not exist'
      24078: ALF-5471 part 2: 'authorityMigration' patch can report 'Node does not exist'
   24243: Fixed ALF-6028 "Impossible to reject invitation due to script error"
   24244: Merged V3.3-BUG-FIX to V3.4
      24242: Fix ALF-5608: Script error after 'Edit' on My Spaces List Dashlet. Also fix "More actions..." link going to wrong details page.
   24247: temp commit of imap message test - will be reinstated soon
   24251: Fix ALF-5992: Language pack errors in Share - It's impossible to delete group with native chars in names (IE specific)
   24265: Merged V3.3-BUG-FIX to V3.4 (RECORD ONLY)
      23744: Merge V3.4 to V3.3_BUG_FIX
         23513 : Merge DEV to V3.4
            ALF-4200 IMAP - LSUB Failed. AccessDenied.
      23758: Merged V3.4 to V3.3-BUG-FIX
         23688: ALF-5405: Strange behavior with long names
         23722: ALF-5405: Strange behavior with long names
         23749: Fixed formatting: Removed tabs (ALF-5405 fix follow-up)
         23750: Fix unit test (ALF-5405) to check for expected exception
      24120: ALF-5997: Merged V3.4 to V3.3-BUG-FIX
         23551: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_21 to BRANCHES/V3.4:
            23474: ALF-5490: The Subsystems configuration folder does not seem to be read when Alfresco is deployed to later versions of JBoss
      24124: ALF-5988: Merged HEAD to V3.3-BUG-FIX
         23231: Merged DEV/TEMPORARY to HEAD
            23227: ALF-5271 : Win7+Kerberos+Spp problem
               1. Vti-context.xml was updated for sharepoint module to allow jetty support requests with total size of headers up to 8k.
      24177: ALF-5178: Merged V3.4 to V3.3-BUG-FIX
         24070: Merged DEV/BELARUS/V3.4-2010_11_11 to V3.4
            24011: ALF-5618: Webdav with MAC OS X problems - Locking / unlocking creates new versions
               1. WebDAV locking properties was added to excluded in VersionableAspect
               2. Appropriate JUnit test created.
         24101: Disabled test and reopened ALF-5618
         24117: Fixed test inter-dependencies on 'excludedOnUpdateProps' for ALF-5618
      24259: Merged V3.3 to V3.3-BUG-FIX
         23747: ALF-5696: Merged V3.4 to V3.3
            23585: Fixed ALF-5372 "JavaScript error on Groups management dialog with IE8 : document.getElementById is null"
         24132: Disable intermittent failing unit test
         24148: ALF-6007: Merged HEAD to V3.3
            23049: Fixed ALF-5099: Error when trying to go back in Create Web Content Wizard (only with certain XSDs)
   24266: Merged V3.3-BUG-FIX to V3.4
      23761: ALF-5358: Invalid JavaBean property 'blockedSenders' being accessed!
         - renamed List versions of setAllowedSenders and setBlockedSenders
      23769: Fixing typo in build.xml that means WebScriptTestSuite was not being run.
      23844: Fix for ALF-1084, ALF-5792 - handling of character encoding as specified in XML file header when missing from response headers. Fixes issue with non-ascii characters in RSS feeds in Share.
      23878: Build fix. InvitationTest.
         Minimally refactored a test case to disable email sending properly.
      23895: Backported fix from rev 23838 - QName refactor causes null-ptr-exception from Upload Content dialog in Explorer.
      23917: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
         23912: Fixes ALF-5878: WQS: Alfresco sessions ramping up rapidly
      23921: Fix for ALF-5826 - Infinite loop while closing "Manage Multilingual Content" dialog.
      23924: Merged V3.3-BUG-FIX-2010_10_04 to V3.3-BUG-FIX
         23416: ALF-5301: TinyMCE is replacing carriage return with white spaces.
      23979: Merged V3.3 to V3.3-BUG-FIX:
         23970: Fixes: ALF-5858 (Javascript error caused by files 404'ing) - URLRewriting bug introduced in r23545
      24001: Merged BRANCHES/DEV/BELARUS/V3.3-2010_11_10 to BRANCHES/DEV/V3.3-BUG-FIX:
         23971: ALF-1948: Deleting a freshly created file doesn't remove it from a user sandbox 
                 - also minor formatting & extra tests
      24007: Merged BRANCHES/DEV/BELARUS/V3.3-2010_11_10 to BRANCHES/DEV/V3.3-BUG-FIX:
         23971: ALF-1948: (commit mergeinfo !)
      24055: ALF-5897: Updated surf.xml to set correct User Factory
      24108: Fix CIFS memory pool leak, in IPC$ processing. ALF-483.
      24129: ALF-5458 Adding paging support to Groups REST APIs.
      24156: ALF-5663 - Deadlock during StatusTemplate lookup in AbstractWebScript (already present in V3.4)
      24181: Added catch block for access denied error in store file processing, returns a 451 error to the FTP client. Part of ALF-6020.
      24182: Convert open content for write errors to an access denied exception, fix for FTP NPE and will also be handled by CIFS protocol code. ALF-6020.
      24252: Fixed ALF-5677: Extremely long launch of the Alfresco server with connector V1.2
         - Avoid any ContentReader interaction (incl. exists checks) when 'lucene.maxAtomicTransformationTime=0'
         - Prevents slow XAM-based XSet operations from slowing reindexing
         - As a side-effect, text/plain content is now treated the same as transformable content when the transformation time is 0
      24255: Check URL support and read-only state in afterRollback cleanup of orphaned content URLs (ALF-5677)
      24256: Neatened code
      24257: Fixed integrity checking when properties have been removed from model
      24258: Helper DEBUG for diagnosing ALF-5677 and future XAM issues
      24260: Merged V3.3 to V3.3-BUG-FIX (RECORD ONLY)
         23707: Merged V3.3-BUG-FIX to V3.3
            23596: Merged HEAD to BRANCHES/DEV/V3.3-BUG-FIX:
               20636: ALF-3157 - Conflict between IMAP and Audit
               20638: ALF-3157 - Conflict between IMAP and Audit
                  - part II update the auditConfig.xml
         23946: Merged V3.3-BUG-FIX to V3.3
            23942: Fix for ALF-5783: Not possible to override the output path pattern anymore when a webform is edited for a specific website
      24261: Merged V3.3 to V3.3-BUG-FIX
         23650: Switch off transaction limiting for now, pending further investigation
         23706: Merged PATCHES/V3.3.3 to V3.3
            23704: ALF-5720: Merged V3.3-BUG-FIX to PATCHES/V3.3.3
               23609: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_06 to BRANCHES/DEV/V3.3-BUG-FIX:
                  23158: ALF-1838: Need to support relative url for WCM TinyMCE Filepicker.
                     Also fixes ALF-866 & ALF-5420
         23708: Merged DEV/TEMPORARY to V3.3
            22697: ALF-4809: The confirmation step to Revert action implementation. New dialog.
         23970: ALF-5858 (Javascript error caused by files 404'ing) - URLRewriting bug introduced in r23545
         23998: Add tomcat bundles
         24053: ALF-5897: Updated surf config to set correct user factory
         24061: Merged V3.2 to V3.3
            19170: Fixed ALF-730: MLText is not fully carried during cut-paste or copy-paste
               - Fetching of properties for copy now uses 'mlAwareNodeService'
         24130: Ensure mysql symlinks created
         24131: ALF-5930: Correct bogus configuration template for Quickr
      24262: Stress test code for ALF-5025: Support background processing of archiving
   24267: Reverting partial merge of build script changes
   24268: Removed svn:mergeinfo on root
   24270: Merged V3.3 to V3.4
      24269: Merge fallout: rename of ASPECT_MAILED to ASPECT_EMAILED
   24271: Merge fallout: fix compilation error (masked by a crashed Eclipse)
   24275: FTP command input buffer resizes on overflow (up to a maximum of 64K), allow long paths in commands. ALF-210.
   24281: Performance improvements relating to WebScripts, Surf, FreeMarker and Apache HTTP synchronization under heavy multi-threaded load.
   24282: Merged V3.3 to V3.4
      24279: Fix for ALF-6025 - increased cluster cache size for webScriptsRegisteryCache
   24284: Fix for ALF-5723: Sharepoint Protocol doesn't seem to work in 3.4.a and 3.4.b with NTLM passthru
   24285: Unit test fallout from merge.  Removed NPE-causing mailActionExecutor member
   24286: Reinstate ImapMessageTest (a required bug fix was incorrectly removed by merge 22725)
   24288: Fix for ALF-4282 Site Contributor can't create datalist until Site Manager creates new one.
     The first user who views the data lists page for a Share site kicks off the lazy creation of the necessary
     site container node. In fact it creates the container, sets its cm:description to "Data Lists" and saves
     that ScriptNode. See parse-args.lib.js circa line 144.
     However if that user is not a Site Manager then they do not have permissions to create the container and
     an exception is thrown which results in a disabled 'New List' button.
     In fact, the creation of the container node was already being run as system. But the Site.save() call was not and
     that was the call that was producing a permissions exception.
     In order to run the whole thing as system (which is not available in the JS layer), I have extracted the JavaScript
     logic into a new Java-layer method createAndSaveContainer(...) and JS now makes that one call.
   24289: Fixed misleading javadoc comment relating to ALF-4282
   24290: Merged BRANCHES/DEV/BELARUS/V3.4-2010_11_29 to BRANCHES/V3.4: 
      24238: ALF-5556 : Items disappear from document library after changing its name
   
   Also added new unit test to verify that site containers can not be renamed.
   24295: Fixes ALF-4290: Installer text errors
   24302: Fixes for dependencies for the SDK.
   24305: Added logging to JodConverterSharedInstance (Alfresco's JodC-facing class)
   Re-enabled the JodC-related test classes - these may break the build.
   Set logging in JodC to DEBUG
   24307: Removing a debug statement which is verbose and unhelpful at a high frequency.
   24310: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
      24283: Fix for ALF-2232: "Collaborator actions in CIFS(Share) are incorrect"
   24311: Fix for ALF-2232: "Collaborator actions in CIFS(Share) are incorrect"
     - missed root dir and import
   24313: ALF-3044: Audit log is incorrect when trying to filed it as record
   
   24315: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
      24314: If the repo is running in read only mode, skip the periodic Tag Scope sweep and update (ALF-6067)
   24317: Disabled the OOoJodC tests again as I should have some info to proceed while we get a good build on this plan.
   "You put your left leg in..."
   24319: Moved logging of soffice file permissions to before the attempt to start JodConverter.
   24321: 
   24323: Changing the use of File.createTempFile to TempFileProvider.createTempFile mostly in test code.
     None of these temporary files are needed for longer than a few seconds.
     By using our own TempFileProvider there will be a chance that our tempFileCleaner will delete temporary files.
     Derek pointed out that there are a lot of such temporary files in our build server's temp dir.
   24330: Data generation for perf. tests: Ensure content is written to file
   24333: Merged V3.4-2010_11_29 to V3.4
      24237: ALF-5829: Cannot upload files to Records Managemennt site using WebDav from Mac OS X.
             Return "403 Forbidden" status if WebDAVMethod.execute() fails with AccessDeniedException.
   24339: Fixed a bug where task properties were not being updated when task was transitioned.
   24340: Fixed a bug where task properties were not being updated when task was transitioned.
   24349: turn off debug logging
   24351: ALF-3584 Cleaning up SDK list of libs.   (I think there may be a limit on the size somewhere)
   24355: Tika update to better support encrypted PDFs (ALF-6040)
   24357: Turned off JodConverter hanging tests again.
   I won't turn these back on again now. Apologies for all the disruption.
   I have a basis on which to address the hanging issue on my own machine now.
   24359: Add code to probe intermittent test failure.
   24368: Patched build of JodConverter.
     This changes jodconverter's OfficeUtils.toUrl(File) method so that it uses Alfresco's mechanism for
     creating OpenOffice URIs.
   24371: Fix for ALF-5563: Sorting documents with multiple locales
   - d:text now uses the .no_locale field for sorting using the user's locale collation
   24372: Turning the jodconverter-related logging down from 'debug' to 'info' by default.
   24373: Merged V3.3 to V3.4 (Missed merge)
      21907: ALF-4401: Web services not working on Websphere 7 (ever?)
         - Added in Sun SAAJ and JAXP reference implementations to shared library in order to make CXF work
         - Removed old Sun SAAJ libraries as these are embedded into JDK 1.6
   24376: ALF-2761: RM adds rma:record to IMAP messages in non RM folders
   
   24378: When copying content, reset the auditable properties. 
   This makes the person doing the copy the creator/modifier, and resets the created/modified at times to now. Avoids the issue of being able to copy a node but then not edit it. Fixes ALF-5288
   24381: Fixed ALF-6002 "Share links and images break when saving html content"
   - Editor content was never persisted to hidden textarea after non "keyup" events, such as embedding links & images
   - Also added tinymce's src files when running alfresco in debug mode
   24383: Fix for ALF-5967 - reset the SpringMVC View Resolvers when the Surf Refresh Object Registry cmd is used.
   24385: Merged BRANCHES/V3.3 to BRANCHES/V3.4
      24384: Merged PATCHES/V3.3.4 to BRANCHES/V3.3
         24382: Fixed ALF-6087 "Wiki: all buttons are disabled in IE" by quoting "delete" (as it is a reserved js word)
   
   24386: Fix for ALF-1339: Share - Posts in discussions can be edited and deleted by any members
   24389: Merged V3.3 to V3.4
      24388: Fix ALF-6128: Upload/recall documents with apostrophe/accent via Alfresco Office plugin
   24395: Fix for ALF-6009: Workflow "View More Actions" link incorrect when first char of site URL is numeric
   24398: Merged DEV-TEMPORARY to V3.4
      24320: Fix ALF-4868: An error occurs, while adding content to space with "has-tag" rule
   24401: More code to probe intermittent IMAP test failure.
   24402: Fix for performance degredation related to ALF-3823.
   RSS feed processing in JavaScript relies on Rhino impl of regex - this is extreemly slow as Rhino regex is by far the slowest component of the library.
   Switched code to use the Java Regex libraries to improve performance and reduce memory usage.
   
   Time to process 4 small rss feeds while running in the profiler:
   Using Rhino regex: 6670ms (required ~3500MB of temp RAM)
   Using Java regex:  1550ms (required ~30MB of temp RAM)
   24404: Merge V3.3 to V3.4 (RECORD ONLY)
     24403 : Merge V3.4 to V3.3
         ALF-5539
   24415: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
      24306: ALF-5987: AVM - AVMNodeDAOIbatis.getRootNodeByID does not seem to handle nulls properly
   24416: Merged BRANCHES/V3.3 to BRANCHES/V3.4: 
       24306: ALF-5987: AVM - AVMNodeDAOIbatis.getRootNodeByID does not seem to handle nulls properly (add logger)
   24420: Merge from V3.3-BUG-FIX to V3.4
     V3.3-BUG-FIX r.24419
       V3.3 r.24418 Fix for ALF-6075. Running out of /tmp space on the server is causing uploads to fail.
   24453: Fixed ALF-6116 "Incorrect behavior of sites filter" 
   - Made rest calls sequential rather than parallell
   24455: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
      24454: AVMStoreDAOIbatis auto-unboxing NPE (see also ALF-5987)
   24456: Resolve ALF-5875 - RM Constraint cannot be used for custom models (via RecordsManagementAdminService)
   24462: Merge V3.3 to V3.4 (RECORD ONLY)
     24460 : Merge HEAD to V3.3
       22680 : ALF-4015 Benchmark broken
   24467: Remove unused labels as part of ALF-6092
   24470: Merged V3.3 to V3.4
      24469: Fix for ALF-6006 - reworking of Share site-index initialisation to use "lazy" dashboard filter.
              - ensures user dashboard is available without having to enter Share via the default index page.
   24473: ALF-6105 - Upgrade from 2.2 to 3.4.0.R1.86 fails with Custom attributes found - will require custom migration patch: [.href]
   24474: Possible fix for ALF-5969. JodConverter.
     I noticed that SuspendableThreadPoolExecutor.available (a non-volatile, non-synchonized accessed boolean)
     is being updated by multiple threads and there may be stale reads of this field by some threads.
     I apply this fix in hope more than expectation that it will fix the JodC problems we're seeing.
   24489: Fix MT startup (Failed to init namespaceRegistry)
   - see also ALF-6029
   24491: ALF-6058: Quickr module doesnot not work.
   
   Checkin comments:
   
   Doesn't broadcast ContextRefreshedEvent and ContextClosedEvents for subsystem context parent.
   Add corresponding unit test: SubsystemsTest.testALF6058().
   
   24494: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
      24298: ALF-6043: AVM orphan reaper - handle concurrent node delete (WCM cluster)
   24499: ALF-5917 Added a property that allows switching off of email notifications for Nominated invitations.
   24500: Merge 3.3 to 3.4:
   24493: Fix for Mac OS X CIFS logon problem, change UID to start at one as zero has special meaning, plus other minor fixes. JLAN-112.
   24501: Merged (and fixed) DEV/BELARUS/V3.4-2010_12_14 to V3.4
   + fixed hard bean reference to injection
   + tested with index test running with continual back up
   24502: Merged (and fixed) DEV/BELARUS/V3.4-2010_12_14 to V3.4 (missed merge info)
   + fixed hard bean reference to injection
   + tested with index test running with continual back up
   24503: ALF-6113 - Don't include non-standard {music} namespace properties when extracting metadata from MP3s. (Don't merge to HEAD)
   To be fixed fully with ALF-6170 via defining an audio content model
   24504: ALF-4373: It's impossible to upload record if any record was previously frozen
   
   24506: Fixes ALF-6181: Add default site notification e-mail settings to global properties
   24511: ALF-5769 - Failed to signal transition from workflow "Expired content in 'Test'" task when click "Task Done"
   24512: Fix for ALF-6100 - Incorrect behaviour of preview content in Share - Websphere specific.
   24522: Merged V3.3 to V3.4
      24521: Fix for ALF-5065 - Share - Missing notify_user_email template
   24523: Fix for ALF-6171: Access Denied error in Alfresco Exporer when in Read-only mode (Websphere)
   24534: Merged V3.3 to V3.4
      24447: Support for ALF-5533 and ALF-5023: Make ContentStore.delete behaviour consistent w.r.t. true/false return value
      24472: Code for ALF-5023: Allow the retention schedule to be extended for XAM nodes
      24515: Fixed ALF-5023: Allow the retention schedule to be extended for XAM nodes
      24533: Minor XAM changes that mainly affect the QA tasks
   24541: ALF-6029 - MT: cannot "Show Folders" in Afresco Share
   24550: Fix for ALF-6088: Categories are unavailable at the Server B after deleting category at the Server A
   - category service handles invalid node refs correctly
   24551: Merge V3.3 to V3.4 (RECORD ONLY)
      24547: Fixed ALF-6188 "Object finder does not allow select users in the singleSelect mode"
      24549: Fixed ALF-6188 "Object finder does not allow select users in the singleSelect mode" part 2 (typo)
   
   24558: Merge V3.3 to V3.4
     24557 : Merge DEV to V3.3
        24527 : ALF-4724 ftp server and list.
   24559: Removed svn:mergeinfo on root
   24561: 
   24564: Fix for ALF-3727: Custom permissions aren't visible in Explorer UI
   - the default Alfresco permission model (or the one associated with the permission model dao is loaded first
   - all other models will be loaded in any order unless specific bean dependencies are added (if ordering is important you need to add it via Spring) 
   - there is no collision detection :-)
   24582: Merged V3.3 to V3.4
      24578: Fix for ALF-4729 and ALF-6048 - Unable to access Share [or Explorer] through NTLM SSO on Safari
   24583: Oracle build fix: ALF-4223: Oracle: testTaskInstanceGet in WorkflowRestAPiTest is only failing on Oracle build plan
   - work around for oracle null === ""
   24588: Committing installer updates for DDraper, fixes: ALF-6096 & ALF-6019
   24602: Build fix for RM permission model loading - collateral damage for R 24564
   24606: Merged BRANCHES/DEV to BRANCHES/V3.4:
      24563: ALF-6063: Alfresco 3.4.0.RC1.86 fails to connect to virtualization server
   24607: Merged V3.3 to V3.4
       24605: Fix for ALF-5552: Many REST API scripts are not resilient to stale Lucene indexes
   24608: ALF-5555: It is impossible to edit review date from record's details page
   
   Implementation of changable "Edit Review Date" date for properties view.
   The structure of dod5015 properties was undefined. An asynchronous call to web script has been added for preservation of the entered date.
   
   24615: Fixes: ALF-6254 - Typo in Dashlets properties file
   24620: Removed RC1 from label
   24623: Installer updates to use new binary versions for SWFTools (0.9.1) and Apache Tomcat (6.0.29)
   24624: Add line break.
   24627: Fix execute permissions for OOo
   24630: Tweak AVM test
   24634: Update root pseudo folder timestamps when new stores are added so NFS clients see the update. ALF-5197.
   24637: RM Caveats - split service/component
   - related to rmEntryVoter (ALF-5875 & ALF-6231)
   24661: ALF-6303: fix typo in upg script


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@26789 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-04-11 14:24:38 +00:00

3321 lines
126 KiB
Java

/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.domain.node;
import java.io.Serializable;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.sql.Savepoint;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.Stack;
import java.util.TreeSet;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.ibatis.BatchingDAO;
import org.alfresco.ibatis.RetryingCallbackHelper;
import org.alfresco.ibatis.RetryingCallbackHelper.RetryingCallback;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.cache.SimpleCache;
import org.alfresco.repo.cache.lookup.EntityLookupCache;
import org.alfresco.repo.cache.lookup.EntityLookupCache.EntityLookupCallbackDAOAdaptor;
import org.alfresco.repo.domain.contentdata.ContentDataDAO;
import org.alfresco.repo.domain.control.ControlDAO;
import org.alfresco.repo.domain.locale.LocaleDAO;
import org.alfresco.repo.domain.permissions.AccessControlListDAO;
import org.alfresco.repo.domain.permissions.AclDAO;
import org.alfresco.repo.domain.qname.QNameDAO;
import org.alfresco.repo.domain.usage.UsageDAO;
import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.repo.security.permissions.AccessControlListProperties;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.repo.transaction.TransactionAwareSingleton;
import org.alfresco.repo.transaction.TransactionListenerAdapter;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.InvalidTypeException;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.repository.AssociationExistsException;
import org.alfresco.service.cmr.repository.AssociationRef;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.CyclicChildRelationshipException;
import org.alfresco.service.cmr.repository.DuplicateChildNodeNameException;
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
import org.alfresco.service.cmr.repository.InvalidStoreRefException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.Path;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.repository.NodeRef.Status;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.ReadOnlyServerException;
import org.alfresco.util.EqualsHelper;
import org.alfresco.util.GUID;
import org.alfresco.util.Pair;
import org.alfresco.util.PropertyCheck;
import org.alfresco.util.ReadWriteLockExecuter;
import org.alfresco.util.SerializationUtils;
import org.alfresco.util.EqualsHelper.MapValueComparison;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.dao.ConcurrencyFailureException;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.util.Assert;
/**
* Abstract implementation for Node DAO.
* <p>
* This provides basic services such as caching, but defers to the underlying implementation
* for CRUD operations.
* <p>
* TODO: Timestamp propagation
*
* @author Derek Hulley
* @since 3.4
*/
public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
{
private static final String CACHE_REGION_ROOT_NODES = "N.RN";
private static final String CACHE_REGION_NODES = "N.N";
private static final String CACHE_REGION_ASPECTS = "N.A";
private static final String CACHE_REGION_PROPERTIES = "N.P";
private static final String CACHE_REGION_PARENT_ASSOCS = "N.PA";
private Log logger = LogFactory.getLog(getClass());
private Log loggerPaths = LogFactory.getLog(getClass().getName() + ".paths");
private boolean isDebugEnabled = logger.isDebugEnabled();
private NodePropertyHelper nodePropertyHelper;
private ServerIdCallback serverIdCallback = new ServerIdCallback();
private UpdateTransactionListener updateTransactionListener = new UpdateTransactionListener();
private RetryingCallbackHelper childAssocRetryingHelper;
private DictionaryService dictionaryService;
private BehaviourFilter policyBehaviourFilter;
private AclDAO aclDAO;
private AccessControlListDAO accessControlListDAO;
private ControlDAO controlDAO;
private QNameDAO qnameDAO;
private ContentDataDAO contentDataDAO;
private LocaleDAO localeDAO;
private UsageDAO usageDAO;
/**
* Cache for the Store root nodes by StoreRef:<br/>
* KEY: StoreRef<br/>
* VALUE: Node representing the root node<br/>
* VALUE KEY: IGNORED<br/>
*/
private EntityLookupCache<StoreRef, Node, Serializable> rootNodesCache;
/**
* Bidirectional cache for the Node ID to Node lookups:<br/>
* KEY: Node ID<br/>
* VALUE: Node<br/>
* VALUE KEY: The Node's NodeRef<br/>
*/
private EntityLookupCache<Long, Node, NodeRef> nodesCache;
/**
* Cache for the QName values:<br/>
* KEY: ID<br/>
* VALUE: Set&lt;QName&gt;<br/>
* VALUE KEY: None<br/>
*/
private EntityLookupCache<Long, Set<QName>, Serializable> aspectsCache;
/**
* Cache for the Node properties:<br/>
* KEY: ID<br/>
* VALUE: Map&lt;QName, Serializable&gt;<br/>
* VALUE KEY: None<br/>
*/
private EntityLookupCache<Long, Map<QName, Serializable>, Serializable> propertiesCache;
/**
* Cache for the Node parent assocs:<br/>
* KEY: ID<br/>
* VALUE: ParentAssocs<br/>
* VALUE KEY: None<br/s>
*/
private EntityLookupCache<Long, ParentAssocsInfo, Serializable> parentAssocsCache;
/**
* Constructor. Set up various instance-specific members such as caches and locks.
*/
public AbstractNodeDAOImpl()
{
childAssocRetryingHelper = new RetryingCallbackHelper();
childAssocRetryingHelper.setRetryWaitMs(10);
childAssocRetryingHelper.setMaxRetries(5);
// Caches
rootNodesCache = new EntityLookupCache<StoreRef, Node, Serializable>(new RootNodesCacheCallbackDAO());
nodesCache = new EntityLookupCache<Long, Node, NodeRef>(new NodesCacheCallbackDAO());
aspectsCache = new EntityLookupCache<Long, Set<QName>, Serializable>(new AspectsCallbackDAO());
propertiesCache = new EntityLookupCache<Long, Map<QName, Serializable>, Serializable>(new PropertiesCallbackDAO());
parentAssocsCache = new EntityLookupCache<Long, ParentAssocsInfo, Serializable>(new ParentAssocsCallbackDAO());
}
/**
* @param dictionaryService the service help determine <b>cm:auditable</b> characteristics
*/
public void setDictionaryService(DictionaryService dictionaryService)
{
this.dictionaryService = dictionaryService;
}
/**
* @param policyBehaviourFilter the service to determine the behaviour for <b>cm:auditable</b> and
* other inherent capabilities.
*/
public void setPolicyBehaviourFilter(BehaviourFilter policyBehaviourFilter)
{
this.policyBehaviourFilter = policyBehaviourFilter;
}
/**
* @param aclDAO used to update permissions during certain operations
*/
public void setAclDAO(AclDAO aclDAO)
{
this.aclDAO = aclDAO;
}
/**
* @param accessControlListDAO used to update ACL inheritance during node moves
*/
public void setAccessControlListDAO(AccessControlListDAO accessControlListDAO)
{
this.accessControlListDAO = accessControlListDAO;
}
/**
* @param controlDAO create Savepoints
*/
public void setControlDAO(ControlDAO controlDAO)
{
this.controlDAO = controlDAO;
}
/**
* @param qnameDAO translates QName IDs into QName instances and vice-versa
*/
public void setQnameDAO(QNameDAO qnameDAO)
{
this.qnameDAO = qnameDAO;
}
/**
* @param contentDataDAO used to create and delete content references
*/
public void setContentDataDAO(ContentDataDAO contentDataDAO)
{
this.contentDataDAO = contentDataDAO;
}
/**
* @param localeDAO used to handle MLText properties
*/
public void setLocaleDAO(LocaleDAO localeDAO)
{
this.localeDAO = localeDAO;
}
/**
* @param usageDAO used to keep content usage calculations in line
*/
public void setUsageDAO(UsageDAO usageDAO)
{
this.usageDAO = usageDAO;
}
/**
* Set the cache that maintains the Store root node data
*
* @param cache the cache
*/
public void setRootNodesCache(SimpleCache<Serializable, Serializable> cache)
{
this.rootNodesCache = new EntityLookupCache<StoreRef, Node, Serializable>(
cache,
CACHE_REGION_ROOT_NODES,
new RootNodesCacheCallbackDAO());
}
/**
* Set the cache that maintains node ID-NodeRef cross referencing data
*
* @param cache the cache
*/
public void setNodesCache(SimpleCache<Serializable, Serializable> cache)
{
this.nodesCache = new EntityLookupCache<Long, Node, NodeRef>(
cache,
CACHE_REGION_NODES,
new NodesCacheCallbackDAO());
}
/**
* Set the cache that maintains the Node QName IDs
*
* @param aspectsCache the cache
*/
public void setAspectsCache(SimpleCache<Long, Set<QName>> aspectsCache)
{
this.aspectsCache = new EntityLookupCache<Long, Set<QName>, Serializable>(
aspectsCache,
CACHE_REGION_ASPECTS,
new AspectsCallbackDAO());
}
/**
* Set the cache that maintains the Node property values
*
* @param propertiesCache the cache
*/
public void setPropertiesCache(SimpleCache<Long, Map<QName, Serializable>> propertiesCache)
{
this.propertiesCache = new EntityLookupCache<Long, Map<QName, Serializable>, Serializable>(
propertiesCache,
CACHE_REGION_PROPERTIES,
new PropertiesCallbackDAO());
}
/**
* Set the cache that maintains the Node parent associations
*
* @param parentAssocsCache the cache
*/
public void setParentAssocsCache(SimpleCache<Long, ParentAssocsInfo> parentAssocsCache)
{
this.parentAssocsCache = new EntityLookupCache<Long, ParentAssocsInfo, Serializable>(
parentAssocsCache,
CACHE_REGION_PARENT_ASSOCS,
new ParentAssocsCallbackDAO());
}
/*
* Initialize
*/
public void init()
{
PropertyCheck.mandatory(this, "dictionaryService", dictionaryService);
PropertyCheck.mandatory(this, "aclDAO", aclDAO);
PropertyCheck.mandatory(this, "accessControlListDAO", accessControlListDAO);
PropertyCheck.mandatory(this, "qnameDAO", qnameDAO);
PropertyCheck.mandatory(this, "contentDataDAO", contentDataDAO);
PropertyCheck.mandatory(this, "localeDAO", localeDAO);
PropertyCheck.mandatory(this, "usageDAO", usageDAO);
this.nodePropertyHelper = new NodePropertyHelper(dictionaryService, qnameDAO, localeDAO, contentDataDAO);
}
/*
* Server
*/
/**
* Wrapper to get the server ID within the context of a lock
*/
private class ServerIdCallback extends ReadWriteLockExecuter<Long>
{
private TransactionAwareSingleton<Long> serverIdStorage = new TransactionAwareSingleton<Long>();
public Long getWithReadLock() throws Throwable
{
return serverIdStorage.get();
}
public Long getWithWriteLock() throws Throwable
{
if (serverIdStorage.get() != null)
{
return serverIdStorage.get();
}
// Avoid write operations in read-only transactions
// ALF-5456: IP address change can cause read-write errors on startup
if (AlfrescoTransactionSupport.getTransactionReadState() == TxnReadState.TXN_READ_ONLY)
{
return null;
}
// Server IP address
String ipAddress = null;
try
{
ipAddress = InetAddress.getLocalHost().getHostAddress();
}
catch (UnknownHostException e)
{
throw new AlfrescoRuntimeException("Failed to get server IP address", e);
}
// Get the server instance
ServerEntity serverEntity = selectServer(ipAddress);
if (serverEntity != null)
{
serverIdStorage.put(serverEntity.getId());
return serverEntity.getId();
}
// Doesn't exist, so create it
Long serverId = insertServer(ipAddress);
serverIdStorage.put(serverId);
if (isDebugEnabled)
{
logger.debug("Created server entity: " + serverEntity);
}
return serverId;
}
}
/**
* Get the ID of the current server, or <tt>null</tt> if there is no ID for the current
* server and one can't be created.
*
* @see ServerIdCallback
*/
private Long getServerId()
{
return serverIdCallback.execute();
}
/*
* Cache helpers
*/
/**
* {@inheritDoc #invalidateCachesByNodeId(Long, Long, List)}
*/
private void invalidateCachesByNodeId(
Long parentNodeId,
Long childNodeId,
EntityLookupCache<Long, ? extends Object, ? extends Serializable> cache)
{
invalidateCachesByNodeId(
parentNodeId,
childNodeId,
Collections.<EntityLookupCache<Long, ? extends Object, ? extends Serializable>>singletonList(cache));
}
/**
* Invalidate cache entries for given nodes. If the parent node is provided,
* then all children of that parent will be retrieved and their cache entries will
* be removed; this usually applies where the child associations or nodes are
* modified en-masse.
*
* @param parentNodeId the parent node of all child nodes to be invalidated (may be <tt>null</tt>)
* @param childNodeId the specific child node to invalidate (may be <tt>null</tt>)
* @param caches caches to invalidate by node id, which must use a <tt>Long</tt> as the key
*/
private void invalidateCachesByNodeId(
Long parentNodeId,
Long childNodeId,
final List<EntityLookupCache<Long, ? extends Object, ? extends Serializable>> caches)
{
if (childNodeId != null)
{
for (EntityLookupCache<Long, ? extends Object, ? extends Serializable> cache : caches)
{
cache.removeByKey(childNodeId);
}
}
if (parentNodeId != null)
{
// Select all children
ChildAssocRefQueryCallback callback = new ChildAssocRefQueryCallback()
{
private int count = 0;
private boolean isClearOn = false;
public boolean preLoadNodes()
{
return false;
}
public boolean handle(
Pair<Long, ChildAssociationRef> childAssocPair,
Pair<Long, NodeRef> parentNodePair,
Pair<Long, NodeRef> childNodePair)
{
if (isClearOn)
{
// We have already decided to drop ALL cache entries
return false;
}
else if (count >= 1000)
{
// That's enough. Instead of walking thousands of entries
// we just drop the cache at this stage
for (EntityLookupCache<Long, ? extends Object, ? extends Serializable> cache : caches)
{
cache.clear();
}
isClearOn = true;
return false; // No more, please
}
count++;
for (EntityLookupCache<Long, ? extends Object, ? extends Serializable> cache : caches)
{
cache.removeByKey(childNodePair.getFirst());
}
return true;
}
public void done()
{
}
};
selectChildAssocs(parentNodeId, null, null, null, null, null, callback);
}
}
/*
* Transactions
*/
private static final String KEY_TRANSACTION = "node.transaction.id";
/**
* Wrapper to update the current transaction to get the change time correct
*
* @author Derek Hulley
* @since 3.4
*/
private class UpdateTransactionListener extends TransactionListenerAdapter
{
@Override
public void beforeCommit(boolean readOnly)
{
if (readOnly)
{
return;
}
TransactionEntity txn = AlfrescoTransactionSupport.getResource(KEY_TRANSACTION);
Long txnId = txn.getId();
// Update it
Long now = System.currentTimeMillis();
updateTransaction(txnId, now);
}
}
private TransactionEntity getCurrentTransaction()
{
TransactionEntity txn = AlfrescoTransactionSupport.getResource(KEY_TRANSACTION);
if (txn != null)
{
// We have been busy here before
return txn;
}
// Check that this is a writable txn
if (AlfrescoTransactionSupport.getTransactionReadState() != TxnReadState.TXN_READ_WRITE)
{
throw new ReadOnlyServerException();
}
// Have to create a new transaction entry
Long serverId = getServerId();
Long now = System.currentTimeMillis();
String changeTxnId = AlfrescoTransactionSupport.getTransactionId();
Long txnId = insertTransaction(serverId, changeTxnId, now);
// Store it for later
if (isDebugEnabled)
{
logger.debug("Create txn: " + txnId);
}
txn = new TransactionEntity();
txn.setId(txnId);
txn.setChangeTxnId(changeTxnId);
txn.setCommitTimeMs(now);
ServerEntity server = new ServerEntity();
server.setId(serverId);
txn.setServer(server);
AlfrescoTransactionSupport.bindResource(KEY_TRANSACTION, txn);
// Listen for the end of the transaction
AlfrescoTransactionSupport.bindListener(updateTransactionListener);
// Done
return txn;
}
public Long getCurrentTransactionId()
{
TransactionEntity txn = getCurrentTransaction();
return txn.getId();
}
/*
* Stores
*/
public List<Pair<Long, StoreRef>> getStores()
{
List<StoreEntity> storeEntities = selectAllStores();
List<Pair<Long, StoreRef>> storeRefs = new ArrayList<Pair<Long,StoreRef>>(storeEntities.size());
for (StoreEntity storeEntity : storeEntities)
{
storeRefs.add(new Pair<Long, StoreRef>(storeEntity.getId(), storeEntity.getStoreRef()));
}
return storeRefs;
}
/**
* @throws InvalidStoreRefException if the store is invalid
*/
private StoreEntity getStoreNotNull(StoreRef storeRef)
{
Pair<StoreRef, Node> rootNodePair = rootNodesCache.getByKey(storeRef);
if (rootNodePair == null)
{
throw new InvalidStoreRefException(storeRef);
}
else
{
return rootNodePair.getSecond().getStore();
}
}
public boolean exists(StoreRef storeRef)
{
Pair<StoreRef, Node> rootNodePair = rootNodesCache.getByKey(storeRef);
return rootNodePair != null;
}
public Pair<Long, NodeRef> getRootNode(StoreRef storeRef)
{
Pair<StoreRef, Node> rootNodePair = rootNodesCache.getByKey(storeRef);
if (rootNodePair == null)
{
throw new InvalidStoreRefException(storeRef);
}
else
{
return rootNodePair.getSecond().getNodePair();
}
}
public Pair<Long, NodeRef> newStore(StoreRef storeRef)
{
// Create the store
StoreEntity store = new StoreEntity();
store.setProtocol(storeRef.getProtocol());
store.setIdentifier(storeRef.getIdentifier());
Long storeId = insertStore(store);
store.setId(storeId);
// Get an ACL for the root node
Long aclId = aclDAO.createAccessControlList();
// Create a root node
NodeEntity rootNode = newNodeImpl(store, null, ContentModel.TYPE_STOREROOT, aclId, false, null);
Long rootNodeId = rootNode.getId();
addNodeAspects(rootNodeId, Collections.singleton(ContentModel.ASPECT_ROOT));
// Now update the store with the root node ID
store.setRootNode(rootNode);
updateStoreRoot(store);
// Push the value into the caches
rootNodesCache.setValue(storeRef, rootNode);
if (isDebugEnabled)
{
logger.debug("Created store: \n" + " " + store);
}
return new Pair<Long, NodeRef>(rootNode.getId(), rootNode.getNodeRef());
}
@Override
public void moveStore(StoreRef oldStoreRef, StoreRef newStoreRef)
{
StoreEntity store = getStoreNotNull(oldStoreRef);
store.setProtocol(newStoreRef.getProtocol());
store.setIdentifier(newStoreRef.getIdentifier());
// Update it
int count = updateStore(store);
if (count != 1)
{
throw new ConcurrencyFailureException("Store not updated: " + oldStoreRef);
}
// All the NodeRef-based caches are invalid. ID-based caches are fine.
rootNodesCache.removeByKey(oldStoreRef);
nodesCache.clear();
if (isDebugEnabled)
{
logger.debug("Moved store: " + oldStoreRef + " --> " + newStoreRef);
}
}
/**
* Callback to cache store root nodes by {@link StoreRef}.
*
* @author Derek Hulley
* @since 3.4
*/
private class RootNodesCacheCallbackDAO extends EntityLookupCallbackDAOAdaptor<StoreRef, Node, Serializable>
{
/**
* @throws UnsupportedOperationException Stores must be created externally
*/
public Pair<StoreRef, Node> createValue(Node value)
{
throw new UnsupportedOperationException("Root node creation is done externally: " + value);
}
/**
* @param key the store ID
*/
public Pair<StoreRef, Node> findByKey(StoreRef storeRef)
{
NodeEntity node = selectStoreRootNode(storeRef);
return node == null ? null : new Pair<StoreRef, Node>(storeRef, node);
}
}
/*
* Nodes
*/
/**
* Callback to cache nodes by ID and {@link NodeRef}. When looking up objects based on the
* value key, only the referencing properties need be populated. <b>ONLY</b> live nodes are
* cached.
*
* @see NodeEntity
*
* @author Derek Hulley
* @since 3.4
*/
private class NodesCacheCallbackDAO extends EntityLookupCallbackDAOAdaptor<Long, Node, NodeRef>
{
/**
* @throws UnsupportedOperationException Nodes are created externally
*/
public Pair<Long, Node> createValue(Node value)
{
throw new UnsupportedOperationException("Node creation is done externally: " + value);
}
/**
* @param nodeId the key node ID
*/
public Pair<Long, Node> findByKey(Long nodeId)
{
NodeEntity node = selectNodeById(nodeId, Boolean.FALSE);
return node == null ? null : new Pair<Long, Node>(nodeId, node);
}
/**
* @return Returns the Node's NodeRef
*/
@Override
public NodeRef getValueKey(Node value)
{
return value.getNodeRef();
}
/**
* Looks the node up based on the NodeRef of the given node
*/
@Override
public Pair<Long, Node> findByValue(Node node)
{
NodeRef nodeRef = node.getNodeRef();
node = selectNodeByNodeRef(nodeRef, Boolean.FALSE);
return node == null ? null : new Pair<Long, Node>(node.getId(), node);
}
}
public boolean exists(NodeRef nodeRef)
{
NodeEntity node = new NodeEntity(nodeRef);
Pair<Long, Node> pair = nodesCache.getByValue(node);
return pair != null && !pair.getSecond().getDeleted();
}
public Status getNodeRefStatus(NodeRef nodeRef)
{
// First check the cache of live nodes
Node node = new NodeEntity(nodeRef);
Pair<Long, Node> pair = nodesCache.getByValue(node);
if (pair == null)
{
// It's not there, so select ignoring the 'deleted' flag
node = selectNodeByNodeRef(nodeRef, null);
}
else
{
node = pair.getSecond();
}
if (node == null)
{
return null;
}
else
{
Transaction txn = node.getTransaction();
return new NodeRef.Status(nodeRef, txn.getChangeTxnId(), txn.getId(), node.getDeleted());
}
}
public Pair<Long, NodeRef> getNodePair(NodeRef nodeRef)
{
NodeEntity node = new NodeEntity(nodeRef);
Pair<Long, Node> pair = nodesCache.getByValue(node);
return (pair == null || pair.getSecond().getDeleted()) ? null : pair.getSecond().getNodePair();
}
public Pair<Long, NodeRef> getNodePair(Long nodeId)
{
Pair<Long, Node> pair = nodesCache.getByKey(nodeId);
return (pair == null || pair.getSecond().getDeleted()) ? null : pair.getSecond().getNodePair();
}
/**
* Find an undeleted node
*
* @param nodeId the node
* @return Returns the fully populated node
* @throws ConcurrencyFailureException if the ID doesn't reference a <b>live</b> node
*/
private Node getNodeNotNull(Long nodeId)
{
Pair<Long, Node> pair = nodesCache.getByKey(nodeId);
if (pair == null || pair.getSecond().getDeleted())
{
throw new ConcurrencyFailureException("No live node exists for ID " + nodeId);
}
else
{
return pair.getSecond();
}
}
public QName getNodeType(Long nodeId)
{
Node node = getNodeNotNull(nodeId);
Long nodeTypeQNameId = node.getTypeQNameId();
return qnameDAO.getQName(nodeTypeQNameId).getSecond();
}
public Long getNodeAclId(Long nodeId)
{
Node node = getNodeNotNull(nodeId);
return node.getAclId();
}
public ChildAssocEntity newNode(
Long parentNodeId,
QName assocTypeQName,
QName assocQName,
StoreRef storeRef,
String uuid,
QName nodeTypeQName,
String childNodeName,
Map<QName, Serializable> auditableProperties) throws InvalidTypeException
{
Assert.notNull(parentNodeId, "parentNodeId");
Assert.notNull(assocTypeQName, "assocTypeQName");
Assert.notNull(assocQName, "assocQName");
Assert.notNull(storeRef, "storeRef");
if (auditableProperties == null)
{
auditableProperties = Collections.emptyMap();
}
// Get the parent node
Node parentNode = getNodeNotNull(parentNodeId);
// Find an initial ACL for the node
Long parentAclId = parentNode.getAclId();
Long childAclId = null;
if (parentAclId != null)
{
AccessControlListProperties inheritedAcl = aclDAO.getAccessControlListProperties(
aclDAO.getInheritedAccessControlList(parentAclId));
if (inheritedAcl != null)
{
childAclId = inheritedAcl.getId();
}
}
// Build the cm:auditable properties
AuditablePropertiesEntity auditableProps = new AuditablePropertiesEntity();
boolean setAuditProps = auditableProps.setAuditValues(null, null, auditableProperties);
if (!setAuditProps)
{
// No cm:auditable properties were supplied
auditableProps = null;
}
// Get the store
StoreEntity store = getStoreNotNull(storeRef);
// Create the node (it is not a root node)
NodeEntity node = newNodeImpl(store, uuid, nodeTypeQName, childAclId, false, auditableProps);
Long nodeId = node.getId();
// Protect the node's cm:auditable if it was explicitly set
if (setAuditProps)
{
NodeRef nodeRef = node.getNodeRef();
policyBehaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
}
// Now create a primary association for it
if (childNodeName == null)
{
childNodeName = node.getUuid();
}
ChildAssocEntity assoc = newChildAssocImpl(
parentNodeId, nodeId, true, assocTypeQName, assocQName, childNodeName);
// There will be no other parent assocs
boolean isRoot = false;
boolean isStoreRoot = nodeTypeQName.equals(ContentModel.TYPE_STOREROOT);
ParentAssocsInfo parentAssocsInfo = new ParentAssocsInfo(isRoot, isStoreRoot, assoc);
parentAssocsCache.setValue(nodeId, parentAssocsInfo);
if (isDebugEnabled)
{
logger.debug(
"Created new node: \n" +
" Node: " + node + "\n" +
" Assoc: " + assoc);
}
return assoc;
}
/**
* @param uuid the node UUID, or <tt>null</tt> to auto-generate
* @param aclId an ACL ID if available
* @param auditableProps <tt>null</tt> to auto-generate or provide a value to explicitly set
* @param deleted <tt>true</tt> to create an already-deleted node (used for leaving trails of moved nodes)
*/
private NodeEntity newNodeImpl(
StoreEntity store,
String uuid,
QName nodeTypeQName,
Long aclId,
boolean deleted,
AuditablePropertiesEntity auditableProps) throws InvalidTypeException
{
NodeEntity node = new NodeEntity();
// Store
node.setStore(store);
// UUID
if (uuid == null)
{
node.setUuid(GUID.generate());
}
else
{
node.setUuid(uuid);
}
// QName
Long typeQNameId = qnameDAO.getOrCreateQName(nodeTypeQName).getFirst();
node.setTypeQNameId(typeQNameId);
// ACL (may be null)
node.setAclId(aclId);
// Deleted
node.setDeleted(deleted);
// Transaction
TransactionEntity txn = getCurrentTransaction();
node.setTransaction(txn);
// Audit
boolean addAuditableAspect = false;
if (auditableProps != null)
{
// Client-supplied cm:auditable values
node.setAuditableProperties(auditableProps);
addAuditableAspect = true;
}
else if (AuditablePropertiesEntity.hasAuditableAspect(nodeTypeQName, dictionaryService))
{
// Automatically-generated cm:auditable values
auditableProps = new AuditablePropertiesEntity();
auditableProps.setAuditValues(null, null, true, 0L);
node.setAuditableProperties(auditableProps);
addAuditableAspect = true;
}
Long id = null;
Savepoint savepoint = controlDAO.createSavepoint("newNodeImpl");
try
{
// First try a straight insert and risk the constraint violation if the node exists
id = insertNode(node);
controlDAO.releaseSavepoint(savepoint);
}
catch (Throwable e)
{
controlDAO.rollbackToSavepoint(savepoint);
// This is probably because there is an existing node. We can handle existing deleted nodes.
NodeRef targetNodeRef = node.getNodeRef();
NodeEntity deletedNode = selectNodeByNodeRef(targetNodeRef, true); // Only look for deleted nodes
if (deletedNode != null)
{
Long deletedNodeId = deletedNode.getId();
deleteNodeById(deletedNodeId, true);
// Now repeat, but let any further problems just be thrown out
id = insertNode(node);
}
else
{
throw new AlfrescoRuntimeException("Failed to insert new node: " + node, e);
}
}
node.setId(id);
Set<QName> nodeAspects = null;
if (addAuditableAspect && !deleted)
{
Long auditableAspectQNameId = qnameDAO.getOrCreateQName(ContentModel.ASPECT_AUDITABLE).getFirst();
insertNodeAspect(id, auditableAspectQNameId);
nodeAspects = Collections.<QName>singleton(ContentModel.ASPECT_AUDITABLE);
}
else
{
nodeAspects = Collections.<QName>emptySet();
}
// Lock the node and cache
node.lock();
nodesCache.setValue(id, node);
// Pre-populate some of the other caches so that we don't immediately query
setNodeAspectsCached(id, nodeAspects);
setNodePropertiesCached(id, Collections.<QName, Serializable>emptyMap());
if (isDebugEnabled)
{
logger.debug("Created new node: \n" + " " + node);
}
return node;
}
public Pair<Long, ChildAssociationRef> moveNode(
final Long childNodeId,
final Long newParentNodeId,
final QName assocTypeQName,
final QName assocQName)
{
final Node newParentNode = getNodeNotNull(newParentNodeId);
final StoreEntity newParentStore = newParentNode.getStore();
final Node childNode = getNodeNotNull(childNodeId);
final StoreEntity childStore = childNode.getStore();
ChildAssocEntity primaryParentAssoc = getPrimaryParentAssocImpl(childNodeId);
final Long oldParentNodeId;
if(primaryParentAssoc == null)
{
oldParentNodeId = null;
}
else
{
if(primaryParentAssoc.getParentNode() == null)
{
oldParentNodeId = null;
}
else
{
oldParentNodeId = primaryParentAssoc.getParentNode().getId();
}
}
// Now update the primary parent assoc
RetryingCallback<Integer> callback = new RetryingCallback<Integer>()
{
public Integer execute() throws Throwable
{
// Because we are retrying in-transaction i.e. absorbing exceptions, we need a Savepoint
Savepoint savepoint = controlDAO.createSavepoint("DuplicateChildNodeNameException");
// We use the child node's UUID if there is no cm:name
String childNodeName = (String) getNodeProperty(childNodeId, ContentModel.PROP_NAME);
if (childNodeName == null)
{
childNodeName = childNode.getUuid();
}
try
{
int updated = updatePrimaryParentAssocs(
childNodeId,
newParentNodeId,
assocTypeQName,
assocQName,
childNodeName);
controlDAO.releaseSavepoint(savepoint);
return updated;
}
catch (Throwable e)
{
controlDAO.rollbackToSavepoint(savepoint);
// We assume that this is from the child cm:name constraint violation
throw new DuplicateChildNodeNameException(
newParentNode.getNodeRef(),
assocTypeQName,
childNodeName,
e);
}
}
};
Integer updateCount = childAssocRetryingHelper.doWithRetry(callback);
if (updateCount > 0)
{
NodeUpdateEntity nodeUpdate = new NodeUpdateEntity();
// ID
nodeUpdate.setId(childNodeId);
// Store
if (!childStore.getId().equals(newParentStore.getId()))
{
nodeUpdate.setStore(newParentNode.getStore());
nodeUpdate.setUpdateStore(true);
}
// Update. This takes care of the store move, auditable and transaction
updateNodeImpl(childNode, nodeUpdate);
// Clear out parent assocs cache
invalidateCachesByNodeId(null, childNodeId, parentAssocsCache);
// Check that there is not a cyclic relationship
getPaths(nodeUpdate.getNodePair(), false);
// Update ACLs for moved tree
accessControlListDAO.updateInheritance(childNodeId, oldParentNodeId, newParentNodeId);
}
else
{
// Clear out parent assocs cache
invalidateCachesByNodeId(null, childNodeId, parentAssocsCache);
}
Pair<Long, ChildAssociationRef> assocPair = getPrimaryParentAssoc(childNodeId);
// Done
if (isDebugEnabled)
{
logger.debug("Moved node: " + assocPair);
}
return assocPair;
}
public void updateNode(Long nodeId, StoreRef storeRef, String uuid, QName nodeTypeQName)
{
// Get the existing node; we need to check for a change in store or UUID
Node oldNode = getNodeNotNull(nodeId);
// Use existing values, where necessary
if (storeRef == null)
{
storeRef = oldNode.getStore().getStoreRef();
}
if (uuid == null)
{
uuid = oldNode.getUuid();
}
if (nodeTypeQName == null)
{
Long nodeTypeQNameId = oldNode.getTypeQNameId();
nodeTypeQName = qnameDAO.getQName(nodeTypeQNameId).getSecond();
}
// Wrap all the updates into one
NodeUpdateEntity nodeUpdate = new NodeUpdateEntity();
nodeUpdate.setId(nodeId);
// Store (if necessary)
if (!storeRef.equals(oldNode.getStore().getStoreRef()))
{
StoreEntity store = getStoreNotNull(storeRef);
nodeUpdate.setStore(store);
nodeUpdate.setUpdateStore(true);
}
else
{
nodeUpdate.setStore(oldNode.getStore()); // Need node reference
}
// UUID (if necessary)
if (!uuid.equals(oldNode.getUuid()))
{
nodeUpdate.setUuid(uuid);
nodeUpdate.setUpdateUuid(true);
}
else
{
nodeUpdate.setUuid(oldNode.getUuid()); // Need node reference
}
// TypeQName (if necessary)
Long nodeTypeQNameId = qnameDAO.getOrCreateQName(nodeTypeQName).getFirst();
if (!nodeTypeQNameId.equals(oldNode.getTypeQNameId()))
{
nodeUpdate.setTypeQNameId(nodeTypeQNameId);
nodeUpdate.setUpdateTypeQNameId(true);
}
updateNodeImpl(oldNode, nodeUpdate);
}
/**
* Updates the node's transaction and <b>cm:auditable</b> properties only.
*
* @see #touchNodeImpl(Long, AuditablePropertiesEntity)
*/
private void touchNodeImpl(Long nodeId)
{
touchNodeImpl(nodeId, null);
}
/**
* Updates the node's transaction and <b>cm:auditable</b> properties only.
*
* @param auditableProps optionally override the <b>cm:auditable</b> values
*
* @see #updateNodeImpl(NodeEntity, NodeUpdateEntity)
*/
private void touchNodeImpl(Long nodeId, AuditablePropertiesEntity auditableProps)
{
Node node = null;
try
{
node = getNodeNotNull(nodeId);
}
catch (DataIntegrityViolationException e)
{
// The ID doesn't reference a live node.
// We do nothing w.r.t. touching
return;
}
NodeUpdateEntity nodeUpdate = new NodeUpdateEntity();
nodeUpdate.setId(nodeId);
if (auditableProps != null)
{
nodeUpdate.setAuditableProperties(auditableProps);
}
updateNodeImpl(node, nodeUpdate);
}
/**
* Helper method that updates the node, bringing it into the current transaction with
* the appropriate <b>cm:auditable</b> and transaction behaviour.
* <p>
* If the <tt>NodeRef</tt> of the node is changing (usually a store move) then deleted
* nodes are cleaned out where they might exist.
*
* @param oldNode the existing node, fully populated
* @param nodeUpdate the node update with all update elements populated
*/
private void updateNodeImpl(Node oldNode, NodeUpdateEntity nodeUpdate)
{
Long nodeId = oldNode.getId();
// Make sure that the ID has been populated
if (!EqualsHelper.nullSafeEquals(nodeId, nodeUpdate.getId()))
{
throw new IllegalArgumentException("NodeUpdateEntity node ID is not correct: " + nodeUpdate);
}
// Copy the Store and UUID to the updated node, but leave the update flags.
// The NodeRef may be required when resolving the duplicate NodeRef issues.
if (!nodeUpdate.isUpdateStore())
{
nodeUpdate.setStore(oldNode.getStore());
}
if (!nodeUpdate.isUpdateUuid())
{
nodeUpdate.setUuid(oldNode.getUuid());
}
// Ensure that other values are set for completeness when caching
if (!nodeUpdate.isUpdateTypeQNameId())
{
nodeUpdate.setTypeQNameId(oldNode.getTypeQNameId());
}
if (!nodeUpdate.isUpdateAclId())
{
nodeUpdate.setAclId(oldNode.getAclId());
}
if (!nodeUpdate.isUpdateDeleted())
{
nodeUpdate.setDeleted(oldNode.getDeleted());
}
// Check the update values of the reference elements
boolean updateReference = nodeUpdate.isUpdateStore() || nodeUpdate.isUpdateUuid();
nodeUpdate.setVersion(oldNode.getVersion());
// Update the transaction
TransactionEntity txn = getCurrentTransaction();
nodeUpdate.setTransaction(txn);
if (!txn.getId().equals(oldNode.getTransaction().getId()))
{
// Only update if the txn has changed
nodeUpdate.setUpdateTransaction(true);
}
// Update auditable
Set<QName> nodeAspects = getNodeAspects(nodeId);
if (nodeAspects.contains(ContentModel.ASPECT_AUDITABLE))
{
NodeRef oldNodeRef = oldNode.getNodeRef();
if (policyBehaviourFilter.isEnabled(oldNodeRef, ContentModel.ASPECT_AUDITABLE))
{
// Make sure that auditable properties are present
AuditablePropertiesEntity auditableProps = oldNode.getAuditableProperties();
if (auditableProps == null)
{
auditableProps = new AuditablePropertiesEntity();
}
boolean updateAuditableProperties = auditableProps.setAuditValues(null, null, false, 1000L);
nodeUpdate.setAuditableProperties(auditableProps);
nodeUpdate.setUpdateAuditableProperties(updateAuditableProperties);
}
else if (nodeUpdate.getAuditableProperties() == null)
{
// cache the explicit setting of auditable properties when creating node (note: auditable aspect is not yet present)
AuditablePropertiesEntity auditableProps = oldNode.getAuditableProperties();
if (auditableProps != null)
{
nodeUpdate.setAuditableProperties(auditableProps);
nodeUpdate.setUpdateAuditableProperties(true);
}
}
else
{
// ALF-4117: NodeDAO: Allow cm:auditable to be set
// The nodeUpdate had auditable properties set, so we just use that directly
nodeUpdate.setUpdateAuditableProperties(true);
}
}
else
{
// Make sure that any auditable properties are removed
AuditablePropertiesEntity auditableProps = oldNode.getAuditableProperties();
if (auditableProps != null)
{
nodeUpdate.setAuditableProperties(null);
nodeUpdate.setUpdateAuditableProperties(true);
}
}
// Just bug out if nothing has changed
if (!nodeUpdate.isUpdateAnything())
{
return;
}
// Do the update
int count = 0;
Savepoint savepoint = controlDAO.createSavepoint("updateNode");
try
{
count = updateNode(nodeUpdate);
controlDAO.releaseSavepoint(savepoint);
}
catch (Throwable e)
{
controlDAO.rollbackToSavepoint(savepoint);
NodeRef targetNodeRef = nodeUpdate.getNodeRef();
// Wipe the node ID from the caches just in case we have stale caches
// The TransactionalCache will propagate removals to the shared cache on rollback
nodesCache.removeByKey(nodeId);
nodesCache.removeByValue(nodeUpdate);
if (updateReference)
{
// This is the first error. Clean out deleted nodes that might be in the way and
// move away live nodes.
try
{
// Look for live nodes first as they will leave a trail of deleted nodes
// that we will have to deal with subsequently.
NodeEntity liveNode = selectNodeByNodeRef(targetNodeRef, false); // Only look for live nodes
if (liveNode != null)
{
Long liveNodeId = liveNode.getId();
String liveNodeUuid = GUID.generate();
updateNode(liveNodeId, null, liveNodeUuid, null);
}
NodeEntity deletedNode = selectNodeByNodeRef(targetNodeRef, true); // Only look for deleted nodes
if (deletedNode != null)
{
Long deletedNodeId = deletedNode.getId();
deleteNodeById(deletedNodeId, true);
}
if (isDebugEnabled)
{
logger.debug("Cleaned up target references for reference update: " + targetNodeRef);
}
}
catch (Throwable ee)
{
// We don't want to mask the original problem
logger.error("Failed to clean up target nodes for new reference: " + targetNodeRef, ee);
throw new RuntimeException("Failed to update node:" + nodeUpdate, e);
}
// Now repeat
try
{
// The version number will have been incremented. Undo that.
nodeUpdate.setVersion(nodeUpdate.getVersion() - 1L);
count = updateNode(nodeUpdate);
}
catch (Throwable ee)
{
throw new RuntimeException("Failed to update Node: " + nodeUpdate, e);
}
}
else // There is no reference change, so the error must just be propagated
{
throw new RuntimeException("Failed to update Node: " + nodeUpdate, e);
}
}
// Do concurrency check
if (count != 1)
{
// Drop the value from the cache in case the cache is stale
nodesCache.removeByKey(nodeId);
nodesCache.removeByValue(nodeUpdate);
throw new ConcurrencyFailureException("Failed to update node " + nodeId);
}
// We need to leave a trail of deleted nodes
if (updateReference)
{
StoreEntity oldStore = oldNode.getStore();
String oldUuid = oldNode.getUuid();
newNodeImpl(oldStore, oldUuid, ContentModel.TYPE_CMOBJECT, null, true, null);
}
// Update the caches
nodeUpdate.lock();
nodesCache.setValue(nodeId, nodeUpdate);
if (updateReference || nodeUpdate.isUpdateTypeQNameId())
{
// The association references will all be wrong
invalidateCachesByNodeId(nodeId, nodeId, parentAssocsCache);
}
// Done
if (isDebugEnabled)
{
logger.debug(
"Updated Node: \n" +
" OLD: " + oldNode + "\n" +
" NEW: " + nodeUpdate);
}
}
public void setNodeAclId(Long nodeId, Long aclId)
{
Node oldNode = getNodeNotNull(nodeId);
NodeUpdateEntity nodeUpdateEntity = new NodeUpdateEntity();
nodeUpdateEntity.setId(nodeId);
nodeUpdateEntity.setAclId(aclId);
nodeUpdateEntity.setUpdateAclId(true);
updateNodeImpl(oldNode, nodeUpdateEntity);
}
public void setPrimaryChildrenSharedAclId(
Long primaryParentNodeId,
Long optionalOldSharedAlcIdInAdditionToNull,
Long newSharedAclId)
{
updatePrimaryChildrenSharedAclId(primaryParentNodeId, optionalOldSharedAlcIdInAdditionToNull, newSharedAclId);
invalidateCachesByNodeId(primaryParentNodeId, null, nodesCache);
}
@Override
public void setNodeDefiningAclId(Long nodeId, long aclId)
{
NodeUpdateEntity nodeUpdateEntity = new NodeUpdateEntity();
nodeUpdateEntity.setId(nodeId);
nodeUpdateEntity.setAclId(aclId);
nodeUpdateEntity.setUpdateAclId(true);
updateNodePatchAcl(nodeUpdateEntity);
invalidateCachesByNodeId(null, nodeId, nodesCache);
}
public void deleteNode(Long nodeId)
{
Node node = getNodeNotNull(nodeId);
Long aclId = node.getAclId(); // Need this later
// Clean up content data
Set<QName> contentQNames = new HashSet<QName>(dictionaryService.getAllProperties(DataTypeDefinition.CONTENT));
Set<Long> contentQNamesToRemoveIds = qnameDAO.convertQNamesToIds(contentQNames, false);
contentDataDAO.deleteContentDataForNode(nodeId, contentQNamesToRemoveIds);
// Delete content usage deltas
usageDAO.deleteDeltas(nodeId);
// Finally mark the node as deleted
NodeUpdateEntity nodeUpdate = new NodeUpdateEntity();
nodeUpdate.setId(nodeId);
// Version
nodeUpdate.setVersion(node.getVersion());
// Transaction
TransactionEntity txn = getCurrentTransaction();
nodeUpdate.setTransaction(txn);
nodeUpdate.setUpdateTransaction(true);
// ACL
nodeUpdate.setAclId(null);
nodeUpdate.setUpdateAclId(true);
// Deleted
nodeUpdate.setDeleted(true);
nodeUpdate.setUpdateDeleted(true);
// Update cm:auditable
Set<QName> nodeAspects = getNodeAspects(nodeId);
if (nodeAspects.contains(ContentModel.ASPECT_AUDITABLE))
{
AuditablePropertiesEntity auditableProps = node.getAuditableProperties();
if (auditableProps == null)
{
auditableProps = new AuditablePropertiesEntity();
}
auditableProps.setAuditValues(null, null, false, 1000L);
nodeUpdate.setAuditableProperties(auditableProps);
nodeUpdate.setUpdateAuditableProperties(true);
}
// Remove value from the cache
nodesCache.removeByKey(nodeId);
// Remove aspects
deleteNodeAspects(nodeId, null);
aspectsCache.removeByKey(nodeId);
// Remove properties
deleteNodeProperties(nodeId, (Set<Long>) null);
propertiesCache.removeByKey(nodeId);
// Remove associations
invalidateCachesByNodeId(nodeId, nodeId, parentAssocsCache);
deleteNodeAssocsToAndFrom(nodeId);
deleteChildAssocsToAndFrom(nodeId);
int count = updateNode(nodeUpdate);
if (count != 1)
{
// Drop cached values in case of stale cache data
nodesCache.removeByValue(node);
throw new ConcurrencyFailureException("Failed to update node: " + nodeUpdate);
}
// Remove ACLs
if (aclId != null)
{
aclDAO.deleteAclForNode(aclId, false);
}
}
@Override
public int purgeNodes(long maxTxnCommitTimeMs)
{
return deleteNodesByCommitTime(true, maxTxnCommitTimeMs);
}
/*
* Node Properties
*/
public Map<QName, Serializable> getNodeProperties(Long nodeId)
{
Map<QName, Serializable> props = getNodePropertiesCached(nodeId);
Node node = getNodeNotNull(nodeId);
// Handle sys:referenceable
ReferenceablePropertiesEntity.addReferenceableProperties(node, props);
// Handle cm:auditable
if (hasNodeAspect(nodeId, ContentModel.ASPECT_AUDITABLE))
{
AuditablePropertiesEntity auditableProperties = node.getAuditableProperties();
if (auditableProperties == null)
{
auditableProperties = new AuditablePropertiesEntity();
}
props.putAll(auditableProperties.getAuditableProperties());
}
// Done
if (isDebugEnabled)
{
logger.debug("Fetched properties for Node: \n" +
" Node: " + nodeId + "\n" +
" Props: " + props);
}
return props;
}
public Serializable getNodeProperty(Long nodeId, QName propertyQName)
{
Serializable value = null;
// We have to load the node for cm:auditable
if (AuditablePropertiesEntity.isAuditableProperty(propertyQName))
{
Node node = getNodeNotNull(nodeId);
AuditablePropertiesEntity auditableProperties = node.getAuditableProperties();
if (auditableProperties != null)
{
value = auditableProperties.getAuditableProperty(propertyQName);
}
}
else if (ReferenceablePropertiesEntity.isReferenceableProperty(propertyQName)) // sys:referenceable
{
Node node = getNodeNotNull(nodeId);
value = ReferenceablePropertiesEntity.getReferenceableProperty(node, propertyQName);
}
else
{
Map<QName, Serializable> props = getNodePropertiesCached(nodeId);
value = props.get(propertyQName);
}
// Done
if (isDebugEnabled)
{
logger.debug("Fetched property for Node: \n" +
" Node: " + nodeId + "\n" +
" QName: " + propertyQName + "\n" +
" Value: " + value);
}
return value;
}
/**
* Does differencing to add and/or remove properties. Internally, the existing properties
* will be retrieved and a difference performed to work out which properties need to be
* created, updated or deleted. It is only necessary to pass in old and new values for
* <i>changes</i> i.e. when setting a single property, it is only necessary to pass that
* property's value in the <b>old</b> and </b>new</b> maps; this improves execution speed
* significantly - although it has no effect on the number of resulting DB operations.
* <p/>
* Note: The cached properties are not updated
*
* @param nodeId the node ID
* @param newProps the properties to add or update
* @param isAddOnly <tt>true</tt> if the new properties are just an update or
* <tt>false</tt> if the properties are a complete set
* @return Returns <tt>true</tt> if any properties were changed
*/
private boolean setNodePropertiesImpl(
Long nodeId,
Map<QName, Serializable> newProps,
boolean isAddOnly)
{
if (isAddOnly && newProps.size() == 0)
{
return false; // No point adding nothing
}
Node node = getNodeNotNull(nodeId);
// Copy inbound values
newProps = new HashMap<QName, Serializable>(newProps);
// Copy cm:auditable
AuditablePropertiesEntity auditableProps = null;
if (!policyBehaviourFilter.isEnabled(node.getNodeRef(), ContentModel.ASPECT_AUDITABLE))
{
auditableProps = node.getAuditableProperties();
if (auditableProps == null)
{
auditableProps = new AuditablePropertiesEntity();
}
boolean containedAuditProperties = auditableProps.setAuditValues(null, null, newProps);
if (!containedAuditProperties)
{
// The behaviour is disabled, but no audit properties were passed in
auditableProps = null;
}
}
// Remove cm:auditable
newProps.keySet().removeAll(AuditablePropertiesEntity.getAuditablePropertyQNames());
// Remove sys:referenceable
ReferenceablePropertiesEntity.removeReferenceableProperties(node, newProps);
// Load the current properties.
// This means that we have to go to the DB during cold-write operations,
// but usually a write occurs after a node has been fetched of viewed in
// some way by the client code. Loading the existing properties has the
// advantage that the differencing code can eliminate unnecessary writes
// completely.
Map<QName, Serializable> oldPropsCached = getNodePropertiesCached(nodeId); // Keep pristine for caching
Map<QName, Serializable> oldProps = new HashMap<QName, Serializable>(oldPropsCached);
// If we're adding, remove current properties that are not of interest
if (isAddOnly)
{
oldProps.keySet().retainAll(newProps.keySet());
}
// We need to convert the new properties to our internally-used format,
// which is compatible with model i.e. people may have passed in data
// which needs to be converted to a model-compliant format. We do this
// before comparisons to avoid false negatives.
Map<NodePropertyKey, NodePropertyValue> newPropsRaw = nodePropertyHelper.convertToPersistentProperties(newProps);
newProps = nodePropertyHelper.convertToPublicProperties(newPropsRaw);
// Now find out what's changed
Map<QName, MapValueComparison> diff = EqualsHelper.getMapComparison(
oldProps,
newProps);
// Keep track of properties to delete and add
Set<QName> propsToDelete = new HashSet<QName>(oldProps.size()*2);
Map<QName, Serializable> propsToAdd = new HashMap<QName, Serializable>(newProps.size() * 2);
Set<QName> contentQNamesToDelete = new HashSet<QName>(5);
for (Map.Entry<QName, MapValueComparison> entry : diff.entrySet())
{
QName qname = entry.getKey();
PropertyDefinition removePropDef = dictionaryService.getProperty(qname);
boolean isContent = (removePropDef != null &&
removePropDef.getDataType().getName().equals(DataTypeDefinition.CONTENT));
switch (entry.getValue())
{
case EQUAL:
// Ignore
break;
case LEFT_ONLY:
// Not in the new properties
propsToDelete.add(qname);
if (isContent)
{
contentQNamesToDelete.add(qname);
}
break;
case NOT_EQUAL:
// Must remove from the LHS
propsToDelete.add(qname);
if (isContent)
{
contentQNamesToDelete.add(qname);
}
// Fall through to load up the RHS
case RIGHT_ONLY:
// We're adding this
Serializable value = newProps.get(qname);
if (isContent && value != null)
{
ContentData newContentData = (ContentData) value;
Long newContentDataId = contentDataDAO.createContentData(newContentData).getFirst();
value = new ContentDataWithId(newContentData, newContentDataId);
}
propsToAdd.put(qname, value);
break;
default:
throw new IllegalStateException("Unknown MapValueComparison: " + entry.getValue());
}
}
boolean updated = propsToDelete.size() > 0 || propsToAdd.size() > 0;
// Touch to bring into current txn
if (updated)
{
// Clean up content properties
try
{
if (contentQNamesToDelete.size() > 0)
{
Set<Long> contentQNameIdsToDelete = qnameDAO.convertQNamesToIds(contentQNamesToDelete, false);
contentDataDAO.deleteContentDataForNode(nodeId, contentQNameIdsToDelete);
}
}
catch (Throwable e)
{
throw new AlfrescoRuntimeException(
"Failed to delete content properties: \n" +
" Node: " + nodeId + "\n" +
" Delete Tried: " + contentQNamesToDelete,
e);
}
try
{
// Apply deletes
Set<Long> propQNameIdsToDelete = qnameDAO.convertQNamesToIds(propsToDelete, true);
deleteNodeProperties(nodeId, propQNameIdsToDelete);
// Now create the raw properties for adding
newPropsRaw = nodePropertyHelper.convertToPersistentProperties(propsToAdd);
insertNodeProperties(nodeId, newPropsRaw);
}
catch (Throwable e)
{
// Don't trust the properties cache for the node
propertiesCache.removeByKey(nodeId);
// Focused error
throw new AlfrescoRuntimeException(
"Failed to write property deltas: \n" +
" Node: " + nodeId + "\n" +
" Old: " + oldProps + "\n" +
" New: " + newProps + "\n" +
" Diff: " + diff + "\n" +
" Delete Tried: " + propsToDelete + "\n" +
" Add Tried: " + propsToAdd,
e);
}
// Build the properties to cache based on whether this is an append or replace
Map<QName, Serializable> propsToCache = null;
if (isAddOnly)
{
// Combine the old and new properties
propsToCache = oldPropsCached;
propsToCache.putAll(propsToAdd);
}
else
{
// Replace old properties
propsToCache = newProps;
propsToCache.putAll(propsToAdd); // Ensure correct types
}
// Update cache
setNodePropertiesCached(nodeId, propsToCache);
}
// Touch to bring into current transaction
if (updated || auditableProps != null)
{
touchNodeImpl(nodeId, auditableProps);
}
// Done
if (isDebugEnabled && updated)
{
logger.debug(
"Modified node properties: " + nodeId + "\n" +
" Removed: " + propsToDelete + "\n" +
" Added: " + propsToAdd);
}
return updated;
}
public boolean setNodeProperties(Long nodeId, Map<QName, Serializable> properties)
{
// Merge with current values
boolean modified = setNodePropertiesImpl(nodeId, properties, false);
// Done
return modified;
}
public boolean addNodeProperty(Long nodeId, QName qname, Serializable value)
{
// Copy inbound values
Map<QName, Serializable> newProps = new HashMap<QName, Serializable>(3);
newProps.put(qname, value);
// Merge with current values
boolean modified = setNodePropertiesImpl(nodeId, newProps, true);
// Done
return modified;
}
public boolean addNodeProperties(Long nodeId, Map<QName, Serializable> properties)
{
// Merge with current values
boolean modified = setNodePropertiesImpl(nodeId, properties, true);
// Done
return modified;
}
public boolean removeNodeProperties(Long nodeId, Set<QName> propertyQNames)
{
propertyQNames = new HashSet<QName>(propertyQNames);
ReferenceablePropertiesEntity.removeReferenceableProperties(propertyQNames);
if (propertyQNames.size() == 0)
{
return false; // sys:referenceable properties cannot be removed
}
Set<Long> qnameIds = qnameDAO.convertQNamesToIds(propertyQNames, false);
int deleteCount = deleteNodeProperties(nodeId, qnameIds);
if (deleteCount > 0)
{
// Update cache
Map<QName, Serializable> cachedProps = getNodePropertiesCached(nodeId);
cachedProps.keySet().removeAll(propertyQNames);
setNodePropertiesCached(nodeId, cachedProps);
// Touch to bring into current txn
touchNodeImpl(nodeId);
}
// Done
return deleteCount > 0;
}
/**
* @return Returns a writable copy of the cached property map
*/
private Map<QName, Serializable> getNodePropertiesCached(Long nodeId)
{
Pair<Long, Map<QName, Serializable>> cacheEntry = propertiesCache.getByKey(nodeId);
if (cacheEntry == null)
{
throw new DataIntegrityViolationException("Invalid node ID: " + nodeId);
}
Map<QName, Serializable> cachedProperties = cacheEntry.getSecond();
Map<QName, Serializable> properties = copyPropertiesAgainstModification(cachedProperties);
// Done
return properties;
}
/**
* Update the node properties cache. The incoming properties will be wrapped to be
* unmodifiable.
* <p>
* <b>NOTE:</b> Incoming properties must exclude the <b>cm:auditable</b> properties
*/
private void setNodePropertiesCached(Long nodeId, Map<QName, Serializable> properties)
{
properties = copyPropertiesAgainstModification(properties);
propertiesCache.setValue(nodeId, Collections.unmodifiableMap(properties));
}
/**
* Shallow-copies to a new map except for maps and collections that are binary serialized
*/
private Map<QName, Serializable> copyPropertiesAgainstModification(Map<QName, Serializable> original)
{
// Copy the values, ensuring that any collections are copied as well
Map<QName, Serializable> copy = new HashMap<QName, Serializable>((int)(original.size() * 1.3));
for (Map.Entry<QName, Serializable> element : original.entrySet())
{
QName key = element.getKey();
Serializable value = element.getValue();
if (value instanceof Collection<?> || value instanceof Map<?, ?>)
{
value = (Serializable) SerializationUtils.deserialize(SerializationUtils.serialize(value));
}
copy.put(key, value);
}
return copy;
}
/**
* Callback to cache node properties. The DAO callback only does the simple {@link #findByKey(Long)}.
*
* @author Derek Hulley
* @since 3.4
*/
private class PropertiesCallbackDAO extends EntityLookupCallbackDAOAdaptor<Long, Map<QName, Serializable>, Serializable>
{
public Pair<Long, Map<QName, Serializable>> createValue(Map<QName, Serializable> value)
{
throw new UnsupportedOperationException("A node always has a 'map' of properties.");
}
public Pair<Long, Map<QName, Serializable>> findByKey(Long nodeId)
{
Map<NodePropertyKey, NodePropertyValue> propsRaw = selectNodeProperties(nodeId);
// Convert to public properties
Map<QName, Serializable> props = nodePropertyHelper.convertToPublicProperties(propsRaw);
// Done
return new Pair<Long, Map<QName, Serializable>>(nodeId, Collections.unmodifiableMap(props));
}
}
/*
* Aspects
*/
public Set<QName> getNodeAspects(Long nodeId)
{
Set<QName> nodeAspects = getNodeAspectsCached(nodeId);
// Nodes are always referenceable
nodeAspects.add(ContentModel.ASPECT_REFERENCEABLE);
return nodeAspects;
}
public boolean hasNodeAspect(Long nodeId, QName aspectQName)
{
if (aspectQName.equals(ContentModel.ASPECT_REFERENCEABLE))
{
// Nodes are always referenceable
return true;
}
Set<QName> nodeAspects = getNodeAspectsCached(nodeId);
return nodeAspects.contains(aspectQName);
}
public boolean addNodeAspects(Long nodeId, Set<QName> aspectQNames)
{
if (aspectQNames.size() == 0)
{
return false;
}
// Copy the inbound set
Set<QName> aspectQNamesToAdd = new HashSet<QName>(aspectQNames);
// Get existing
Set<QName> existingAspectQNames = getNodeAspectsCached(nodeId);
// Find out what needs adding
aspectQNamesToAdd.removeAll(existingAspectQNames);
aspectQNamesToAdd.remove(ContentModel.ASPECT_REFERENCEABLE); // Implicit
if (aspectQNamesToAdd.isEmpty())
{
// Nothing to do
return false;
}
// Add them
Set<Long> aspectQNameIds = qnameDAO.convertQNamesToIds(aspectQNamesToAdd, true);
startBatch();
try
{
for (Long aspectQNameId : aspectQNameIds)
{
insertNodeAspect(nodeId, aspectQNameId);
}
}
catch (RuntimeException e)
{
// This could be because the cache is out of date
aspectsCache.removeByKey(nodeId);
throw e;
}
finally
{
executeBatch();
}
// Manually update the cache
Set<QName> newAspectQNames = new HashSet<QName>(existingAspectQNames);
newAspectQNames.addAll(aspectQNamesToAdd);
setNodeAspectsCached(nodeId, newAspectQNames);
// If we are adding the sys:aspect_root, then the parent assocs cache is unreliable
if (newAspectQNames.contains(ContentModel.ASPECT_ROOT))
{
invalidateCachesByNodeId(null, nodeId, parentAssocsCache);
}
// Touch to bring into current txn
touchNodeImpl(nodeId);
// Done
return true;
}
public boolean removeNodeAspects(Long nodeId)
{
// Get existing
Set<QName> existingAspectQNames = getNodeAspectsCached(nodeId);
// If we are removing the sys:aspect_root, then the parent assocs cache is unreliable
if (existingAspectQNames.contains(ContentModel.ASPECT_ROOT))
{
invalidateCachesByNodeId(null, nodeId, parentAssocsCache);
}
// Just delete all the node's aspects
int deleteCount = deleteNodeAspects(nodeId, null);
// Manually update the cache
aspectsCache.setValue(nodeId, Collections.<QName>emptySet());
// Touch to bring into current txn
touchNodeImpl(nodeId);
// Done
return deleteCount > 0;
}
public boolean removeNodeAspects(Long nodeId, Set<QName> aspectQNames)
{
// Get the current aspects
Set<QName> existingAspectQNames = getNodeAspects(nodeId);
// Now remove each aspect
Set<Long> aspectQNameIdsToRemove = qnameDAO.convertQNamesToIds(aspectQNames, false);
int deleteCount = deleteNodeAspects(nodeId, aspectQNameIdsToRemove);
// Manually update the cache
Set<QName> newAspectQNames = new HashSet<QName>(existingAspectQNames);
newAspectQNames.removeAll(aspectQNames);
aspectsCache.setValue(nodeId, newAspectQNames);
// If we are removing the sys:aspect_root, then the parent assocs cache is unreliable
if (aspectQNames.contains(ContentModel.ASPECT_ROOT))
{
invalidateCachesByNodeId(null, nodeId, parentAssocsCache);
}
// Touch to bring into current txn
touchNodeImpl(nodeId);
// Done
return deleteCount > 0;
}
public void getNodesWithAspect(QName aspectQName, Long minNodeId, int count, NodeRefQueryCallback resultsCallback)
{
Pair<Long, QName> qnamePair = qnameDAO.getQName(aspectQName);
if (qnamePair == null)
{
// No point running a query
return;
}
Long qnameId = qnamePair.getFirst();
selectNodesWithAspect(qnameId, minNodeId, resultsCallback);
}
/**
* @return Returns a writable copy of the cached aspects set
*/
private Set<QName> getNodeAspectsCached(Long nodeId)
{
Pair<Long, Set<QName>> cacheEntry = aspectsCache.getByKey(nodeId);
if (cacheEntry == null)
{
throw new DataIntegrityViolationException("Invalid node ID: " + nodeId);
}
return new HashSet<QName>(cacheEntry.getSecond());
}
/**
* Update the node aspects cache. The incoming set will be wrapped to be unmodifiable.
*/
private void setNodeAspectsCached(Long nodeId, Set<QName> aspects)
{
aspectsCache.setValue(nodeId, Collections.unmodifiableSet(aspects));
}
/**
* Callback to cache node aspects. The DAO callback only does the simple {@link #findByKey(Long)}.
*
* @author Derek Hulley
* @since 3.4
*/
private class AspectsCallbackDAO extends EntityLookupCallbackDAOAdaptor<Long, Set<QName>, Serializable>
{
public Pair<Long, Set<QName>> createValue(Set<QName> value)
{
throw new UnsupportedOperationException("A node always has a 'set' of aspects.");
}
public Pair<Long, Set<QName>> findByKey(Long nodeId)
{
Set<Long> nodeAspectQNameIds = selectNodeAspectIds(nodeId);
// Convert to QNames
Set<QName> nodeAspectQNames = qnameDAO.convertIdsToQNames(nodeAspectQNameIds);
// Done
return new Pair<Long, Set<QName>>(nodeId, Collections.unmodifiableSet(nodeAspectQNames));
}
}
/*
* Node assocs
*/
public Long newNodeAssoc(Long sourceNodeId, Long targetNodeId, QName assocTypeQName)
{
Long assocTypeQNameId = qnameDAO.getOrCreateQName(assocTypeQName).getFirst();
try
{
// Touch to bring into current txn
touchNodeImpl(sourceNodeId);
return insertNodeAssoc(sourceNodeId, targetNodeId, assocTypeQNameId);
}
catch (Throwable e)
{
// Probably due to the association already existing. We throw a well-known
// exception and let retrying take itparameterObjects course
throw new AssociationExistsException(sourceNodeId, targetNodeId, assocTypeQName, e);
}
}
public int removeNodeAssoc(Long sourceNodeId, Long targetNodeId, QName assocTypeQName)
{
Pair<Long, QName> assocTypeQNamePair = qnameDAO.getQName(assocTypeQName);
if (assocTypeQNamePair == null)
{
// Never existed
return 0;
}
// Touch to bring into current txn
touchNodeImpl(sourceNodeId);
Long assocTypeQNameId = assocTypeQNamePair.getFirst();
return deleteNodeAssoc(sourceNodeId, targetNodeId, assocTypeQNameId);
}
public int removeNodeAssocsToAndFrom(Long nodeId)
{
// Touch to bring into current txn
touchNodeImpl(nodeId);
return deleteNodeAssocsToAndFrom(nodeId);
}
public int removeNodeAssocsToAndFrom(Long nodeId, Set<QName> assocTypeQNames)
{
Set<Long> assocTypeQNameIds = qnameDAO.convertQNamesToIds(assocTypeQNames, false);
if (assocTypeQNameIds.size() == 0)
{
// Never existed
return 0;
}
// Touch to bring into current txn
touchNodeImpl(nodeId);
return deleteNodeAssocsToAndFrom(nodeId, assocTypeQNameIds);
}
public Collection<Pair<Long, AssociationRef>> getSourceNodeAssocs(Long targetNodeId)
{
List<NodeAssocEntity> nodeAssocEntities = selectNodeAssocsByTarget(targetNodeId);
List<Pair<Long, AssociationRef>> results = new ArrayList<Pair<Long,AssociationRef>>(nodeAssocEntities.size());
for (NodeAssocEntity nodeAssocEntity : nodeAssocEntities)
{
Long assocId = nodeAssocEntity.getId();
AssociationRef assocRef = nodeAssocEntity.getAssociationRef(qnameDAO);
results.add(new Pair<Long, AssociationRef>(assocId, assocRef));
}
return results;
}
public Collection<Pair<Long, AssociationRef>> getTargetNodeAssocs(Long sourceNodeId)
{
List<NodeAssocEntity> nodeAssocEntities = selectNodeAssocsBySource(sourceNodeId);
List<Pair<Long, AssociationRef>> results = new ArrayList<Pair<Long,AssociationRef>>(nodeAssocEntities.size());
for (NodeAssocEntity nodeAssocEntity : nodeAssocEntities)
{
Long assocId = nodeAssocEntity.getId();
AssociationRef assocRef = nodeAssocEntity.getAssociationRef(qnameDAO);
results.add(new Pair<Long, AssociationRef>(assocId, assocRef));
}
return results;
}
public Pair<Long, AssociationRef> getNodeAssoc(Long assocId)
{
NodeAssocEntity nodeAssocEntity = selectNodeAssocById(assocId);
if (nodeAssocEntity == null)
{
throw new ConcurrencyFailureException("Assoc ID does not point to a valid association: " + assocId);
}
AssociationRef assocRef = nodeAssocEntity.getAssociationRef(qnameDAO);
return new Pair<Long, AssociationRef>(assocId, assocRef);
}
/*
* Child assocs
*/
private ChildAssocEntity newChildAssocImpl(
Long parentNodeId,
Long childNodeId,
boolean isPrimary,
final QName assocTypeQName,
QName assocQName,
final String childNodeName)
{
Assert.notNull(parentNodeId, "parentNodeId");
Assert.notNull(childNodeId, "childNodeId");
Assert.notNull(assocTypeQName, "assocTypeQName");
Assert.notNull(assocQName, "assocQName");
Assert.notNull(childNodeName, "childNodeName");
// Get parent and child nodes. We need them later, so just get them now.
final Node parentNode = getNodeNotNull(parentNodeId);
final Node childNode = getNodeNotNull(childNodeId);
final ChildAssocEntity assoc = new ChildAssocEntity();
// Parent node
assoc.setParentNode(new NodeEntity(parentNode));
// Child node
assoc.setChildNode(new NodeEntity(childNode));
// Type QName
assoc.setTypeQNameAll(qnameDAO, assocTypeQName, true);
// Child node name
assoc.setChildNodeNameAll(dictionaryService, assocTypeQName, childNodeName);
// QName
assoc.setQNameAll(qnameDAO, assocQName, true);
// Primary
assoc.setPrimary(isPrimary);
// Index
assoc.setAssocIndex(-1);
RetryingCallback<Long> callback = new RetryingCallback<Long>()
{
public Long execute() throws Throwable
{
Savepoint savepoint = controlDAO.createSavepoint("DuplicateChildNodeNameException");
try
{
Long id = insertChildAssoc(assoc);
controlDAO.releaseSavepoint(savepoint);
return id;
}
catch (Throwable e)
{
controlDAO.rollbackToSavepoint(savepoint);
// We assume that this is from the child cm:name constraint violation
throw new DuplicateChildNodeNameException(
parentNode.getNodeRef(),
assocTypeQName,
childNodeName,
e);
}
}
};
Long assocId = childAssocRetryingHelper.doWithRetry(callback);
// Persist it
assoc.setId(assocId);
// Primary associations accompany new nodes, so we only have to bring the
// node into the current transaction for secondary associations
if (!isPrimary)
{
updateNode(childNodeId, null, null, null);
}
// Done
if (isDebugEnabled)
{
logger.debug("Created child association: " + assoc);
}
return assoc;
}
public Pair<Long, ChildAssociationRef> newChildAssoc(
Long parentNodeId,
Long childNodeId,
QName assocTypeQName,
QName assocQName,
String childNodeName)
{
ChildAssocEntity assoc = newChildAssocImpl(
parentNodeId, childNodeId, false, assocTypeQName, assocQName, childNodeName);
Long assocId = assoc.getId();
// update cache
ParentAssocsInfo parentAssocInfo = getParentAssocsCached(childNodeId);
parentAssocInfo = parentAssocInfo.addAssoc(assocId, assoc);
setParentAssocsCached(childNodeId, parentAssocInfo);
// Done
return assoc.getPair(qnameDAO);
}
public void deleteChildAssoc(Long assocId)
{
ChildAssocEntity assoc = selectChildAssoc(assocId);
if (assoc == null)
{
throw new ConcurrencyFailureException("Child association not found: " + assocId);
}
// Update cache
Long childNodeId = assoc.getChildNode().getId();
ParentAssocsInfo parentAssocInfo = getParentAssocsCached(childNodeId);
parentAssocInfo = parentAssocInfo.removeAssoc(assocId);
setParentAssocsCached(childNodeId, parentAssocInfo);
// Delete it
int count = deleteChildAssocById(assocId);
if (count != 1)
{
throw new ConcurrencyFailureException("Child association not deleted: " + assocId);
}
}
public int setChildAssocIndex(Long parentNodeId, Long childNodeId, QName assocTypeQName, QName assocQName, int index)
{
int count = updateChildAssocIndex(parentNodeId, childNodeId, assocTypeQName, assocQName, index);
if (count > 0)
{
invalidateCachesByNodeId(null, childNodeId, parentAssocsCache);
}
return count;
}
/**
* TODO: See about pulling automatic cm:name update logic into this DAO
*/
public void setChildAssocsUniqueName(final Long childNodeId, final String childName)
{
RetryingCallback<Integer> callback = new RetryingCallback<Integer>()
{
public Integer execute() throws Throwable
{
Savepoint savepoint = controlDAO.createSavepoint("DuplicateChildNodeNameException");
try
{
Integer count = updateChildAssocsUniqueName(childNodeId, childName);
controlDAO.releaseSavepoint(savepoint);
return count;
}
catch (Throwable e)
{
controlDAO.rollbackToSavepoint(savepoint);
// We assume that this is from the child cm:name constraint violation
throw new DuplicateChildNodeNameException(null, null, childName, e);
}
}
};
Integer count = childAssocRetryingHelper.doWithRetry(callback);
if (count > 0)
{
invalidateCachesByNodeId(null, childNodeId, parentAssocsCache);
}
if (isDebugEnabled)
{
logger.debug(
"Updated cm:name to parent assocs: \n" +
" Node: " + childNodeId + "\n" +
" Name: " + childName + "\n" +
" Updated: " + count);
}
}
public Pair<Long, ChildAssociationRef> getChildAssoc(Long assocId)
{
ChildAssocEntity assoc = selectChildAssoc(assocId);
if (assoc == null)
{
throw new ConcurrencyFailureException("Child association not found: " + assocId);
}
return assoc.getPair(qnameDAO);
}
public List<NodeIdAndAclId> getPrimaryChildrenAcls(Long nodeId)
{
return selectPrimaryChildAcls(nodeId);
}
public Pair<Long, ChildAssociationRef> getChildAssoc(
Long parentNodeId,
Long childNodeId,
QName assocTypeQName,
QName assocQName)
{
List<ChildAssocEntity> assocs = selectChildAssoc(parentNodeId, childNodeId, assocTypeQName, assocQName);
if (assocs.size() == 0)
{
return null;
}
else if (assocs.size() == 1)
{
return assocs.get(0).getPair(qnameDAO);
}
// Keep the primary association or, if there isn't one, the association with the smallest ID
Map<Long, ChildAssocEntity> assocsToDeleteById = new HashMap<Long, ChildAssocEntity>(assocs.size() * 2);
Long minId = null;
Long primaryId = null;
for (ChildAssocEntity assoc : assocs)
{
// First store it
Long assocId = assoc.getId();
assocsToDeleteById.put(assocId, assoc);
if (minId == null || minId.compareTo(assocId) > 0)
{
minId = assocId;
}
if (assoc.isPrimary())
{
primaryId = assocId;
}
}
// Remove either the primary or min assoc
Long assocToKeepId = primaryId == null ? minId : primaryId;
ChildAssocEntity assocToKeep = assocsToDeleteById.remove(assocToKeepId);
// If the current transaction allows, remove the other associations
if (AlfrescoTransactionSupport.getTransactionReadState() == TxnReadState.TXN_READ_WRITE)
{
for (Long assocIdToDelete : assocsToDeleteById.keySet())
{
deleteChildAssoc(assocIdToDelete);
}
}
// Done
return assocToKeep.getPair(qnameDAO);
}
/**
* Callback that applies node preloading. Instances must be used and discarded per query.
*
* @author Derek Hulley
* @since 3.4
*/
private class ChildAssocRefBatchingQueryCallback implements ChildAssocRefQueryCallback
{
private static final int BATCH_SIZE = 256 * 4;
private final ChildAssocRefQueryCallback callback;
private final boolean preload;
private final List<NodeRef> nodeRefs;
/**
* @param callback the callback to batch around
*/
private ChildAssocRefBatchingQueryCallback(ChildAssocRefQueryCallback callback)
{
this.callback = callback;
this.preload = callback.preLoadNodes();
if (preload)
{
nodeRefs = new LinkedList<NodeRef>(); // No memory required
}
else
{
nodeRefs = null; // No list needed
}
}
/**
* @return Returns <tt>false</tt> always as batching is applied
*/
public boolean preLoadNodes()
{
return false;
}
/**
* {@inheritDoc}
*/
public boolean handle(
Pair<Long, ChildAssociationRef> childAssocPair,
Pair<Long, NodeRef> parentNodePair,
Pair<Long, NodeRef> childNodePair)
{
if (!preload)
{
return callback.handle(childAssocPair, parentNodePair, childNodePair);
}
// Batch it
if (nodeRefs.size() >= BATCH_SIZE)
{
cacheNodes(nodeRefs);
nodeRefs.clear();
}
nodeRefs.add(childNodePair.getSecond());
return callback.handle(childAssocPair, parentNodePair, childNodePair);
}
public void done()
{
// Finish the batch
if (preload && nodeRefs.size() > 0)
{
cacheNodes(nodeRefs);
nodeRefs.clear();
}
callback.done();
}
}
public void getChildAssocs(
Long parentNodeId,
Long childNodeId,
QName assocTypeQName,
QName assocQName,
Boolean isPrimary,
Boolean sameStore,
ChildAssocRefQueryCallback resultsCallback)
{
selectChildAssocs(
parentNodeId, childNodeId,
assocTypeQName, assocQName, isPrimary, sameStore,
new ChildAssocRefBatchingQueryCallback(resultsCallback));
}
public void getChildAssocs(Long parentNodeId, Set<QName> assocTypeQNames, ChildAssocRefQueryCallback resultsCallback)
{
switch (assocTypeQNames.size())
{
case 0:
return; // No results possible
case 1:
QName assocTypeQName = assocTypeQNames.iterator().next();
selectChildAssocs(
parentNodeId, null, assocTypeQName, (QName) null, null, null,
new ChildAssocRefBatchingQueryCallback(resultsCallback));
break;
default:
selectChildAssocs(
parentNodeId, assocTypeQNames,
new ChildAssocRefBatchingQueryCallback(resultsCallback));
}
}
public Pair<Long, ChildAssociationRef> getChildAssoc(Long parentNodeId, QName assocTypeQName, String childName)
{
ChildAssocEntity assoc = selectChildAssoc(parentNodeId, assocTypeQName, childName);
return assoc == null ? null : assoc.getPair(qnameDAO);
}
public void getChildAssocs(
Long parentNodeId,
QName assocTypeQName,
Collection<String> childNames,
ChildAssocRefQueryCallback resultsCallback)
{
selectChildAssocs(
parentNodeId, assocTypeQName, childNames,
new ChildAssocRefBatchingQueryCallback(resultsCallback));
}
public void getChildAssocsByPropertyValue(
Long parentNodeId,
QName propertyQName,
Serializable value,
ChildAssocRefQueryCallback resultsCallback)
{
PropertyDefinition propertyDef = dictionaryService.getProperty(propertyQName);
NodePropertyValue nodeValue = nodePropertyHelper.makeNodePropertyValue(propertyDef, value);
if(nodeValue != null)
{
switch (nodeValue.getPersistedType())
{
case 1: // Boolean
case 3: // long
case 5: // double
case 6: // string
// no floats due to the range errors testing equality on a float.
break;
default:
throw new IllegalArgumentException("method not supported for persisted value type " + nodeValue.getPersistedType());
}
selectChildAssocsByPropertyValue(parentNodeId,
propertyQName,
nodeValue,
new ChildAssocRefBatchingQueryCallback(resultsCallback));
}
}
public void getChildAssocsByChildTypes(
Long parentNodeId,
Set<QName> childNodeTypeQNames,
ChildAssocRefQueryCallback resultsCallback)
{
selectChildAssocsByChildTypes(
parentNodeId, childNodeTypeQNames,
new ChildAssocRefBatchingQueryCallback(resultsCallback));
}
public void getChildAssocsWithoutParentAssocsOfType(
Long parentNodeId,
QName assocTypeQName,
ChildAssocRefQueryCallback resultsCallback)
{
selectChildAssocsWithoutParentAssocsOfType(
parentNodeId, assocTypeQName,
new ChildAssocRefBatchingQueryCallback(resultsCallback));
}
public Pair<Long, ChildAssociationRef> getPrimaryParentAssoc(Long childNodeId)
{
ChildAssocEntity childAssocEntity = getPrimaryParentAssocImpl(childNodeId);
if(childAssocEntity == null)
{
return null;
}
else
{
return childAssocEntity.getPair(qnameDAO);
}
}
private ChildAssocEntity getPrimaryParentAssocImpl(Long childNodeId)
{
ParentAssocsInfo parentAssocs = getParentAssocsCached(childNodeId);
return parentAssocs.getPrimaryParentAssoc();
}
private static final int PARENT_ASSOCS_CACHE_FILTER_THRESHOLD = 2000;
public void getParentAssocs(
Long childNodeId,
QName assocTypeQName,
QName assocQName,
Boolean isPrimary,
ChildAssocRefQueryCallback resultsCallback)
{
if (assocTypeQName == null && assocQName == null && isPrimary == null)
{
// Go for the cache (and return all)
ParentAssocsInfo parentAssocs = getParentAssocsCached(childNodeId);
for (ChildAssocEntity assoc : parentAssocs.getParentAssocs().values())
{
resultsCallback.handle(
assoc.getPair(qnameDAO),
assoc.getParentNode().getNodePair(),
assoc.getChildNode().getNodePair());
}
}
else
{
// Decide whether we query or filter
ParentAssocsInfo parentAssocs = getParentAssocsCacheOnly(childNodeId);
if ((parentAssocs == null) || (parentAssocs.getParentAssocs().size() > PARENT_ASSOCS_CACHE_FILTER_THRESHOLD))
{
// Query
selectParentAssocs(childNodeId, assocTypeQName, assocQName, isPrimary, resultsCallback);
}
else
{
// Go for the cache (and filter)
for (ChildAssocEntity assoc : parentAssocs.getParentAssocs().values())
{
Pair<Long, ChildAssociationRef> assocPair = assoc.getPair(qnameDAO);
if (((assocTypeQName == null) || (assocPair.getSecond().getTypeQName().equals(assocTypeQName))) &&
((assocQName == null) || (assocPair.getSecond().getQName().equals(assocQName))))
{
resultsCallback.handle(
assocPair,
assoc.getParentNode().getNodePair(),
assoc.getChildNode().getNodePair());
}
}
}
}
}
public List<Path> getPaths(Pair<Long, NodeRef> nodePair, boolean primaryOnly) throws InvalidNodeRefException
{
// create storage for the paths - only need 1 bucket if we are looking for the primary path
List<Path> paths = new ArrayList<Path>(primaryOnly ? 1 : 10);
// create an empty current path to start from
Path currentPath = new Path();
// create storage for touched associations
Stack<Long> assocIdStack = new Stack<Long>();
// call recursive method to sort it out
prependPaths(nodePair, null, currentPath, paths, assocIdStack, primaryOnly);
// check that for the primary only case we have exactly one path
if (primaryOnly && paths.size() != 1)
{
throw new RuntimeException("Node has " + paths.size() + " primary paths: " + nodePair);
}
// done
if (loggerPaths.isDebugEnabled())
{
StringBuilder sb = new StringBuilder(256);
if (primaryOnly)
{
sb.append("Primary paths");
}
else
{
sb.append("Paths");
}
sb.append(" for node ").append(nodePair);
for (Path path : paths)
{
sb.append("\n").append(" ").append(path);
}
loggerPaths.debug(sb);
}
return paths;
}
/**
* Build the paths for a node
*
* @param currentNodePair the leave or child node to start with
* @param currentRootNodePair pass in <tt>null</tt> only
* @param currentPath an empty {@link Path}
* @param completedPaths completed paths i.e. the result
* @param assocIdStack a stack to detected cyclic relationships
* @param primaryOnly <tt>true</tt> to follow only primary parent associations
* @throws CyclicChildRelationshipException
*/
private void prependPaths(
Pair<Long, NodeRef> currentNodePair,
Pair<StoreRef, NodeRef> currentRootNodePair,
Path currentPath,
Collection<Path> completedPaths,
Stack<Long> assocIdStack,
boolean primaryOnly) throws CyclicChildRelationshipException
{
Long currentNodeId = currentNodePair.getFirst();
NodeRef currentNodeRef = currentNodePair.getSecond();
// Check if we have changed root nodes
StoreRef currentStoreRef = currentNodeRef.getStoreRef();
if (currentRootNodePair == null || !currentStoreRef.equals(currentRootNodePair.getFirst()))
{
// We've changed stores
Pair<Long, NodeRef> rootNodePair = getRootNode(currentStoreRef);
currentRootNodePair = new Pair<StoreRef, NodeRef>(currentStoreRef, rootNodePair.getSecond());
}
// get the parent associations of the given node
ParentAssocsInfo parentAssocInfo = getParentAssocsCached(currentNodeId);
// does the node have parents
boolean hasParents = parentAssocInfo.getParentAssocs().size() > 0;
// does the current node have a root aspect?
// look for a root. If we only want the primary root, then ignore all but the top-level root.
if (!(primaryOnly && hasParents) && parentAssocInfo.isRoot()) // exclude primary search with parents present
{
// create a one-sided assoc ref for the root node and prepend to the stack
// this effectively spoofs the fact that the current node is not below the root
// - we put this assoc in as the first assoc in the path must be a one-sided
// reference pointing to the root node
ChildAssociationRef assocRef = new ChildAssociationRef(null, null, null, currentRootNodePair.getSecond());
// create a path to save and add the 'root' assoc
Path pathToSave = new Path();
Path.ChildAssocElement first = null;
for (Path.Element element : currentPath)
{
if (first == null)
{
first = (Path.ChildAssocElement) element;
}
else
{
pathToSave.append(element);
}
}
if (first != null)
{
// mimic an association that would appear if the current node was below the root node
// or if first beneath the root node it will make the real thing
ChildAssociationRef updateAssocRef = new ChildAssociationRef(
parentAssocInfo.isStoreRoot() ? ContentModel.ASSOC_CHILDREN : first.getRef().getTypeQName(),
currentRootNodePair.getSecond(),
first.getRef().getQName(),
first.getRef().getChildRef());
Path.Element newFirst = new Path.ChildAssocElement(updateAssocRef);
pathToSave.prepend(newFirst);
}
Path.Element element = new Path.ChildAssocElement(assocRef);
pathToSave.prepend(element);
// store the path just built
completedPaths.add(pathToSave);
}
if (!hasParents && !parentAssocInfo.isRoot())
{
throw new RuntimeException("Node without parents does not have root aspect: " + currentNodeRef);
}
// walk up each parent association
for (Map.Entry<Long, ChildAssocEntity> entry : parentAssocInfo.getParentAssocs().entrySet())
{
Long assocId = entry.getKey();
ChildAssocEntity assoc = entry.getValue();
ChildAssociationRef assocRef = assoc.getRef(qnameDAO);
// do we consider only primary assocs?
if (primaryOnly && !assocRef.isPrimary())
{
continue;
}
// Ordering is meaningless here as we are constructing a path upwards
// and have no idea where the node comes in the sibling order or even
// if there are like-pathed siblings.
assocRef.setNthSibling(-1);
// build a path element
Path.Element element = new Path.ChildAssocElement(assocRef);
// create a new path that builds on the current path
Path path = new Path();
path.append(currentPath);
// prepend element
path.prepend(element);
// get parent node pair
Pair<Long, NodeRef> parentNodePair = new Pair<Long, NodeRef>(
assoc.getParentNode().getId(),
assocRef.getParentRef());
// does the association already exist in the stack
if (assocIdStack.contains(assocId))
{
// the association was present already
logger.error(
"Cyclic parent-child relationship detected: \n" +
" current node: " + currentNodeId + "\n" +
" current path: " + currentPath + "\n" +
" next assoc: " + assocId);
throw new CyclicChildRelationshipException("Node has been pasted into its own tree.", assocRef);
}
// push the assoc stack, recurse and pop
assocIdStack.push(assocId);
prependPaths(parentNodePair, currentRootNodePair, path, completedPaths, assocIdStack, primaryOnly);
assocIdStack.pop();
}
// done
}
/**
* @return Returns a node's parent associations
*/
private ParentAssocsInfo getParentAssocsCached(Long nodeId)
{
Pair<Long, ParentAssocsInfo> cacheEntry = parentAssocsCache.getByKey(nodeId);
if (cacheEntry == null)
{
throw new DataIntegrityViolationException("Invalid node ID: " + nodeId);
}
return cacheEntry.getSecond();
}
private ParentAssocsInfo getParentAssocsCacheOnly(Long nodeId)
{
// can be null
return parentAssocsCache.getValue(nodeId);
}
/**
* Update a node's parent associations.
*/
private void setParentAssocsCached(Long nodeId, ParentAssocsInfo parentAssocs)
{
parentAssocsCache.setValue(nodeId, parentAssocs);
}
/**
* Callback to cache node parent assocs.
*
* @author Derek Hulley
* @since 3.4
*/
private class ParentAssocsCallbackDAO extends EntityLookupCallbackDAOAdaptor<Long, ParentAssocsInfo, Serializable>
{
public Pair<Long, ParentAssocsInfo> createValue(ParentAssocsInfo value)
{
throw new UnsupportedOperationException("Nodes are created independently.");
}
public Pair<Long, ParentAssocsInfo> findByKey(Long nodeId)
{
// Find out if it is a root or store root
boolean isRoot = hasNodeAspect(nodeId, ContentModel.ASPECT_ROOT);
boolean isStoreRoot = getNodeType(nodeId).equals(ContentModel.TYPE_STOREROOT);
// Select all the parent associations
List<ChildAssocEntity> assocs = selectParentAssocs(nodeId);
// Build the cache object
ParentAssocsInfo value = new ParentAssocsInfo(isRoot, isStoreRoot, assocs);
// Done
return new Pair<Long, ParentAssocsInfo>(nodeId, value);
}
}
/*
* Bulk caching
*/
/**
* {@inheritDoc}
* <p/>
* Loads properties, aspects, parent associations and the ID-noderef cache.
*/
public void cacheNodes(List<NodeRef> nodeRefs)
{
/*
* ALF-2712: Performance degradation from 3.1.0 to 3.1.2
* ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
*
* There is an obvious cost associated with querying the database to pull back nodes,
* and there is additional cost associated with putting the resultant entries into the
* caches. It is NO MORE expensive to check the cache than it is to put an entry into it
* - and probably cheaper considering cache replication - so we start checking nodes to see
* if they have entries before passing them over for batch loading.
*
* However, when running against a cold cache or doing a first-time query against some
* part of the repo, we will be checking for entries in the cache and consistently getting
* no results. To avoid unnecessary checking when the cache is PROBABLY cold, we
* examine the ratio of hits/misses at regular intervals.
*/
if (nodeRefs.size() < 10)
{
// We only cache where the number of results is potentially
// a problem for the N+1 loading that might result.
return;
}
int foundCacheEntryCount = 0;
int missingCacheEntryCount = 0;
boolean forceBatch = false;
// Group the nodes by store so that we don't *have* to eagerly join to store to get query performance
Map<StoreRef, List<String>> uuidsByStore = new HashMap<StoreRef, List<String>>(3);
for (NodeRef nodeRef : nodeRefs)
{
if (!forceBatch)
{
// Is this node in the cache?
if (nodesCache.getKey(nodeRef) != null)
{
foundCacheEntryCount++; // Don't add it to the batch
continue;
}
else
{
missingCacheEntryCount++; // Fall through and add it to the batch
}
if (foundCacheEntryCount + missingCacheEntryCount % 100 == 0)
{
// We force the batch if the number of hits drops below the number of misses
forceBatch = foundCacheEntryCount < missingCacheEntryCount;
}
}
StoreRef storeRef = nodeRef.getStoreRef();
List<String> uuids = (List<String>) uuidsByStore.get(storeRef);
if (uuids == null)
{
uuids = new ArrayList<String>(nodeRefs.size());
uuidsByStore.put(storeRef, uuids);
}
uuids.add(nodeRef.getId());
}
int size = nodeRefs.size();
nodeRefs = null;
// Now load all the nodes
for (Map.Entry<StoreRef, List<String>> entry : uuidsByStore.entrySet())
{
StoreRef storeRef = entry.getKey();
List<String> uuids = entry.getValue();
cacheNodes(storeRef, uuids);
}
if (logger.isDebugEnabled())
{
logger.debug("Pre-loaded " + size + " nodes.");
}
}
/**
* Loads the nodes into cache using batching.
*/
private void cacheNodes(StoreRef storeRef, List<String> uuids)
{
StoreEntity store = getStoreNotNull(storeRef);
Long storeId = store.getId();
int batchSize = 256;
SortedSet<String> batch = new TreeSet<String>();
for (String uuid : uuids)
{
batch.add(uuid);
if (batch.size() >= batchSize)
{
// Preload
cacheNodesNoBatch(storeId, batch);
batch.clear();
}
}
// Load any remaining nodes
if (batch.size() > 0)
{
cacheNodesNoBatch(storeId, batch);
}
}
/**
* Bulk-fetch the nodes for a given store. All nodes passed in are fetched.
*/
private void cacheNodesNoBatch(Long storeId, SortedSet<String> uuids)
{
// Get the nodes
List<NodeEntity> nodes = selectNodesByUuids(storeId, uuids);
SortedSet<Long> aspectNodeIds = new TreeSet<Long>();
SortedSet<Long> propertiesNodeIds = new TreeSet<Long>();
for (NodeEntity node : nodes)
{
Long nodeId = node.getId();
nodesCache.setValue(nodeId, node);
if (propertiesCache.getValue(nodeId) == null)
{
propertiesNodeIds.add(nodeId);
}
if (aspectsCache.getValue(nodeId) == null)
{
aspectNodeIds.add(nodeId);
}
}
List<NodeAspectsEntity> nodeAspects = selectNodeAspects(aspectNodeIds);
for (NodeAspectsEntity nodeAspect : nodeAspects)
{
Long nodeId = nodeAspect.getNodeId();
List<Long> qnameIds = nodeAspect.getAspectQNameIds();
HashSet<Long> qnameIdsSet = new HashSet<Long>(qnameIds);
Set<QName> qnames = qnameDAO.convertIdsToQNames(qnameIdsSet);
aspectsCache.setValue(nodeId, qnames);
}
Map<Long, Map<NodePropertyKey, NodePropertyValue>> propsByNodeId = selectNodeProperties(propertiesNodeIds);
for (Map.Entry<Long, Map<NodePropertyKey, NodePropertyValue>> entry : propsByNodeId.entrySet())
{
Long nodeId = entry.getKey();
Map<NodePropertyKey, NodePropertyValue> propertyValues = entry.getValue();
Map<QName, Serializable> props = nodePropertyHelper.convertToPublicProperties(propertyValues);
propertiesCache.setValue(nodeId, props);
}
}
/**
* {@inheritDoc}
* <p/>
* Simply clears out all the node-related caches.
*/
public void clear()
{
nodesCache.clear();
aspectsCache.clear();
propertiesCache.clear();
parentAssocsCache.clear();
}
/*
* Transactions
*/
public Long getMaxTxnIdByCommitTime(long maxCommitTime)
{
Transaction txn = selectLastTxnBeforeCommitTime(maxCommitTime);
return (txn == null ? null : txn.getId());
}
public int getTransactionCount()
{
return selectTransactionCount();
}
public Transaction getTxnById(Long txnId)
{
return selectTxnById(txnId);
}
public List<NodeRef.Status> getTxnChanges(Long txnId)
{
return getTxnChangesForStore(null, txnId);
}
public List<NodeRef.Status> getTxnChangesForStore(StoreRef storeRef, Long txnId)
{
Long storeId = (storeRef == null) ? null : getStoreNotNull(storeRef).getId();
List<NodeEntity> nodes = selectTxnChanges(txnId, storeId);
// Convert
List<NodeRef.Status> nodeStatuses = new ArrayList<NodeRef.Status>(nodes.size());
for (NodeEntity node : nodes)
{
nodeStatuses.add(node.getNodeStatus());
}
// Done
return nodeStatuses;
}
public int getTxnUpdateCount(Long txnId)
{
return selectTxnNodeChangeCount(txnId, Boolean.TRUE);
}
public int getTxnDeleteCount(Long txnId)
{
return selectTxnNodeChangeCount(txnId, Boolean.FALSE);
}
public List<Transaction> getTxnsByCommitTimeAscending(
Long fromTimeInclusive,
Long toTimeExclusive,
int count,
List<Long> excludeTxnIds,
boolean remoteOnly)
{
// Pass the current server ID if it is to be excluded
Long serverId = remoteOnly ? serverId = getServerId() : null;
return selectTxns(fromTimeInclusive, toTimeExclusive, count, null, excludeTxnIds, serverId, Boolean.TRUE);
}
public List<Transaction> getTxnsByCommitTimeDescending(
Long fromTimeInclusive,
Long toTimeExclusive,
int count,
List<Long> excludeTxnIds,
boolean remoteOnly)
{
// Pass the current server ID if it is to be excluded
Long serverId = remoteOnly ? serverId = getServerId() : null;
return selectTxns(fromTimeInclusive, toTimeExclusive, count, null, excludeTxnIds, serverId, Boolean.FALSE);
}
public List<Transaction> getTxnsByCommitTimeAscending(List<Long> includeTxnIds)
{
return selectTxns(null, null, null, includeTxnIds, null, null, Boolean.TRUE);
}
public List<Long> getTxnsUnused(Long minTxnId, long maxCommitTime, int count)
{
return selectTxnsUnused(minTxnId, maxCommitTime, count);
}
public void purgeTxn(Long txnId)
{
deleteTransaction(txnId);
}
public static final Long LONG_ZERO = 0L;
public Long getMinTxnCommitTime()
{
Long time = selectMinTxnCommitTime();
return (time == null ? LONG_ZERO : time);
}
public Long getMaxTxnCommitTime()
{
Long time = selectMaxTxnCommitTime();
return (time == null ? LONG_ZERO : time);
}
/*
* Abstract methods for underlying CRUD
*/
protected abstract ServerEntity selectServer(String ipAddress);
protected abstract Long insertServer(String ipAddress);
protected abstract Long insertTransaction(Long serverId, String changeTxnId, Long commit_time_ms);
protected abstract int updateTransaction(Long txnId, Long commit_time_ms);
protected abstract int deleteTransaction(Long txnId);
protected abstract List<StoreEntity> selectAllStores();
protected abstract NodeEntity selectStoreRootNode(Long storeId);
protected abstract NodeEntity selectStoreRootNode(StoreRef storeRef);
protected abstract Long insertStore(StoreEntity store);
protected abstract int updateStoreRoot(StoreEntity store);
protected abstract int updateStore(StoreEntity store);
protected abstract Long insertNode(NodeEntity node);
protected abstract int updateNode(NodeUpdateEntity nodeUpdate);
protected abstract int updateNodePatchAcl(NodeUpdateEntity nodeUpdate);
protected abstract void updatePrimaryChildrenSharedAclId(
Long primaryParentNodeId,
Long optionalOldSharedAlcIdInAdditionToNull,
Long newSharedAlcId);
protected abstract int deleteNodeById(Long nodeId, boolean deletedOnly);
protected abstract int deleteNodesByCommitTime(boolean deletedOnly, long maxTxnCommitTimeMs);
protected abstract NodeEntity selectNodeById(Long id, Boolean deleted);
protected abstract NodeEntity selectNodeByNodeRef(NodeRef nodeRef, Boolean deleted);
protected abstract List<NodeEntity> selectNodesByUuids(Long storeId, SortedSet<String> uuids);
protected abstract Map<Long, Map<NodePropertyKey, NodePropertyValue>> selectNodeProperties(Set<Long> nodeIds);
protected abstract List<NodeAspectsEntity> selectNodeAspects(Set<Long> nodeIds);
protected abstract Map<NodePropertyKey, NodePropertyValue> selectNodeProperties(Long nodeId);
protected abstract Map<NodePropertyKey, NodePropertyValue> selectNodeProperties(Long nodeId, Set<Long> qnameIds);
protected abstract int deleteNodeProperties(Long nodeId, Set<Long> qnameIds);
protected abstract int deleteNodeProperties(Long nodeId, List<NodePropertyKey> propKeys);
protected abstract void insertNodeProperties(Long nodeId, Map<NodePropertyKey, NodePropertyValue> persistableProps);
protected abstract Set<Long> selectNodeAspectIds(Long nodeId);
protected abstract void insertNodeAspect(Long nodeId, Long qnameId);
protected abstract int deleteNodeAspects(Long nodeId, Set<Long> qnameIds);
protected abstract void selectNodesWithAspect(Long qnameId, Long minNodeId, NodeRefQueryCallback resultsCallback);
protected abstract Long insertNodeAssoc(Long sourceNodeId, Long targetNodeId, Long assocTypeQNameId);
protected abstract int deleteNodeAssoc(Long sourceNodeId, Long targetNodeId, Long assocTypeQNameId);
protected abstract int deleteNodeAssocsToAndFrom(Long nodeId);
protected abstract int deleteNodeAssocsToAndFrom(Long nodeId, Set<Long> assocTypeQNameIds);
protected abstract List<NodeAssocEntity> selectNodeAssocsBySource(Long sourceNodeId);
protected abstract List<NodeAssocEntity> selectNodeAssocsByTarget(Long targetNodeId);
protected abstract NodeAssocEntity selectNodeAssocById(Long assocId);
protected abstract Long insertChildAssoc(ChildAssocEntity assoc);
protected abstract int deleteChildAssocById(Long assocId);
protected abstract int updateChildAssocIndex(
Long parentNodeId,
Long childNodeId,
QName assocTypeQName,
QName assocQName,
int index);
protected abstract int updateChildAssocsUniqueName(Long childNodeId, String name);
protected abstract int deleteChildAssocsToAndFrom(Long nodeId);
protected abstract ChildAssocEntity selectChildAssoc(Long assocId);
protected abstract List<NodeIdAndAclId> selectPrimaryChildAcls(Long nodeId);
protected abstract List<ChildAssocEntity> selectChildAssoc(
Long parentNodeId,
Long childNodeId,
QName assocTypeQName,
QName assocQName);
/**
* Parameters are all optional except the parent node ID and the callback
*/
protected abstract void selectChildAssocs(
Long parentNodeId,
Long childNodeId,
QName assocTypeQName,
QName assocQName,
Boolean isPrimary,
Boolean sameStore,
ChildAssocRefQueryCallback resultsCallback);
protected abstract void selectChildAssocs(
Long parentNodeId,
Set<QName> assocTypeQNames,
ChildAssocRefQueryCallback resultsCallback);
protected abstract ChildAssocEntity selectChildAssoc(
Long parentNodeId,
QName assocTypeQName,
String childName);
protected abstract void selectChildAssocs(
Long parentNodeId,
QName assocTypeQName,
Collection<String> childNames,
ChildAssocRefQueryCallback resultsCallback);
protected abstract void selectChildAssocsByPropertyValue(
Long parentNodeId,
QName propertyQName,
NodePropertyValue nodeValue,
ChildAssocRefQueryCallback resultsCallback);
protected abstract void selectChildAssocsByChildTypes(
Long parentNodeId,
Set<QName> childNodeTypeQNames,
ChildAssocRefQueryCallback resultsCallback);
protected abstract void selectChildAssocsWithoutParentAssocsOfType(
Long parentNodeId,
QName assocTypeQName,
ChildAssocRefQueryCallback resultsCallback);
/**
* Parameters are all optional except the parent node ID and the callback
*/
protected abstract void selectParentAssocs(
Long childNodeId,
QName assocTypeQName,
QName assocQName,
Boolean isPrimary,
ChildAssocRefQueryCallback resultsCallback);
protected abstract List<ChildAssocEntity> selectParentAssocs(Long childNodeId);
/**
* No DB constraint, so multiple returned
*/
protected abstract List<ChildAssocEntity> selectPrimaryParentAssocs(Long childNodeId);
protected abstract int updatePrimaryParentAssocs(
Long childNodeId,
Long parentNodeId,
QName assocTypeQName,
QName assocQName,
String childNodeName);
protected abstract Transaction selectLastTxnBeforeCommitTime(Long maxCommitTime);
protected abstract int selectTransactionCount();
protected abstract Transaction selectTxnById(Long txnId);
protected abstract List<NodeEntity> selectTxnChanges(Long txnId, Long storeId);
/**
* @param txnId the transaction ID (never <tt>null</tt>)
* @param updates <tt>TRUE</tt> to select node updates, <tt>FALSE</tt> to select
* node deletions or <tt>null</tt> to select all changes.
* @return Returns the number of nodes affected by the transaction
*/
protected abstract int selectTxnNodeChangeCount(Long txnId, Boolean updates);
protected abstract List<Transaction> selectTxns(
Long fromTimeInclusive,
Long toTimeExclusive,
Integer count,
List<Long> includeTxnIds,
List<Long> excludeTxnIds,
Long excludeServerId,
Boolean ascending);
protected abstract List<Long> selectTxnsUnused(Long minTxnId, Long maxCommitTime, Integer count);
protected abstract Long selectMinTxnCommitTime();
protected abstract Long selectMaxTxnCommitTime();
}