Commit Graph

191 Commits

Author SHA1 Message Date
Dave Ward
2c872598b7 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
Gavin Cornwell
d06e3a7b5e Merged BRANCHES/DEV/V3.4-BUG-FIX to HEAD:
23654: Fix for ALF-5359: System error after open Summary page of Regenerate Renditions Wizard
   24757: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
        24756: Fix for ALF-6269: WebForm (Edit Web Content Wizard) ERROR on Alfresco Community Edition 3.4.b and 3.4.c
   23964: Re-implemented fix for ALF-5783: Not possible to override the output path pattern anymore when a webform is edited for a specific website

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24770 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-01-11 15:08:41 +00:00
Gavin Cornwell
1b56833a18 Fixed ALF-5099: Error when trying to go back in Create Web Content Wizard (only with certain XSDs)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-12 14:18:38 +00:00
Gavin Cornwell
dc916dda18 Merged BRANCHES/DEV/V3.3-BUG-FIX to HEAD:
22910: Fixed ALF-872: TinyMCE Insert/edit Link dialog does not display properly in IE6
   22914: Merged DEV/BELARUS/HEAD-2010_04_28 to V3.3-BUG-FIX
        ALF-2315: WCM Schema: Inconsistent error if not filling in required fields
   22918: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_06_24 to V3.3-BUG-FIX
        ALF-2931: WCM Forms - min/maxLength ignored for xs:string elements
   22940: Merged DEV/BELARUS/V3.3-2010_05_26 to V3.3-BUG-FIX
        ALF-2742: Impossibility to manage site for MS Excel
   22949: (RECORD ONLY) Added "continuous-without-distribute" target

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-07 13:34:33 +00:00
Dave Ward
e0e04abccd Merged V3.3-BUG-FIX to HEAD
22215: Fix compilation error
   22240: ALF-4207: Download servlets show error page with permissions error rather than login page when non-guest user has insufficient permissions
   22241: ALF-4469: External Access Servlet should also show status 403 errors to non-guest users, as in ALF-4207
   22244: ALF-4599: CIFS access to alfresco with Kerberos authentication creates wrong users with domain suffix
      ALF-4395: recognize Kerberos machine accounts with lower case names
   22247: ALF-4397: Properly handle null values in SortableSelectItem.compareTo()
   22248: Merged DEV/TEMPORARY to V3.3-BUG-FIX
      21963: ALF-4390: ModuleManagementTool is not returning error code in case of failure
         Error code constants and appropriate System.exit(code) invokations were added.
   22260: ALF-4597: InviteContentUsersWizard was caching permissions in a non-type-specific cache
      - removed the cache - didn't allow for dynamic model updates either
   22269: Merged V3.3 to V3.3-BUG-FIX (RECORD ONLY)
      22268: Merged V3.3-BUG-FIX to V3.3
         - Merged across all differences from V3.3-BUG-FIX
   22270: Incremented revision number
   22467: Merge from V3.3 to V3.3BUG-FIX. Fix for ALF-4741.
      V3.3: 22466 Merge from V3.2 to V3.3. Fix for ALF-4741.
         V3.2: 22465 Fix for ALF-4741. Repository Web Scripts can produce a corrupted response after a transaction collision/retry.
   22667: Merged DEV/TEMPORARY to V3.3-BUG-FIX
      22665: ALF-4825: Unlocking checked out content cause both original & working copy un-usable.
         Do not include unlock in the actions list when a node has a working copy.
   22691: Add missing "logAbandoned" (= false) prop to config - follow on to r15133 (related to ALF-4020 / ETWOTWO-562)
   22710: ALF-3948 - from time to time we have exception "Failed to init dictionaryRegistry"
   22718: Merge from V3.3 to V3.3-BUG-FIX
      r 22715 Merge from V3.2 to V3.3
         r 22713 Fix for ALF-4946 Possible NullPointerException during creation of thumbnails whose names are null-valued.
   22722: Merged V3.3 to V3.3-BUG-FIX
      22271: ALF-3712: Merged HEAD to V3.3
         22249: Bin contents were not being packaged.
      22272: Merged DEV/TEMPORARY to V3.3
         22067: ALF-4479: when using webdav inline edit on webdav + MS Word 2003 +IE6, one gets: Unable to check in Content Node due to system error. Access Denied. You do not have the appropriate permissions to perform this operation.
            - Do not unlock a working copy.
      22273: Merged DEV/TEMPORARY to V3.3
         21729: ALF-3112: Property parameterTemplates not resolved correctly for SimpleTemplateActionDefinition
            The temporary fix for unconfigurable valueSeparator property.
            https://jira.springframework.org/browse/SPR-7429
      22274: Merged DEV/TEMPORARY to V3.3
         21993: ALF-4396: webdav "supportedlock" propfind request returns malformed response
            WebDAV supported lock elements were wrapped by “lockentry” elements according to the WebDAV specification.
      22276: ALF-3890: FTP Change Working Directory (CWD) command works with root-relative paths with more than one component
      22277: Merged DEV/TEMPORARY to V3.3
         22076: ALF-3579: Open the Details Page URL removes the header, navigation bar etc
            The identifiers for modify action tag and details' actions tag should be different in the details pages. For documents:
            in the filelink-details.jsp and document-details.jsp. For spaces: in the space-details.jsp and spacelink-details.jsp.
      22285: Merged HEAD to V3.3
         22284: Fix for ALF-3063 "Incorrect behaviour on filtering by tag in Repository". Labels updated to more accurately reflect behaviour.
      22299: Fix for ALF-3893: lucene.indexer.mergerTargetIndexCount is redundant
         - this property is now used to control the merging of indexes as was intended
      22309: Merged DEV/TEMPORARY to V3.3 (Approved by Roy)
         21035: ALF-2588: RM: Export and import of file plan causes disposition errors
            When content is imported from acp the actionId that points to the action NodeRef is old in the imported content and NullPointerExcepption appears.
            To avoid this we changed DispositionScheduleImpl. Now it stores the action that has different name and ID (when action is create it name equals id) in a separate map. And when getDispositionActionDefinition(String id) method is called it tries to retrieve the action from this map, if it hasn’t been found earlier.
      22325: Fix for ALF-4428: Incorrect behaviour of Consumer and Contributor permissions with Quickr
         - unit test pass
      22334: Merged HEAD to V3.3
         22331: Fixes: ALF-3558: Input and variable encoding issues in Share Calendar & API JSON data.
      22355: ALF-4489: Special Characters Create Stack Overflow Exception in the Group Admin Console for Share in Internet Explorer.
         Fixed missing encoding and also added guard code to prevent stack overflow problem in case of future error.
      22356: Fix for ALF-4384 - missing JSP page directive
      22360: Fix for ALF-4428: Incorrect behaviour of Consumer and Contributor permissions with Quickr
         - unit test pass
         - no abstain allowed
      22365: Merged DEV/TEMPORARY to V3.3
         21874: ALF-2641: WebDav Permission Issues - MAC OSX Finder
            The createExclusive field was introduced instead of m_scope. New algorithm of lockscope determination was added.
            Also ALF-4008 compliant fix provided with this.
         21812: ALF-4008: save a MS Word change over webdav after a 2-3 minutes delay causes the error 'XXX.doc is currently in use. Please try again later.'
            Modified LOCK method, it gets a scope from NodeRef property if m_scope field is not defined.
      22367: Merged DEV/TEMPORARY to V3.3
         21442: ALF-2587: WEBDAV error in Windows 7
            - variant generateLockDiscoveryXML methods were factored into a single one capable of generating a namespaced LOCK response compatible with Windows 7 when its user agent header is detected.
      22368: Merged DEV/TEMPORARY to V3.3
         20919: ALF-2834: All day events created in Outlook not appearing in Meeting Workspace
            Different date format is used by Outlook when creating all day meeting request and meeting request specifying date and time. The code was changed to handle both situations accordingly.
      22369: Merged DEV/TEMPORARY to V3.3 (With simplifications)
         21470: ALF-3796: Locale is not always set/reset on every request thread
            - A GlobalLocalizationFilter sits in front of ALL requests and sets a default fallback locale on I18NUtil
            - Moved BaseServlet.setLanguageFromRequestHeader into this filter and made sure it always falls back to a default locale
            - Subsequent filters / servlets in faces chain may override this with user preferred locale after authentication
      22370: ALF-3868: Fix for compatibility with Sun Directory Server
      22371: Merged DEV/TEMPORARY to V3.3
         21811: ALF-4067: Display Value for Action Constraint breaking a java eval in Share
            When a node doesn't have a ContentModel.PROP_TITLE property it is added to AllowableValues with PROP_NAME value.
         21795: ALF-4067: Display Value for Action Constraint breaking a java eval in Share
            The fix introduces the code which doesn't add a node to AllowableValues if it doesn't have a ContentModel.PROP_TITLE property.
      22378: ALF-3796: Fixed compilation error - BaseServlet.setLanguageFromRequestHeader replaced by global filter
      22380: ALF-3761: War bundles + extension samples now include alfresco-global.properties in correct position in hierarchy
      22386: ALF-3887: Two versions of geronimo-activation are shipped
         - Removed the older version
      22402: WCM - add more debug logging only
      22405: Change notification handler not enabled by the server configuration bean. ALF-4715.
      22407: Merged DEV/TEMPORARY to V3.3
         22231: ALF-4096: Share point module is causing file descriptor leaks.
            The following changes were added to VtiIfHeaderAction and GetDocumentMethod: 
            - code that copies data between streams was replaced by org.apache.commons.io.IOUtils.copy()
            - correct stream closing was added for all cases including exceptions while copying
      22411: Merged DEV/TEMPORARY to V3.3
         21864: ALF-4371: Error occurs if user try to find event from meeting place
            Replaced incorrect NamespaceService.CONTENT_MODEL_PREFIX with NamespaceService.CONTENT_MODEL_1_0_URI in QName creation.
      22412: Merged DEV/TEMPORARY to V3.3
         22018: ALF-4403: Search on users in JSF client and SHARE do not specify "cm:person" type clause in the query leading to incorrect results in user searching.
            People searches in Alfresco and share are restricted by “cm:person” type. 
         21988: ALF-4403: Search on users in JSF client and SHARE do not specify "cm:person" type clause in the query leading to incorrect results in user searching.
            People searches in Alfresco and share are restricted by “cm:person” type. 
      22418: ALF-4578: Avoid ConcurrentModificationException in AVMDeploymentTarget
      22420: Fixed ALF-958: Target associations aren't copied
         - Added CopyBehaviourCallback. getAssociationCopyAction
         - Default behaviour:
           - Remove existing associations of same type when copying OVER an existing node (e.g. check-in)
           - Copy the association using a new target if the target is copied in the same call
           - Copy the association to the original target if the target is not copied in the same call
         - Abstract behaviour (for those that have implemented a CopyBehaviourCallback):
           - Remove existing associations of same type when copying OVER an existing node (e.g. check-in)
           - Only copy the association to a new target if the original target is copied 
      22421: ALF-4641: Strip ticket parameter on login page redirect to avoid endless redirect loop
      22422: Merged DEV/TEMPORARY to V3.3
         21201: ALF-1804: Passthru server check gets confused when a server goes offline
      22423: Merged DEV/TEMPORARY to V3.3
         21891: ALF-3356: Error changing own user role from coordinator to consumer
            When a user changes the Roles, all Permissions are immediately deleted and new selected permissions are created. If all permissions are deleted then the user doesn't have access for permissions creation.
            If the user currently has permission change permission the currently set of permissions is cleared and new permissions are added from a System User authority.
      22424: Merged DEV/TEMPORARY to V3.3
         21182: ALF-1786: Remote Opensearch request mimetype missing
            SearchProxy was changed to provide original User-Agent header. HTTPProxy was extended to set request headers. New overridable method setRequestHeaders was added to provide ability of setting headers.
      22425: Merged DEV/TEMPORARY to V3.3
         22165: ALF-197: When returning to the first step of Advanced Workflow creation from second or third steps it's always Adhoc Task chosen there
            The selectedWorkflow variable was reseting every time on "Choose Workflow" step
      22426:Merged DEV/TEMPORARY to V3.3
         21323: ALF-687: Error when invoking webservices via SSL repository location url.
            Add a new overload of ContentUtils.putContent() method with the isSSL argument at the end. 
            If this parameter value is true then SSLSocket is used and Socket otherwise. 
      22428: ALF-3490: Unfriendly error messages from WebDAV when content doesn't exist
         - Generalized ALF-4207 solution so that the error page instead displays a status 404 message
      22429: Merged DEV/TEMPORARY to V3.3
         21325: ALF-3502: Logging in FacesHelper.getManagedBean on failure to create bean
            Detailed logging of the EvaluationException for ValueBinding was added.
      22430: Merged DEV/TEMPORARY to V3.3
         20974: ALF-2695: mimetypes-extension-context.xml.sample does not use the correct classes
            Changed the type of the bean id="mimetypeConfigService" from “"org.alfresco.config.xml.XMLConfigService” to  “org.springframework.extensions.config.xml.XMLConfigService”
            Renamed mimetypes-extension-context.xml.sample file  to file  mimetypes-extension.xml.sample.  The file mimetypes-extension-context.xml.sample was interpreted like spring context file. It wasn’t correct.
      22431: Merged DEV/TEMPORARY to V3.3
         21099: ALF-3046: UI - Import feature not available to contributor user
            The fix also covers related bug ALF-2802.
            Permission ‘Write’ was replaced by ‘CreateChildren’ for import action because contributor has ‘AddChildren’ (not ‘Write’) permission.
      22432: Merged DEV/TEMPORARY to V3.3
         20973: ALF-3244: alfresco-sample-website.war does not deploy to bundled Tomcat
            The cause of the corrupted alfresco-sample-website.war deployment is the usage of the SSIFilter in the application.
            Only Contexts which are marked as privileged may use SSI features. For this reason, the context has been marked as privileged in META-INF/context.xml
      22433: Merged DEV/TEMPORARY to V3.3
         21190: ALF-3751: Unintentional copy/remove of 'Web Forms' space removes form associations in Web Projects
            Parent validation before deleting was added. Now deleted web form is removed from Web Project only if this form is located in original Web Form folder.
      22434: Merged DEV/TEMPORARY to V3.3
         21490: ALF-4099: Customer concern about String comparison operators == vs equals
            Comparison operator was replaced by equals/EqualsHelper.nullSafeEquals in the ContentFilterLanguagesMap DocumentNavigator UIAjaxTagPicker Presence classes. 
            DocumentNavigator.getAttributeName() method was changed because the previous method's logic always returned escapedLocalName in any case.
      22436: Merged DEV/TEMPORARY to V3.3
         22063: ALF-4494 : Share show error if versionable document has no version history.
            1. evaluator.lib.js was modified to prevent NPE if no version history exists for document.
            2. Result was manually tested.
      22437: ALF-2796: java.naming.referral is set to "follow" in the LDAP contexts to avoid PartialResultExceptions on LDAP sync
      22466: Merge from V3.2 to V3.3. Fix for ALF-4741.
         V3.2: 22465 Fix for ALF-4741. Repository Web Scripts can produce a corrupted response after a transaction collision/retry.
      22469: Fix for CIFS long directory path results in duplicate folder displays. ALF-3938.
         Removed (hopefully) last of the hardcoded buffer length limits.
      22472: Fixed ALF-4670: XAM retainUntil value does not propagate down the space hierarchy
      22473: Fixed ALF-4656: Deleted Content Backup should ignore unrecognised URLs
         - Also fixes ALF-4657: Content stored on XAM is not cleaned up correctly
         - Errors in the listeners are logged only
         - ContentStoreCleanerListener checks and warns if the URL is unsupported
      22474: Fix to web.xml to correctly validate and therefore deploy on JBoss5.1.0
      22485: Fix for NFS losing contents during edit or copy. ALF-4737.
      22492: ALF-4652 XAM bug fixes and improvements: Respect 0 'retentionPeriodDays'
      22501: Fixed ALF-4763 XAM-enabled nodes must not go to the archive://SpacesStore
      22504: Fix for MS Word mimetype is changed when editing via CIFS. ALF-3772.
      22520: ALF-4768: WCM (w/ virt svr) - submit  (no need to virtualize direct submit workflows)
      22526: Externalised setting of BINARIES, plus added bin with jars and dlls
      22561: ALF-4792: WCM virt svr - add experimental option for lazy deployment (defer startup of dependent webapps until accessed)
      22611: Fixed ALF-1893: Windows 7 SSP Read-only.
         Note: Relies on the patched Excel and PowerPoint mimetypes, but also falls back to file exension.
      22612: Merged HEAD to BRANCHES/V3.3:
         22609: Resolve ALF4822, ALF4818
      22628: ALF-3239: Added encoding elements to mysql db url
      22656: Fix for Solaris/Gedit problem, keep a mapping for the original file handle to the new path after a rename. ALF-4843.
      22673: ALF-4845: Person and Group member deletion performance fix
         - Don't batch load all a group's members when trying to delete one of them!
         - Can result in infeasibly large hibernate sessions when trying to delete a person / LDAP sync in a repository with very large groups
         - Switched off batch loading in NodeService.removeChild()
         - Avoided unnecessary use of removeAuthority in PersonService.deletePerson()
      22674: Merged DEV/TEMPORARY to V3.3
         22653: ALF-661: There is no way to determine the protocol, hostname and port from a javascript kicked off by JBPM
            These variables are now available for use in workflow and action javascript and they are wired to the corresponding parameters that already exist in the sysAdmin subsystem.
               urls.alfresco.protocol
               urls.alfresco.host
               urls.alfresco.port
               urls.alfresco.context
               urls.share.protocol
               urls.share.host
               urls.share.port
               urls.share.context
            See bug for example usage
      22676: Merged HEAD to V3.3:
         20306: Google Doc integration fixes:
          - Fixed up inconsistancies in powerpoint and excel mimetypes set throughout the code
          - Unit tests failures for excel sheets fixed
          - Able to now create and checkout docs, sheets and presentations successfullly
          - Docs, sheets and presentations downloadable and viewable
          - Fixed ALF-2700
         (See ALF-4827)
      22715: Merge from V3.2 to V3.3.
         r. 22713. Fix for ALF-4946 Possible NullPointerException during creation of thumbnails whose names are null-valued.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-27 12:47:35 +00:00
Gavin Cornwell
67a9bf6d4a Merged BRANCHES/DEV/BELARUS/HEAD_2010_09_21 to HEAD:
22696: Restores original fixes for ETHREEOH-3850, ETHREEOH-3834 that got lost during various merges back to HEAD, fixes ALF-4675 and ALF-3043

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22703 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-27 07:02:17 +00:00
Jan Vonka
e0b0e5d97e ALF-4291: PostgreSQL - AVM index/search (wip)
- split concurrency test(s) into separate file and added to AVMTestSuite
- added missing close(s) for calls to AVM createFile

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22307 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-07 16:04:45 +00:00
Dave Ward
53fc77ff7f Merged V3.3-BUG-FIX to HEAD
20954: Calendar Dashlet updates. Fixes: ALF-2907 (meeting workspace issue)
   20968: Minor VersionableAspect fix to onDeleteNode policy firing (follow-on for r19507)
   20981: Removed Install Jammer installers from V3.3.3
   20982: AVMTestSuite - run PurgeTestP after AVMServiceTest (investigating ALF-3611)
   20997: Fix for ALF-2605 - updated share-config-custom.xml.sample and removed obsolete extension files
   21030: Pulled XAMConnector AMP into main 3.3SP3 codeline.  Apart from build changes (incl. EOL), there are no repo changes.
   21032: StoreSelector passes through NodeContentContext allowing stores access to node information
   21036: Fix ALF-245: Can't delete space that contains "translation without content"
      - Delete triggers 'unmakeTranslation'
      - Empty translations are marked with sys:temporary before being deleted
   21051: More on fix ALF-245.  Reduced complexity by not deleting empty translations twice
   21064: Merged V3.3 to V3.3-BUG_FIX
      20898: Merged HEAD to V3.3
         20724: AVMTestSuite - temporarily comment out PurgeTestP
            - TODO: investigate intermittent test failure
      20903: Incremented version revision
      20921: AVM - fix purge store so that vr nodes are actually orphaned (ALF-3627)
      20952: Fix for ALF-3704: Module conflict - Alfresco web client config property page missing metadata. 
         This is application of a fix made to the config service in a hotfix. The change provides a deterministic load order for config files loaded via the ConfigBootstrap spring bean. More importantly it means that config files loaded by modules on different machines in a cluster load in the same order.

         The forms client and AWE config files have been updated to take advantage of the new loading order.
      21061: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY)
         20890: ALF-3687: Apply LUCENE-1383 patch to Lucene 2.1.0 to reduce memory leaks from ThreadLocals
         20891: ALF-3687: Build classpath fix
         20892: Incremented version label
      21062: Merged PATCHES/V3.2.1 to V3.3
         20897: (RECORD ONLY) Incremented version label
         20901: (RECORD ONLY) ALF-3740: Merged V3.3 to PATCHES/V3.2.1
            20524: VersionMigrator - option to run as scheduled job (ALF-1000)
         20904: (RECORD ONLY) ALF-3732: Merged PATCHES/V3.2.r to PATCHES/V3.2.1
            19803: ALF-558: File servers (CIFS / FTP / NFS) can now handle concurrent write operations on Alfresco repository
               - ContentDiskDriver / AVMDiskDriver now use retrying transactions for write operations
               - Disable EagerContentStoreCleaner on ContentDiskDriver / AVMDiskDriver closeFile() operations so that they may be retried after rollback (Sony zero byte problem)
               - Allow manual association of AVM ContentData with nodes so that closeFile() may be retried
               - Propagation of new argument through AVM interfaces
         20905: (RECORD ONLY) ALF-3732: Rolled back the now unnecessary reference()/dereference() stuff from ALF-558
         20906: (RECORD ONLY) ALF-3732: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.2.1
            20623: Fix for ALF-3188 : Access Denied when updating doc via CIFS
         20907: (RECORD ONLY) ALF-3732: Merged V3.3 to PATCHES/V3.2.1
            20173: Propagate IOExceptions from retryable write transactions in AlfrescoDiskDriver
         20950: ALF-3779: Upgrades on large repositories from v2.1 and v2.2 were failing on MySQL due to "The total number of locks exceeds the lock table size" errors
            - Solution was to add support for new --BEGIN TXN and --END TXN comments and execute LOCK TABLES statements in the same transaction as large INSERT - SELECT statements.
         20990: ALF-3789: Concurrency issues with InMemoryTicketComponentImpl
            - Previous ETHREEOH-1842 method of caching web session 'ref counts' against tickets could cause tickets to unpredictably fall out of the transactional cache
            - Rolled back original ETHREEOH-1842 fix. Would be too much overhead to keep these ref counts consistent across a cluster.
            - Instead, avoid invalidating tickets on web session timeout and only do it on explicit log out.
            - Now tickets maintained in non-transactional shared cache so they can't drop out unpredictably
            - Logic for ticket inactivity timeout caching improved so that it should work across a cluster
         20991: (RECORD ONLY) Incremented version label
         20993: ALF-3789: Fixed Spring configuration backward compatibily issue with previous fix
            - Ticket cache bean name restored to ticketsCache. This is actually now a non-transactional cache.
            - Also externalized parameters so that they can now be controlled by alfresco-global.properties without any bean overrides
               authentication.ticket.ticketsExpire=false
               authentication.ticket.expiryMode=AFTER_FIXED_TIME
               authentication.ticket.validDuration=PT1H
         20994: Eclipse classpath fixes for unit testing after ant build
         21057: ALF-3592: PassthruCifsAuthenticator now auto-creates / imports users who do not already exist in Alfresco
            - At least one of the following properties must be true for this to happen
               synchronization.autoCreatePeopleOnLogin
               synchronization.syncWhenMissingPeopleLogIn
            - Also improved debug logging of unknown passthru domains
      21063: Merged PATCHES/V3.2.r to V3.3
         21037: ALF-3793: Final attempt at realigning saved XForm data with a modified Schema
            - removeRemovedNodes / insertUpdatedNodes / insertPrototypeNodes replaced by a one stop recursive process that builds a new instance tree from scratch
            - Nodes copied over in correct order
            - Missing nodes added in and extra nodes discarded
            - Prototype nodes appended at appropriate points
         21038: (RECORD ONLY) Incremented version label


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21065 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-07-11 14:22:26 +00:00
Dave Ward
335f9a97ff Merged DEV/V3.3-BUG-FIX to HEAD
20884: Merged V3.3 to V3.3-BUG-FIX
      20883: ALF-3604: Fix PersonTest
      20881: Merged PATCHES/V3.2.r to V3.3
         20880: ALF-3264: Fix up handling of default namespace. Workaround to JXPATH-61
      20878: Merged V2.2 to V3.3
         20474: Fix for ALF-1362 - encode group identifiers when used inside embedded param tags
         20621: Fix for reopened ALF-1362 - UnknownAuthorityException when viewing/editing/deleting a user group with html entities in it's name
      20874: Merged HEAD to V3.3
         20873: ALF-3604: Correct case-sensitivity issues in LDAP sync
            - User names are now brought in line with the case of the LDAP directory during sync (in case the UID attribute is case sensitive)
            - User names are now compared according to Alfresco's case sensitivity setting
            - Group name comparisions are still case sensitive
            - Added unit test to ensure correct behaviour
      20868: Merged PATCHES/V3.2.r to V3.3
         20832: ALF-3264: XForms 'schema evolution': Remove nodes from XForms instance document with XPaths that don't occur in prototype document
      20867: Merged PATCHES/V3.2.r to V3.3 (RECORD ONLY)
         20833: Incremented version label
         20688: Incremented version label
         20687: Merged V3.3 to PATCHES/V3.2.r
            20398: Fixed ALF-2890: Upgrade removes content if transaction retries are triggered
               - Setting ContentData that was derived outside of the current transaction opened up a window
                 for the post-rollback code to delete the underlying binary. The binaries are only registered
                 for writers fetched via the ContentService now; the low-level DAO no longer does management
                 because it can't assume that a new content URL indicates a new underlying binary.
               - The contentUrlConverter was creating new URLs and thus the low-level DAO cleaned up
                 live content when retrying collisions took place. The cleanup is no longer on the stack
                 for the patch.
               - Removes the ALF-558 changes around ContentData.reference()
            20590: Fixed ALF-3189: Oracle/DB2/SQLServer/PostgreSQL are missing indexes to support many FK constraints
               - Reverses rev 17421
               - Added patchy bits to post-create script and declared patch
               - Patch only applies to *new* installations from 3.2.0 onwards (schema 3007 to 3400)
         20686: ALF-3259: Merged HEAD to PATCHES/V3.2.r
            19784: Fix for CIFS/CheckInOut.exe save of working copy breaks lock on original file. ALF-2028.
      20866: Merged PATCHES/V3.2.1 to V3.3 (RECORD ONLY)
         20840: Incremented version label
         20839: ALF-3691: Merged V3.3-BUG-FIX to PATCHES/V3.2.1
            20307: VersionStore - minor fixes if running deprecated V1 
               - warn in startup log
               - do not execute migration cleanup
            20367: ALF-2829: Avoid reading entire result set into memory in FixNameCrcValuesPatch
            20368: Work-around for ALF-2366: patch.updateDmPermissions takes too long to complete
               - this patch may now be deferred until 3.4 using the sample context (DM will use old permissions and AVM new as it did in 2.2.x)
               - this is only supported upgrading direct to 3.2.1.x
            20370: Version Migrator (ALF-1000) - use common batch processor to enable multiple workers
            20373: Version Migrator (ALF-1000) - resolve runtime conflict (w/ r20334)
            20387: Version Migrator (ALF-1000) - approx x3 boost (policies ignore version2 store)
            20431: Version Migrator (ALF-1000) - migrate 1st batch independently
         20738:ALF-3617: Merged V3.3-BUG-FIX to PATCHES/V3.2.1
            20438: ALF-479: Merged DEV/BELARUS/V3.2-2010_01_11 to DEV/V3.3-BUG-FIX
               18448: ETHREEOH-4044: External Authentication Subsystem does not perform user mapping for WebDAV requests
                  The changes listed in the bug comments have been made (and corrected).
         20728: Incremented version label
         20727: ALF-3617: Merged HEAD to PATCHES/V3.2.1
            20616: ALF-2265: Share 'Uber Filter' part 2
               - WebScriptNTLMAuthenticationFilter detached from its superclass and renamed to WebScriptSSOAuthenticationFilter
               - Now the filter simply chains to the downstream authentication filter rather than call its superclass
               - This means the same filter can be used for Kerberos-protected webscripts as well as NTLM
               - Wired globalAuthenticationFilter behind webscriptAuthenticationFilter in the filter chain in web.xml
               - Configured webscriptAuthenticationFilter for Kerberos subsystem
         20612: Incremented version label
         20610: Merged V3.3 to PATCHES/V3.2.1
            20590: Fixed ALF-3189: Oracle/DB2/SQLServer/PostgreSQL are missing indexes to support many FK constraints
              - Reverses rev 17421
              - Added patchy bits to post-create script and declared patch
              - Patch only applies to *new* installations from 3.2.0 onwards (schema 3007 to 3501)
         20403: Merged V3.3 to PATCHES/V3.2.1
            20398: Fixed ALF-2890: Upgrade removes content if transaction retries are triggered
               - Setting ContentData that was derived outside of the current transaction opened up a window for the post-rollback code to delete the underlying binary. The binaries are only registered for writers fetched via the ContentService now; the low-level DAO no longer does management because it can't assume that a new content URL indicates a new underlying binary.
               - The contentUrlConverter was creating new URLs and thus the low-level DAO cleaned up live content when retrying collisions took place. The cleanup is no longer on the stack for the patch.
               - Removes the ALF-558 changes around ContentData.reference()
         20391: Incremented version label
         20390: ALF-2966: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.2.1
            20388: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
               20372: ALF-897: It is impossible to create content when default value selected in ContentHeadlineBackground field for intranet_rssi_landing_template web-form (also fixes ALF-2798 & ALF-791)
         20371: ALF-2861: Merged V3.2 to PATCHES/V3.2.1
            20028: Reverted (and fixed line endings) of log4j.properties
            20027: Merged BRANCHES/V3.1 to BRANCHES/V3.2:
               19983: Changes for ALF-2545: Cannot upgrade from 2.1.2a (b 209) to the 3.1.2 (.a3 458) on Oracle
               20008: ALF-2351: Oracle upgrade scripts need enhancements from 2.2SP7
         20362: ALF-2883: Merged HEAD to V3.2.1
            19750: Fix for ALF-2310: alfresco-mmt-3.3dev.jar shows NoClassDefFoundError: org/safehaus/uuid/UUIDGenerator
         20359: Merged PATCHES/V3.2.0 to PATCHES/V3.2.1
            20349: Merged V3.3 to PATCHES/V3.2.0
               20346: ALF-2839: Node pre-loading generates needless resultset rows
                  - Added missing Criteria.list() call
            20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows
               - Split Criteria query to retrieve properties and aspects separately
            20272: Backports to help fix ALF-2839: Node pre-loading generates needless resultset rows
               Merged BRANCHES/V3.2 to PATCHES/V3.2.0:
                  18490: Added cache for alf_content_data
               Merged BRANCHES/DEV/V3.3-BUG-FIX to PATCHES/V3.2.0:
                  20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
            20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows
         20358: Increment version label
         20343: Incremented version label
         20342: Merged V3.3 to PATCHES/V3.2.1
            20322: Fixed ALF-1998: contentStoreCleanerJob leads to foreign key exception
               - Possible concurrent modification of alf_content_url.orphan_time led to false orphan detection
               - Fixed queries to check for dereferencing AND use the indexed orphan_time column
               - More robust use of EagerContentStoreCleaner: On eager cleanup, ensure that URLs are deleted
               - Added optimistic lock checks on updates and deletes of alf_content_url
      20864: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY)
         20750: Merged V3.3 to PATCHES/V3.2.0
            20590: Fixed ALF-3189: Oracle/DB2/SQLServer/PostgreSQL are missing indexes to support many FK constraints
               - Reverses rev 17421
               - Added patchy bits to post-create script and declared patch
               - Patch only applies to *new* installations from 3.2.0 onwards (schema 3007 to 3400)
         20748: Incremented version label
         20745: ALF-3639: Merged V3.2 to PATCHES/V3.2.0
            18363: WCM clustering - ETHREEOH-3962 (duplicate root node entry)
      20863: Merged PATCHES/V3.1.2 to V3.3
         20830: ALF-934: Another go at making External Access Servlet reset JSF view state for the document it is requesting
         20701: ALF-3203: Guarantee a deterministic initialization sequence for WebClientConfigBootstrap (PARTIAL - Needs Surf fix)
      20861: Merged PATCHES/V3.2.1 to V3.3 (RECORD ONLY)
         20831: Incremented version label
         20702: Incremented version label
         20681: ALF-3109: Merged V3.2 to PATCHES/V3.1.2
            16933: Fix ETHREEOH-1788 - Bootstrap fails due to disabled-avm-indexing-context.xml
         20680: ALF-3109: Merged V3.2 to PATCHES/V3.1.2
            16714: WCM/AVM fixes
               - ETHREEOH-2697 - file system likely to get full with avm lucene directories for unindexed WCM store
               - ETHREEOH-1847 - re-starting cluster node may show non-staging WCM store indexes out-of-date (although not indexed)
         20611: Incremented version label
         20538: ALF-3117: Merged HEAD to PATCHES/V3.1.2
            17099: Build Fix for failing permission test (missing flush in DAO)
         20535: ALF-3141: Merged V3.2 to PATCHES/V3.1.2
            17441: Build fix: Fix AVM permission inheritance to match DM and fix common permission dao component
         20534: Incremented version label
         20533: ALF-3117: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.1.2
            20368: Work-around for ALF-2366: patch.updateDmPermissions takes too long to complete
               - this patch may now be deferred until 3.4 using the sample context (DM will use old permissions and AVM new as it did in 2.2.x)
               - this is only supported upgrading direct to 3.3.1
         20532: ALF-3117: Merged V3.2 to PATCHES/V3.1.2
            17076: Improvements for ETHREEOH-2153: patch.updateDmPermissions takes too long to complete
         20531: ALF-3141: Merged V3.2 to PATCHES/V3.1.2
            17419: Fix for ETHREEOH-3296: Enterprise 3.X / Permissions Error When Cut & Paste on Sub-Folder
         20516: Incremented version label
         20515: ALF-3109: Merged V3.2 to PATCHES/V3.1.2
            18363: WCM clustering - ETHREEOH-3962 (duplicate root node entry)
      20860: Merged V3.1 to V3.3
         19424: Fix bug in permission evaluation time reporting
      20859: Merged V3.1 to V3.3 (RECORD ONLY)
         20599: Incremented version label
         20596: ALF-3184: Merged V3.3-BUGFIX to V3.1A
            20307: VersionStore - minor fixes if running deprecated V1 
               - warn in startup log
               - do not execute migration cleanup
            20370: Version Migrator (ALF-1000) - use common batch processor to enable multiple workers
            20373: Version Migrator (ALF-1000) - resolve runtime conflict (w/ r20334)
            20387: Version Migrator (ALF-1000) - approx x3 boost (policies ignore version2 store)
            20431: Version Migrator (ALF-1000) - migrate 1st batch independently
         20591: ALF-3184: Merged V3.2 to V3.1A (partial)
            19507: ALF-955: deletion of dynamic custom model
               - ignore policies/behaviours for node archive store (reviewed w/ DH)
            19553: Follow-on to r19507 (ALF-955) - fix testAutoRemovalOfVersionHistory
         20577: ALF-3184: Ported BatchProcessor to V3.1A in preparation for VersionMigrator port
         19426: Fix for eclipse build path: Part 2
         19425: Fix for eclipse build path
         19305: Merged V3.2 to V3.1 ('cause you never know!)
            19304: Removed static (singleton) usage of CacheFactory
         18996: MOB-388: Fixed copying of properties
         18919: CopyServiceChildAssocsFix on 3.1
         18566: Removed svn:mergeinfo
         18428: Backport of r14260:  fixed code typo which cased a ClassCastException with multiple pooled actors.
         18424: Updated version label to 3.1.2.1
         17861: Merge 2.2 to 3.1:
            17803: Re-use open files for the same session/process id so that writes on each file handle go to the same file. ETWOTWO-1250. (Record-only)
         17843: Re-use open files for the same session/process id so that writes on each file handle go to the same file. Port of ETWOTWO-1250.
         17842: Missing file from previous checkin.
         17839: Rewrite the rename file logic to handle MS Office file rename patterns. ETHREEOH-1951.
         17359: Fix for CIFS/Kerberos/SPNEGO logon problem with Win2008/Win7 client. ETHREEOH-3225.
         17193: ETHREEOH-3112: Issue for adding / deleting non-English files
            Appropriate encoding for non English symbols was added.
            Ported from V3.2.
         17181: Fixed typo on --record-only
         17130: Fix for cannot delete file via CIFS that has a thumbnail associated with it. ETHREEOH-3143 and ETHREEOH-3115.
      20858: Merged V2.2 to V3.3
         18568: (RECORD ONLY) Fix for CIFS SendTo->Compressed Folder 'not enough space' error. ETWOTWO-596.
         Ported latest v3 repo filesystem rename logic to v2, should fix a few other issues too.
         17803: (RECORD ONLY) Re-use open files for the same session/process id so that writes on each file handle go to the same file. ETWOTWO-1250.
      20857: Merged V2.2 to V3.3
         20504: Merged DEV/BELARUS/V2.2-2010_02_03 to V2.2 
            19346: ALF-1358: Deleting space with "execute a script" rule fails
               - The invocation of the RuleServiceImpl.getRule() was added on the ruleNodeRef to get updated associations of the last one. (???)
         20476: Fix for ALF-1863: Advanced Search does not work with custom type of type d:int with a constraint of type LIST
         20475: Merged DEV/TEMPORARY to V2.2
            20375: ALF-1830: Manage Task UI for Pooled Tasks: don't show Reject/Accept if user hasn't taken ownership 
         20472: (RECORD ONLY) ALF-1841: Merged DEV/BELARUS/V2.2-2009_12_01 to V2.2 (with corrections)
            17865: ETWOTWO-935: Regression: readOnly settings do not work in 2.2 causing bootstrap to fail
               The check on current mode is read only was added into AbstractLuceneIndexerAndSearcherFactory and  AlfrescoJobExecutorThread classes. 
         20068: Merged BRANCHES/DEV/BELARUS/V2.2-2010_02_03 to BRANCHES/V2.2:
            19326: ALF-1932: ALF-1358 Deleting space with "execute a script" rule fails: Unit Test move to RuleServiceImplTest.
         19670: Fix for ALF-1788: Renamed Category not usable in Query
            - renaming a category in the admin console now also renames the association and changes the PATH by which the category is known.
         19093: Fix ALF-1791
            - added unit test
         19055: Fix compile error introduced during pervious merge
         19048: Merge DEV/BELARUS/V2.2-2010_02_03 to V2.2
            19014 : ALF-883: Rule is not triggered for a item which is restored from the bin
         19045: Merge DEV/V2.1SP7 to V2.2
            12225 : ETWOONE-74 (Authentication tickets expire after set time, but would be more useful to have them expire after an inactivity timeout.)
         18958: Merged BELARUS/V2.2-2010_02_03 18850 Fixed ALF-1358: Deleting space with "execute a script" rule fails
            - Merged the fix only.  The unit test belongs to the RuleService.
         18918: (RECORD ONLY) Fixed backward compatibility of CopyServiceChildAssocsFix module
         18759: (RECORD ONLY) Merged DEV/BELARUS/V2.2-2010_02_03 to V2.2
            18553: ResultSet closing was added to methods
            This was fixed separately in V3.2; port forward selectively
         18561: (RECORD ONLY) Merged DEV to V2.2
            18552: Fix ETWOTWO-1389: Issues with ACL upgrade script for Oracle
             (DH: Removed commented-out SQL statements)
         16304: (RECORD ONLY) ETWOONE-335: Parallel Review does not store Priority and Due Date set at task creation
            1. Appropriate changes have been made in parallelreview_group_processdefinition.xml and parallelreview_processdefinition.xml files.
            2. Redeploy flag is kept with false value by default in the workflow-context.xml.sample file.
            3. A sorting of the list of workflow definitions by name has been already applied in all branches according to ETWOTWO-302 issue fix.
      20855: Fix for ALF-3690. Unable to FTP files into Share site documentLibrary folder.
         This fix corrects what it essentially a typo. The dictionaryService was injected twice into the CreateNodeRuleTrigger bean, rather than the dictionaryService and the ruleService.
      20853: Merged V2.2 to V3.3 (RECORD ONLY)
         20459: Build fix - don't try to delete the guest user in PersonTest
         20411: Merged BRANCHES/V3.1 to BRANCHES/V2.2: (for ALF-2628)
            14863: (RECORD ONLY) Fixed ETHREEOH-2223: Oracle version-specific schema update failure in upgrading from 2.1A build to 
         20383: Merged V3.2 to V2.2 (Fixes duplicate ALF-1359)
            16731: ETHREEOH-2411: Error message appears when trying to create advanced workflow with long description
         19303: Updated version to 2.2.7
         17811: Updated version to 2.2.6
         17433: Merged V3.1 to V2.2
            15894: Fix ETHREEOH-2416 and ALFCOM-3300: Duplicate name exceptions not being trapped correctly
               Fixes ETWOTWO-1261 
         15869: Port of desktop action client side EXE fixes from v3.x. ETWOTWO-1374.
      20849: (RECORD ONLY) Merged V3.3-BUG-FIX to V3.3
         20847: Fixes Recent Documents and My Tasks localisation issues: ALF-2021 & adds an FTL friendly medium length date format property
   20828: Missed svn:mergeinfo


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20885 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-07-01 08:25:06 +00:00
Derek Hulley
5f9d3cb6b1 Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-5 to HEAD:
20678: DAO5 branch: Preparation for merge back to HEAD
   20689: Merged DAO4 to DAO5
        - Removed all 'dbscripts/create/3.x/SomeDialect' and replaced with 'dbscripts/create/SomeDialect'
          DB create scripts are taken from latest DAO4
        - TODO: FixAuthoritiesCrcValuesPatch needs query implementation in PatchDAO
        Merged DAO3 to DAO4
           - Reapplied fixes for ALF-713 (race condition on Usages)
           19350: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-2 to BRANCHES/DEV/V3.3-DAO-REFACTOR-3:
               18939: SAIL-4 :2nd stage branch for DAO refactor off HEAD rev 18898
               18948: Merged V3.3-DAO-REFACTOR to V3.3-DAO-REFACTOR-2
                    18202: Dev branch for DAO refactor
                    18252: SAIL-233: QName.hbm.xml
                    18295: Added missing CREATE TABLE statements for QName-related code
                    18324: SAIL-234: Node.hbm.xml: Node aspects initial integration
                    18355: Added 'setValue' method to manually update the cached value
                    18356: MV property stressing lowered to speed test up
                    18357: SAIL-234: Node.hbm.xml
                    18376: Pulled all Alfresco-related create SQL into script
                    18389: SAIL-234: Permissions DAO refactor - initial checkpoint
                    18390: Formatting only (line-endings)
                    18400: SAIL-234: Node.hbm.xml
                    18418: SAIL-234: Node.hbm.xml: 'alf_node_assoc' CRUD
                    18429: SAIL-234: Node.hbm.xml: Cleaned out all Hibernate references to NodeAssocImpl
                    18457: SAIL-234: Permissions DAO refactor
               18959: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
                    18479: SAIL-234: Node.hbm.xml - fix updateNode (missing id when saving oldDummyNode)
                    18482: SAIL-235: remove Permissions.hbm.xml
                    18517: SAIL-235: Permissions DAO refactor
                    18523: SAIL-234: Node.hbm.xml
                    18524: SAIL-235: Permissions DAO refactor
               18960: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
                    18533: Flipped back to Windows line endings
                    18535: Formatting-only (eol)
                    18540: Formatting-only (eol)
                    18541: SAIL-235: Permissions DAO refactor
                    18543: SAIL-234: Node.hbm.xml: Start alf_store changes
                    18567: SAIL-235: Permissions DAO refactor
                    18596: SAIL-305:  Alfresco DDL - formatted/rationalized and added missing indexes & fk constraints
                    18603: SAIL-311: Minor cleanup for schema upgrade scripts (V3.3)
                    18604: SAIL-311: Remove empty dirs
                    18619: SAIL-274: Locale.hbm.xml
                    18621: Added method to create default ACL
                    18622: SAIL-234: Node.hbm.xml: Store, Transaction, Server and some node
                    18624: Formatting only (eol)
                    18631: SAIL-235: Permissions DAO refactor
                    18633: SAIL-235: Permissions DAO refactor - do not expose CRUD for AceContext (or AuthorityAlias) since currently unused
                    18639: getLocale(Locale) should return null if it doesn't exist
                    18640: SAIL-234 NodeDAO: More replacement of node queries and updates
                    18648: SAIL-310: Create SQL script for core repo tables (All DB ports)
                    18651: SAIL-234 NodeDAO: Moves across stores handle presence of target deleted nodes
               18961: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
                    18658: SAIL-274 Locale DAO: Missing getValueKey() method
                    18662: SAIL-235: Permissions DAO refactor - further cleanup (of DbAccessControlList usage, including copyACLs)
                    18664: DB scripts porting for PostgreSQL finished.
                    18668: SAIL-234 Node DAO: Note in case Transaction Change ID is dropped from indexes
                    18669: SAIL-234 Node DAO: deleteNode and archive (store move) fixes
                    18672: DB scripts porting for Oracle finished. 
                    18675: SAIL-235: Permissions DAO refactor 
                    18677: DB scripts porting for DB2 finished.
               18964: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
                    18687: Execute a callback with retries
                    18688: SAIL-234 Node DAO: Child association creation
                    18690: SAIL-234 Node DAO: Comment out raw creation of stores as it breaks subsequent bootstrap checks
                    18691: SAIL-234 Node DAO: More replacement of alf_child_assoc handling
                    18713: Commented about needing a more efficient removeChildAssociation method
                    18714: SAIL-234 Node DAO: Replaced queries on alf_child_assoc
                    18715: SAIL-234 Node DAO: More alf_child_assoc query replacement
                    18727: SAIL-234 Node DAO: alf_child_assoc queries complete
                    18737: SAIL-234 Node DAO: Tweaks to newNode and implemented prependPaths
                    18741: SAIL-234 and SAIL-334: Moved UsageDelta Hibernate code and queries over to UsageDeltaDAO
                    18748: SAIL-234 Node DAO: fix NPE (EditionServiceImplTest)
                    18769: SAIL-234 Node DAO: alf_node_properties ground work
                    18786: SAIL-234 Node DAO: alf_node_properties and cm:auditable properties
                    18810: Added EqualsHelper.getMapComparison
                    18813: TransactionalCache propagates cache clears and removals during rollback
                    18826: SAIL-234 Node DAO: Moved over sundry references to NodeDaoService to NodeDAO
                    18849: SAIL-237: UsageDelta.hbm.xml - eol formatting only (including removal of unwanted svn:eol-style=native property)
                    18869: SAIL-234 NodeDAO: Fixed more references to 'nodeDaoService'
                    18895: SAIL-234 NodeDAO: Queries for alf_transaction
                    18899: SAIL-234 Node DAO: Fixed bean fetching for 'nodeDAO'
                    18909: SAIL-234 NodeDAO: Fixes to getNodeRefStatus and various txn queries
                    18916: SAIL-234 NodeDAO: Fixed moveNode alf_child_assoc updates
                    18922: SAIL-235: DAO refactoring: Permission.hbm.xml
                    18930: SAIL-235: DAO refactoring: Permission.hbm.xml
                    18932: SAIL-234 NodeDAO: Fixing up gotchas, javadocs and some naming
                    18933: SAIL-234 NodeDAO: Minor neatening
                    18935: SAIL-234 Node DAO: Caches for ID to NodeRef and StoreRef
                    18936: EHCache config files line endings
                    18938: SAIL-237: Usage DAO refactor - initial checkpoint
                    18945: SAIL-235: DAO refactoring: Permission.hbm.xml. Move Node.
               18975: Fix for move-node ACL jiggery-pokery
               19067: SAIL-4: fix VersionHistoryImpl.getSuccessors (causing VersionServiceImplTest.testGetVersionHistorySameWorkspace failure)
               19068: SAIL-234: fix VersionMigratorTest.testMigrateOneVersion
               19074: SAIL-237: Usage DAO - update to common iBatis mapping pattern(s) to ease DB porting
               19076: SAIL-231: Activities DAO - update to common iBatis mapping pattern(s)
               19077: SAIL-232: AppliedPatch DAO - minor cleanup (comments & formatting only)
               19092: Merging HEAD to DEV/V3.3-DAO-REFACTOR-2
                     18973: Temporarily comment out AVMTestSuite and run AVM tests individually
                     19056: AVM unit test improvements
               19097: SAIL-235: DAO refactoring: Permission.hbm.xml: Additional index to support queries to find the id and acl id for the primary children of a node.
               19185: SAIL-238: Permissions DAO - (minor) update to common iBatis mapping pattern
               19289: SAIL-234 NodeDAO: Node cache replaces NodeRef cache
               19302: SAIL-234 Node DAO: Added cache for node properties
               19318: SAIL-4: AVM DAO - (minor) update to common iBatis mapping pattern
   20690: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-4 to BRANCHES/DEV/V3.3-DAO-REFACTOR-5:
        20063: (RECORD ONLY) DAO refactor branch V4
        20146: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
             19401: SAIL-234 Node DAO: Fix permission service tests (setPrimaryChildrenSharedAclId needs to invalidate nodesCache)
             19428: Fixed TransactionalCache issue with null and NullValueMarker
             19429: Took empty cm:content creation out of FileFolderService#createImpl
             19430: SAIL-234 Node DAO: Tweaks around caching and cm:auditable
             19431: SAIL-4 DAO Refactor: Exception thrown when attempting writes in read-only txn have changed
             19436: SAIL-234 Node DAO: Fix NPE during cm:auditable update
             19475: Allow debugging of code without stepping into trivial stuff
             19476: Follow-up on 19429 by ensuring CIFS/FTP set a  mimetype on the ContentWriter
             19477: SAIL-234 Node DAO: Leverage DAO better for NodeService.addProperties
             19478: SAIL-234 NodeDAO: Added toString() for ParentAssocsInfo (cache value for parent assocs)
             19479: SAIL-234 Node DAO: Fixed for parent association and property caches
             19480: Made TransactionAwareSingleton bind-key a GUID
             19481: SAIL-234 Node DAO: Reinstated 100K collection property tests
             19482: SAIL-234 Node DAO: Node and property cache fixes highlighted by unit tests
             19483: SAIL-234 Node DAO: Start on NodeBulkLoader implementation
             19595: SAIL-234 Node DAO: Fix moveNode to detect cyclic relationship prior to updating ACLs for moved tree FileFolderServiceImplTest.testETHREEOH_3088_MoveIntoSelf)
        20147: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
             19602: (RECORD ONLY) Reintegrated with HEAD up to rev 19433
             19621: (RECORD ONLY) SAIL-347
             19683: (RECORD ONLY) Reverse-merged 19621 for SAIL-347
             19722: (RECORD ONLY) Merged /alfresco/HEAD:r19434-19721
        20150: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
             19741: Merged DEV\V3.3-DAO-REFACTOR-2 to DEV\V3.3-DAO-REFACTOR-3
                   19739: Extended "move" tests
             19743: Fix AuditableAspectTest.testAddAspect (to allow for node modified date tolerance)
             19748: Remaining part of merge from HEAD to V3.3-DAO-REFACTOR-3
                   19367: Merged BRANCHES/V3.2 to HEAD:
                       19286: Fix for ALF-626 "Using 'null' as an authority argument in clearPermissions() cause a java.lang.NullPointerException"
             19755: SAIL-234 Node DAO: Fix RepoAdminServiceImplTest.testConcurrentDynamicModelDelete (handle InvalidNodeRefException after getChildAssocs)
   20692: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-4 to BRANCHES/DEV/V3.3-DAO-REFACTOR-5:
        - Retired all 1.3 and 1.4 upgrade scripts ... R.I.P.
        - Fixed CRC patch for Authorities (only tested on MySQL)
        - Fixed SQL patch revision numbers and bumped version schema number up
        20158: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
             19773: SQL mappings and scripts: SAIL-310, SAIL-304, SAIL-303 and SAIL-347
             19774: Futher fix for SAIL-310: Sequence patch must take into account sequences created for 3.3
             19851: SAIL-371 (SAIL-294) NodeDAO fallout: Fix QName and Namespace read/write handling and bean name in unit test
        20183: Merged DAO3 to DAO4
             19852: SAIL-370: Remove LinkValidation
             19853: SAIL-239 (SAIL-294) Attributes.hbm.xml: Added ability to attach arbitrary property to unique context
             19857: SAIL-373 Fallout from Permissions DAO refactor (SAIL-235)
             19864: SAIL-239 (SAIL-294): Removed AttributeService RMI API
             19865: More SAIL-239 (SAIL-294): Removed AttributeService RMI API
        20208: DAO-refactor implementation of ALF-2712 query improvements
        20209: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
             20060: Removal of AttributeService for SAIL-239 (SAIL-294)
        20348: SAIL-371 (SAIL-294): Protect collection properties during map insert and retrieval
        20547: SAIL-371 (SAIL-294) Attributes.hbm.xml: implement getAttributes + fixes
        20573: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests and other fallout
        20597: SAIL-239 Attributes.hbm.xml: WCM/AVM locking test fixes (wip)
        20598: SAIL-239 Attributes.hbm.xml: WCM/AVM locking test fixes (wip) - fix AssetServiceImplTest.testSimpleLockFile NPE
        20600: Fix PropertyValueDAOTest.testPropertyValue_Enum (follow-on to r20060 for SAIL-239 - which introduces ENUM prop vals)
        20601: Fix UsageDAOTest.testCreateAndDeleteUsageDeltas NPE (would also affect ContentStoreCleanerScalabilityRunner)
        20603: Fix CMISPropertyServiceTest.* (fallout from r20146 <- r19429 <- Took empty cm:content creation out of FileFolderService#createImpl)
        20604: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - TransferServiceImplTest.*
        20618: SAIL-371 (SAIL-294): NodeDAO: AuditableAspectTest (fix testCreateNodeWithAuditableProperties_ALF_2565 + add remove aspect test)
        20624: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - UserUsageTest.*
        20626: Fixed random keys for RuleTrigger NodeRef tracking
        20635: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - PersonTest.testSplitDuplicates
        20642: SAIL-371 (SAIL-294) DAO: Fixed CacheTest
        20643: Removed must of the 'distribute' target's dependencies.  Not for HEAD
        20645: Follow-on to r20643 (Removed most of the 'distribute' target's dependencies.  Not for HEAD)
        20654: SAIL-371 (SAIL-294): NodeDAO: DMDeploymentTargetTest.* (do not try to remove mandatory aspects)
        20655: SAIL-371 (SAIL-294): NodeDAO: Initial fix for TaggingServiceImplTest.testTagScopeUpdateViaNodePolicies (+ minor test cleanup)
        20657: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - VersionMigratorTest.testMigrateOneVersion (cm:accessed not returned if null)
        20658: Merged (back merge only - no merge info) BRANCHES/V3.3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
             20090: Dynamic models: minor improvements to DictionaryModelType
             20554: Improvement to model delete validation (investigating intermittent failure of RepoAdminServiceImplTest.testSimpleDynamicModelViaNodeService)
        20662: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - RecordsManagementAuditServiceImplTest.* (we now ignore attempt to update 'cm:modifier' prop so update 'cm:title' prop instead)
        20666: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - ADMLuceneTest.*
        20668: SAIL-239 (SAIL-294) - delete WCM locks + tests (follow-on to r20060)
        20674: SAIL-371 (SAIL-294) NodeDAO fallout: Cleaner and additional checks for ContentStoreCleaner
        20675: SAIL-371 (SAIL-294) NodeDAO fallout: Fixed handling of ContentData


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20693 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-06-17 19:35:49 +00:00
Dave Ward
7c7f733f64 Merged V3.3 to HEAD
20440: RM: CapabilitiesTest.testDestroyRecordsCapability (MS SQL Server build) - use non-public nodeService
   20441: Include virtual tomcat in installers
   20442: Change bitrock builder version to use.
   20443: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: (Fixed tabs and removed 'svn:executable' and 'svn:eol-style')
      20384: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
         20271: ALF-803: Asset Service Improvements
      20386: Merged V2.2 to V3.3-BUG-FIX
         20385: Merged DEV/BELARUS/V2.2-2010_04_06 to V2.2
            20379: V2.2-ALF-1888 AssociationQuery was corrected to filter ...
      20387: Version Migrator (ALF-1000) - approx x3 boost (policies ignore version2 store)
      20388: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
         20372: ALF-897: It is impossible to create content when default value selected in ContentHeadlineBackground field for intranet_rssi_landing_template web-form (also fixes ALF-2798 & ALF-791)
      20389: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
         20374: ALF-2723: WCM - Http 500 creating content via webform
      20394: Fix for ALF-2257 - It's impossible to find and add group at Records Manage Permissions page
      20396: Fixed ALF-2956 "XSS attack is made when a rule is being deleted"
      20397: Fix for ALF-922: Mysql does not support unique keys that contain nulls as one would expect
      20402: ALF-2186 : Rules not being fired on datalist items - because it's a zero byte file?
      20404: Fixed ALF-2109 "Rule doesn't apply to the files in sub-folders when 'Run rule for this folder and its subfolders' action was performed"
      20406: Fix for ALF-2985 - Share document library throws error if document modifier or creator is deleted from Alfresco
      20409: Improved FormServiceImplTest, added more content related tests and some edge case tests using the FDK model (this test needs to be manually enabled though as the FDK model is not available by default)
      20414: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX
         20401: ALF-2616: Serious Web Form layout performance issues on IE8. This fix contains:
      20427: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX
         20042: ALF-1523: Failed Kerberos SSO auth doesn't fail through, simply returns a blank page
         20323: ALF-1523: Failed Kerberos SSO auth doesn't fail through, simply returns a blank page
      20428: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX
         20417: ALF-736: WebDAV Folder Renaming fails on Mac but works on Windows.
      20430: Fix for ALF-2313 - Accessing a Doclib folder in Share which has a link to a deleted node fails
      20431: Version Migrator (ALF-1000) - migrate 1st batch independently
      20432: Fix for ALF-2327 - Can not have more than one Transfer Step in a disposal schedule
      20438: ALF-479: Merged DEV/BELARUS/V3.2-2010_01_11 to DEV/V3.3-BUG-FIX
         18448: ETHREEOH-4044: External Authentication Subsystem does not perform user mapping for WebDAV requests
   20444: Fix for ConcurrentModificationException in file server quota manager. ALF-2970.
   20445: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
      20413: Added clean of quickr project
   20446: Changed version to 3.3.1dev
   20447: Merged V3.3-BUG-FIX to V3.3
      20294: Fixes: ALF-1020 & ALF-1013 for all views except agenda.
   20451: Merged V2.2 to V3.3
      20450: Merged DEV/BELARUS/V2.2-2010_04_06 to V2.2
         20412: ALF-1887: too easy to break alfresco - one can remove the guest user and recreate it but then access to RSS is broken
            - PersonServiceImpl.beforeDeleteNode prohibits attempts to delete a guest user.
   20452: Fix for transaction error from NFS server file expiry thread. ALF-3016.
   20458: ALF-2729 - rationalise (and deprecate) VersionLabelComparator
   20460: Fix for ALF-2430
      - AVM nodes are not checked for exclusion - the default ACLEntryVoter will always vote for AVM
      - avoids embedded AVM permission checks for getType/getAspect and anything else that may be added
      - seems AVM read is not checked upon "lookup" for the last node in the PATH (getType should have failed too)
   20466: Merged V2.2 to V3.3
      20243: (RECORD ONLY) ALF-2814: Merged V3.2 to V2.2
         17891: Merged DEV_TEMPORARY to V3.2
            17873: ETHREEOH-3810: WCM - Recursion detector erroring
   20467: Merged V3.1 to V3.3 (RECORD ONLY)
      20276: Incremented version label
      20275: ALF-2845: Merged V3.2 to V3.1
         17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2
            17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch - also causes subsequent patches to not be applied
      19573: Merged V3.2 to V3.1
         19539: Merged HEAD to V3.2
            19538: Build fix - fix build speed
   20468: Merged PATCHES/V3.2.r to V3.3 (RECORD ONLY)
      20357: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r
         20349: Merged V3.3 to PATCHES/V3.2.0
            20346: ALF-2839: Node pre-loading generates needless resultset rows
               - Added missing Criteria.list() call
      20339: Incremented version label
      20338: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r
         20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows
            - Split Criteria query to retrieve properties and aspects separately
         20272: Backports to help fix ALF-2839: Node pre-loading generates needless resultset rows
            Merged BRANCHES/V3.2 to PATCHES/V3.2.0:
               18490: Added cache for alf_content_data
            Merged BRANCHES/DEV/V3.3-BUG-FIX to PATCHES/V3.2.0:
               20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
         20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows
   20469: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY)
      20393: Eclipse classpath fix to avoid problems in JBoss
      20309: ALF-2777: PrimaryChildAssocCopyBehaviour from MOB-388 corrupts cm:name attributes of copied child nodes
         - Folded example behaviours from previous AMP into repository
         - Fixed PrimaryChildAssocCopyBehaviour to back-up and set the cm:name property on copied children
   20470: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY)
      20465: Incremented version label
      20464: ALF-3060: Merged V3.2 to PATCHES/V3.2.0
         19920: Merged HEAD to BRANCHES/V3.2:
            19918: Fix ALF-2499 (Deleting a web project also deletes similarly named web projects - Potential Data Loss)
      20448: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.2.0
         20414: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX
            20401: ALF-2616: Serious Web Form layout performance issues on IE8. This fix contains:
               a) X-UA-Compatible head tag with IE=EmulateIE7 value
               b) alfresco.ieVersion and alfresco.ieEngine in common.js
               c) recurseOnChildren in _updateDisplay
               d) Some performance modifications in xforms.js
      20350: Increment version label
      20349: Merged V3.3 to PATCHES/V3.2.0
         20346: ALF-2839: Node pre-loading generates needless resultset rows
            - Added missing Criteria.list() call
   20471: Fix for offline sync losing metadata properties, due to rename/delete of original file. ALF-575.
   20478: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
      20477: Fix ALF-3086: CMIS checkin of a non-versionable document should make it versionable
   20479: ALF-2110: Make it possible to determine which person properties are synced via LDAP and hence immutable
      - Added Set<QName> UserRegistrySynchronizer.getPersonMappedProperties(String username)
      - UI/Services Fix to follow
   20481: Latest SpringSurf libs:
      - Fix for ALF-1518 - Added support for HTTP and HTTPS proxies for Surf application remote api calls - via the standard JVM cmd line properties such as -Dhttp.proxyHost=...
   20484: ALF-2886: LDAP sync defaults display names incorrectly and can't cope with DNs containing escaped trailing whitespace.
      - Had to work around a JDK bug in LDAP RDN parsing
   20486: Added case sensitive flag to the file state cache. Part of ALF-570.
   20487: Fix for copy/rename of folders causing file exists errors in some cases. ALF-570.
   20488: Fix ALF-680: Previously valid content models now fail with CMISAbstractDictionaryService$DictionaryRegistry exception
   20489: Uploaded correct version of spring source jars and reunited them with 3rd-party/.classpath
   20490: Fix for cannot delete folders via CIFS from Mac OSX, due to desktop actions. ALF-2553.
   20491: Merged DEV/TEMPORARY to V3.3 (With corrections)
      20485: ALF-2290: a HTTP GET request of a document redirects to the Home Location when using NTLM SSO
         The logic related to ADB-61 in NTLMAuthenticationFilter clears previous location and redirects request to default home location. NTLMAuthenticationFilter was changed to process GET requests to documents correctly. Now, fix to ADB-61 processes only “/faces” requests and GET requests to documents are processed correctly.
         The same fix was made to KerberosAuthenticationFilter
   20492: Fix ALF-680: Previously valid content models now fail with CMISAbstractDictionaryService$DictionaryRegistry exception
      - missing remove directory
   20493: Fix ALF-2837: ClassCastException in getProperties()
   20498: Fix for ALF-2818: Failure to close index writer under certain conditions.
      - fix for index writer to close indexes when stopped by exceptions during FTS
      - fix FTS job to handle exceptions better
      - debug for FTS background operations
   20499: ALF-3094: In ticket authenticate method in AuthenticationHelper, invalidate the current session if its cached ticket doesn't match
   20500: Fix for ALF-2858 "Zero KB sized bin files will be created in the contentstore when new sites are created" (RECORD ONLY)
   20503: AVMTestSuite: minor fixes to cleanup ctx usage (avoid re-loading)
   20505: Merged BRANCHES/V2.2 to BRANCHES/V3.3 (record-only)
      13859: (record-only) Removed dev from version label
      14003: (record-only) Updated version to 2.2.5dev
      14566: (record-only) ETWOTWO-1239 - remove workflow interpreter/console bootstrap
      14572: (record-only) ETWOTWO-1239 - fix PersonTest to fix JBPMEngineTest (part-sourced from r13247)
      14776: (record-only) Merged V3.1 to V2.2
         14748: ETHREEOH-2225 - WCM upgrade (performance improvements for MySQL)
   20506: NFS ReadDir/ReadDirPlus skips some folder entries. JLAN-98. 
   20507: Fixed issue with folder search resume id being reset to the wrong value during NFS folder search. Part of JLAN-98.
   20508: Merged BRANCHES/V3.2 to BRANCHES/V3.3:
      18319: Merged BRANCHES/DEV/BELARUS/V3.2-2010_01_11 to V3.2
         18273: ETHREEOH-3834: WCM: An extral .xml.html file is created when editing newly created content
      19182: Merged V3.1 to V3.2
         18423: ETHREEOH-3850 - Content Manager unable to edit content items if there is a lock on a generated rendition
         18432: (RECORD ONLY) Added FTP data port range configuration via <dataPorts>n:n</dataPorts> config value. ETHREEOH-4103.
         18451: (RECORD ONLY) Fixed incorrect FTP debug level name.
         18577: (RECORD ONLY) Fix for ETHREEOH-4117, based on CHK-11154
         18792: Fix ETHREEOH-2729:  Import of property with @ symbol in name fails with "start tag unexpected character @ "
      19570: ALF-192 / ALF-1750:  System Error if user trying submit web content based on web form which was deleted
      19583: Merged DEV/BELARUS/V3.2-2010_03_17 to V3.2
         19545: ALF-1954: Regression: same item can be submitted multiple times to workflow
      19725: AVMStoreDescriptor - fix minor typo (for debugging)
      19917: (RECORD ONLY) Merged HEAD to BRANCHES/V3.2:
         19880: Fix ALF-898 - WCM: Deleting a file leads to error (only if RM/DOD installed)
      19920: (RECORD ONLY) Merged HEAD to BRANCHES/V3.2:
         19918: Fix ALF-2499 (Deleting a web project also deletes similarly named web projects - Potential Data Loss)
   20509: Merged BRANCHES/V3.2 to BRANCHES/V3.3 (RECORD ONLY):
      19825: (RECORD ONLY) Merged PATCHES/V3.2.r to BRANCHES/V3.2: 
         19804: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r 
            Merged HEAD to V3.2.0 
            ...
   20510: Merged BRANCHES/V3.1 to BRANCHES/V3.3 (RECORD ONLY)
      17482: (RECORD ONLY) Merged V3.2 to V3.1
         17478: Fix ETHREEOH-3340 - WCM - Revert to snapshot failure (fix AVM getListing -> AVMSync compare -> WCM revertSnapshot)
      18783: (RECORD ONLY) MT: ensure group (EMAIL_CONTRIBUTORS) bootstraps tenant admin user (when creating tenant)
   20513: Added port change example for remote Alfresco server to share-config-custom.xml.sample
   20518: ALF-657 Created tests to check that the 'runas' functionality works in the AlfrescoJavaScript action handler. Also modified the handler to run as the System user if no Authentication is currently set, as may occur if the action handler is being executed asynchronously.
   20519: ALF-657 Created tests to check that the 'runas' functionality works in the AlfrescoJavaScript action handler. Also modified the handler to run as the System user if no Authentication is currently set, as may occur if the action handler is being executed asynchronously.
   20520: Removed dev version.label
   20522: ALF-3129: Map cm:organization property in LDAP as well as cm:organizationId, since cm:organization is what shows up in JSF and Share. Needed by ALF-2110.
   20523: First part of fix for ALF-2110:
      - Appropriate Person and webframework metadata APIs now return information on immutability of Person properties (as some properties are immutable when synced to LDAP etc.)
      - Share client  now correctly disables profile fields in User Profile and Admin User Console as appropriate based on individual user property mutability
      - Change Password button now correctly enabled/disabled based on account mutability
   20524: VersionMigrator - option to run as scheduled job (ALF-1000)
   20525: Fix for various IE6 CSS issues:
      ALF-3047 - It's impossible to destinate any action with data list item (IE6 specific)
      ALF-3049 - Incorrect layout of Manage aspects page
      ALF-3050 - Incorrect layout of Assign Workflow form
   20526: Fix for ALF-2915 - Select > None feature for Data Lists not working across multiple pages in IE
      Closed ALF-2846 - DataList UI not fully I18Ned [Old prototype code]
   20527: Fix for ALF-3082 - There is no Edit Offline action at Details page in Share site
   20528: Fix various script errors due to typo:
      ALF-3088 - Script error occurs on creating duplicated record seria
      ALF-3012 - Incorrect behaviour on creating duplicating folders
      ALF-3004 - Script error when submitting an item with long data in Prioprity field
   20529: Fix for ALF-3006 - Selected Items > Copy to... and Move to actions not working in Document Library
   20530: Dynamic Models - fix test(s)
      - fix concurrency test for Oracle build (retry if txn lock cannot be acquired)
      - when getting deployed models, skip if invalid (eg. cannot be parsed)
   20536: Remove @Override (ALF-657)
   20537: Activities - (minor) fix NPE for Oracle build/test
   20543: Final part of ALF-2110 - Appropriate person properties disabled for editing in Explorer Client if external mapped sync such as LDAP is used.
      Fixed issue with Change Password option being disabled incorrectly.
   20544: Follow-up fix to r20528
   20546: Fix for ALF-3151 - Freemarker causes NPE while deploying 3.3 enterprise onto WebSphere 7.0.0.7
      - NOTE: will need to submit patch to freemarker.org
   20552: Merged BRANCHES/V3.2 to BRANCHES/V3.3 (RECORD ONLY)
      20551: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/V3.2:
         20090: Dynamic models: minor improvements to DictionaryModelType
   20553: Fix for escalated issue ALF-2856: Space returns to browse view after completing Add Content dialog; need a way to return to custom view (applied patch provided by customer).
   20554: Improvement to model delete validation (investigating intermittent failure of RepoAdminServiceImplTest.testSimpleDynamicModelViaNodeService)
   20558: Merged DEV/BELARUS/V3.3-2010_06_08 to V3.3
      20550: ALF-922: Mysql does not support unique keys that contain nulls as one would expect ...... duplicates in the alf_access_control_entry table
   20562: ALF-3177 - security fix.
   20563: Merged BRANCHES/V3.2 to BRANCHES/V3.3:
      19412: Fix for ALF-865 "WCM / Cluster: unexpected error when concurrently submitting content"
         ALF-862 "WCM submit execution will require locking in a clustered WCM authoring env"
   20564: Merged BRANCHES/V3.1 to BRANCHES/V3.3:
      20542: Fixed ALF-3152: ImporterComponent transaction retry settings can cause IllegalArgumentException
   20568: Follow-up on fix ALF-3152.  Fix jobLockService's retryWaitIncrementMs


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-06-09 14:53:24 +00:00
Gavin Cornwell
1225970db4 Merged BRANCHES/DEV/BELARUS/HEAD-2010_03_30 to HEAD
19866: ALF-790: WCM - Underscore not displaying for enumeration values

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-04-27 11:38:22 +00:00
Mark Rogers
5036b6b86a ALF-2031 - DR and VT can't start
- undeleted and reinstated use of org.alfresco.util.Pair
   - undeleted org.alfresco.util.PropertyCheck which is used in the deployment code.
   - undeleted other org.alfresco.util.* classes which probably should never have been moved to spring surf.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-16 15:05:47 +00:00
Paul Holmes-Higgin
60c08702d5 Updated files to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18963 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-02 21:36:59 +00:00
Gavin Cornwell
6221cbde08 Merged V3.2 to HEAD
18862: Merged DEV_TEMPORARY to V3.2 
      18699: ETHREEOH-4171: HTTP 500 when filling in a WCM webform (ACT-15969)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-02-25 22:04:55 +00:00
Gavin Cornwell
7cbb3a0daf Merged V3.2 to HEAD
18484: Merged DEV-TEMPORARY to V3.2 
                  18478: XForms errors - ACT 15969

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-02-05 21:02:51 +00:00
Gavin Cornwell
6989a3fcb3 Merged V3.2 to HEAD
18358: Merged DEV_TEMPORARY to V3.2
                  18177 & 18342:  ETHREEOH-3979: Web Forms: Inline images within TinyMCE controls aren't displayed correctly

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-28 21:18:35 +00:00
Gavin Cornwell
3da6e266f8 Merged V3.2 to HEAD
17891: Merged DEV_TEMPORARY to V3.2
                  17873: ETHREEOH-3810: WCM - Recursion detector erroring
   18032: Merged V3.1 to V3.2
                 18030: Merged V2.2 to V3.1
                    17683: Merged DEV_TEMPORARY to V2.2 (back-port of fix)
                       17677: ETHREEOH-2778: davfs2 is not working correctly with Alfresco
                    17880: Merged DEV_TEMPORARY to V2.2 (record-only as fix is already applied to 3.1 branch)
                       17845: ETWOTWO-1289: My Web Files (Forms) dashlets: XSS Attck can be made when web project's details has been edited
   18062: Merged DEV_TEMPORARY to V3.2
                 18036: ETHREEOH-1844: Text field (areas) became non-editable if user use navigate-remove combination for repeatable elements on Create Web content based on web form screen
   18205: Merged V3.1 to V3.2 (record-only)
                  *RECORD ONLY* Merged DEV/TEMPORARY to 3.1
                  17837: ETHREEOH-3801: Creating users via the api does not add them to the user store
   18277: Merged DEV_TEMPORARY to V3.2
                  18178: ETHREEOH-3222: ERROR [org.alfresco.webdav.protocol] WebDAV method not implemented - PROPPATCH
   18311: Fix for ETHREEOH-3872: forms32 examples not working
   18317: Remaining fixes to forms samples (ETHREEOH-3872)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18318 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-27 12:13:56 +00:00
Derek Hulley
419606be51 Merged V3.2 to HEAD
17620: Merged DEV_TEMPORARY to V3.2
      17599: Fix for ETHREEOH-3308: xf:switch cannot be used in repeating field type
   17634: Put back AVM concurrency checks (reverse r17405)
   17644: Fixed up some comments and added return value to in-txn recording of deleted nodes
   17647: Fixed read-only detection of ContentStoreCleaner
   17648: Merged DEV fixes for ETHREEOH-3473 and ETHREEOH-3454 - DB script and iBatis-related changes
   17649: Fixed problem after merge-in: ETHREEOH-3641: build 270: cannot install on PostgreSQL
   17652: Fix ETHREEOH-3376 - Reindexer failure: requires rollback (Cluster)
   17658: Removed failing concurrency test for split person cleanup
   17659: Merged V3.1 to V3.2
      17308: Fixed ETHREEOH-2310: Upgrade from 2.1 E Sp7 to 3.1.1 E build 225 - Duplicate alf_node_status entries detected
             Fixes ETHREEOH-3606 (same as CHK-10454)
   17661: Fixed DB2 iBatis problems related to http://issues.apache.org/jira/browse/IBATIS-536
   17666: ETHREEOH-3376 / ETHREEOH-3637 - reindexer failure in a cluster (dictionary repo bootstrap)
   17678: Follow-on to r17666 (for RM custom model)
   17685: Merged DEV_TEMPORARY to V3.2
      17676: ETHREEOH-3187: Creating Web Content based on Web Form with most elements-read-only/default failed
   17695: Temporarily comment-out testSubmitChangedAssets1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_24:r17632,17636,17676
   Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_09:r17599
   Merged /alfresco/BRANCHES/V3.1:r17308
   Merged /alfresco/BRANCHES/V3.2:r17620,17634,17644,17647-17649,17652,17658-17659,17661,17666,17678,17685,17695


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18165 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-20 11:30:46 +00:00
Derek Hulley
182eece8f7 Merged V3.2 to HEAD
17502: Merged V3.1 to V3.2 (Fixes ETHREEOH-3155 & ETHREEOH-2653)
      17501: Merged V2.2 to V3.1
         17358: Improved debugging in Schema2XForms utility to help with resolving of repeating switch support for ETWOTWO-490
         17488: Fix for ETWOTWO-1006: xforms.js DEBUG output can cause performance issues with web forms
         17491: More XForms debugging improvements
   17503: Failover content transformer
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V2.2:r17358,17488,17491
   Merged /alfresco/BRANCHES/V3.1:r17501
   Merged /alfresco/BRANCHES/V3.2:r17502-17503


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18146 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-19 14:51:40 +00:00
Derek Hulley
e80a27b73c Merged V3.2 to HEAD
17410: Merged V3.1 to V3.2
      16667: (record-only) Fix ETHREEOH-2477 - group-based perms (MT env)
      16883: Fix ETHREEOH-1544 - cannot paste an item, if cut from another web project (modifyLock errror)
      16918: Fix ETHREEOH-3053 - Deployment of non-stale file in a stale layered folder removes the file from FSR
      16947: (record-only) Temporarily comment-out testSubmitChangedAssets1 (intermittent permission failure)
      17162: Fix ETHREEOH-2850 - submitting delete of (web form) xml instance does not submit the associated deleted renditions
      17319: Fix ETHREEOH-3111 - ManageReviewTaskDialog (fix-up contributed patch)
   17418: Merged V3.1 to V3.2
      17141: Fix ETHREEOH-3088: Cut/Paste into self causes stack overflow
      17216: Fixed ETHREEOH-3170: DB errors on MSSQL with Snapshot Isolation enabled while CIFS copying
      17255: Fixed ETHREEOH-3180: Error appears when trying to search resources on Manage Task page
   17419: Fix for ETHREEOH-3296: Enterprise 3.X / Permissions Error When Cut & Paste on Sub-Folder
   17421: Review and tweaks of DB script port
   17423: Follow-on for ETHREEOH-3088
   17424: Missed check-in for ETHREEOH-3032 (CHK-10240)
   17437: ETHREEOH-2790 - OpenOffice-startup-context.xml needs to also initiate the connection to OpenOffice
   17441: Build fix: Fix AVM permission inheritance to match DM and fix common permission dao component
   17470: Fix for ETHREEOH-3350: Admin Console - Viewing user properties for user without home folder throws exception
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V3.1:r16667,16883,16918,16947,17141,17162,17216,17255,17319
   Merged /alfresco/BRANCHES/V3.2:r17410,17418-17419,17421,17423-17424,17437,17441,17470


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-19 13:18:50 +00:00
Kevin Roast
2cd5047075 Merged V3.2E to HEAD
17533: Fix for unreported issue for events with multiple days (secondary elements) aren't filtered correctly when view is filtered by tags
   17535: ETHREEOH-3411 - Alert appears when loading My Dashboard when Documents I'm editing dashlet is aded and site name was edited with XSS text
   17536: Fixes for various forms issues (ETHREEOH-3398, ETHREEOH-3273, ETHREEOH-3339 & ALFCOM-3587) and reverted accidentally checked in log4j.properties file
            - Folders can now have tags applied in edit form
            - Working copy nodes have their cm:name property set to protected
            - Removed mandatory marker from checkbox control (if you have a boolean there is always a value so no need to mark as mandatory)
            - Potential security issue
   17537: ETHREEOH-1908 - .docx word documents are not displayed in 'Word Documents' category in 'Document List' component. Also fixed some i18n strings.
   17538: Fix for ETHREEOH-3085 and ETHREEOH-3341.
          - NTLM/Kerberos, Tomcat/JBoss5 and JSF client now play nicely on session timeout and display the correct configured page on first login.
          - Tested Share NTLM works correctly with above changes.
   17539: Fix for ETHREEOH-3368: UI does not show multi-valued MLText propertis as localisable
   17543: Merged DEV_TEMPORARY to V3.2
      17529: Fix for ETHREEOH-3186 & ETHREEOH-3187
   17544: Fix for ETHREEOH-1509 - Manage action is not applied for task resources part from My Tasks tab in Office Addins if user already opens another task.
   17547: Fix for ETHREEOH-1709 - AccessDeniedException - Download Servlet not re-directing user to login page.
          - WebDav path now resolved to a noderef as system user - then the permission test for READ_CONTENT is performed directly on the resulting noderef.
   17548: Fix for ETHREEOH-3137 - Tags created for All day event are not displayed in Tags pane.
   17551: Final part of fix for ETHREEOH-2161 includes solution for ETHREEOH-3270.
          - An admin user can now optionally disable the execute of Rules and the Archive of nodes during a folder delete operation.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18128 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-19 12:01:16 +00:00
Kevin Roast
189422edce Merged V3.2E to HEAD
17495: Changed xforms-samples name to wcm-sample
   17496: Minor fixes for day and week views when rendering new events
   17497: *RECORD ONLY* Added Enterprise logo local copy.
   17498: ETHREEOH-2933 - User can see contents of the moderated site if user is not a member of the site
          - Site containers are now private and non member's can't see content.
          - fix only applies to new moderated sites.
   17499: ETHREEOH-2322 - Office Plugin: filename overlaps the plugin UI if longer than 40 characters without spaces
   17500: Temorary build fix for site visibility
   17508: ETHREEOH-1268 - Pages and Components show varying degrees of success handling "site not found" errors.
   17509: Fix for ETHREEOH1733 - Wrong display of multi day events in Share
   17514: View In Browser action for document list and document details actions.
   17515: Merged DEV-TEMPORARY to V3.2
      17471: ETHREEOH-3193: 'capitalize' in output path pattern works differently for templates (vs. XSDs)
   17516: Missing css file from Edit Offline changes. Also "Checked out on/by" text changed to "Editing started on/by". Tags now comma separated
   17517: Merged DEV-TEMPORARY to V3.2
      17474: ETHREEOH-1211: Can't See Images in TinyMCE
   17518: Office add-in: ETHREEOH-3361 - Workflow name is visible only before symbol &, ETHREEOH-2735 - Total number of founded items is not shown
   17519: 3.2E help links
   17520: 3.2E help links, plus ETHREEOH-1536 - Incorrect "insert into current document" function work for unsupported files in MS Office Addin
   17522: Fix for ETHREEOH-3257 - Event becomes All day again after editing it to not All day
   17526: Fix for unreported issue when rendering an edited event after the view is filtered via tag component causes an script error
   17528: Fixed ETHREEOH-3364 " Admin Console - Group Search needs to show searching message and disable further requests while search is running"
          - Disabling search button & message displaying "Searching..." after 2 seconds for long searches for the following components:
             * Admin Console: Users - search user, add group
             * Admin Console: Groups - search group, add group, add user
             * Site: Members: People - search members, add people
             * Site: Members: Groups - search membergroups, add group
             * Site: Members: Pending invites - search invites
             * Site: Doclib: Assign Workflow - add users
             * People Finder 
             * Site Finder
          - All component listed above uses max search result except the following where webscript services lacks support for it:
             * Admin Console: Users - add group
             * Admin Console: Groups - search group, add group
             * Site: Members: Pending invites - search invites
          - Bugfix: When minSearchTermLength is set to 0:
             * Group Admin Console: switched to browse view
             * User Admin Console: didnt do a search
          - Bugfix: For some components minSearchTermLength & maxSearchResults were brought in as strings causing the global search's max result to be 1001 instead of 101

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18126 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-19 11:50:05 +00:00
Kevin Roast
97f06f3773 Merged V3.2E to HEAD
17460: Refactored calendar views into separate objects
   17466: Remote API part of fix for ETHREEOH-3268.
          - Added simple webscript to return details of the authentication system, such as account creation allowed.
   17473: ETHREEOH-3268 - UI part of fix.
          - Add External Users is now disabled in Share if Alfresco instance does not support creating new users i.e. if LDAP or similar is used.
   17479: ETHREEOH-2409 - Doc Library Details page displays incomplete action list; usability issue
   17480: My Tasks dashlet - prevent display of fake date used for sorting
   17484: Fixed ETHREEOH-2305 "It's impossible to implement a Search request with empty search field in Site Members area."
          - Default settings can be applied in web-framework-config-application.xml:
             <min-search-term-length>1</min-search-term-length>
             <max-search-results>100</max-search-results>
             and later be overriden in the properties section for each searchable components binding file.
          - The components that override the min-search-term-length default value and set it to "0" are:
             site-finder, site-members & site-groups
   17485: Merged DEV_TEMPORARY TO V3.2
      17468: Problem rendering field description (MultilingualTextAreaGenerator) for app:folderlink
   17486: Merged DEV_TEMPORARY to V3.2 (record-only)
   17487: Partial fix for ETHREEOH-3308 (xf:switch cannot be used in repeating field type), fixes 'extra' set of fields seen when using a maxOccurs of more than 1
   17489: MERGED DEV/TEMPORARY to V3.2
      ETHREEOH-3068 - WCM Create Web Content Wizard
   17492: Fix for ETHREEOH-2598 documents uploaded via Share interface are not incremented as versions with CIFS/SMB interface.
          - Auto versioning of documents now correctly handled via CIFS edit if an appropriate rule is applied to a doclib

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-19 11:33:37 +00:00
Kevin Roast
9576bd46f5 Merged V3.2E to HEAD
17246: ETHREEOH-3208: User profiles for users authenticated by immutable subsystems are now read only
         - Introduced MutableAuthenticationService interface, only implemented by Alfresco native authentication service
         - Split out those methods from AuthenticationService that mutate the user store and added isAuthenticationMutable()
         - Now both Alfresco Explorer and Share user profile / password edit link rendering is conditional on isAuthenticationMutable
         - Works with authentication chain containing mixture of internally and externally authenticated users
   17247: Fix failing unit tests
         - rm-public-services-security-context.xml needed to be brought in line with public-services-security-context.xml (and will forever more!)
   17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters
   17253: *RECORD ONLY* ETHREEOH-2885: web.xml must conform to the schema to work on JBoss

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-18 15:32:57 +00:00
Derek Hulley
f56da7800c Merged V3.2 to HEAD
17201: Fix for ETHREEOH-1786: Time fields are displayed incorrectly
   17202: Fix for ETHREEOH-1886: alf:hint tag in XSDs results in error
   17204: Fix for ETHREEOH-1941: gMonth element is not correctly handled on creating web content based on web form process
   17206: Fixed ETHREEOH-1134 "Incorrect behavior of tab indexes for windows"
   17212: Fixed ETHREEOH-3063 "It is impossible to add tags after creating duplicate wiki page"
   17214: Fix for ETHREEOH-1940: Problem with creating web forms containing mandatory boolean attributes with default values
   17226: Fixed ETHREEOH-3105 "Error occurs when user add tag containing disallowed symbols."
   17228: ETHREEOH-3181 - Tag inconsistence between JSF and Share client
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V3.2:r17201-17204,17206-17207,17211-17216,17219-17228


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18025 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-14 13:06:47 +00:00
Kevin Roast
0c88b471ee Merged DEV/TEMPORARY to HEAD
17667: Branch for SpringSurf integration - from HEAD r17665
   17668: Fix to ensure included scripts files are not loaded from a cached classpath loader.
   17670: Part 1 of SpringSurf integration - changes relating to spring-surf-core-1.0.0.CI-SNAPSHOT.jar
   17674: Part 2 of SpringSurf integration - changes relating to spring-surf-core-configservice-1.0.0.CI-SNAPSHOT.jar

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-12-14 13:41:05 +00:00
Dave Ward
9decf60e5d Integrated Spring v3 snapshot CI-477
- Fixes SPR-6411 and SPR-6412
- Removes dependency on Hibernate v3.3

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-11-30 09:36:40 +00:00
Dave Ward
afec362f9a Merged BRANCHES/DEV/DAVEW/SPRING3 to HEAD
15422: Fix deploy-virtual-tomcat macro for Spring 3
   15391: Fix ContentStoreReplicatorTest for Spring 3
   15390: Upgrade CXF to version 2.2.2 for Spring 3 compatibility
   15385: Correction to previous checkin
   15384: Fix ClassPathStore.createRelative() to work with Spring 3
      - Relative resource path resolution with directory resources has changed
   15346: Merged V3.3_SPRING3 to SPRING3
      15310: Spring 3: Change to the way that FileContentStore broadcasts its existence to interested parties (for enterprise-only monitoring)
         - Introduced new SafeEventPublisher singleton that queues up events until after the application context has finished refreshing
      15309: Use AUTODETECT_NONE auto detect mode for JMX exporters to be compatible with Spring 3
      15308: Fix IBATIS integration to be compatible with Spring 3
      15307: Added missing runtime dependencies
         - org.springframework.expression-3.0.0.RC2.jar
         - org.springframework.asm-3.0.0.RC2.jar
      15289: Move Alfresco stack to Spring 3
         - Stage 1: get it compiling in eclipse and update ant scripts
         - Still requires Web Framework contributions from Uzi


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-11-23 20:20:06 +00:00
Gavin Cornwell
8ad23d61c0 Fix for ETHREEOH-3117: Schema elements of type xs:anyType defined as repeating have their group label missing
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17177 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-27 11:38:39 +00:00
Gavin Cornwell
cf2fc18ec2 Merged DEV-TEMPORARY to HEAD
17093: ETHREEOH-2590: Profile WCM web form in extras/wcm/ doesn't work properly

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17148 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-23 21:23:29 +00:00
Jan Vonka
9aadc8f493 WCM - fix ETHREEOH-569, ETHREEOH-571, ETHREEOH-3123 (after deleting web form)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-23 11:04:11 +00:00
Kevin Roast
b99c60a115 Fix to unreported issue where FormImpl class was not correctly deserializable, it would not correctly reinitialize from serialized state due to a static initialisation block relying on a FacesContext being available.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17107 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-23 09:01:41 +00:00
Gavin Cornwell
fc7c241ce3 Fix for ETHREEOH-1811, ETHREEOH-866 & ETHREEOH-2226: Issue with required field nodes within optional parent node that is a complextype
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17083 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-22 10:58:34 +00:00
Gavin Cornwell
b1e86e69f2 Merged V3.2 to HEAD
16725: Merged V3.1 to V3.2
      16721: Merged DEV/BELARUS/V3.1 to V3.1 
         16483: Fix for ETHREEOH-2728 : WCM - Forms rendering issue using IE6
   16889: Merged V3.1 to V3.2
      16888: Merged V2.2 to V3.1 
         16694: Fix for ETHREEOH-1384/ACT 11135: Poor performance when using webscript based web forms 
         16787: Fixed Web-Client Eclipse project after recent chiba JAR file name change 
         16840: Resolution to issue in ETHREEOH-2633: Change to Common.js function implemented in CHK-5134 causes problems with missing icons in Navigator panel. Implemented configuration approach so that both modes can be supported. 
         16870: Fix for ETWOTWO-119 & ALFCOM-332: WCM config override issues where the OOTB web-client-config-wcm.xml file needed to be changed and the ability to define custom scripts to load to avoid the need to edit xforms.js or XFormsProcessor.java

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-14 11:37:27 +00:00
Gavin Cornwell
e13b3f6414 Merged V3.2 to HEAD
15292: Solution for MOB-536 (Remove form-include virtualization server dependencies from Web Forms)
   15299: Fix for ETHREEOH-896 and partial fix for ETHREEOH-1923: XForms layout issues
   15501: MOB-947: Remove virtualisation server dependency from the TinyMCE control used in web forms. Preview URL has been replaced with a call to the 'avm' webscript.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16904 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-14 10:26:07 +00:00
Jan Vonka
d9d774eac0 Merged V3.2 to HEAD
16030: Merged V3.1 to V3.2
        16001: Merged V2.2 to V3.1
            15999: Temp build/test (AVM permissions - testSimpleInternalLayer)
    16223: WCM UI - simple perf improvement when displaying modified list (lock icon)
    16472: Merged V3.1 to V3.2
        16180: ETHREEOH-2821 - fix deployment of WCM layered (ie. across web project) file
        16188: WCM - minor: display (localisable) "File" text (follow-on fix for r15970)
        16255: WCM - ETHREEOH-2836
        16257: AVM - minor updates to unit tests
        16275: WCM - ETHREEOH-2844
        16277: WCM - ETHREEOH-2829 - added simple unit test
        16341: AVM - minor update to reuse core (path) utils
        16344: Merged V2.2 to V3.1
            16323: Fix ETWOTWO-1266 (unexpected AVM conflict)
        16457: Fix ETHREEOH-2836 (WCM layered files) - follow-on fix, with additional unit test
    16649: Fix ETHREEOH-1878 - configure WCM locking for CIFS/FTP
    16654: Merged V3.1 to V3.2
        16507: Fix ETHREEOH-2604 - update unsecured-public-services-security-context.xml.sample (to allow server to start)
        16527: Fix ETHREEOH-2868 - can't submit removal of WCM layered file (Older version prevents update)
        16607: AVM - additional tests when deleting LD + fix to avoid cycle
        16612: AVM - console improvement (lsver, rmvers) to enable admin/support to list & purge snapshots between dates
        16638: Fix ETHREEOH-2893 - stale WCM/AVM layered dir
        16643: AVM - console improvement (setopacity) -> eg. to set stale/modifed WCM layered folder as opaque


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-14 09:20:15 +00:00
Derek Hulley
6c3b7b8cd6 Merged V3.2 to HEAD
15897: Merged V3.1 to V3.2
      14485: (RECORD ONLY) ETHREEOH-1937
      14915: (RECORD ONLY) Fix for ETHREEOH-2011: chaining-authentication-context.xml.sample
      14954: (RECORD ONLY) Fix merge error
      14966: (RECORD ONLY) Merged V2.2 to V3.1
         14131: *RECORD ONLY*
         14605: Merged HEAD to V2.2 (workaround for ETWOTWO-1137)
            14368: Fix for ETHREEOH-1936
         14607: Fixed NPE in TextMiningContentTransformer: Lead-up to fix for ETWOTWO-1174
      14992: (RECORD ONLY) Updated svn:mergeinfo for V2.1-A
      15080: Applied suggested fix for ETHREEOH-2252: Emailed content created in wrong space
      15131: Merged V2.1-A to V3.1 (ETHREEOH-2270)
         13465: Fix for ADB-161 ACT 7870 - added 'xsd' to mimetype map.
      15134: Merged V2.2 to V3.1
         14332: (RECORD-ONLY)
         14717: (RECORD-ONLY)
         14745: (RECORD-ONLY)
         14746: Fixed error relating to detection and clean-up of duplicate child associations
         14759: Missed check-in: Set transactionService for post-transaction duplicate child assoc cleanup
         14761: (RECORD-ONLY)
         14885: (RECORD-ONLY)
         14893: (RECORD-ONLY)
         14903: (RECORD-ONLY)
      15204: Fixed ETHREEOH-2303: FixNameCrcValuesPatch throws ConstraintViolationException during upgrade ...
      15214: Fixed ETHREEOH-1861: Offline synchronization updates file content without any changes
      15271: Applied patch fix: Imported users don't conform to case-sensitivity switch
      15352: ETHREEOH-2322
      15361: ETHREEOH-1112
      15369: ETHREEOH-2448
      15419: ETHREEOH-2479
      15431: ETHREEOH-2520 and ETHREEOH-2521
      15587: (RECORD ONLY) Moved Enterprise-only scripts to correct location
      15616: Fix ETHREEOH-2581 - WCM layered folder - can't submit deleted file
      15675: WCM fixes (ETHREEOH-2110 & ETHREEOH-2645)
      15836: Check for null username in ContentUsage service getUserUsage() method
      15840: (RECORD ONLY) Merged V3.2 to V3.1
         14760: Fix for ALFCOM-586 - trims and ignores leading/trailing whitespace before validation in JSF client forms.
      15841: Fixes for ETHREEOH-2702 and ETHREEOH-2687
      15860: (RECORD ONLY) Added Oracle and MS SQL Server config
      15891: Removed unused compiler directive
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/DEV/BELARUS/ETHREEOH-2221:r14753
   Merged /alfresco/BRANCHES/V2.1-A: lots
   Merged /alfresco/BRANCHES/V2.2:r14131,14332,14605,14607,14717,14745-14746,14759,14761,14885,14893,14903
   Merged /alfresco/BRANCHES/V3.1:r14485,14915,14954,14966,14992,15080,15131,15134,15204,15214,15271,15352,15361,15369,15419,15431,15587,15616,15675,15818,15836,15840-15841,15860,15891
   Merged /alfresco/BRANCHES/V3.2:r15897


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-13 20:08:41 +00:00
Derek Hulley
aa61dae7b0 Merged V3.2 to HEAD
15200: Fixed ETHREEOH-2480: Cannot upload files with .doc extension owing to exception from ContentMetadataExtracter
   15203: ETHREEOH-2246: Rework patch.authorityMigration to be more performant and report progress
   15254: ETHREEOH-2339: Fixed NullPointerException when editing LDAP-synced user who doesn't have an email address
   15267: Applied patch for ETHREEOH-1448: Exception when using the move up/down button when editting a web form
   15270: Mereg (sic) - Record only 15238
   15285: Merged V3.1 to V3.2
      15281: Merged V2.2 to V3.1
         15280: Absorb all metadata exceptions at all levels
      15282: Merged V2.2 to V3.1
         15273: Merged V3.2 to V2.2
            15200: Fixed ETHREEOH-2480: Cannot upload files with .doc extension owing to exception from ContentMetadataExtracter
-------------------------
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V2.2:r15273,15280
   Merged /alfresco/BRANCHES/V3.1:r15281-15282
   Merged /alfresco/BRANCHES/V3.2:r15200,15203,15254,15267,15270,15285



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16854 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-13 10:57:47 +00:00
Kevin Roast
e470d63e36 Merged V3.1 to HEAD
14628: Second attempt at ETHREEOH-2144 fix - tested against several known good webforms.
   14854: Fix for ETHREEOH-2206. Also fixes minor issue where rule condition selection box was not reset after adding a condition to a composite.
   14862: Fix for ETHREEOH-1946 - correctly coerce nodes returned from javascript into AVMTemplateNode objects if they are AVM NodeRef objects.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-23 14:34:50 +00:00
Derek Hulley
3a37812a85 Merged V3.1 to HEAD
13857: Merged V2.2 to V3.1
      7028-13041: (Record only) New merge path
      13343: (Record onlY) Merged V3.1 to V2.2:
         13330: Fix ETHREEOH-1408: Incorrect button name at "Manage Task: Submitted" page
         13337: Fix for ETHREEOH-1409 and further fix for ETHREEOH-1408
      13363: Fix ETWOTWO-1022 (Virtual website not found - Bad host name)
      13386: Fix ETWOTWO-1145: WCM Form web script include is not handling ${} token format
      13387: (Record only) Removed dev from version label
      13621: (Record only) Merged V3.1 to V2.2
         13497: Fixed ETHREEOH-1431: Authentication case sensitivity switch doesn't work
                Fixes ETWOTWO-1012
      13828: ETWOTWO-1171 - checkpoint (alternative patch: resetWCMToGroupBasedPermissions)
      13845: ETWOTWO-1171 - alternative patch: resetWCMToGroupBasedPermissions (part 2 of 2 - set layered/shared acls)
      13855: Fixed line endings
      13856: ETWOTWO-1171 - minor fix: wcmPostPermissionSnapshot patch target schema should be 95
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V2.2:r7028-12305,12307-12310,12312-12319,12321,...
      Merged /alfresco/BRANCHES/V3.1:r13857


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-17 12:44:32 +00:00
Jan Vonka
1f961e31f7 MOB-690 - WCM PreviewURIService - checkpoint
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14642 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-10 17:04:09 +00:00
Jan Vonka
50827e1bbb Merged V3.1 to HEAD
14077: Merged V2.2 to V3.1
        14074: Fix ETWOTWO-929 and ETWOTWO-1175 (WCM preview)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14568 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-05 17:12:00 +00:00
Kevin Roast
9c1d8b616d Merged V3.1 to HEAD
14465: Fix for ALFCOM-195 - date added to WCM FreeMarker template model.
   14466: Fix for ETHREEOH-2075
   14469: Fix for ETHREEOH-2120

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-05 16:29:50 +00:00
Gavin Cornwell
da7376b89b Refactored XForms samples to provide one central location for all XForms tests and examples, continuous build also now builds a distribute archive of all the tests (except unit tests) and examples for use by QA, SEs and the installer
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13746 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-25 21:23:56 +00:00
Derek Hulley
bd92627376 Merged V3.1 to HEAD
13256: Fix ETHREEOH-1221   Hard-coded use of "admin" username
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.1:r13256


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-12 21:48:15 +00:00
Kevin Roast
3531bb88e5 Merged V3.1 to HEAD
13409: Fix for ETHREEOH-1337 - to escape query characters in Site/People service filter methods.
   13410: Fix for ETHREEOH-1272 - another missing pager control.
   13425: Italian lang pack for TinyMCE editors. Fixes ETHREEOH-1491.
   13430: Fix for ETHREEOH-1488.
          Also IDs added to a couple of pagers - not causing a bug, but completes the pager fixes.
   13464: Fix for ETHREEOH-1474 - now possible to use NTLM auth with Alfresco and SURF apps hosted in same app-server with same user browser session in different tabs.
          Added additional NTLM filter debugging info for Session ID.
   13483: Fix for ETHREEOH-1547 - System error happens when trying to create any Web Project.
          Also fixes issue where webproject FormImpl objects did not deserialize correctly due to unsafe service call usage in constructor.
   13501: Fix for ETHREEOH-965 - disallow guest login until explicit Guest support is added to Share.
   13507: Fix for ETHREEOH-1586 - language selectable at login working again.
   13512: Fix for ETHREEOH-1522 - wiki RSS feed template variable named incorrectly.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13598 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-12 12:18:25 +00:00
Derek Hulley
e98e71fb6f Merged V3.1 to HEAD
12994: Merged V3.0 to V3.1
      12931: Merged V2.2 to V3.0
         12635: Fix for ETWOTWO-995: Diff performance degrades on large data sets
         12742: Fix for ETWOTWO-981: WCM - regression - revert fails (eg. for content publisher)
         12743: AVM - add missing tests to test suite & fix existing tests (including base setup)
         12759: AVM - build/test fix - follow-on to r12742
         12781: Fix PersonDAO - fixes AuthorityServiceTest which failed after adding AVMServicePermissionsTest
      12932: Merged V2.2 to V3.0   
         12763: Support for ETWOTWO-975: AVMDifference now implements Comparable<AVMDifference>
         12782: Fix for ETWOTWO-939: Content Contributor cannot edit their own items
         12809: Test fixes after r 12782
         12818: ETWOTWO-977 (Orphan Reaper) - removal of comment questioning cache interaction.
      12933: Merged V2.2 to V3.0
         12306: (record-only) Final set of XSS and HTML encoding fixes for ETWOONE-90 - already merged (see r12310)
      12934: Merged V2.2 to V3.0
         12311: (record-only) Fix for ETWOONE-389 - Current page number not always visible on the browse screen - already merged (see r12312)
      12935: Merged V2.2 to V3.0
         12320: (record-only) Fix for ETWOONE-87: Behavior of delete cascade - already merged (see r12324)
         12322: (record-only) Fix merge issue (marked as Do Not Merge - see CHK-5607)
      12936: Merged V2.2 to V3.0
         12775: (record-only) ETHREEOH-872: Editing Email-notify-rules fails w/ ClassCastException (back-port of r11966)
      12937: Merged V2.2 to V3.0
         12780: Fixed ETWOTWO-1003: DuplicateChildNameException not generated correctly (on Oracle)
         12820: Update to ETWOTWO-926 (WCM Form Inline callouts to Web Scripts)
         12825: Further ETWOTWO-926 update: provide compatibility with old token scheme as the original patch has already made its way into 3.0.1
         12850: ETWOTWO-975 - Show Conflicts in Modified Items List
         12938: Fix merge typo (follow on from r12931)
         12941: Fix merge typo (follow on from r12931)
   12998: Cleaned up svn:mergeinfo entries
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r12931-12938,12941
      Merged /alfresco/BRANCHES/V2.2:r12306,12311,12320,12322,12635,12742-12743,12759,12763,12775,12780-12782,12809,12818,12820,12825,12850
      Merged /alfresco/BRANCHES/V3.1:r12994,12998


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-11 02:50:32 +00:00
Gavin Cornwell
91e042144c Merged V3.1 to HEAD
12988: Fix for ETHREEOH-1238: Cannot use Jsp:include feature in XSD - 'Store not found' exception
   12986: Merged V3.0 to V3.1 
      12980: Merged V2.2 to V3.0 
         12726: Fix for ETWOTWO-950: Forms with list control does not work in IE (6 & 7)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12989 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-30 14:14:51 +00:00
Gavin Cornwell
e1da4cb9d4 Merged V3.0 to HEAD (fixes ALFCOM-2311 & ALFCOM-2332)
12718: Merged V2.2 to V3.0
      12706: Merged V2.1 to V2.2
         12693: Fixed regression where summary pages of WCM related wizards do not render correctly after XSS fixes, related to ETWOTWO-987

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12722 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-13 22:57:30 +00:00