15 Commits

Author SHA1 Message Date
Dave Ward
8521b7d7bd Merged V4.0-BUG-FIX to HEAD
34060: Merged V4.0 (4.0) to 4.0-BUG-FIX (4.0.1) <<< NOTE ALF-12939 still needs to be done to complete this merge to 4.0.1 >>>
      33056: Fix for ALF-12280: Upgrading from version 3.4.7 to 4.0.0 failed with MS SQL database
       - Added dialect-specific script for SQL Server
      33059: Fix for ALF-12127, ALF-11161, ALF-11988
         Merged BRANCHES/DEV/THOR1 to BRANCHES/V4.0
            33049: Fixed follow issues on THOR-839 & THOR-826
                   - Following webscripts now sets "Content-Type" response header to application/json
                   - which makes people search display follow buttons for people correctly
      Fix for ALF-12077
         Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
            32999: Fix for ALF-12050 - IE specific handling of Ajax requests does not correctly respect no-cache setting, need to set Expires header also
      33060: Fix for ALF-12208 - group name encoding
      33072: Merge from HEAD to V4.0
         33071: ALF-11843 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode
            - Fixed build failure in HeartBeat. It had relied on the fact that the previous LicenseComponent kept calling onLicenseChange every time
              the license was checked. It needed the check 1 minute after the initial bootstrap call as there was a memory model sync issue in the
              HeartBeat constructor to do with setting the URL it needed to call.
      33073: Fix for ALF-12295 - CLONE - Upload issue ? - Failed to get content ... (No such file or directory) ... x22
      33083: Merge from HEAD to V4.0
         33082: ALF-11843 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode
            - Did not refresh Tortoise window, this file was missed in the last commit
         33080: ALF-11843 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode
               - On reflection decided to call onLicenseChange every time the license is checked.
                 A change of valid license would not have resulted in a call to onLicenseChange
                 Also have been able to make failure and success code more symmetrical.
               - The previous commit also added a RetryingTransaction around the sendData() call to
                 currentRepoDescriptorDAO.getLicenseKey() which I found while making the HeartBeat
                 changes. As a result we should no longer see the error in 4.0 about there not being a
                 transaction.
      33087: Calendar: Permissions updates, fixes: ALF-12179 & makes the permissions flag boolean.
      33088: FIXED : ALF-11862: An error message appears when you open the "edit task", to request to join the "moderated site"
      Now handles null value
      33102: Fix for ACT #15024-37148 (will update with JIRA no. once available) 
      - issue where in a load balanced Share environment (multiple web-tiers behind a reverse proxy) the modification to the template layout selection for a site or user dashboard would not be reflected in all servers.
      33105: Bitrock license notice file.
      33114: Merged DEV to V4.0
         33067: Fix ALF-12206: CMIS: Error getting association information referencing archived node
      33122: Fix for ALF-12316 Repo -> SOLR query uses HTTPClient that only supports 2 simultaneous connections
      - configurable via spring (default if unconfigured is 40 connections to one host and 40 max connections)
      33142: ALF-12339: Prevents ArrayOutOfBoundsException that can occur with concurrent access of i18n bundle in WebScript
   34065: Fix for ALF-12708 (part 2)
     - Alfresco opencmis extensions library
   34093: ALF-10902 : CIFS: No friendly notification occurs when Editor or Collaborator tries to delete content
   34120: ALF-12767 : CIFS TextEdit - File has been modified outside TextEdit
   34125: Merged BRANCHES\V4.0 to BRANCHES\DEV\V4.0-BUG-FIX
       34094: Fix for ALF-12944 OpenCMIS - CMIS-QL - Range queries for date and datetime properties fail
       34095: Fix for ALF-12944 OpenCMIS - CMIS-QL - Range queries for date and datetime properties fail
              - caught incorrect exception - so much for reading the Java Doc :-)
              - build fix
   34138: ALF-564 : Is network-protocol-context.xml still useful ?
   34149: Removes more server side rendered dates:
   Fixes: ALF-12965, ALF-12984, ALF-12988.
   34158: Fix for ALF-12741 - Steck specific : error on managing groups
   34176: Merged BRANCHES\V4.0 to BRANCHES\DEV\V4.0-BUG-FIX
       34155: Fix for ALF-12979 CLONE - Search - searching in site without any images for *.jpg brings back all the documents
              - note this relies on wildcard/prefix/term/phrase all going through the phrase implementation for wildcard from ALF-12162
   34193: Fix for ALF-12205
   34196: Fix for ALF-12758
   34201: ALF-12892: Ensure that document permissions are refreshed in the dialog after being changed
   34214: Switched off the CIFS Kerberos ticket cracking code by default, added a config value to enable it, latest JVMs do not require this. Part of ALF-12294.
   CIFS Kerberos authentication now works with the IBM JDK. 
   34215: Switched off the CIFS Kerberos ticket cracking code by default, added a property to enable it, latest JVMs do not require this. Part of ALF-12294.
   CIFS Kerberos authentication now works with the IBM JDK (and OpenJDK, Oracle/Sun JVMs) 
   34219: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/V4.0-BUG-FIX:
      32096: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)"
      32125: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)"
   34220: Minor: follow-on to r34219 (ALF-11563)
   34226: ALF-12780:	Mac OS X Lion 10.7.2: Editing a document via CIFS and TextEdit removes versionable aspect from this file
   34228: ALF-12689: Fixed character encoding issue with dynamic welcome dashlet
   34237: ALF-12740: Updated XHR requests to include a noCache request parameter to address IE issue where 304 reponse is assumed for XHR request
   34240: ALF-12835: Second click in status box no longer clears status
   34241: ALF-11991: Updated DocLib to support categories
   34245: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX:
      33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node)
   34246: Reverse merge of BRANCHES/DEV/V4.0-BUG-FIX -c 34245
   Due to an 'svn commit' command argument ordering error, I checked in the solrcore.properties files. This reverse merge removes those changes.
   34247: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX:
      33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node)
   34249: ALF-12782 : IMAP - No friendly notification occurs when a user without delete permissions tries to delete content
   34254: Fix for ALF-13090 SOLR - cross tokenisation field matches too much for "*u*a"
   34262: Fixes: ALF-11557: Publishing Balloon popups appearing in wrong locations. Now appears in correct location in Doc Lib & replaced with standard popup message on Channel Admin page.
   34279: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
   - if orphaned nodes are identified (eg. via getPath(s)) then attempt partial recovery by placing them in (temp) lost_found
   - ... ALF-12358 ('child' node has deleted parent(s))
   - ... ALF-13066 (non-root 'child' node has no parent(s))
   - for internal use only - allows index tracking (eg. Solr) to continue
   - precursor to fixing underlying root causes
   - includes merge & extension of "testConcurrentLinkToDeletedNode" (from DEV/DEREK/ALF-12358)
   34298: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      34068: Fix for ALF-342 - Entering a search containing a double quote displays pop-up 500 error in OpenSearch JSF component
      34069: Fix for ALF-342 - Completed fix with additional encoded of output HTML
      34070: Fix for ALF-12553 - Users are unable to see more than 100 sites under 'My Sites' page. List length now configurable.
      34080: Fix for ALF-10306 - Share Advanced search issue with the Date Range form values
      34107: Added missing jar lib to wcmquickstart and webeditor dependencies
      34114: Fix for ALF-10284 - User should be informed when user provides invalid credentials while opening document using link
      34151: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9)
         34121: Merged BELARUS/V3.4-BUG-FIX-2012_01_26 to V3.4 (3.4.8)
            Should have been done in 3.4.7 in ALF-12174 but was not found by Eclipse search
            34100: ALF-12948 : Copyright year on "About Alfresco" page is out of date   
            Updated copyright year to 2012.
         34150: ALF-10976 (relates to ALF-10412)
            - Thumbnail mimetype check should have been >= 0 not > 0.   
      34171: ALF-13016 : TestModel class exits with a return code of 0 even if model fails validation.
      34190: A modifiable map that protects and underlying map from modification
       - When cloning the backing map (in the event of an potentially-modifying operation) keys and values
         are specifically checked for mutability to prevent excessive cloning.
       - Working towards fix for ALF-12855   
      34191: Fix ALF-12855: Improvement for Lucene in memory sorting and improvement for nodeService.getProperty()
       - Use ValueProtectingMap when passing values out of the NodeDAO
       - Solves the problem of map cloning when used internally as well as when calling NodeService.getProperty()
       - If client code retrieves immutable values from the properties, then they will not be cloned
       - TODO: Special handling of entrySet() and keySet() methods (see ALF-12868) to prevent interceptors from
               triggering map cloning
      34230: Fixes: ALF-12520. Adds i18n strings for siteModel
      34253: Fix for ALF-13102 - JBoss: Unathorized responce recieved on a wcs/touch request with clustered alfrescos (ntlm sso enabled).
      34272: ALF-13136 Merged V3.4.7 (3.4.7.5) to V3.4-BUG-FIX (3.4.9)
         34267: ALF-12419 "Garbage collector error" LockAcquisition on the OrphanReaper process
            - Modified OrphanReaper to use newer JobLockRefreshCallback.
              Refresh lock every minute and timeout if it takes longer than an hour.
      34281: ALF-13145: Merged PATCHES/V3.4.7 to V3.4-BUG-FIX
         34273: ALF-13112: Groups are not displayed when 60k sites and 60 groups in the system
            - Timeout adjustment approved by Kev and Erik
      34291: Merged V3.4 to V3.4-BUG-FIX
         34197: ALF-12900 Error occurs in My Documents dashlet
            NodeRef (ScriptNode) passed to the doclist.get.js doesn't have any content. Not sure why yet.
            Investigation continues, so there may be more changes to stop such nodes being passed in the first place.   
            NPE is as a result of having a nodeRef without content. It falls over on new code in 3.4.8 for ALF-10976 and ALF-10412.
            Not too sure what would have happened in 3.4.7, but expect there world have been another exception in the transformer code.   
            - Addition of defensive code around contentData being null and the reader given to the transformer being null.
         34198: ALF-12900 Error occurs in My Documents dashlet
            - File missing from last commit
         34242: ALF-13078 Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012
            - Should have been done in 3.4.7 in ALF-12174 but was not found by Eclipse search
         34265: Updated installer splash screen for 2012 (thanks Linton!)
         34282: ALF-13059: Windows 7 specific: It's impossible to add documents to DWS
         - Fix by Alex Malinovsky
         34286: ALF-12949: Merged V4.0 to V3.4
            34248: ALF-13102: NTLM on JBoss - Fix problem with Share SSO Authentication Filter corrupting cookie headers
      34292: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         34284: ALF-12949: Merged V3.4-BUG-FIX to V3.4
            34253: Fix for ALF-13102 - Surf mixing up cookies for different sessions
   34299: Merged V4.0 to V4.0-BUG-FIX
      34067: ALF-12423: Prevent script error on IE9
      34102: SPANISH: Fixes minor encoding error
      34115: Merged BRANCHES/DEV/BELARUS/V4.0-BUG-FIX-2012_01_20 to BRANCHES/V4.0:
         34099: ALF-12710: Stack specific: It's impossible to log into CMIS Workbench through WebServices binding
      34156: Missed from commit for r34154
      34189: Fix for ALF-12822 - Script error when Add translation
      34216: Fixes: ALF-11938 - A distinction needed making between the i18n labels for company address and personal address - I extended this to other company specific fields too.
      34238: ALF-12864: Removed trailing spaces from installed jodconverter defaults
      - Stopped forms from recognising booleans
      34243: NFS, switch from read-only to writeable file if write access required and cached file was opened read-only. ALF-12193.
      Fix I/O error saving from OpenOffice on Linux.
      34263: Merged HEAD to V4.0
         34250: Fixed THOR-1137 "Make Spring Surf enable-auto-deploy-modules by default"
      34264: ALF-12975: alfresco-enterprise-4.0.1-installer-win-x64.exe / x32 installers fail
      - Due to not detecting new stderr file
      34278: ALF-12763: Re-applied change from ALF-7528 after it was lost in r28224 / ALF-5900
         - PutMethod was modified to use only guessed mime type for documents and completely ignore the Content-Type header from client.
   34303: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
      33110: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0:
         33109: ALF-11479: When upgrading from Alfresco Community 3.4.d to 4.0.b, some nodes that are blocked and have versions fail after the upgrade
      33320: Merged BRANCHES\DEV\V4.0-BUG-FIX to BRANCHESV4.0
          33305: ALF-12463 Error querying database was detected during upgrade process from 3.1 to 4.0.0.
      33326: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
          33277    ALF-12468 CLONE - Regression. Searches cause database server to thrash CPU - ALF-12426
      33331: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\V4.0
          33301: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
              33299: ALF-12281: Memory leak in ReferenceCountingReadOnlyIndexReaderFactory
          33303: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
              33302: ALF-12281: Correction to previous checkin - deal with the initial reference created by the constructor and cleared by closeIfRequired()
      33398: Merged V4.0-BUG-FIX to V4.0
         33116: ALF-12517: Allow multiple deferred requests per oplock break, next level of fix for ALF-11935.
         33147: FTP implemented set modification date/time command (MFMT). ALF-12105.
         33151: Fix problems with FTP and UTF-8. JLAN-81.
         When using the Java6 Normalizer use the NFC form.
         33158: Fix NFS server swallows exceptions. ALF-11667.
         Startup exception details are now saved.
         33183: Minor fix to exception string in extendBuffer().
      34061: Merged V4.0-BUG-FIX to V4.0 (Start of 4.0.1)
      34062: Merge V4.0-BUG-FIX to V4.0 RECORD ONLY (changes that came from V4.0)
      34109: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0
         34108: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
            Added missing jar lib to wcmquickstart and webeditor dependencies
      34154: Merged BRANCHES/DEV/V4.0-BUG-FIX/ to BRANCHES/V4.0:
         34149: Removes more server side rendered dates: Fixes: ALF-12965, ALF-12984, ALF-12988.
      34274: Merged V4.0-BUG-FIX to V4.0
         34237: ALF-12740: Updated XHR requests to include a noCache request parameter to address IE issue where 304 reponse is assumed for XHR request
      34288: Merged V3.4 to V4.0
         34197: ALF-12900 Error occurs in My Documents dashlet
            NodeRef (ScriptNode) passed to the doclist.get.js doesn't have any content. Not sure why yet.
            Investigation continues, so there may be more changes to stop such nodes being passed in the first place.   
            NPE is as a result of having a nodeRef without content. It falls over on new code in 3.4.8 for ALF-10976 and ALF-10412.
            Not too sure what would have happened in 3.4.7, but expect there world have been another exception in the transformer code.
            - Addition of defensive code around contentData being null and the reader given to the transformer being null.
         34198: ALF-12900 Error occurs in My Documents dashlet
            - File missing from last commit
         34242: ALF-13078 Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012
            - Should have been done in 3.4.7 in ALF-12174 but was not found by Eclipse search
         34265: Updated installer splash screen for 2012 (thanks Linton!)
         34284: ALF-12949: Merged V3.4-BUG-FIX to V3.4
            34253: Fix for ALF-13102 - Surf mixing up cookies for different sessions   
         34286: ALF-12949: Merged V4.0 to V3.4
            34248: ALF-13102: NTLM on JBoss - Fix problem with Share SSO Authentication Filter corrupting cookie headers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34305 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-01 11:41:07 +00:00
Dave Ward
811519ae48 Merged V4.0-BUG-FIX to HEAD
33116: Allow multiple deferred requests per oplock break, next level of fix for ALF-11935.
   33136: Fix for ALF-12200: "Content type is not recognized on creating document from source"
   33137: Activities feed generator: change info log messages to debug log messages
   33139: ALF-12262	View in Source Repository works incorrect if the folder was created on target side at first
   33141: Fix for ALF-12178 "Bulk import - status page shows broken link (Initiate another in-place import)"
   33144: Fixes ALF-11119: The 2 tranformations didn't work - Segmentation fault in ffmpeg - it looks like a bug with ffmpeg and it was decided that compile/bug fixing ffmpeg is not a priority at the moment.  The 2 entries have been commented out.  If they are required, the user should consult the ffmpeg documentation for the correct version & o/s at the time.
   33146: ALF-11345 Patch from Pavel Yurkevich to fix another VTI/SPP problem with site names that start with Alfresco
   33147: FTP implemented set modification date/time command (MFMT). ALF-12105.
   33148: ALF-12063 Pull some of the VTI list type definitions out to a common base class
   33150: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33076: ALF-12285: Allow dumping of schema to XML via JMX
   33151: Fix problems with FTP and UTF-8. JLAN-81.
   When using the Java6 Normalizer use the NFC form.
   33158: Fix NFS server swallows exceptions. ALF-11667.
   Startup exception details are now saved.
   33160: Improve the Vti/SPP exception message for the case of the Vti port being already in use
   33161: ALF-12063 Additional SPP/Vti list info required for Mac Office 2011 support
   33162: Fixes: ALF-10322: Edit Dialogue gets out of sync if event moved using FullCalendar (extends FullCalendar to provide a callback after an event changes, which enables us to keep our event object up to date).
   33163: Fixes: ALF-10248: Grey Placeholder image for unauthorised channels has now been replaced with yellow one.
   33164: Fixes: ALF-11562; Refactors My Calendar dashlet to use timezone aware ISO8601 dates from updated Calendar API & removes obsolete properties from userevents calendar API
   33165: Fixes: ALF-10645; i18n label doesn't appear in property bundle.
   33167: Fix for ALF-11970
   33168: Fix for ALF-10565 "Category manager in admin console needs query not search"
     - i18n'd the strings
   33178: Publishing: Fixes: ALF-11552; Inline edit icon alignment issue fixed
   33183: Minor fix to exception string in extendBuffer().
   33194: ALF-10545: NodeServicePolicies#onUpdateNodePolicy not adequate for NodeService#setType
      * Added beforeSetNodeType and onSetNodeType policies
      * Both callbacks have old and new types as parameters
   33204: Fixes: ALF-11230, publishing tracking link opens in repository, not Doc Lib. Also fixes a couple of other minor bugs:
      - balloon pop up didn't appear when published from Doc Details page
      - tracking link appears black (on black) when hovered over.
      - adds defensive code to prevent an error if the expected element for the notification balloon isn't there.
   33212: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33211: ALF-12384: Failed schema dump can cause failure of repository start up
   33217: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      31840: Fix for ALF-10282 - Web Browser freezes with large xml files Web form transformation
      31987: Proper fix for ALF-11489: 'patch.sitesSpacePermissions' failed on upgrade 2.2.8 -> 3.4.6
         - Just handle missing defined ACLs   
      32341: Fix for ALF-9883 - WCM Forms: Changing 'abstract' type carries previously-added elements
      32911: Add a (currently disabled) unit test for ALF-10466 - The HTML to Text transformer (not Tika based) should take account of the content encoding
      32912: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_10_13 to BRANCHES/DEV/V3.4-BUG-FIX with changes + unit testing:
         31742: ALF-10466 - The HTML to Text converter needs to take account of the Encoding set on the Content Property, to be able to correctly index MBCS text in wiki pages (and others)   
      32946: ALF-12161: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
         32921: Merged DEV/TEMPORARY to PATCHES/V3.4.5
            32913: ALF-11440: Content Manager unable to edit content from another user sandbox
               In order to allow a Content Manager to edit a locked document in other user's sandbox, it is needed to modify the AVMLockingAwareService.grabLock().
               The 'lockState' variable could be set to 'LOCK_OWNER', if a user is ContentManager to bypass the check.   
      32964: Fixes ALF-11054: Sharepoint - Wrong sorting by date
        - incorporated patch from investigation team
      32967: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_10_13 to BRANCHES/DEV/V3.4-BUG-FIX:
         31828: Fixes ALF-10720: Webform performance improvement
               Minimize database usage by adding new variable to FormWrapper that holds a form's name.   
      32969: Fixes ALF-10471: Cannot correctly remove users from email notification rule list
      32980: Merged DEV/TEMPORARY to V3.4-BUG-FIX
         32961: ALF-12132: Set "common-placeholder-configurer" as parent for "lotusWSPlaceholderConfigurer" bean.    
      32996: ALF-12184: SchemaBootstrap must use same assumptions as PatchServiceImpl when deciding whether an alternative patch succeeded
      - Fixes regression introduced by r31972 / ALF-11489
      33068: Added suggested fix to commit any current transactions in the NFS file expiry thread. ALF-11827.
      33077: ALF-10142: Allow TinyMCE to accept <meta> element when editing HTML files inline in Share.
      33094: Fix for ACT #15024-37148 (no JIRA yet)
       - issue where in a load balanced Share environment (multiple web-tiers behind a reverse proxy) the modification to the template layout selection for a site or user dashboard would not be reflected in all servers.
      33118: ALF-12278: Prevent the copying over of headers specific to a POST request on to the touch GET request   
      33138: Upgraded SpringSurf to 1.0.0 rev 968
      33140: Added missing json-simple jar to 3rd party eclipse classpath, which bizarrely is used to generate the JUnit cmd line unit test classpath, no really.
      33145: Fix for native FTP timestamps returned in GMT timezone format. ALF-11986.
      33175: ALF-12366: Cope with read committed DB behaviour in AbstractReindexComponent.reindexTransaction()
      33179: ALF-12344 CLONE - Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012 as that is when we will release 3.4.7
          - Being done in 3.4.8 not 3.4.7
      33190: Latest SpringSurf libs:
       - much improved handling of multiple connections and connection reuse in RemoteClient
       - improves connection reuse generally, but also much more stable under load balancing condition with multiple Share web-tiers behind a reverse proxy
      33193: ALF-12344 CLONE - Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012 as that is when we will release 3.4.7
          - Found a few more having followed previous date changes and searches
      33203: Fix for HttpClient issue: Error status 500 Unbuffered entity enclosing request can not be repeated.
      33206: Fix to FormUIGet - no need to manually patch up the JSON request since rev 33138 (SpringSurf 1.0.0)
   33218: Fix for ALF-11868 "CMIS: removeAcl() function doesn't work via atompub."
   33220: Merged PATCHES/V3.4.6 to V4.0-BUG-FIX
      32405: Merged V3.4.6 (3.4.6.1) to V3.4.1 (3.4.1.24)
         32404: ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites.
            Removed read only transaction from invites.get.desc.xml as it broke InviteServiceTest testRejectInvite
         32397: ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites.
            Return first 200 invitations (similar to 4.0 paging)
            Transaction used by the invites.get is now read only so does not force a flush of caches.   
      32503: Merged PATCHES/V3.4.6 to PATCHES/V3.4.1
         32501: ALF-11727: Reinstated read-only transaction around invites.get and prevented it from trying to lazily create persons from rejected invites that had previously been deleted by InviteHelper.cleanUpStaleInviteeResources!   
      32650: ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally
      32775: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         Even more changes:
         - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible)
         - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows
         - modified js which was making a query for each person in order to work out if they were already in a pending invites list
      32838: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
      - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site)
      - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors
      - Performance implications still to be checked but at least functionally correct
      - Corrected JPDL source jar
      32857: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 
      32861: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
      - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects
      32868: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
      - Rationalization of batch fetching at hibernate layer
      32881: ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation().
      32927: ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks()
      32936: ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out
      - Pending invitation workflows are cancelled in an asynchronous action
      - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate
      - Creating the rows in the first place took 20 minutes!   
      32956: ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks
      - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete
      33169: ALF-12312 'org.hibernate.LazyInitializationException: could not initialize proxy - no Session' when clicking on a Pending Invite workflow task in JSF
         - Follow on from ALF-11872: Only use lazyloaded WorkflowTasks from JBPMEngine.getWorkflowTasks() when we are using the same session (currently
           only done from InvitationService). The fallback is to assume it is not the same session and return a normal list of Workflows.
   33221: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      30463: L10N Updates from Gloria (based on r30332): Fixes ALF-8211 and new string updates
      30473: Merged HEAD to V3.4-BUG-FIX
         30468: Fixed ALF-10280: Slow to report ® Duplicate entry ¯ in database.
                - DuplicateChildNodeNameException implements DoNotRetryException   
      30685: Merged HEAD to V3.4-BUG-FIX
         30679: Unit test for ALF-1017 - Non site content in the Sites Space
         30683: ALF-1017 Remove EVERYONE Contributor permissions from /Company Home/Sites/, to avoid misc nodes being created in there by mistake by users, and update the SiteService to runAsSystem when creating the Site node   
      30693: Merged HEAD to V3.4-BUG-FIX
         30692: Fix ALF-1017 specific test following ALF-1017 changes to permissions   
      30808: Fixes: ALF-10485 (minor text update)
      30873: Latest L10N update from Gloria (based on r30698):
         - Adds Web Quick Start translations (back port from 4.0)
         - Adds/updates new or previously missing strings
      31019: Merged HEAD to V3.4-BUG-FIX
         28974: added double-checks for associations when a potential failure is detected
         31018: Fixed ALF-9591: Integrity check: Association source multiplicity checking is incorrect
                - Drop checks for source multiplicity when no associations are pointing to a type/aspect instance   
      31045: Merged HEAD to V3.4-BUG-FIX
         31044: Performance improvements for PATH queries relating to Share dashboard dashlets and document library.
                - tweaks to generation of PATH queries - hugely improves performance when dealing with 1000's site memberships
      31160: Merged HEAD to V3.4-BUG-FIX
         31156: Various Share search related fixes as spotted by Andy:
                - increased resultset size that is used to retrieve raw results from query before Share specific results are filtered - this means sensible results are now shown from large repository wide and sorted queries, previously results would be "missing" if they dropped out of the resultset prefiltering
                - fix to Share Search component to correctly display if more than N results were found in the repository
                - fix to add default TYPE clause to generated Share search if no other TYPE is specified - this reduces masses of potentially matches results from repository wide searches that would otherwise need to be post-filtered
      31345: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX:
         31330: Fixed WCM bulkImport's importDirectory
      31442: Merged HEAD to V3.4-BUG-FIX
         31441: Fixed ALF-11014: Content output stream close errors are absorbed silently
                - Found while testing XAMcontentStore
                - Pulled stream copy code into AbstractContentWriter
                - OutputStream closure (write-side) exception is rethrown to allow full rollback, etc   
      31444: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX:
         31383: MLPropertyInterceptor performance improvements:
      31758: Merged V3.3 to V3.4-BUG-FIX
         31757: ALF-11279: Fixed RetryingTransactionInterceptor so that it actually behaves like an interceptor and doesn't throw away the rest of the interceptor chain!   
      31798: Merged V3.3 to V3.4-BUG-FIX
         31773: ALF-11279: Further RetryingTransactionInterceptor fixes - must do mark for rollback on propagating transactions   
      32051: ALF-7195: Merge HEAD (4.0) to V3.4-BUG-FIX (3.4.7)
         Merge was simply to take HEAD version to pick up changes made by Derek to DisableAuditableBehaviourInterceptor
         32047: ALF-8882 Edit Online: Modifier and Modified date are changed even no changes were applied
            - needed to turn off ASPECT_AUDITABLE on removeProperty which is called on unlock
            - added code to not enable this aspect early if nested calls were made (this is not done, but is safer this way)
      32088: Merging HEAD to 3.4-BUG-FIX:
      r32063: ALF-10947 Fixed issue where repeating JBPM timer was causing an infinite loop if an exception was thrown within the timer event.
      32475: ALF-11727 Improved performance of pending invites search.
      32512: Incremented version revision for 3.4.8
      32917: ALF-12133: Merged HEAD to V3.4-BUG-FIX
         32906: ALF-12068 - Zimbra desktop - corrected InternalDateAsString.   
      32923: ALF-12133: Merged HEAD to V3.4-BUG-FIX
         32918: ALF-12133 - Attempt 2 to get Imap internal date correct.   
      33021: ALF-9878: Merge V3.4.1 (3.4.1.25) to V3.4-BUG-FIX (3.4.8)
         32956: ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks
         - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete
         32936: ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out
         - Pending invitation workflows are cancelled in an asynchronous action
         - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate
         - Creating the rows in the first place took 20 minutes!
         32927: ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks()
         32881: ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation().
         32868: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - Rationalization of batch fetching at hibernate layer
         32861: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects
         32857: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 
         32838: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site)
         - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors
         - Performance implications still to be checked but at least functionally correct
         - Corrected JPDL source jar
         32775: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            Even more changes:
            - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible)
            - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows
            - modified js which was making a query for each person in order to work out if they were already in a pending invites list
         32650: ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally   
      33143: Merged BRANCHES/V3.4-TEAM to BRANCHES/DEV/V3.4-BUG-FIX
         25103: ALF-6613 - SpringSurf improvements to allow easier refactoring of Document Details page
                - removed manual request level caching of remote calls responses in web-tier components - now completely automatic
         25138: Flattening of user preferences remote calls - ensures /preferences hits the RequestCachingConnector - reduces no. of remote calls by 3 for the doclib and by 4 for a site dashboard.
      33216: Merged PATCHES/V3.4.1 to V3.4-BUG-FIX (3.4.8)
         32405: Merged V3.4.6 (3.4.6.1) to V3.4.1 (3.4.1.24)
            32404: ALF-9878 / ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites.
               Removed read only transaction from invites.get.desc.xml as it broke InviteServiceTest testRejectInvite
            32397: ALF-9878 / ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites.
               Return first 200 invitations (similar to 4.0 paging)
               Transaction used by the invites.get is now read only so does not force a flush of caches.   
         32503: Merged PATCHES/V3.4.6 to PATCHES/V3.4.1
            32501: ALF-9878 / ALF-11727: Reinstated read-only transaction around invites.get and prevented it from trying to lazily create persons from rejected invites that had previously been deleted by InviteHelper.cleanUpStaleInviteeResources!   
         32641: ALF-12387 / ALF-11872: Merged V3.4-BUG-FIX (3.4.8) to V3.4.1 (3.4.1.25)
               32475: ALF-11727 Improved performance of pending invites search.
         	     (N Smith changes to do with only using ONE search value - faster as multiple are taken as ORs rather than ANDs)
         32650: ALF-12387 / ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally
         32775: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            Even more changes:
            - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible)
            - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows
            - modified js which was making a query for each person in order to work out if they were already in a pending invites list
         32838: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site)
         - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors
         - Performance implications still to be checked but at least functionally correct
         - Corrected JPDL source jar
         32857: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 
         32861: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects
         32868: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - Rationalization of batch fetching at hibernate layer
         32881: ALF-12387 / ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation().
         32927: ALF-12387 / ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks()
         32936: ALF-12387 / ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out
         - Pending invitation workflows are cancelled in an asynchronous action
         - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate
         - Creating the rows in the first place took 20 minutes!   
         32956: ALF-12387 / ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks
         - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete
         33169: ALF-12382 / ALF-12312 'org.hibernate.LazyInitializationException: could not initialize proxy - no Session' when clicking on a Pending Invite workflow task in JSF
            - Follow on from ALF-11872: Only use lazyloaded WorkflowTasks from JBPMEngine.getWorkflowTasks() when we are using the same session (currently
              only done from InvitationService). The fallback is to assume it is not the same session and return a normal list of Workflows.   
   33224: Fix for ALF-12230 "Bootstrap re-encryption failed"
   33225: Fix for ALF-12349 Transformations need to handle failures due to server being busy.
     Change to system behaviour:
       We want to support transient failures of thumbnail creations. Primary example now is the Polymorph Transformation Server which
       can fail transformations because it is under load and wishes to decline transform requests.
       Prior to this check-in, such failures would be interpreted by Alfresco as 'real' failures and the content node would be marked
       as FailedToTransform. The transformers' state data would also be affected by the failure.
       We need to allow transformers to fail and NOT trigger any negative consequences such as above.
     Changes in code:
     New exception type ActionServiceTransientException when thrown from an ActionExecuter will NOT trigger any compensating action that has been configured.
       This allows actions to fail 'normally' or due to some transient condition with the implication that if rerun later the action may succeed.
     Additional end-state for Actions in the ActionTrackingService: ActionStatus.Declined. The ActionExecuter has declined to execute the action at this time.
     New exception type ContentServiceTransientException which means that a content operation (currently only a transformation) has failed due to a transient condition.
       CreateThumbnailActionExecuter catches this exception type and throws the ActionServiceTransientException.
     Tests at the ActionServiceImpl, ActionTrackingServiceImpl and ThumbnailServiceImpl APIs & various test config & other changes.   
   33231: ALF-10581 - MySQLIntegrityConstraintViolationException: Cannot add or update a child row: a foreign key constraint fails ... fk_alf_cass_cnode
   - unexpected non-null child node id when creating a new node (see also THOR-906)
   - for now genericise ALF-10153 (to include at least MySQL in addition to MS SQL Server)
   33237: Fixing JUnit jar's src attachment.
   33238: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33222: ALF-12351: Separate schema descriptor files for table prefixes: alf_, avm_, JBPM_, act_
      33235: ALF-12351: Separate schema descriptor files for table prefixes: alf_, avm_, JBPM_, act_
   33239: partial fix for: ALF-10446 - Upgraded FullCalendar to support ISO8601 Zulu timezone & told it not to ignore the timezone information.
   33240: Implementation of improvement ALF-12404.
     This fix has been OK'd by Andy Hind.
   33246: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33244: ALF-12352: Add JMX support to trigger a schema check manually
   33252: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      33245: ALF-12366: Delete a node by deleting its row and inserting a new one with the deleted flag set
         - Forces a new ID to be generated for the deleted node
         - Makes it impossible to simultaneously delete a node and add new children in two concurrent transactions
         - Can't be merged to 4.0 due to SOLR - needs something more clever!
      33250: ALF-12366: Derek code review
   33254: Merge V3.4-BUG-FIX to V4.0 BUG-FIX
     33249 - ALF-12342 Excel 2003 Patterns.
   33256: ALF-12386 Change the simpler projects to use explicit dependencies, rather than blindly importing all of 3rd-party, to make generating downstream Maven POMs easier
   33266: ALF-12163 - mail.parameters.from does not use the from address provided
   33283: ALF-12185 SPP/Vti Mac Office checkin correction for Collaborators (Patch from Pavel Yurkevich)
   33295: Fix to SMTP authentication implementation.
   33296: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
      33285: Fix for ALF-12336 - Share loses performance if noncachableObjectTypes are defined (page & component)
             - New and improved mechanism for dealing with cache invalidation in Share load balancing and clustering based on the Hazelcast messaging system
             - See http://www.hazelcast.com/docs.jsp - and specifically http://www.hazelcast.com/docs/1.9.4/manual/single_html/#SpringIntegration
             - Sample per node cluster config provided in custom-slingshot-application-context.xml.sample
             - Tested with an Alfresco cluster plus a Share cluster both balanced via Apache server instances
             - Significantly improved Share stability with latest SpringSurf libs and individual node performance back up to non-clustered node speed
   Modified Alfresco JLan build to use newer hazelcast JAR and also modified existing build file references to use new jar location.
   33297: Merge V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) (RECORD ONLY)
      33292: ALF-12457: Merge V3.4.4 (3.4.4.8) to V3.4-BUG-FIX (3.4.8)
         33287: ALF-12400: Merged DEV/BELARUS/V3.4-BUG-FIX-2012_01_10 to V3.4.4 (3.4.4.8)
            33284: ALF-12400 CLONE - Security risk in Web View dashlet
            The check for user role was added to Web View and Site Links dashlets to disallow to configure Web View for Consumer, Contributor, and Collaborator roles and disallow to add Site Links for Consumer role.
      33286: ALF-9514 I18N: Model constraint values need localized display names
         - Applied diff file attached to JIRA issue (with a minor compiler error correction).
           It appeared to be a merge of: DEV/SWIFT r27643, r27645, r27692, r27846 and HEAD r28405, r29364
   33298: ALF-12461 If the OOXML file contains a thumbnail image, use this for the document thumbnail, plus improve the iWorks analoguous transformer
   33305: Fix for ALF-12463 Error querying database was detected during upgrade process from 3.1 to 4.0.0.
   33306: Experiment - adding an sdk-extras target for the enterprise specific bits of the SDK.
   33308: Merged V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1)
      33242: ALF-5830 show_audit.ftl template doesn't work anymore
         - ISO9075 encode the node path
      33271: ALF-9659 In auditing, nodeNameValue extractor never works on a deletion event.
         - As pre call audit is not discarded on transaction rollback, we need to be able to have access to pre call values in the post call audit application.
           One such value is the nodeName for the post call of NodeService.deleteNode()
      33274: Merged DEV to V3.4-BUG-FIX
         33273: ALF-12314: Failed to create content due to error: lockOwner is a mandatory parameter
            It is necessary to pass the correct 'lockOwner' of a rendition, for example, to use 'rr.getLockOwner()' instead of 'lockOwner'
      33277: ALF-12436: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
         33275: ALF-12426: Correction to joins in select_ContentDataByNodeIds
            - inner join to alf_node_properties first
      33279: ALF-12366: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
         33278: ALF-12393: Another indexing race condition when MySQL read committed is enabled, this time in the debug diagnostics!
      33282: Merged V3.4 to V3.4-BUG-FIX
         32979: ALF-12114: Reverse merged ALF-10282 and related changes from V3.4-BUG-FIX, which have caused serious regressions
            31840: Fix for ALF-10282 - Web Browser freezes with large xml files Web form transformation
            32341: Fix for ALF-9883 - WCM Forms: Changing 'abstract' type carries previously-added elements   
         32998: (RECORD ONLY) Merged V3.4-BUG-FIX to V3.4
            32996: ALF-12184: SchemaBootstrap must use same assumptions as PatchServiceImpl when deciding whether an alternative patch succeeded
               - Fixes regression introduced by r31972 / ALF-11489
         33084: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to V3.4 (3.4.7)
            33069: ALF-12266 NPE creating content using the web form
            Locale language can be passed not only as lang_country but as only country code as well.
         33257: ALF-10340: patch.db-V2.2-CleanNodeStatuses must now have patch.db-V2.2-Upgrade-From-2.2SP1 as an alternative to allow upgrade from 2.2.8
         - That's because patch.db-V2.2-Upgrade-From-2.2SP1 exists in 2.2.8 and once run it's too late to run patch.db-V2.2-CleanNodeStatuses
         33260: Set failonany=true on distribute-installers parallel task so that the build actually fails if an installer fails to build
      33301: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
         33299: ALF-12281: Memory leak in ReferenceCountingReadOnlyIndexReaderFactory
            - The diagnostic code I added to track memory leaks was actually causing some!
            - For some reason I was recording a new reference when the index reader was dereferenced rather than clearing it
            - Would affect scenarios where the main index is long-lived and there are no writes to it and lots of searches
            - Spotted by Pavel
            - Too much late night coding!
      33303: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
         33302: ALF-12281: Correction to previous checkin - deal with the initial reference created by the constructor and cleared by closeIfRequired()
   33315: ALF-11214 - IMAP subsystem is not successfully restarted after incorrect modification of IMAP properties via Admin Console
   33321: Remove /hazelcast lib dir include which is no longer required as libs are now at lib root folder
   33322: ALF-2550 - Enterprise SDK files do not contain enterprise repository project.
   33323: SDK - Added Enterprise third party libs.
   33327: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX:
      33324: Fix for THOR-941. Some MIME types appear as Unknown in metadata form.
   The inconsistencies in the edit mimetype form were slightly different on V4.0.1 so I tidied them up.
   33330: ALF-12487 In Mimetype Detection, if Tika detects a generic type of text/plain or XML, defer to the Alfresco filename based type (as we already do for octet stream)
   33335: Quick build fix - comment out SDK enterprise docs while I work out what's wrong.
   33353: Added more projects to Enterprise Generate Docs.
   33357: When installing a module the tool reads the war's version.properties file and will not install if the war version is outside the repoVersionMin or repoVersionMax
   33361: Merged DEV/GETHIN/FINDBUGS to V4.0-BUG-FIX
      32962: Findbugs fix: Suspicious comparison of Integer references
      32963: Findbugs fix: Call to equals() compares different types
      32968: hashcode should be hashCode
      32970: Findbugs fix: Suspicious comparison of Integer references
      32972: Findbugs fix: Suspicious comparison of Integer or Long references
      32976: Findbugs fix: .remove() incompatible with expected argument type String 
      32977: Findbugs fix:  String is incompatible with expected argument type 
      32978: Findbugs fix: Call to equals() compares different types
      I prefer this fix to the previous one I did
      32982: Findbugs fix: Call to equals() compares different types
      classDefinition.getName().equals instead of classDefinition.equals 
      32983: Findbugs fix:  String is incompatible with expected argument type java.util.Locale
      32984: Findbugs fix: An apparent infinite loop
      32985: Findbugs fix: bad month value of 12 passed to new java.util.GregorianCalendar
      This code passes a constant month value outside the expected range of 0..11 to a method.
      32986: Findbugs fix: authenticationComponent masks field from superclass
      32987: Findbugs fix: Invocation of toString on Array
      Now uses Arrays.toString()
      32988: Findbugs fix: Incorrect lazy initialization of static field
      Now uses static initialization block
      32989: Findbugs fix: Dead code: A null pointer would have been thrown before these lines
      32990: Findbugs fix: possible null pointer dereference
      Just made the code a little clearer
      32991: Findbugs fix: class defines a clone() method but the class doesn't implement Cloneable.
      32992: Findbugs fix: All equals() methods should return false if passed a null value.
      32993: Findbugs fix: Invocation of toString on Array
      Now uses Arrays.toString()
      32994: Findbugs fix: If the multiplication is done using long arithmetic, you can avoid the possibility that the result will overflow.
      33006: Findbugs fix: possible null
      Just made the code a little clearer
      33007: Findbugs fix: Invocation of toString on Array
      Now uses Arrays.toString()
      33008: Findbugs fix:  Call to String.equals(Character)
      Explicitly using String
      33009: Findbugs fix:  int converted to long and passed as absolute time to new java.util.Date(long)
      Now works after the year 2037!
      33014: Findbugs fix: Invocation of toString on Array
      Now uses Arrays.toString()
      33023: Findbugs fix: There is an apparent infinite recursive loop
      No longer
      33025: Findbugs fix: possible null
      Just made the code a little clearer
      33026: Findbugs fix: impossible null check
      Changed && to ||
      33029: Findbugs fix: Minor change to Integer.valueOf
      33126: Findbugs fix: Comparison of String objects using ==
      now used .equals
      33127: Findbugs fix: Unwritten field.  All reads of it will return the default value. 
      Now sets values in the constructor
      33128: Findbugs fix: Removed try/catch
      33129: Findbugs fix: Added an assertTrue to the unit test
      33130: Findbugs fix: Passes null for nonnull parameter
      Mocked the serviceReg and now the tests work!
      33131: Findbugs fix: Call to a collection method contains an argument with an incompatible class from that of the collection's parameter   
      33133: Findbugs fix: Deadly embrace between inner class and thread local - not eligible for garbage collection.
      Made inner class static
      33182: Findbugs fix: possible null
      Now intialises documentPaths correctly
      33184: Findbugs fix: possible null pointer (no more)
      33185: Findbugs fix: Comparison of itself
      Changed variable name to fixedValue
      33186: Findbugs fix: Possible null pointer dereference of nodePair
      Now continues
      33187: Findbugs fix: This code seems to be using non-short-circuit logic
      33188: Findbugs fix: Possible null pointer dereference of entry
      Discussed with Andy. If there's no entry then throw the exception, we can't continue
      33189: Findbugs fix: Call to a collection method contains an argument with an incompatible class from that of the collection's parameter
      It must want to remove the user
      33199: Modified the end of line character
      33209: Changed tabs for spaces
      33210: I removed the "if" because it was never called, however Brian suggested moving it to a place where it would be called!
   33363: Fix for ALF-12374 - Share sample 'share-config-custom.xml' is missing an endpoint 'activiti-admin'
   33364: Merge V3.4-BUG-FIX to V4.0-BUG-FIX
     33362 : ALF-12448 - Missing jars in enterprise SDK
   33376: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1)
      33375: ALF-12154: Merged HEAD to V3.4-BUG-FIX (3.4.8)
         Requested to RECORD ONLY this change when merging back to HEAD/V4.0-BUG-FIX etc.
         - Removed duplicate 'List constraint display labels' values from bpm-messages*.properties and dictionarydaotest_model.properties.
           May have been introduced by ALF-9514 changes in the same area, which was also RECORD ONLY
         - Manual merge of JSON propertyLabels that exist in HEAD back into 3.4.8
         32724: OPEN : ALF-11176: Untranslated strings in Group Review and Approve Task form
         Activiti has one default transition "Next".  If there is no transition then the model builder was not finding a translation for the task outcome (and just using the english word, e.g. "Approve").  Now it looks up the translation workflowtask.outcome.[wf:outcome property]
         32943: FIXED : ALF-11176: Untranslated stings in Group Review and Approve Task form
         I've changed the way task descriptions are retrieved. You can now enter translations for them.
   33377: ALF-12509: ibooks Format
   Added quick.ibooks file
   33378: ALF-12207	IMAP: Empty file is not opened/downloaded (using IMAP Content Links) if it was uploaded to Share via fileserver
   33379: Add the TIFF mimetype
   33380: Improve the stream to Tika conversion code, following review for THOR-952
   33385: Upgrade to the latest Tika and POI, for recent bug fixes
   33387: ALF-12492 - Email with empty subject sent to Alfresco by SMTP cause Null pointer Exception
   33396: ALF-12497 - Opening and closing (not save) MS Exel 2003 file via CIFS adds new version
   33397: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33259: ALF-12354: DB2 reference files.
      33261: ALF-12354: MySQL reference files.
      33268: ALF-12354: Oracle reference files
      33310: ALF-12354: Create schema reference files for MySQL, PostgreSQL, Oracle, DB2
      33349: ALF-12354: Create schema reference files for MySQL, PostgreSQL, Oracle, DB2
      33366: ALF-12412: Schema reference files should contain schema version number
      33367: ALF-12412: Schema reference files should contain schema version number
      33373: ALF-12354: Added comment to DB2 file regarding intermittent comparison failures.
      33389: ALF-12516: Produce XML schema definition file (XSD) for schemacomp reference files.
      33390: ALF-12516: added missing file (the actual XSD!)
      33392: ALF-7260 RINF 03: Automate DB schema validation
   33401: FindFindbugs fix: Maybe Derek expected null after all
   33406: Latest SpringSurf libs - fixed use of java.util.UUID which blocks
   33407: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\DEV\V4.0-BUG-FIX
       33399: Fix for ALF-11962 Lucene queries searching on metadata (not on cm:content) with stopwords returns wrong results
   33414: ALF-11746 Webscript to expose the repository mimetypes, along with their user facing display names and their extensions
   33415: ALF-11746 Mimetype information can be available to all
   33442: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
      33441: Latest SpringSurf libs - performance and thread safety improvements.
   33447: Fix to email test - query error exposed by recent change.
   33451: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33446: ALF-12354: fixed DB2 intermittent unique index creation problems.
      33448: ALF-7260: removed redundant code.
   33454: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1)
      33388: Removed L10N that no longer have a default. 
      33437: ALF-9514 I18N: Model constraint values need localized display names
          - Undo changes to webclient_ja.properties that were made by r33286 for this issue.
            There were no changes in webclient.properties that did not already exist in webclient_ja.properties
            This should simplify translations.
      33453: ALF-9514 I18N: Model constraint values need localized display names
         - Tidy up mess to do with the initial r33286 revision for this issue. Lots of L10N property changes.
           I think some of my trial merges from 4.0 did not get reverted before I applied the diff file.
           Reverse merged r33437 and r33286. Note r33388 and r33375 (for ALF-12154) already included changes to try and fix the initial revision.
   33456: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX:
      33455: ALF-12410: JMX Dumps taking very long to finish
   33457: SDK build fix
   33463: Add in Enterprise Docs to SDK (again)
   33464: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33312: ALF-12448: Merged HEAD to V3.4-BUG-FIX (3.4.8)
         33304: ALF-7542 SDK is missing spring-test.jar
            - ant script modified to copy org.springframework.test*.jar files into root\build\assemble\sdk\lib\server\dependencies   
      33382: ALF-10239 Form validation bug when content becomes invalid after XSD change
         - override isValidForSubmit function in alfresco.xforms.TextField as alfresco.xforms.Widget version does not check the max length
      33383: Fix for ALF-11791 - Multiple search on category in Share Advanced Search return no result
         Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX
            29710: SVC15: Contribution: Alfresco Share Adv Search Enhancement: Allow advanced search on category to include sub-categories in query by checking a checkbox as in Alfresco Explorer (ALF-7157)
                   A new "showSubCategoriesOption" has been added to the "category.ftl" form control, that when set to true (as shown in the example config snippet below) will display a checkbox allowing the user to request all sub categories be searched as well as the selected ones.
                     <field id="cm:categories">
                        <control>
                           <control-param name="compactMode">true</control-param>
                           <control-param name="showSubCategoriesOption">true</control-param>
                        </control>
                     </field>
            30572: Fix for ALF-7008 - Double category in Share Advanced Search return no result
      33384: Fix for ALF-12469 - Change method BaseAssociationEditor.generateFormSubmit to protected
      33400: ALF-12366: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
         33354: ALF-12393: Parent assocs must be cached with a txn ID, even when a node has no parents
            - Use left outer join in parent assocs query
         33355: ALF-12393: Fixed typo in SQL + allowed assocIndex to be null
      33413: ALF-12219: Fix CommandServlet to not mess up Document List and My Spaces List dashlets on Websphere
      33416: ALF-12411: Merged DEV to V3.4-BUG-FIX (with corrections)
         33404: Fix that introduces full Unicode character support into jBPM 3.3.1:
            - new patch that alters columns of the jBPM 3.3.1 tables to change 'TEXT' datatype to 'NVARCHAR(MAX)' (SQL Server and Generic dialects);
            - 'jbpm-upgrade.sql' patch modified to alter as in the new patch;
            - 'AlfrescoSQLServerDialect' fixed to allow create tables with 'CLOB' columns as 'NVARCHAR(MAX)' columns
            - devious chain of alternatives (suggested by Derek) introduced to make sure the right patch executes under the right circumstances
      33418: ALF-9507: Fixed possible LDAP security hole
         Now we force RFC 2254 escaping of the user DN resolution query using argument substitution, as described here   
      http://docs.oracle.com/javase/jndi/tutorial/ldap/search/search.html
      33419: ALF-9658: Corrected AFTER_INACTIVITY cache update behaviour in InMemoryTicketComponentImpl
      - Now the key is preserved on entry update and not accidentally regenerated
      33421: Merged DEV to V3.4-BUG-FIX
         32042: ALF-11448: ArrayIndexOutOfBoundsException caused by unsynchronized call in org.alfresco.repo.webdav.WebDAV.formatModifiedDate
            Creation of SimpleDateFormatter was moved to a method.
      33422: ALF-12302: /api/tags API returns badly-formed JSON
      - Resolved as suggested by MH
      33423: ALF-10312: Parameter Based Redirection
      - Now we validate that the Explorer login page redirect URL is within the context path of the application (/alfresco)
      33424: Merged DEV to V3.4-BUG-FIX
         33358: ALF-11719: Webscript fails due to colon in password
            Split basic authentication header by first colon. Remaining part is user's password.
      33425: Merged DEV to V3.4-BUG-FIX
         33359: ALF-12071: Windows 7 cannot open files stored on Alfresco mounted as a webdav network drive if the filename contains + (plus) character
            For Windows 7 we SHOULD decode the file name gotten from GET request taking into account that "+" is not encoded as "%2B" for GET request.
      33426: Merged DEV to V3.4-BUG-FIX (with corrections)
         33374: ALF-10713: Remaining dependencies repo.remote.url from outboundSMTP-context.xml and activities-feed-context.xml was removed and SysAdminParams bean was injected instead. 
            - MailActionExecuter.URLHelper returns url to alfresco using SysAdminParams.
      33427: ALF-10713: repo.remote.url no longer used in 3.4.8 so removed altogether
      33429: Merged HEAD to BRANCHES\DEV\V3.4-BUG-FIX
          31191: First fix for ALF-10741 TAG field does not support wildcard, prefix, fuzzy queries etc -> wildcard searches entered by users will fail (for ALF-12162)
      33433: ALF-12411: Fixed postUpdateScriptPatches declaration
      33435: ALF-11719: Fix Authorization and AuthorizationTest
      33436: ALF-12411: Fixed patch script paths
      33445: Fixes: ALF-12389; internationalises the tool tip strings for changing the data list sort order.
      33449: ALF-12411: Fixes from Dmitry
      - Corrected ID of patch.db-V3.4-Upgrade-JBPM
      - dependsOn property has no effect on a SchemaUpgradeScriptPatch - order controlled by schemaBootstrap.postUpdateScriptPatches   
      33459: ALF-9811: SSOAuthenticationFilter now supports basic auth as well.
   33471: ALF-12297	Emailing to document via inbound SMTP causes integrity violation
   33473: Reference schema files moved on from 5025 to 5026
   33478: Fix for ALF-12515
   33479: Fix for ALF-11116
   33481: Fix for ALF-12099
   33487: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33485: ALF-12598: Incorrect column order on indexes and primary keys must be reported to user
   33496: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33494: ALF-12412: Schema reference files should contain schema version number
   33508: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33507: ALF-12412: Added missing files
   33515: Merge (Record Only) V3.4-BUG-FIX to V4.0-BUG-FIX
     33495 : SDK Build fix - do not merge to V4.0
   33517: V4.0 version of the fix for ALF-12393
    - The node caching structure in 4.0 is version-based and there was already a check to
      ensure that in-memory vs database versions matched for all calls to get parent associations.
    - Added an additional version check for cases where the node returns no parent associations
    - Removed right outer joins associated with the 3.4 fixes (minor complexity that is no longer required)
   33555: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1)
      33554: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9)
         33512: GERMAN: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389
         33513: SPANISH: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389
         33514: FRENCH: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389
         33516: ITALIAN: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389
         33526: JAPANESE: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389
         33544: SPANISH: Fixes additional Spanish translation bugs
         33552: JAPANESE: Adds previously missing workflow related translations
   33560: Fix the line endings to be consistent
   33561: DOC-335 Provide a commented out example of SPP/Vti SSL Configuration in the Module
   33563: Merge (Record Only) V3.4-Bug-FIX to V4.0-BUG-FIX
     33328 : ALF-12098 Issue ALF-4010 not fully resolved. ftp transfer of a previously moved file copies it to the destination folder of the previous move
   33566: fixed a comment.
   33567: Small change to debug logging
   33568: Removed deleteConfirm flag.   Not neccessary as events are fired postCommit.
   33570: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33550: Fixed ALF-10895 "Links, documents and folders: Unable to delete comments"
         - Made sure no "content" is sent when using HTTP DELETE to avoid proxy issues
   33574: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1)
      33573: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9)
         33557: JAPANESE: Removes redundant string
   33576: ALF-12634 When building the edit online link to SPP/Vti, don't assume that the protocol (http/https) is the same as Share, but instead make that a module property (similar to how the port and hostname are set)
   33577: Remove un-used imports
   33584: ALF-12363: Protect against attempt to reference undefined rawPerms variable in folder-permissions WebScript controller
   33586: ALF-12405: Always show delete site icon on My Sites dashlet when viewed on IE7
   33605: Fixes: ALF-12408: Script Error when hovering on a row.
   33616: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\DEV\V4.0-BUG-FIX
       33500: Fix for ALF-12162 Searching for words with german umlaut does not show expected results
   33624: ALF-12488 - CIFS error occurs if Hazelcast Config is enabled.
   33637: ALF-11594: Disable comment field on upload dialog after version update
   33643: ALF-12243: Fixed create HTML content via HTML editor
   33649: Minor: tabs
   33650: ALF-12657: We need to set maxSavePostSize for tomcat connectors to support SSL (e.g. ModelsGet from SOLR will truncate JSON to 4096 characters)
   33662: Fix for ALF-12460
   33663: Fix for ALF-12460 (part 2)
   33664: Fix for ALF-12460 (part 2)
   33665: Fix for ALF-12443
   33672: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33468: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX
         33467: Enterprise overlay update for MessagesWebScript
      33470: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX
         33469: Revert rev 33467 - not required
      33482: Fixed ALF-12373 "IE7 Specific: incorrect displaying of "Link to Rule Set" window in Alfresco Share"
      - also fixed for ie6 removed javascript error thrown on click
      33580: Minor formatting for easier debug stepping
      33581: Fixed ALF-12638: No username in an audit context after an error
      33589: ALF-12650: Merged V3.4.1 to V3.4-BUG-FIX (3.4.9)
         33588: ALF-12620 Regression. Since 3.4.1.25 / 3.4.6.7 a user can be invited to a site multiple times
            - correction to js contains function. Bug introduced in r32775
      33597: Merge DEV to V3.4-BUG-FIX
        33465 : ALF-11193 - Consumer role cannot Unscribe/subscribe the IMAP folders.
      33602: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/DEV/V3.4-BUG-FIX:
         32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself
      33630: Merge Dev to V3.4-BUG-FIX
         33626 : ALF-4896 - Lock icon displayed for documents with expired lock
      33633: Merge V3.4.7 (3.4.7.1) to V3.4-BUG-FIX (3.4.9)
         33609: ALF-12589 CLONE - Content Manager unable to edit content from another user sandbox - Hot Fix for 3.4.7 needed
            Changed the permissions on the user's 'preview' store so that the group of ContentManagers was granted the ContentManager permission.
            It had been granting the permission to all current users in the group individually. As a result new ContentManagers could not FLATTEN or WRITE to the preview store.
            This had already been done for the main user store a few years back.
            As the managers parameter was no longer needed the was removed.
      33647: Merged DEV to V3.4-BUG-FIX
         33629: ALF-12585: Manage System Users shows "Change Password" icon for LDAP users in search results
            Sets "isMutable" property using addPropertyResolver in UsersDialog.   
      33648: Merged DEV to V3.4-BUG-FIX
         33623: ALF-10586: CMIS: Trying to delete a multilingual document w/o translations via webscript
            There is no need to delete associations in CMISServicesImpl.deleteObject().    
      33659: Merged V3.4 to V3.4-BUG-FIX
         33594: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/V3.4:
            32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself
         33595: Reverse merge of the following. Should have been committed to V3.4-BUG-FIX
            33594: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/V3.4:
               32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself   
         33604: ALF-12597: WCMQS doesn't work out of the box
         33654: Merged DEV to V3.4
            33622: ALF-12655: Configure link isn't presented in Web View dashlet(My Dashboard page)   
               User userIsSiteManager is true by default in webview.get.js. This allows to configure Web View dashlet on user's dashbord.
            33651: ALF-12655: Configure link isn't presented in Web View dashlet(My Dashboard page)   
               Sets userIsSiteManager=false before remote call, so if remote call fails it won't give site manager role to the user.
         33655: ALF-12366: Merged PATCHES/V3.4.6 to V3.4
            33548: ALF-12393: More changes to cope with read committed DB behaviour in AbstractReindexComponent
               - Reverted r33278, 33354, 33355 and introduced more generic solution
               - NodeRefs resolving to deleted nodes in the cache cause cache cleaning and transaction retry if they resolve OK in the database
               - Cached parent assocs are thrown away for non-deleted nodes if they are empty
               - Removes the need for the outer join and special case exception handling all over the place   
            33562: ALF-12393: Further improvments
               - Lookup of NodeRef to a deleted node must always result in cache clearing and transaction retrying (due to possible read committed behaviour half way through transaction)
               - Detection and correction of stale cached negative results (VALUE_NOT_FOUND) in node cache   
            33583: ALF-12393: Rework to getNodePair(NodeRef) to have less impact on existing code but still cope with read committed
               - Look ups of deleted nodes still cause InvalidNodeRefExceptions but these have a retryable cause so that both handlers can handle and retrying transactions can recover
               - Corrections to cached negative results (because the nodesCache remembers negative results) are written straight through and the transaction does not need to be retried
      33660: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         33634: ALF-12161: Merge V3.4-BUG-FIX (3.4.9) to V3.4 (3.4.8)
            33633: Merge V3.4.7 (3.4.7.1) to V3.4-BUG-FIX (3.4.9)
               33609: ALF-12589 CLONE - Content Manager unable to edit content from another user sandbox - Hot Fix for 3.4.7 needed
                  Changed the permissions on the user's 'preview' store so that the group of ContentManagers was granted the ContentManager permission.
                  It had been granting the permission to all current users in the group individually. As a result new ContentManagers could not FLATTEN or WRITE to the preview store.
                  This had already been done for the main user store a few years back.
                  As the managers parameter was no longer needed the was removed.   
         33657: ALF-12650: Merged PATCHES/V3.4.6 to V3.4
            33590: ALF-12620: Merged V3.4-BUG-FIX (3.4.9) to V3.4.6 (3.4.6.10)
               33589: ALF-12650: Merged V3.4.1 to V3.4-BUG-FIX (3.4.9)
                  33588: ALF-12620 Regression. Since 3.4.1.25 / 3.4.6.7 a user can be invited to a site multiple times
                     - correction to js contains function. Bug introduced in r32775
   33673: Fixed compilation error
   33678: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33677: Merged V3.4 to V3.4-BUG-FIX
         33676: ALF-12436: Increase content data cache sizes to match node properties cache sizes to allow bulk loading without overflowing
   33679: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      33486: Merge V4.0-BUG-FIX to V3.4-BUG-FIX
        33306 - experiment to add sdk-extras
      33489: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
        33322 : Enterprise SDK
        33323
        33335
        33353
        33457
        33463
      33495: SDK Build fix - do not merge to V4.0.
   33680: Merged DEV to V4.0-BUG-FIX
      33675: ALF-12379: WebLogic: alfresco fails to start: java.lang.NoSuchMethodError: org.apache.commons.lang.mutable.MutableInt.increment()V
         org.apache.commons.* package should be used as application's preferrable for WebLogic.
   33683: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33682: Merged V3.4 to V3.4-BUG-FIX
         33681: ALF-12132: Fix Bitrock's copy of the custom lotus context. Yuck!
   33689: Fix for ALF-12437 Switching from Lucene to Solr caused subsystems to be in inconsistent state and repository to hang
   - filter out changes to read only properties when set in bulk - ie they are ignored
   33691: Fix for ALF-12667
   33693: Fix for ALF-12695 SOLR should not appear to work with AVM - it should not silently fail.
   - AVM search and indexing will raise exceptions when used with SOLR
   - removed the AVM site bootstrap associated with Share in older versions of the product.
   33701: Merged DEV to V4.0-BUG-FIX
      33697: ALF-12691: Alfresco Explorer doesn't work: java.lang.NoClassDefFoundError: org/apache/commons/lang/builder/HashCodeBuilder
         Shared library for WAS was fixed. commons-lang-2.6.jar is used.
   33704: ALF-12299 - NFS subsystem enable/disable needs a different attribute name
   33714: ALF-10229: DOS Voodoo to set ALF_HOME to the parent parent directory of the apply_amps script
   - for /D %%D IN (%~dp0..\) do set ALF_HOME=%%~dpD
   - Yuck!
   33721: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33720: Merged BRANCHES/DEV/BELARUS/V4.0-BUG-FIX-2012_01_20 to BRANCHES/DEV/mward/schemacomp:
           33631: LF-12355 : Create schema reference files for SQL Server
   33727: Test fix - fallout from removing the bootstrap for the "sitestore" AVM store
   33729: Fixes: ALF-12575 - missing i18n strings. (translations pending)
   33738: SPANISH: Translation updates based on EN r33523
   33739: Merged DEV to V4.0-BUG-FIX
      33723: ALF-10229: apply_amps.bat doesn't work properly from alfresco-enterprise-4.0.0a.zip
         Fix for apply_amps.sh to set ALF_HOME to the parent parent directory of the apply_amps script
   33746: ALF-10656 SOLR: Patches execute search during bootstrap causing deadlock 
   - Part 1: 
     - SOLR query use during bootstrap will throw an exception
     - tidy up some patch beans
     - ignore unused AVM "sitestore" in WCMPostPermissionSnapshotPatch
   33753: Remove upgrade installers from build targets


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33758 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-08 11:06:09 +00:00
Mark Rogers
f695bcdcd0 ALF-10686 - Original modification date is lost when files are copied into Alfresco via CIFS
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-11-08 17:09:09 +00:00
Mark Rogers
b503a3c08c CIFS - the root node should not have a name.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31537 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-10-28 10:26:25 +00:00
Mark Rogers
76533353ad ALF-9592 - Saving MS Office files on CIFS drive breaks check-out locks
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30770 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-09-26 13:26:35 +00:00
Mark Rogers
c9a7210e9d ALF-10213 - Content rule is not applied to empty files, created via CIFS
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-09-13 16:24:49 +00:00
Mark Rogers
7c9c6be018 ALF-6297 - Adobe Framemaker "save" function does not play well with alfresco cifs
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-08-11 12:54:36 +00:00
Mark Rogers
41a735de30 ALF-9689 - Reinstate FTP tests
ALF-9404 - Save As New file.
ALF-8756 - Robocopy and Touch

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29551 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-08-05 09:05:37 +00:00
Mark Rogers
b4bd3a21c2 Merge DEV to HEAD
ContentDiskDriver rework.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29451 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-07-29 09:08:54 +00:00
Mark Rogers
664c2bd4c8 ContentDiskDriver test fix.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28877 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-07-08 09:51:29 +00:00
Mark Rogers
86f3c8cd8c ContentDiskDriverTest needs to initialise new JLAN stuff introduced by merge of JLAN_CLUSTER.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-07-07 14:20:05 +00:00
Derek Hulley
e118211bd3 Merged DEV/SWIFT to HEAD (FTP Tests, Tika and Poi)
26059: ALF-5900 - IMAP creates winmail.dat in attachment folder (Add support for Microsoft Transport Neutral Encapsulation Format.)
          - added attachment extraction for TNEF documents - goodbye winmail.dat !
   26063: javadoc for imap.
   26088: ALF-7408 - addition of commons-net for ftp client library.
          First test of end to end ftp.   Just a simple test of connection now, will be followed by more detailed tests.
   26176: ALF-7408 - FTP tests + disabled failing test case for ALF-7618
   26180: ALF-7618 - correction of unit test error.
   26188: ALF-7618 - added a test of paths
   26229: Added back simple '\~.*' pattern
   26288: ALF-7676 - Test to stress different user rights.
          - FTPServerTest.testTwoUserUpdate added for the FTP server.
   26304: Corrected spelling name in private class.
   26408: addming minimal package infos.
   26416: ALF-5082 / ALF-2183 / ALF-4448 - When guessing the mimetype for a file, add the option to supply a ContentReader to enhance the accuracy.
          Enable this for a few key places that do mimetype guessing,
          which should avoid issues for files with the wrong extension (either renamed accidently, or for .TMP)
   26433: Re-order the mimetype guess step to ensure that the Content Reader is always valid
   26440: Added another test for word 2003 save as.
   26441: Test resource for ContentDiskDriver
   26446: ALF-5082 - Back out a FileFolderService change to mimetype guessing, which had broken things, pending a better way to do it with ContentWriter
   26490: Small change for ContentDiskDriverTes.fileExists.  Leaky transaction causing problems in automated build.
   26497: ContentDiskDriver - commented out two of the problematic leaky transaction tests.
   26503: Add new interface methods + documentation for asking a ContentWriter to guess the mimetype and encoding for you.
          (Code will be migrated from places that currently do this themselves later)
   26504: Add an extension interface in the DataModel project for some of the extra ContentReader methods that FileContentReader provides
   26505: When ContentWriter.putContent(String) is called with no encoding specified, record what the system default encoding was that was used.
          (Prevents issues if the system default is ever changed)
   26509: When calling Tika to do file detection, if we have a file based reader then give Tika the File rather than an InputStream
   26522: More debug logging while debugging ALF-5260
   26546: Have one copy of the Tika Config in spring, rather than several places fetching their own copy of the default one (either explicitly or implicitly).
   26522: More debug logging while diagnosing ALF-5260
   26548: Add another mimetype check - ensures that truncated/corrup container files which can't be fully processed can still get the container type without failure
   26549: Implement the mimetype and encoding guessers on ContentWriter (either immediately or as a listener, as required), and update FileFolderServer to make use of this (+test this)
   26553: Replace explicit mimetype and encoding guess calls with ContentWriter requests to have the work done
   26554: Replace explicit mimetype and encoding guess calls with ContentWriter requests to have the work done
   26579: Switch the transformer to use Tika

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28224 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-06-07 07:36:37 +00:00
Dave Ward
a8f0689c1c Merged V3.4-BUG-FIX to HEAD
28158: ALF-8925: Merged V3.3 to V3.4-BUG-FIX
      28121: ALF-8878: Prevent authentication errors in SMBSrvSession.cleanupSession()
   28159: Merged HEAD to V3.4-BUG-FIX (RECORD ONLY)
      27951: Fixed merge issue in ContentDiskDriverTest
   28161: ALF-8861: Fix from Bitrock to kill OpenOffice process on uninstallation if all else fails
   28165: ALF-8260: Corrected French translations of 'Library'
   28166: Fix for ALF-8751 - Dates are not localized in Document Lists dashlet
   28167: Fix for ALF-8493
   28169: ALF-5797: Translation corrections to complex strings
   28171: Merged DEV TO V3.4-BUG-FIX 
      ALF-8808 : CLONE - NFS: User with editor role cannot edit content - unit test required
   28181: Fixed ALF-280: Unfriendly message appears when trying to specify non-existent file-store
   28184: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_04_12 to BRANCHES/DEV/V3.4-BUG-FIX:
      28179: ALF-8754: Cannot preview content on other webapp folder than ROOT (merged w/ trivial clean-up)
   28185: Fixed ALF-8020: Multivalue date in document details causes error in alfresco share   
      NOTE: We do not support any multi-valued fields other than text currently, this fix is therefore to handle the case where a multivalued date or dateTime field is configured in a form. The form will list the dates in view mode but in create and edit modes the control is not displayed at all when there are multiple values, if there is only one value the control continues to function as it has done previously.
   28188: Fix for ALF-731 - in a cluster environment (high availibility), when a node goes down, the users are asked to login


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@27948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-05-21 10:41:57 +00:00