104 Commits

Author SHA1 Message Date
Mark Rogers
c9ba4bc66e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76582: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76493: MNT-11670: Merged DEV to V4.2-BUG-FIX (4.2.4)
         73830: MNT-11670: Unable to end a workflow when a timer is triggered and a rule is configured on a target folder
            - Save current user info when rule is added to the pending execution. Then it can be used during rule execution if security context is empty.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77648 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:47:20 +00:00
Alan Davis
6ccd948c48 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59021: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58878: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58843: MNT-10137 : Update of document.name during creation leads to execution of a content rule specified for deletion (outbound)
         Added BeforeMoveNodePolicy binding to BeforeDeleteChildAssociationRuleTrigger to handle renames via move correctly.
         58645: ALF-12726 : Update of document.name during creation leads to execution of a content rule specified for deletion (outbound)
         Added a JUnit test to reproduce the issue.
         58670: MNT-10137 : Update of document.name during creation leads to execution of a content rule specified for deletion (outbound)
         Added an additional check to the test that reproduces the issue (does not pass).
         Added a test that uses NodeService to rename the node (passes).
         58675: MNT-10137 : Update of document.name during creation leads to execution of a content rule specified for deletion (outbound)
         Added fixes to the test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62065 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:36:16 +00:00
Samuel Langlois
ab4ca7177f Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00
Dave Ward
fb887123ea Merged V4.1-BUG-FIX to HEAD
44918: Fix for ALF-14850 Opencmis getTotalNumItems doesn't return the correct result when setting MaxItemsPerPage
   - correctly report the max number of items
   44927: ALF-16254 ("Leave Site" behaviour for group based site membership)
   44931: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      44930: Merged V3.4 (3.4.12) to V3.4-BUG-FIX
         44929: Merged V4.1-BUG-FIX to V3.4 (3.4.12)
            42118: ALF-15878 ALF-15741: generate doc and src zip for web-framework-commons and jlan
   44939: Remove svn:mergeinfo
   44985: Merged DEV to V4.1-BUG-FIX
      44981: ALF-17085 : DB2: unexpected index found in database
         Correcting db structure after upgrade from 3.4. Optional statement was added.
   44988: Merged DEV to V4.1-BUG-FIX
      44937: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured.
         Add check for content data length during determining existence of content on node.
   44989: Merged PATCHES/V4.1.3 to V4.1-BUG-FIX
      44984: Merged DEV to PATCHES/V4.1.3
         44983: ALF-12425: Can't launch activiti workflow console from Share when external / ntlm / kerberos authentication is used.
         In activiti-admin.get.js generated an absolute URL . Use  url.server + url.context  instead of /alfresco.
      44986: (RECORD ONLY) Merged DEV to PATCHES/V4.1.3
         44937: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured.
         Add check for content data length during determining existence of content on node.
      44987: ALF-17331 60k Site Performance: Admin Console | Groups | Browse Groups (include sys groups): Pagination doesn't work correctly
   45008: ALF-17300 - ConcurrentModificationException
   45011: BDE-103 - Timezone test fail when not run from the UK (at least from Maven build)
   45054: Merged from DEV to V4.1-BUG-FIX
     ALF-13312 - If the license does not exist, please specify in the error message
   45055: Fix for ALF-13921. Description of the web project is not updated.
   45063: Slight improvement to test code as part of ALF-15413.
     Changing test code to get companyHome from repositoryHelper rather than Lucene query, which doesn't work on a dev box with ill-configured SOLR/Lucene.
   45170: Merged PATCHES\V4.1.3 to BRANCHES\DEV\V4.1-BUG-FIX
       45161: Fix for     ALF-17341  CLONE - Hyphen not handled correctly in cmis-alfresco search for Aspects/types : " no viable alternative at character 'a' "
   45192: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX:
      45187: (RECORD ONLY) Fix for ALF-16997 Discrepancies between standalone and cluster ehcache config
   45312: Merged V4.0.2 (4.0.2.23-24) to V4.1-BUG-FIX (4.1.4)
      44912: MNT-248 - 4.0.2.22 HOT FIX: Extra version is created saving changes in OpenOffice document via CIFS
      44964: Merged DEV to PATCHES/V4.0.2
         44963: MNT-263 : CLONE - CIFS: Image document version history lost after saving content in Preview on Mac Mountain Lion
         Fix for "Preview" shuffle scenario on Mac Mountain Lion. New ScenarioDoubleRenameShuffle scenario was added for pattern .*\.sb(-[A-Za-z0-9]*){2}. Unit test for correspomding scenario was added.
      45037: Remove PID check from byte range lock list checks. MNT-266.
      45286: MNT-277 - CIFS: Input/output error during saving ods file via OpenOffice. (Linux Specific)
   45319: NORWEGIAN: Translation updates.
   45338: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4)
      45186: ALF-17303: fix naming mismatch when deploying alfresco-enterprise-repository artifactId to Maven
      45247: Part 2: Better fix for     ALF-16359 Fix SOLR logging in production and other environments
      45265: ALF-17337 Read time out when browsing trash can 
      45298: ALF-17389: Merged: CLOUD1 to V4.1.3
         45082: CLOUD-1139: Cloud feednotifier running on 2 boxes
         - FeedNotifierImpl modified to use reliable lock refresh
         - Added additional debug logging to AbstractUserNotifier just in case we have to prove duplicate entries are still being processed
         - For full debug logging set
            log4j.logger.org.alfresco.repo.activities.feed.FeedNotifier=debug 
         - Happy New Year!
   45355: ALF-17389: Fix build error
   45357: Fix for     ALF-17430  CMIS valid relationships do not check the source and target are valid CMIS docs or folders.
   45363: Merge CLOUD1-BUG-FIX to V4.1-BUG-FIX
     42576 : Job Locking of PostLookup
   45367: Build fix corrections to merge 45363
   45381: ALF-17389 : Implementing Activities Job Lock.
   45416: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) RECORD ONLY
      45415: ALF-17389: Merged V4.1-BUG-FIX to V4.1.3 (4.1.3)
         << Previous merge was to the wrong branch >>
         45363: Merge CLOUD1-BUG-FIX to V4.1-BUG-FIX
           42576 : Job Locking of PostLookup
         45367: Build fix corrections to merge 45363
         45381: ALF-17389 : Implementing Activities Job Lock.
   45424: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2013_01_05 to BRANCHES/DEV/V4.1-BUG-FIX:
      45235: ALF-15604 : Oracle: schema reference files missing nvarchar2 column sizes
   45425: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2013_01_05 to BRANCHES/DEV/V4.1-BUG-FIX:
      45236: ALF-15604 : Oracle: schema reference files missing nvarchar2 column sizes
   45480: ALF-17224: There will not be a "pageList" object in the freemarker model if a wiki page does not exist in a site and the wiki dashlet will cause an error on the site
   45482: Fixed ALF-11036, applied the patch, ran the tests.
   45485: ALF-17224: If the wiki page which was configured in the wiki dashlet will be deleted the dashlet will cause an error. The result of the call must be checked.
   45513: MNT-279: Use binary search in cached authority search to cut down search time when a group contains an astronomical number of authorities
   - Experimental fix to cut down on severe profiling hit
   45542: Fix for ALF-17443 - Contributors cannot edit their own discussion reply
   --This line, and th se below, will be ignored--
   M    root/projects/remote-api/source/java/org/alfresco/repo/web/scripts/discussion/ForumPostPut.java
   M    root/projects/remote-api/source/java/org/alfresco/repo/web/scripts/discussion/DiscussionRestApiTest.java
   45550: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      44920: ALF-11315 removed date localisation on blogpost.lib.ftl dates and corrected date format on pubDate within postlist-rss.get.rss.ftl (iso8601 was being used instead of the required RFC822)
      44936: Fix build
      44967: Merged V3.4 to V3.4-BUG-FIX
         44966: Merged PATCHES/V3.4.11 to V3.4 (3.4.12)
            44891: ALF-17339: Merged DEV to V3.4.11 (3.4.11.2)
               44877: MNT-265: possible improvement to Alfresco SQL query?
               -   Add getOneTxnsByCommitTimeDescending function that makes efficient query to find most recent transaction in time range.
            44951: ALF-17325 / MNT-274: Merged HEAD to PATCHES/V3.4.11
               33015: ALF-11837 - Alfresco 4.0 SMTP Inbound does not work with messages without From and To Headers.
      45191: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
         45172: Fixed ALF-16140: Blank filetype icon is displayed for tiff image
      45436: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX:
         31107: Google Docs SSL error
             * Fixed SSL required error that has appeared recently.
             * Google seemingly no longer supports non secure access to GDoc API.
             * Default URL's fixed up.
      45547: Merged V3.4 to V3.4-BUG-FIX
         45166: ALF-17339: Merged V3.4.11 (3.4.11.4) to V3.4 (3.4.12)
            45162: Merged DEV to V3.4.11 (3.4.11.4)
               44877: MNT-275 Possible issue with MNT-265 fix
                  - SQL from original HF should have used < rather than <= for upper time limit.
         45230: Merged DEV to V3.4 (3.4.12)
            45203: ALF-16992 : patch.fixAclInheritance is failing on sharedAclsThatDoNotInheritCorrectlyFromThePrimaryParent
            Ignoring of repeated ACL added
         45233: Mark the NFS server as active during startup. ALF-16228.
         45287: ALF-12145 Calendar autocomplete for advanced search form incorrectly handles zeros 
         45380: ALF-17461: There is different size of wcm-bootstrap-context.xml file from installer and archive
         - Replicated changes from ALF-11644 to Bitrock-installed copy of wcm-bootstrap-context.xml 
         45454: ALF-17396, ALF-13805: Merged V4.1-BUG-FIX (4.1.4) to V3.4 (3.4.12)
            Revision: 45452
            Author: kroast
            Date: 16 January 2013 09:59:45
            Message:
            Corrected config check for ALF-16413 - Share asks for Basic-Auth while not needed trying to access RSS feeds (thus breaking SSO).
            ----
            Modified : /alfresco/BRANCHES/DEV/V4.1-BUG-FIX/root/projects/slingshot/source/java/org/alfresco/web/site/servlet/SlingshotFeedController.java
         45491: Merge DEV to V3.4 (V3.4.12)
            45473: ALF-11956: WCM accessibility
            DOJO time picker has been fixed to allow selection of hours and minutes, using keyboard. Missing JavaScript key event handlers have been added.
            CSS class checking has been fixed in 'alfresco.xforms.FocusResolver' in 'xforms.js' to support all versions of IE. Some other minor changes...
         45543: Merged V4.1 to V3.4
            44743: ALF-17533 / ALF-17117: Created article or publication cant be viewed on WQS site
            - Further corrections to locking to avoid deadlocks
            44682: ALF-17512 / ALF-17118 WQS: Impossible to upload document to publications space
               - Only first part to do with the transformation failure has been committed. 
            44653: ALF-17533 / ALF-17117: Created article or publication cant be viewed on WQS site
            - Missed file from previous checkin
            44652: ALF-17533/ ALF-17117: Created article or publication cant be viewed on WQS site
            - Fixes by Dmitry Vaserin
            - Removed unnecessary outer read locks from getRelatedAssets and getRelatedAsset to prevent deadlock
            - Correct markup error when node doesn't have tags
         45546: ALF-17512: Corrections to property names by Pavel
      45548: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         44977: Merged V3.4-BUG-FIX to V3.4
            44936: Fix build
   45553: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      45523: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX:
         45482: Fixed ALF-11036, applied the patch, ran the tests.
   45557: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      45556: Merged V3.4 to V3.4-BUG-FIX
         45554: Latest translations from Gloria for revision 45205
   45568: Merged PATCHES/V4.1.3 to V4.1-BUG-FIX
      45421: Merged HEAD to PATCHES\V4.1.3
          44243: Merged BRANCHES\DEV\AUTH_BRIDGE to HEAD
              43735: Final part of ALF-14861 	  SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                     ALF-17489  ALF-17456
      45428: ALF-17455 : BM-0013: SOAK01_04: Activities Feed Cleaner query runs for minutes
      45489: ALF-17455 : BM-0013: SOAK01_04: Activities Feed Cleaner query runs for minutes
   45569: Merged PATCHES/V4.1.3 to V4.1-BUG-FIX (RECORD ONLY)
      45564: ALF-17492: WebScript errors must contain useful information 
      - So doth Derek decree
      - Copied in Surf revision 1217 changes as class local to share.war to avoid pulling in any more untested Surf changes
   45591: ALF-17465 (Document "social buttons/actions" not showing in document library page while document is being edited (locked))
   45601: ALF-17433 (Document detail version display incorrect document version when clicking on edit off line)
   45611: ALF-17478 - MailMetadataExtracter does not store all Message-Recipient-Address
   45622: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX:
      35614: ALF-17598: CLONE - Add range header support to the webDAV servlet
   45633: ALF-17469: JSON message sent back to a client after a category creation is only partially JSON
   --This line, and th se below, will be ignored--
   M    category.post.json.ftl
   45641: Fix non-ASCII character in source comment
   45649: ALF-17556 (Share not redering URL correctly in description field)
   45650: Manually merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX:
      - Changes to StreamContent from merge of THOR1_SPRINTS to HEAD in r34698
   45651: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX:
      45222: ALF-17599: CLONE - Support For HTTP Range Requests in Repository WebScripts
           - Added HttpRangeProcessor.processRange which takes a WebScriptResponse parameter instead of HttpServletResponse
           - Changed HttpRangeProcessor.processSingeRange and HttpRangeProcessor.processMultiRange to accept a generic Object parameter then cast to the appropriate WebScriptResponse or HttpServletResponse
           - Added Javadoc to HttpRangeProcessor.processRange
           - Changed StreamContent.streamContentImpl to add code from BaseDownloadContentServlet which does the work of processing the range header from the request
           - Changed StreamContent.streamContentImpl method signature to accept nodeRef and propertyQName parameters needed for multi-range requests
           - Modified methods which override or call StreamContent.streamContentImpl for new method signature, passing in nodeRef and propertyQName or nulls where appropriate
   45655: Merged DEV to V4.1-BUG-FIX (4.1.4)
      45565: ALF-17503 : Lucene search with skipcount > hits fails when RM is installed
      Return a length=0 if a difference of values (count of finded results and results, that need to skip) is < 0
   45672: ALF-17452 (Status can't be updated with a blank status)
   45682: ALF-17444: Transformation of Outlook files (.msg) doesn't work ootb
   45751: Merged DEV to VC4.1-BUG-FIX (4.1.4)
      45748: ALF-17517: Document does not revert to previous version if certain rule is applied to the parent folder.
      Check node existance on ActionExecuterAbstractBase execution. Add unit test for case when inbound rule executed on node that was checked in.
   45758: ALF-12264: Fixed issue with pooled-tasks for groups with same name across tenants
   45761: Block r45756 from being merged to V4.1-BUG-FIX
   45765: Fix for     ALF-17153    FTS query parser FTSQueryParser is not debuggable
   45810: ALF-17520: Open Document templates are not tranformed properly for thumbnail and preview generation
   45828: Additional fix for     ALF-17153  FTS query parser FTSQueryParser is not debuggable
   45857: ALF-17516 (SHARE: Admin console of users and groups)
   45873: Remove so-called intermittent test category, so that only RepositoryStartupTest remains as a gatekeeper
   45903: ALF-16611 (When opening My Pages filter, a link to the renamed document becomes red)
   45906: ALF-17515: Wrong mimetype name in mimetype-map.xml
      - Changed macroEnabled to macroenabled
   45913: ALF-17462 (In Alfresco explorer invitation to a site does not show the correct options)
   45921: Fix for     ALF-17421  If a property is both multi-valued and multilingual a ClassCastException is thrown when Solr tries to index the property 
   - support multi-valued ML text but not content
   45926: Fix for     ALF-17602    lucene.defaultAnalyserResourceBundleName is not injected anywhere in the spring config
   46024: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4)
      45585: ALF-17303: alfresco-platform-distribution was not deployed properly to Maven repo
      45621: Removed svn:mergeinfo.  A 1.7 client should do this automatically.
      45669: Fix ALF-17582 - BM-0013: JMeter: Run 02: MT ContentStore caching is not thread safe
      45670: Fix ALF-17589 - BM-0013: JMeter: Run 02: CMISAbstractDictionaryService caching of DictionaryRegistry is not thread safe
      45692: Config option for     ALF-17526  BM-0013: JMeter: Run 02: Improve efficiency of services for SOLRAPIClient.getNodesMetaData 
      - preloading can be controlled + removed incorrect use of the secondary cache that could pull in stale data
      45705: Reverted Config option for     ALF-17526  BM-0013: JMeter: Run 02: Improve efficiency of services for SOLRAPIClient.getNodesMetaData 
      - preloading can be controlled + removed incorrect use of the secondary cache that could pull in stale data
      45716: Fix for ALF-17594 	SolrTracker: CMIS model diff (show 1 repeated diff) => CMIS dictionary re-init x2 (every 15 sec) 
      - only refresh the CMIS dictionary if there was an actual model put
      45755: Extra support to make clear what causes any difference between SOLR reports ALF-17588 	BM-0013: JMeter: Run 02: Deviation was detected in full index check reports for SOLR nodes. 
      - also added RETRY command to retry indexing any nodes that failed with errors.
      45803: Fix for     ALF-17490 Solr indexation problem with certain acls on a customer environment 
      - AclsGet respects the maximum acls requested and does not silently truncate toe 1024
      45829: GERMAN: Translation updates based on EN r45262
      45830: SPANISH: Translation updates based on EN r45262
      45831: FRENCH: Translation updates based on EN r45262
      45832: ITALIAN: Translation updates based on EN r45262
      45833: JAPANESE: Translation updates based on EN r45262
      45834: DUTCH: Translation updates based on EN r45262
      45835: RUSSIAN: Translation updates based on EN r45262
      45836: CHINESE: Translation updates based on EN r45262
      45858: Fix ALF-17634 -on startup FeedNotifier fetches all people slowly
      - switch from GetChildren CQ -> GetPeople CQ
      45859: Fix ALF-17634 -on startup FeedNotifier fetches all people slowly
      - reverse fix for this test ... for now, until we re-implement the deprecated method and fix the test case ;-)
      45951: Fix for     ALF-17687  BM-0013: Soak: Run 02: SolrJSONResultSet must preload nodes 
      - added node preload
      45952: SiteServiceImplTest: Added check that size limiting of results is working (and other minor cleanup)
      45953: Fixed ALF-17702: BM-0013: Soak: Run 02: getCachedChildAuthorities is not caching results 
       - getChildAssocs specifically checks for 'members' associations (was eliminated by code)
       - Cache negative results i.e. when there are no children
      45969: Part fix for     ALF-17526   BM-0013: Soak: Run 02: SOLRAPIClient.getNodesMetaData does N+1 calls to NodeDAO 
      - prependPaths caches nodes for the next layer
      45998: Part 2     ALF-17526   BM-0013: Soak: Run 02: SOLRAPIClient.getNodesMetaData does N+1 calls to NodeDAO 
      - make sure bulk node load works and that assocs are cached
      45999: Alternative implementation for     ALF-17719  BM-0013: Soak: Run 03: Contained authorities cache warmup times are restrictive 
      - bridge table is the default for hasAuthority()  - configurable on AuthorityServiceImpl
      46000: ALF-17574 BM-0013: JMeter: Run 02: Blocked threads on PDFParser.parse 
         - Found two blocking points in PdfBox to do with loading fonts from the class path (this was the main cause) and
           the PDFOperator access to a Synchronised map (identified above by Derek).
         - Note in 1.7.0 of PDFBox generally no font was loaded, but under 1.6.0 it was.
           This may be a bug in 1.7.0
      46001: ALF-17722: Merged V3.4 (3.4.12) to V4.1.3 (4.1.3)
         45629: ALF-17536: Stack Specific: Can't transform pdf to jpg
            - Added TRACE to log env properties using
              log4j.logger.org.alfresco.util.exec.RuntimeExec=trace
         45667: ALF-17536 Can't transform multi page pdf to jpg
            - issue was introduced by ALF-15436 Alfresco 3.4c + Share + TIFF preview only shows the first page
      46018: Merged HEAD to PATCHES/V4.1.3
         41904: Fixes bugs uncovered by JDK 7 upgrade
         - nodeService's interceptors depended on nodeService, resulting in some 'interesting' interceptor ordering in the chain (3 * the normal number in a random order). Now we use a lazy interceptor to break the cycle.
         - When the Content Language was en_GB and an MLText property contained {en_US, en_GB} it would return the en_US one, not taking country codes into account when available
      46023: Follow on to previous check in. Fix up evil cloud sync override of "nodeService" to also not suffer from a cyclic dependency!
   46034: Merged V3.4-BUG-FIX (3.4.13) to V4.1-BUG-FIX (4.1.4)
      45745: Merge V3.4 (3.4.12) to V3.4-BUG-FIX (3.4.13)
         45629: ALF-17536: Stack Specific: Can't transform pdf to jpg
            - Added TRACE to log env properties using
              log4j.logger.org.alfresco.util.exec.RuntimeExec=trace
         45667: ALF-17536 Can't transform multi page pdf to jpg
            - issue was introduced by ALF-15436 Alfresco 3.4c + Share + TIFF preview only shows the first page
         45724: ALF-17533 CLONE - Created article or publication cant be viewed on WQS site
            - Further change required to avoid deadlock
         45743: Correction to AuditComponentTest
            - Test was reporting "Incorrect number of audit entries after failed login expected:<1000> but was:<XXX>"
              where XXX was less than 1000. This was because results was being cleared if all all audit failures were
              not available in the first loop. The results needed to cleared before the first loop rather than in every
              loop. For example an XXX value of 830 would simply indicate that the first loop had received 170 audit
              results and that a second loop was required to get the rest.
      45754: Merged V3.4 (3.4.12) to V3.4-BUG-FIX (3.4.13)
         45747: Correction to AuditComponentTest
            - Okay last commit did not work. Try just waiting a bit longer than a second if we don't have all records.
      45976: Merged DEV to V3.4-BUG-FIX
         45925: ALF-16992 : patch.fixAclInheritance is failing on sharedAclsThatDoNotInheritCorrectlyFromThePrimaryParent
            Added a detection on cyclic loop for "inherits from" field.
   46037: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4)
      46033: Build fixes
      46032: ALF-17628 (No information is displayed in My Activities and Site Activities dashlets for content creation)
   46095: 
   46100: ALF-17773, ALF-17774, ALF-17775, ALF-17776: Merged V4.0.2 (4.0.2.26) to V4.1-BUG-FIX (4.1.4)
      45469: MNT-280: Merge from HEAD to V4.0.2 (4.0.2.25)
         43617: Fix for     ALF-16795 CMIS 0.8 TCK - load of large content fails
      45875: Merged DEV to V4.0.2 (4.0.2.26)
         45874: MNT-282: Mbean error stemming from cmis create.
         Synchronize initiating ContentStore.
         Add tenant name to object name of ContentStore MBean for preventing overriding of tenant MBeans.
      45904: MNT-285 Content Stream Errors during CMIS load test (Continuation of MNT-280)
         - Added 'advice' above retrying transactions to supply a ReusableContentStream
      45910: MNT-285 Content Stream Errors during CMIS load test (Continuation of MNT-280)
         - Added unit tests - tests both new TempFileProvider method and AlfrescoCmisStreamInterceptor
         - Corrections to interceptor
   46104: ALF-15843: Upgrade swftools back to 0.9.2
   46109: Merged RECORD ONLY V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4)
      46106: Merged V4.1-BUG-FIX (4.1.4) to V4.1.3 (4.1.3)
         46100: ALF-17773, ALF-17774, ALF-17775, ALF-17776: Merged V4.0.2 (4.0.2.26) to V4.1-BUG-FIX (4.1.4)
            45469: MNT-280: Merge from HEAD to V4.0.2 (4.0.2.25)
               43617: Fix for     ALF-16795 CMIS 0.8 TCK - load of large content fails
            45875: Merged DEV to V4.0.2 (4.0.2.26)
               45874: MNT-282: Mbean error stemming from cmis create.
               Synchronize initiating ContentStore.
               Add tenant name to object name of ContentStore MBean for preventing overriding of tenant MBeans.
            45904: MNT-285 Content Stream Errors during CMIS load test (Continuation of MNT-280)
               - Added 'advice' above retrying transactions to supply a ReusableContentStream
            45910: MNT-285 Content Stream Errors during CMIS load test (Continuation of MNT-280)
               - Added unit tests - tests both new TempFileProvider method and AlfrescoCmisStreamInterceptor
               - Corrections to interceptor
      46087: Merge V4.1-BUG-FIX (4.1.4) to V4.1.3 (4.1.3)
         45480: ALF-17224: There will not be a "pageList" object in the freemarker model if a wiki page does not exist in a site and the wiki dashlet will cause an error on the site
   46112: Merged (4.1.3) to V4.1-BUG-FIX (4.1.4)
      46048: ALF-17727 - BM-0013: Soak: Run 03: Site creation leads to contention on sites container
      - disable auditable behaviour on "sites" container (when creating a site)
      46050: ALF-17727 - BM-0013: Soak: Run 03: Site creation leads to contention on sites container
      - disable auditable behaviour on "sites" container (when deleting a site)
      46055: ALF-17729 - BM-0013: Soak: Run 03: ADMRemoteStore optimization to reduce contention on share folders
      - disable auditable behaviour on parent folder (when creating / deleting file)
      46059: Fixed ALF-17756: Thumbnails are being indexed 
       - Add the cm:indexControl aspect to thumbnails at creation time
       - Also prevent timestamp propagation when adding or removing thumbnails
      46077: Following on from rev 46059 (ALF-17756): Fixed up the mock NodeService.createNode call as we now pass in indexControl properties
      46078: Build fix for SiteServiceImplTest.testGroupMembership(SiteServiceImplTest.java:1308)
      46079: Additional fix for out of transaction tests
   46124: Reverse merge
      << Will A. did not intend to commit this >>
      46095: 
   46159: Fixed ALF-16889, Enabled cookie support for /wcs/api/login, independent from SSOAuthenticationFilter, on by default.
   46165: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately
   46169: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately - missing file
   46184: Refactoring a test class to use JUnit Rules - as part of attempt to reproduce ALF-17797.
   Using JUnit Rules like this will make it much easier to switch users between test methods.
   Checking in separately from future work as this check-in is a pure refactor.
   46185: ALF-17503 : Lucene search with skipcount > hits fails when RM is installed
      Fix build failures
      - Correct tests which expected -ve number of rows returned in a resultset
   46192: Enhancement to JUnit Rule TemporaryNodes.java as required by fix for ALF-17797.
   This check-in enhances TemporaryNodes to allow for the easy creation of specific named quick files.
   Previously you could only easily create a quick file selected by MIME type.
   Now you can use e.g. 'quickCorrupt.pdf' to get that specific file.
   46194: Fix for ALF-17797. AddFailedThumbnailActionExecuter is failing.
   This check-in adds a test case that reproduces the issue and a fix.
   The fix was to have the AddFailedThumbnailActionExecuter action runAs system.
   This is consistent with the behaviour of the create-thumbnail action itself.
   There is no way via the ActionService to run an action (in this case a compensating action)
   as a nominated user, and therefore I have had to change the implementation of
   AddFailedThumbnailActionExecuter.executeImpl so that it always runs-as system.
   46202: ALF-17644: Document version was increased after canceling editing.
   - Also a better fix for ALF-17167
   46208: ALF-17517 Document does not revert to previous version if certain rule is applied to the parent folder.
      - fix build failures (may still be one left) - Not all actions are node based
   46230: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.4)
      46227: Filter repository test resources from alfresco.war
   46272: ALF-17841: Upgrade 4.0 --> 4.1.4 ClassCastException from OnPropertyUpdateRuleTrigger
   - Only listen for updates of single-valued content properties and cope with it previously being multi-valued (as can be the case with the devious license property)
   46279: ALF-17810: Imagemagick requires installation of Visual C++ redistributables
   - x86 VC++ 2008 SP1 redistributables now installed to support ImageMagick
   46354: ALF-10569: Reversing r32622 as it was due to an invalid interpretation of a Microsoft spec and should be unnecessary for the correct support of WebDAV 'dead properties'.
   - Correct fix about to be merged in from V3.4-BUG-FIX
   46360: ALF-17697: Create proper source jars, to deploy to Maven repository
   46361: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      45756: ALF-14722: Repeat merge of V4.1-BUG-FIX to V3.4-BUG-FIX - previous merge in r43028 did not bring over all required changes
      42902: Merged DEV to V4.1-BUG-FIX
         42519: ALF-13588: Google Doc failed to authenticate after incorrect password being entered for google account
            Add ability to unregister class behaviours.
            Unregister googledocs behaviours when subsystem stops. 
      45948: Merged DEV/WABSON/V4.1-GOOGLEDOCS-BUG-FIX to DEV/V3.4-BUG_FIX
         45898: ALF-17704 / ALF-16167: 'Edit Offline' checks out document in Google docs
            - Edit in Google Docs action is now decoupled from Edit Offline action
            - The checkout to Google Docs is only performed if a new parameter 'gdc' is set as a paramter when calling the action web script
            - This paramter causes the web script to call a new method checkoutToGoogleDocs() on ScriptNode if the parameter is set
            - The new method simply calls the existing checkout() method after setting a custom property on the transaction
            - The Google Docs policies now check for the presence of this transaction property before sending the document to Google
      45976: ALF-17876: Merged DEV to V3.4-BUG-FIX
         45925: ALF-16992 : patch.fixAclInheritance is failing on sharedAclsThatDoNotInheritCorrectlyFromThePrimaryParent
            Added a detection on cyclic loop for "inherits from" field.
      46041: ALF-17877: Merged DEV to V3.4-BUG-FIX (with corrections)
         46013: ALF-17662 : The deleted via Sharepoint document is not removed from Alfresco but hidden aspect is added for it
         Documents marked with sys:hidden aspect should be invisible through SPP protocol and should be treated as nonexistent.
      46054: ALF-17878 / ALF-17633 add alfresco-mmt.jar in the SDK distribution
      46173: ALF-17879 / ALF-17806: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX
         46099: MNT-293: Merged V4.0-BUG-FIX to PATCHES/V3.4.10
            37969: Fixes for:
            ALF-12772 'Path not found' error in Share if user has no permissions to parent folders in breadcrumb
            ALF-14527 Share - Error to display documents if user has no access to the parent folder
            - Share now correctly supports accessing documents and folders (and details page actions) where the user does not have Read permissions on the parent node.
         46101: MNT-293: AccessDenied using CMIS when user does not have access to parent folder
         - Fix by Vasily
         46125: MNT-293: Correct Kev's logic to do permission checks after resolving a path as system
         46127: Merged V3.4 to PATCHES/V3.4.10
            45743: Correction to AuditComponentTest
               - Test was reporting "Incorrect number of audit entries after failed login expected:<1000> but was:<XXX>"
                 where XXX was less than 1000. This was because results was being cleared if all all audit failures were
                 not available in the first loop. The results needed to cleared before the first loop rather than in every
                 loop. For example an XXX value of 830 would simply indicate that the first loop had received 170 audit
                 results and that a second loop was required to get the rest.  
            45747: Correction to AuditComponentTest
               - Okay last commit did not work. Try just waiting a bit longer than a second if we don't have all records.   
      46195: ALF-17880 / ALF-17378: Web content is not editable after cancelling the Edit Web Content Wizard
      - Fix by Andrey
      46227: Filter repository test resources from alfresco.war
      46324: Merged DEV to V3.4-BUG-FIX (with improvements)
         45602: ALF-10569 / ALF-17519 : SPP is setting residual properties with an unknown name space (urn:schemas-microsoft-com)
         Implemented special case for handling dead webdav properties. New webdav:object aspect was introduced. It is used to 
         store all dead properties that may be set on resource.
      46353: ALF-17881 / ALF-17272: TooManyClauses error due to syntax error in the query generated from UIComponentSelector
      - Fixed typo in Lucene query generation introduced in r20310
   46362: ALF-17876: Re-fix typo introduced in V3.4-BUG-FIX merge
   46363: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      46285: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
         46279: ALF-17810: Imagemagick requires installation of Visual C++ redistributables
         - x86 VC++ 2008 SP1 redistributables now installed to support ImageMagick
      46325: ALF-17863: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
         43649: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured. 
         43651: ALF-16756: Fixed typos - I took this code in good faith!
         44988: Merged DEV to V4.1-BUG-FIX
            44937: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured.
               Add check for content data length during determining existence of content on node.
   46395: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4)
      46121: Fixed code warnings
      46123: Further improvements on ALF-17702: BM-0013: Soak: Run 02: getCachedChildAuthorities is not caching result
       - Reduced cache entry size
       - Removed binary sort search for authority entries
       - PS: This is one of the most heavily used code paths in the system
      46153: Merged DEV to V4.1.3 (4.1.3)
         << Lots of other changes in addition to merged code>>
         46093: ALF-16149 : CLONE - User search retrieves all users from the DB regardless of search criteria
            - Re-implemented deprecated method PersonServiceImpl.getPeople(...) to use getPeopleCQ or FTS search
         - Replaced calls to deprecated getPeople with calls to other one where it would end up being called anyway.
         - Fixed PersonServiceTests
         - Fixed GetPeopleCannedQuery to use totalResultCount - tests failed otherwise
         - Added warning to PersonService.getPeopleFilteredByProperty(...) if PROP_FIRSTNAME, PROP_LASTNAME, PROP_USERNAME
           were not being used. This was the one place that 'could' called the deprecated getPeople(...) method with
      	 other properties. Other properties are not included in the search values.
      46178: ALF-17796 - BM-0013: Soak: Run 04: Contention on folder 'user' containing users
      - disable auditable behaviour on parent folders (see also ALF-17729)
      46244: Fix for     ALF-17801   BM-0013: Soak: Run 04: ConcurrentModificationException in AbstractLuceneQueryParser 
      - consistently name anonymous constraints defined on properties
      46265: ALF-17799 - BM-0013: Soak: Run 04: Regular timeouts getting site memberships
      - initial fix: make sure limit cut-off is also applied when processing "groups to expand"
      46286: Fix for     ALF-17801   BM-0013: Soak: Run 04: ConcurrentModificationException in AbstractLuceneQueryParser 
      - build fixes for 
         1) Anonymous over-ridden constraints defined to contain the wrong property definition (no matter)
         2) but above causes name collision on over-ridden anonymous constraints on properties
         3) fix -over ride order to set inherited property definition info before over-ridding the property
      46290: ALF-17799 - BM-0013: Soak: Run 04: Regular timeouts getting site memberships
      - fix SiteActivityTest fallout (and adhere to current API contract)
      46315: ALF-17788: WebSphere: QueryException occurs during the clean startup
      - Corrected regression where FeedNotifier tries to scroll past the end of a result set
      46316: ALF-17702: Fixed regression of MNT-279 fix
      - Avoid sequential search across massive user sets when evaluating ACLs
      46350: Update Maven POM files
       - Upgrade version to 4.1.3
       - Upgrade pdfbox to 1.7.0-alfresco-20130130, to catch up after r46000 fixing ALF-17574
      46370: ALF-17613: Merged V4.0.2 (4.0.2.27) to V4.1.3 (4.1.3)
         46368: MNT-298 HF - Replace file by drag-and-drop over CIFS on Mac OS X and passthru/LDAP-AD gets "is in use" message and deletes the file 
   46421: Fix for ALF-17886. DeleteRenditionActionExecuter Acces is denied.
   With test of course.
   46438: ALF-17622 (Activities with Google Docs are not displayed in My Site Activities and Site Activities dashlets)
   46445: Fix for  ALF-17327 Cannot retrieve documents with a Japanese keyword.
   46457: ALF-17904 (GoogleDocs action doesn't work in doclib view)
   46482: Fix for ALF-17858. NPE in formService webscript.
   46497: Fix for ALF-15371 Instances of java.util.Map interface cannot be accessed in JavaScript
   The fix was to have getDefaultValue(Class) return the map.toString. It was previously returning null.
   46533: ALF-17286: SPP (Cluster specific):Document workspace is not browseable via Share if alfresco.host is pointing to balancer host
    - Ensure that concurrency conditions from AclDAO get propagagedby NodeDAO
   46540: Fix for     ALF-17397  searching based on property value that contains dashes doesn't work in a crossloanguage context using Solr 
   - fixed - also added support for query/index time analysis control for the default cross-language analyser. 
   - Not required to resolve the bug but may be useful to reduce query complexity (e.g. do not generate concatenated tokens for query)
      which could have been used as a work around for this bug if available.
   46546: Merged DEV to V4.1-BUG-FIX
      46494: ALF-17899 TempFileProvider.createTempFile() is not debugable
      Added debug logs.
   46562: ALF-17917: Corrected internationalization of Imap Home folder
   - Unfinished business from ALF-15700
   46563: Fix for ALF-17572 - Grey background in 'Google Docs Theme' when uploading files with IE8
   46564: Fix for ALF-17150 - Edit Online action missing in Share for some mime types (incorrect mimetype for PowerPoint files with SLDM extension)
   46565: ALF-17917: Correction to previous fix
   - Use distinct key spaces.imap_home.childname, because spaces.imapConfig.childname was already being used for other purposes
   46568: Fix for ALF-17757 and ALF-1101
   RSS Dashlet cannot display RSS feed produced by Shareӳ blog / RSS Feed Dashlet unable to read internal Alfesco Share site RSS Feeds
   - Fix implementation from Will Abson
   NOTE: there is a cavet, suggest SSO style config as per ALF-16413 to avoid basic auth pop-up when displaying some feeds.
   46624: removed
   46625: Undo last commit
   46626: Merged V4.1.1 (4.1.1.21) to V4.1-BUG-FIX (4.1.4)
      46602: ALF-17953: Alfresco constantly running full GCs
      - Possible fix to TikaPoweredContentTransformer to make it wrap FileContentReaders as TikaInputStreams which can be cast to Files and appear not to need reading into memory in their entirety in uncompressed form!
      - Fix also required to TikaOfficeDetectParser to avoid it wrapping a TikaInputStream unnecessarily
   46629: RECORD ONLY Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4)
      46622: ALF-17968: Merged V4.0.2 (4.1.1.21) to V4.1.3 (4.1.3)
         46602: ALF-17953: Alfresco constantly running full GCs
         - Possible fix to TikaPoweredContentTransformer to make it wrap FileContentReaders as TikaInputStreams which can be cast to Files and appear not to need reading into memory in their entirety in uncompressed form!
         - Fix also required to TikaOfficeDetectParser to avoid it wrapping a TikaInputStream unnecessarily
         46607: ALF-17953 Alfresco constantly running full GC's - some java.lang.threads holding around 9Gb of memory
            - Added transformation limits to the 8 TikaPoweredContentTransformer based transformers, so that the maxSourceSizeKBytes
              can be set for each transformer and for each source mimetype used by each transformer.
            - maxSourceSizeKBytes set to 40MB for the newer 2007 MS office types (4 char ext).
         46619: ALF-17953 Alfresco constantly running full GC's - some java.lang.threads holding around 9Gb of memory
            - Changed maxSourceSizeKBytes values from 40MB back to -1 for the newer 2007 MS office types (4 char ext).
   46636: Fix for     ALF-13442      Tomcat memory leak warnings occur during the shutdown
   46679: Merged DEV to V4.1-BUG-FIX (4.1.4)
      46659: ALF-17631 : Errors/Exception during stress tests of CMIS GET children
      RetryingTransactionHelper has now ability to handle pre-configured exceptions as retriable in addition to default list of exceptions.
   46683: Merge PATCHES/V4.1.3 to V4.1-BUG-FIX (4.1.4)
      46637: Update the notice.txt and licenses with the latest modifications
   Add Microsoft Visual C++ 2008 Redistributable Package in the notice.txt
   46693: RECORD ONLY Merged V3.4-BUG-FIX (3.4.13) to V4.1-BUG-FIX (4.1.4)
      46692: ALF-17984: Merged V3.4.12 (3.4.12.2) to V3.4-BUG-FIX (3.4.13)
         46680: MNT-307: DEV to V3.4.12 (3.4.12.2)
            46659: ALF-17631 : Errors/Exception during stress tests of CMIS GET children
            RetryingTransactionHelper has now ability to handle pre-configured exceptions as retriable in addition to default list of exceptions.
            - Change to opencmis-context.xml on DEV (based on 4.1.4) was made to cmis-ws-context.xml on V3.4.12
   46694: Merged DEV to V4.1-BUG-FIX (4.1.4)
      46686: ALF-17631 : Errors/Exception during stress tests of CMIS GET children
      Unit test add for RetryingTransactionHelper to test extra exceptions are rertied correctly.
   46724: create-site.css and create-site.js will be included in the header (share-config.xml) therefore there is no reason to include them in the freemarker templates.
   46759: Merged DEV to V4.1-BUG-FIX (4.1.4)
      46734: ALF-17873 Missing versionLabel property after Version2ServiceImpl.restore()
      1. In Version2ServiceImpl.restore() to props Map was added ContentModel.PROP_VERSION_LABEL property.
      2. In VersionServiceImplTest.testRestore() was added the check that ContentModel.PROP_VERSION_LABEL property is correct.
   46760: Merged DEV to V4.1-BUG-FIX (4.1.4)
      46433: ALF-16883: Incorrect message occurred when delete Workspace if document is locked.
      Not possible to change MS Office message - have improved alfresco log message
   46782: ALF-17317 4.0.2.23 HOT FIX: OpenOffice server conversion failed 
   46783: ALF-17546 OOXMLThumbnailContentTransformer is not registered to handle special Office document types, such as templates and macro-enabled variants of document / template 
   46797: Restore missing mergeinfo accidentally removed in r46562
   46799: ALF-17546 OOXMLThumbnailContentTransformer is not registered to handle special Office document types, such as templates and macro-enabled variants of document / template
      - typo in mimetype case
   46916: ALF-17174 pdf2swf supports converting N first pages but alfresco does not support it via the pageLimit 
   46933: ALF-8144: Drastically improving performance using lazy-loaded WorklfowTask properties and path + improved the way share pages workflow-tasks to prevent building full model for unneeded tasks
   46946: ALF-18000: Startup script depends on the working directory where it is run
   - Changed vti.properties to
   vti.server.ssl.keystore=${dir.keystore}/vti.ssl.keystore 
   46995: Improvement related to     ALF-17380   Solr queries running slowly 
   - reader -> acl cache is built on demand (and warmed via authority warming)
   - this will mean it is not eagerly built for the archive store where it would be little used, and could be configured off for this case
   47032: ALF-17804: cmisatom URL (opencmis backed by Apache Chemistry OpenCMIS) does not support External authentication
    - Now it supports all kinds of authentication because it sits behind Alfresco's authentication filters
    - Fix researched by Alex Mukha
   47033: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      46453: ALF-18122 / ALF-17708: Incorrect behavior of "Show/Hide Breadcrumb" button when RM is installed
      - ContentService.getReader() now triggers a transaction retry if content is found to have disappeared under its feet due to eager content cleaning
      46495: ALF-18122 / ALF-17708: Incorrect behavior of "Show/Hide Breadcrumb" button when RM is installed
      - lower impact fix will only throw retryable exception if stream is accessed
      46822: ALF-18123: Merge Dev to V3.4-BUG-FIX
        ALF-17408 : Content is not displayed in imap folder after recovering
      46823: ALF-18124 / ALF-18091: Fix for MNT-311 - authentication challenge not present when users open direct links below /share/proxy/alfresco/cmis/i
      46927: ALF-18124 / ALF-18091: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX
         46925: Merged V3.4-BUG-FIX to PATCHES/V3.4.10 (with correction)
            46823: Fix for MNT-311 - authentication challenge not present when users open direct links below /share/proxy/alfresco/cmis/*/content
      46942: ALF-17990: Fix security descriptors for new FileFolderService isHidden setHidden methods
      47021: ALF-18125: Merged DEV to V3.4-BUG-FIX
         46825: ALF-17681 : Lucene Search queries with PATH doesn't work in tenants
         A JUnit test was implemented to show that the PATH Lucene indexes are not created correctly for tenants. 
         46968: ALF-17681 : Lucene Search queries with PATH doesn't work in tenants
         The creation of PATH indexes is now made in context of multi tenant System user to run the reindexing process correctly in unauthenticated threads.
   47034: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      47030: ALF-16102: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX (RECORD ONLY)
         41755: ALF-16013: Merged V4.1-BUG-FIX to PATCHES/V3.4.10
            41539: ALF-15899: Inbound email does not support multiple recipient folders
               - Fix by Dmitry Vaserin
      47031: ALF-18121: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX
         46978: MNT-320: Merged HEAD to PATCHES/V3.4.11:
            36623: ALF-10243: form-service date-control now allows configuring only to send date-component of date-only formfields (timezone and time-component is reset server-side to prevent unnecesairy timezone-issues)
   47035: Merged PATCHES/V4.1.3 to V4.1-BUG-FIX
      46398: Fix for     ALF-17889   Alfresco failing as constraint in extension model cannot be defined 
      - use the namespace from the containing model and not the over-ridden property.
      46426: Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3:
         46421: Fix for ALF-17886. DeleteRenditionActionExecuter Acces is denied.
      46446: ALF-17864: BM-0013: Soak: Run 05: SiteService.listSites(username, size) performance (=> via listSitesImpl)
      - isAuthorityContained made to prune its search drastically - it caches hits and misses speeding up the search in a deeply nested group hierarchy such as SAP's
      - To avoid huge memory impact with lots of duplicate copies of authority names a pool of authority names is shared across all threads
      - getContainingAuthoritesInZone reinstated for site listing as it warms the same caches as the ACLs
      - Derek's latest tests with the changes applied showed a good speed up
      46501: ALF-17929: BM-0013: Soak: Run 06: /api/sites/{shortname}/memberships/{authorityname} / SiteServiceImpl.getMembersRoleInfo performance poor
      - Possible fix to regression caused by ALF-16254
      - A very inefficient route was being taken towards checking a user's indirect site role
      46502: ALF-17930: BM-0013: Soak: Run 06: ConcurrentModificationException in AuthorityDAOImpl
      - Don't try to mutate the set returned by getContainingAuthorities()
      46503: ALF-17929: BM-0013: Soak: Run 06: /api/sites/{shortname}/memberships/{authorityname} / SiteServiceImpl.getMembersRoleInfo performance poor
      - Further optimizations to prevent unnecessary recursion in AuthorityDAOImpl.listAuthorities()
      46506: ALF-17929: BM-0013: Soak: Run 06: /api/sites/{shortname}/memberships/{authorityname} / SiteServiceImpl.getMembersRoleInfo performance poor
      - Fixed typo producing invalid membership results
      46627: ALF-17967: Error in org.alfresco.repo.workflow.WorkflowServiceImpl.getPooledTasks on StartUp.
      - Logic error in org.alfresco.repo.workflow.WorkflowServiceImpl.getPooledTasks() introduced in ALF-14861 / r45421
      - Rather than fixing the screwy logic (which I think would cause a major performance hit) I'm reinstating the 4.1.2 "cut off after 100 groups" behaviour
      46630: Merged 4.1-BUG-FIX to PATCHES/V4.1.3
         46562: ALF-17917: Corrected internationalization of Imap Home folder
         - Unfinished business from ALF-15700
         46565: ALF-17917: Correction to previous fix
         - Use distinct key spaces.imap_home.childname, because spaces.imapConfig.childname was already being used for other purposes
      46779: ALF-17967: Error in org.alfresco.repo.workflow.WorkflowServiceImpl.getPooledTasks on StartUp.
      - Improved fix that uses the bridge table cache if it is available
      - Groups queried for pooled tasks still limited to 100 by default but can be configured with system.workflow.maxAuthoritiesForPooledTasks
      - Overall number of results can be cut off with system.workflow.maxPooledTasks
      47013: Fix HiddenAspect to NOT use permission-checking NodeService
       - Should fix ALF-17605: CLONE - Severe performance problems with Group ACL checking under stress test 
      47018: (RECORD ONLY) Disabled EmailServiceImplTest.testEmailContributorsAuthority pending ALF-17979
   47036: Merged PATCHES/V4.1.2 to V4.1-BUG-FIX
      46180: Merged DEV to PATCHES/V4.1.2
         46170: MNT-299 : CLONE - Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters
            Improved debug logging for Activity Feed and Activity Post DAOs.
   47037: ALF-17973 (Incorrect name (title.single/title.multi) for "cloud target selection" window when RM is installed)
   47042: RM-601 (Copy/Move dialog causes an error in firebug console)
   47047: DE: Translation update based on EN r46507
   47048: SPANISH: Translation update based on EN r46507
   47049: FRENCH: Translation update based on EN r46507
   47050: ITALIAN: Translation update based on EN r46507
   47051: NORWEGIAN: Translation update based on EN r46507
   47052: JAPANESE: Translation update based on EN r46507
   47089: ALF-17089 (Displaying Url Name instead of site Name in Select form)
   47102: New Norwegian translations from Gloria plus Bitrock configuration to enable them
   47110: ALF-10243: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      47105: ALF-18121: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX
         47040: MNT-323: Fixed issue with passing empty due date when starting workflow
         47101: MNT-320: also applied fix to wcmquickstart module
      47109: ALF-18121: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX
         47106: MNT-320: Merged V4.1-BUG-FIX to PATCHES/V3.4.11
            41010: ALF-15697: Not possible to start workflow not specifying the Due Date
               - Regression caused by ALF-10243
   47135: DUTCH: Translation update based on EN r46507
   47137: RUSSIAN: Translation update based on EN r46507
   47138: CHINESE: Translation update based on EN r46507
   47141: Fix for     ALF-17979    EmailServiceImplTest intermittently failing
   47147: Part 2 of    ALF-17979   EmailServiceImplTest intermittently failing 
   - fix related cache to avoid any future issue
   47148: ALF-17804: Fix NPE
   47171: ALF-18060: removing obsolete expensive sorting and preventing too many variable-queries to be performed when listing COMPLETED WorkflowTask


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-02-27 11:56:13 +00:00
Kevin Roast
34cc24aad6 Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD
44359: Fix for ALF-15236 - JSF - Edit online of html files does not keep the formatting
   44365: Fix for ALF-14653 - Share - Page link created wrongly in wiki
   44366: Fix for ALF-15435 - Incorrect behavior while managing groups via Explorer
   44370: Completion of existing fix for ALF-14568. Also a build fix.
   44372: Fix for ALF-13192 Rules from first folder move to second when delete first folder.
          This bug was caused because up to now, all rules have been firing for system folders, which they shouldn't have been.
   44381: ALF-17094: Merged V4.1.1  (4.1.1.14) to V4.1-BUG-FIX (4.1.3)
          << Code is actually as suggested by Derek rather than code on V4.1.1 >>
      44291: MNT-222 InvalidNodeRefException on user deletion in Share UI 
   44385: Fix for ALF-16006 - MT: Document Library is absent after upgrade from 3.4.x to 4.1.x (eg. 3.4.10 -> 4.1.1)
          Offshore team identified that patches running outside of a TXN were returning an empty list of tenants for MT upgrades
          - fixed after chat to Derek – added a new "big" TenantAdminService with a TXN wrapper interceptor so the AbstractPatch method that generates the list of tenants will also have a txn support regardless of the config set for a particularly patch
          - merged in fix to AVMToADM store patch to respect tenant named objects in paths
   44395: Fix for ALF-17061 Search is failing with Node does not exist: missing://missing/missing(null)
   44402: Merged DEV to V4.1-BUG-FIX
      44347: ALF-16866 : Failure when trying to login as tenant created on 3.4.0 after the upgrade from 3.4.0 to 4.1.2
         The immutableEntityTransactionalCache was made not tenant aware, and fixUserQNames patch now runs after migrateTenantsFromAttrsToTable to fix tenant users, too.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44521 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-12-09 21:26:09 +00:00
Kevin Roast
f651abe34a Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD
43598: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX *RECORD ONLY*
             41906: ALF-11378: REST API has been modified to return extra information about a user whether s/he belongs to a group or not.
   44003: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_22 to BRANCHES/DEV/V4.1-BUG-FIX:
            ALF-15210: Inconsistency in the '?' icon over the dashlets projects\slingshot\source\web\js\share.js DashletTitleBarActions_onReady() function was updated. Fix initialize the style for actionsNode elements into the DOM for IE.
   44004: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_22 to V4.1-BUG-FIX:
            ALF-15793: edit offline hides version history projects\slingshot\source\web\components\document-details\document-actions.js onActionUploadNewVersion function was updated. Fix sets version variable correctly now using asset.workingCopy property instead asset.custom property, which is undefined.
   44018: ALF-16540 : CMIS: createDocument with VersioningState.CHECKEDOUT causes NodeLockedException for types with mandatory versionable aspect
            The ckeck for lock was disabled when beforeCreateVersion policy is handled.
            Version could be created for a locked node. 
   44054: Fix for ALF-16337. Datalist assignee not searchable by full name.
   44056: Trivial change. Fixing some compiler warnings under org.alfresco.repo.content.metadata including a noisy Tika one.
   44143: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_10_19 to BRANCHES/DEV/V4.1-BUG-FIX:
            42989: ALF-16331: Wrong user for "completed by" information provided in Group Review And Approve workflow
   44147: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX:
   44146: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2012_05_22 to BRANCHES/DEV/V3.4-BUG-FIX:
            37733: ALF-12051: Webdav - Cannot open files containing "?" character in the filename in WinXP
   44152: ALF-17009 : Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
            44151: ALF-14035 Tiny HTML file that causes Jodconverter to launch a 100% CPU soffice instance
               - HTML to PDF is now done via ODT as the direct transform hangs if there are <sub> tags in the HTML.
               - Added in 'unsupportedTransformations' to stop a bare transformer.JodConverter from doing HTML to PDF 
               - TransformerDebug test file debugTransformers.txt no longer needs to be 18 bytes, as it made it too fiddly.
               - Modified debug from RuntimeExec so less editing is required to running from the command line
            - Removed tabs that had been added to enterprise/content-services-context.xml in 4.1-BUG-FIX
   44192: ALF-16560 - CIFS: Word document version history lost after saving content in Word:mac 2011 on Mac Mountain Lion
   44224: ALF-16896 Exception with TIKA meta data extractor.
            - Patch POI to handle parsing of Unicode properties that starts on a 4 byte boundary
              rather than the specified offset. Example file was created using http://www.aspose.com/
   44241: Merged DEV to V4.1-BUG-FIX
            44208: ALF-14591 : Ordering not supported for IMAP properties defining IMAP sort fields in Share
                   Make properties from imap:imapContent aspect indexable for SOLR. 
   44253: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/V4.1-BUG-FIX:
            38927: CLOUD-128 - Update rules works incorrectly
          This is a partial fix for ALF-14568. The rest is coming in a separate check-in.
          I made some minor adjustments to this change - trivial spelling fix and whitespace changes.
   44257: ALF-16563 - CIFS: Image document version history lost after saving content in Preview on Mac Mountain Lion
   44260: Fix for ALF-16430 - List of values shown in alphabetical order in Share Forms. Values now only sorted if the Forms config 'field' element has the sorted='true' attribute.
   44269: Completion of fix for ALF-14568 - Update rule works incorrectly.
   44318: Fix for ALF-17055 - remoteadm webscript set a Last-Modified HTTP header whose date format does not conform to RFC 2616 hence breaking proxy caching
   44320: Fix for ALF-16463 - documentLibrary RSS feed does not pass the w3c validator, in particular pubDate breaks RFC-822, date not displayed when using non English locale
   44352: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_12 to BRANCHES/DEV/V4.1-BUG-FIX
            43860: ALF-16263: Search using a "Stop Word" not displaying any result

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44459 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-12-07 14:04:23 +00:00
Dave Ward
182c29aac2 Merged V4.1-BUG-FIX to HEAD
43628: Fix for ALF-16299 - On full user profile, in the 'Sites' tab, the site descriptions are not aligned when a long site description is provided.
   43639: ALF-16701: use newly released Spring Surf 1.2.0-M1 rather than a SNAPSHOT
   43644: ALF-16527: webscript person.lib.ftl does not include all attributes for users out of the box.
       - added missing organizationId attribute.
   43649: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured. 
   43651: ALF-16756: Fixed typos - I took this code in good faith!
   43659: ALF-16006: MT: Document Library is absent after upgrade from 3.4.x to 4.1.x (eg. 3.4.10 -> 4.1.1)
       - More patch dependencies required
   43666: ALF-16833 / MNT-187: Fixed regression in inbound rule firing caused by the fix to ALF-14744
   - Inbound rules were not firing for newly created content nodes that had null content properties (e.g. dataListItems)
   - Now the ALF-14744 fix has been revised so that inbound rules are only not fired for new nodes with zero-length content, as possibly created by the OSX / Windows 7 WebDAV clients during an upload, and only if policy.content.update.ignoreEmpty=true (the default)
   - OnContentUpdateRuleTrigger removed. Now all content property updates are handled by OnPropertyUpdateRuleTrigger so that we can have this subtle treatment of 'empty' content properties.
   - Reverted ALF-14744 changes to RuleServiceCoverageTest and added new tests for 'empty' content and ASPECT_NO_CONTENT
   - Updated RuleTriggerTest in line with changes
   43675: Merged V4.1 to V4.1-BUG-FIX
      43674: Merged PATCHES/V4.1.1 to V4.1
         43673: Merged V3.4-BUG-FIX to PATCHES/V4.1.1
            43672: ALF-16834, ALF-16833, MNT-187: Fix unit test failures and 'fine tune' logic to handle multiple updates within a single transaction creating a node
   43676: ALF-12324: Can't delete site with WQS content
   - Don't try to add nodes to the publish queue on site deletion
   43689: Fix for ALF-14207 - cm:link not correctly handled in Share's doclist when users don't have permission
   43690: Fix for ALF-16538 - Wrong label on change group permission message
   43696: ALF-16348 (Inconsistent error message when latest manager leaves a site)
   43719: ALF-16031: "CMISChangeLog does not log Created events"
   43720: ALF-14137: "When calling CMIS getAllVersions method using the OpenCMIS Browser the PreparedStatement is executed multiple times"
   43722: ALF-16352: Re-instated manage permissions action to document list view
   43745: Fix for ALF-15351.
   ContentModelFormProcessor had a TODO to handle associations defined on aspects other than
   those aspects already on the node for which a form is being submitted.
   I've added code that, when an association is added to a node, will check if the association
   is defined on any aspect in the system and if it is, it will let the association be created.
   43757: ALF-16171: If a password for admin user is specified with a space in the end during the installation Alfresco startup fails
      - Added validation that will not allow the specified password to contain leading to trailing white space
   43760: Fixed ALF-16317 "Labels not displaying full text when creating a rule on a folder with IE8" part 2
   43769: Fix for ALF-13461.
   Merged PATCHES/V3.4.8 to BRANCHES/DEV/V4.1-BUG-FIX:
      43344: MNT-162: Merged DEV to PATCHES/V3.4.8
           43254: MNT-162: CLONE - Hidden folder "Comments" is available to searching
              - Removed last '/' from COMMENT_QNAMEPATH constant.
   43770: ALF-15616: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      43768: Merged Dev to V3.4-BUG-FIX (3.4.12)
         43743: ALF-11956: WCM accessibility
         The problem with absence of initial focus on the first Web form element has been resolved in 'alfresco.xforms.XForm._loadHandler()'. This method creates all controls, defined in the form.
         'alfresco.xforms.FocusResolver._findControl()' has been renamed to a public-like method ('alfresco.xforms.FocusResolver.findControl()'). Also it has been modified to introduce a possibility of searching elements, using root XForms widgets container.
         Some other minor fixes.
   43772: Fixed ALF-16497 "Selected Items drop down box is expanded to the right in IE9"
   43787: Merged in Philippe's fix for ALF-16313:unmakeTranslation() called on pivot language gives exception
   43794: ALF-16155: "Notification digest accumulates and is repeatedly sent if 1 or more notification email fails"
   43805: ALF-16212: Fixes double encoding issue.
   43835: Fixed ALF-13595: Patches third party library date.js to prevent infinite loop.
   43836: ALF-16480: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX
       43252: MNT-166: Document lock not removed after the lock expiry date has been reached
           -  Changed evaluator "evaluator.doclib.metadata.isLocked" to use "evaluator.doclib.indicator.nodeLocked" and "evaluator.doclib.indicator.lockOwner" evaluator.
       43253: MNT-165: "Cancel Editing" does not completely remove lock from document
           - Added documentLibrary cancel editing action for locked documents.
       43300: MNT-171: Merged V4.1-BUG-FIX to PATCHES/V4.1.1 (modified)
       43096: Fix for ALF-16283 - When document is checked out, 'Edit Online' and 'Upload New Version' options should not be visible on the original document.
       43311: MNT-165: "Cancel Editing" does not completely remove lock from document
           - Fix for page refresh problem when cancel editing on details page
       43421: MNT-186: 4.1.1.7 HF: Webscipt error on doclib page, containing locked by other users files
           - Change evaluator.doclib.metadata.isLocked to break circular dependency
       43755: MNT-202: Upload New Version not available for a document that has been edited offline
           - Upload New Version is now available if editable by user (respecting locks, type of checkout, etc).
   43844: ALF-16696: Merged DEV to V4.1-BUG-FIX
       43734: Share nodebrowser is unable to access node of a document with MS residual properties
           - Use localname if no prefix is registered for a namespace uri
   43864: Fixed ALF-16320 "Properties side panel collapses after editing properties in document preview window with IE8"
   43866: Fixed ALF-16320 "Properties side panel collapses after editing properties in document preview window with IE8" part 2
   - Checking using YAHOO.util.Event.getTarget instead
   43867: Fixed ALF-16276 "'"Web View' dahslet displays 2 scrollbars in IE8."
   43872: Merged V4.1 to V4.1-BUG-FIX
      43622: ALF-16757: Sharepoint doesn't work correct with SSO
      - Fix by Pavel
      43633: Latest translations from Gloria (r43623)
      43636: Merged PATCHES/V4.1.1 to V4.1
         43301: ALF-16811 / MNT-173: SOLR tracking spending too long evaluating paths
         - Too much time was being spent fetching the individual nodes in each path and there could be potentially thousands
         - Now we traverse all the ancestor parent associations in the cache before switching shared cache reads off, then bulk load them in one shot!
         43303: ALF-16812 / MNT-174: "dictionaryDAO.init() called, yet no namespace registry for domain" after node rejoins cluster
         - namespaceRegistryCache is secondary to the clustered dictionaryRegistryCache, so can be a non-clustered cache. Synchronization and thread locals already in use so still thread safe.
         - dictionaryDAO.init() now has sole responsibility of establishing the NamespaceRegistry threadlocal within its locks, so no more risk of cyclic dependencies, race conditions, partial initialization, or registries dropping out of the cache
         - To avoid being confused by the 'consistent read' behaviour of a transactional cache, DictionaryDAOImpl now reads / writes directly to a shared cache. Again locks and thread locals still used so still thread safe
         43334: ALF-16812 / MNT-174: Fixed failing unit tests
         - Because DictionaryDAOImpl now reads directly from the shared cache we need to reset it on initialization to avoid problems in multi-context unit tests
         43337: ALF-16811 / MNT-173: Fix test failure. Cope with IDs of deleted nodes in getCachedAncestors()
         43356: ALF-16811 / MNT-173: If we are disabling shared cache reads for the transaction, convert all existing reads and updates to avoid 'consistent read' behaviour giving us a potentially out of date node already accessed
         - Existing read buckets are simply thrown away
         - Updates are converted to removes to avoid any assumptions about existing shared cache content
         - New entries are left alone as they haven't come from the shared cache anyway
         43410: ALF-16813 / MNT-185: Web Scripts are being endlessly re-registering in clustered environment
         - Due to 'consistent read' behaviour of transactional cache
         - As accesses are regulated by RW locks we can read straight through to the shared cache instead
         43565: ALF-16814 / MNT-190: Bmlab Solr Node 2 threw unhandled NullPointerException (and possibly made solr unresponsive)
         - Added missing return statement
      43646: ALF-15755: Rationalization of WebDAVMethod.checkNode()
      43681: Merged HEAD to V4.1
         43656: Fix for ALF-16683 CMIS: cannot navigate to original document was created through CMIS with CHECKED OUT version state.
      43698: Latest Russian translations from Gloria
      43838: ALF-16875: Merged V4.1-BUG-FIX to V4.1
          43836: ALF-16480: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX
              43252: MNT-166: Document lock not removed after the lock expiry date has been reached
                  -  Changed evaluator "evaluator.doclib.metadata.isLocked" to use "evaluator.doclib.indicator.nodeLocked" and "evaluator.doclib.indicator.lockOwner" evaluator.
              43253: MNT-165: "Cancel Editing" does not completely remove lock from document
                  - Added documentLibrary cancel editing action for locked documents.
              43300: MNT-171: Merged V4.1-BUG-FIX to PATCHES/V4.1.1 (modified)
              43096: Fix for ALF-16283 - When document is checked out, 'Edit Online' and 'Upload New Version' options should not be visible on the original document.
              43311: MNT-165: "Cancel Editing" does not completely remove lock from document
                  - Fix for page refresh problem when cancel editing on details page
              43421: MNT-186: 4.1.1.7 HF: Webscipt error on doclib page, containing locked by other users files
                  - Change evaluator.doclib.metadata.isLocked to break circular dependency
              43755: ALF-16890 / MNT-202: Upload New Version not available for a document that has been edited offline
                  - Upload New Version is now available if editable by user (respecting locks, type of checkout, etc).
      43868: Reverse merging r43838
      - Merge in wrong direction introducing duplicate fragment into share-documentlibrary-config.xml
      43871: ALF-16890: Merged PATCHES/V4.1.1 to V4.1
         43755: MNT-202: Upload New Version not available for a document that has been edited offline
             - Upload New Version is now available if editable by user (respecting locks, type of checkout, etc).
   43873: Merged V4.1 to V4.1-BUG-FIX (RECORD ONLY)
      43602: ALF-16254: Merged V4.1-BUG-FIX to V4.1
         43598: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX
            41906: ALF-11378: REST API has been modified to return extra information about a user whether s/he belongs to a group or not.
      43612: ALF-16598: Merged V4.1-BUG-FIX to V4.1
          43252: MNT-166: Document lock not removed after the lock expiry date has been reached
              -  Changed evaluator "evaluator.doclib.metadata.isLocked" to use "evaluator.doclib.indicator.nodeLocked" and "evaluator.doclib.indicator.lockOwner" evaluator.
          43254: MNT-165: "Cancel Editing" does not completely remove lock from document
              - Added documentLibrary cancel editing action for locked documents.
          43300: MNT-171: Merged V4.1-BUG-FIX to PATCHES/V4.1.1 (modified)
              43096: Fix for ALF-16283 - When document is checked out, 'Edit Online' and 'Upload New Version' options should not be visible on the original document.
          43311: MNT-165: "Cancel Editing" does not completely remove lock from document
              - Fix for page refresh problem when cancel editing on details page
          43421: MNT-186: 4.1.1.7 HF: Webscipt error on doclib page, containing locked by other users files
              - Change evaluator.doclib.metadata.isLocked to break circular dependency
      43615: ALF-16794: Merged V4.1-BUG-FIX to V4.1
         43478: MNT-181: Now WebDAV will ALWAYS preserve the original metadata and versions of ANY node that is temporarily 'moved out' in ANY kind of 'shuffle' operation
         - To make the source node temporarily invisible to WebDAV the client specific HIDDEN aspect features are used
         - WebDAVHelper.isRenameShuffle() method introduced, to parallel ALF-3856 CIFS fix and using similar system.webdav.renameShufflePattern global property to detect the start of a shuffle
         - WebDAVHelper converted to use proper dependency injection
         - CopyMethod has become a simple subclass of MoveMethod as all the hidden aspect munging is done by it
         - DeleteMethod now preserves hidden nodes
         - PropFindMethod now ignores hidden nodes
         - Listing methods will hide hidden nodes from WebDAV
         43483: MNT-181: Corrected typo
         43523: MNT-181: Corrections
         - WebDAVLockService.unlock() made 'harmless' to call on already-unlocked nodes
         - Delete method hides rather than deletes versioned nodes and working copes in case it is called by OSX Finder during a 'replace' operation
         43524: MNT-181: Correction
         - PutMethod now 'unhides' hidden nodes and behaves as though it created them
         43570: MNT-181: More corrections researched by Valery
         - Don't treat all moves to temporary locations as copies - just those from non-temporary locations. Avoids initial upload leaving lots of hidden files around.
         - Only copy the content, not the whole node including aspects to avoid versioning temporary files!
         - Don't version on changes to sys:clientVisibilityMask - avoids 'double versioning'
         - Recognize Mac .TemporaryItems folder and ._ files as temporary
         43586: MNT-181: Final correction researched by Valery
         - Corrected system.webdav.renameShufflePattern so that it matches .TemporaryItems folder and ._ files as a full match
      43616: ALF-15755: Merged V4.1-BUG-FIX to V4.1    
          43591: ALF-16772: If the WebDAV path of a document exceeds 255 characters, documents opened in MSOffice cannot be saved back
              - Interpret null nodeLockToken as not locked.
      43629: Merged V4.1-BUG-FIX to V4.1 (4.1.2)
         43498: Fix for ALF-16648 - Alfresco Enterprise artifacts in artifacts.alfresco.com do not provide POM files / dependencies declarations:
         Merged HEAD to V4.1-BUG-FIX (4.1.2)
            43380: -- added site content for alfresco-platform-distribution POM
            43379: -- added site documentation for alfresco-platform-distribution POM
            43378: -- added site documentation for alfresco-platform-distribution POM
               -- deployed site for 4.2.b Community at https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-platform-distribution/latest/index.html
               -- created repository for Enterprise docs and added url in the appropriate edition properties
            43273: Use property to define POI version
            42966: ALF-14353 - Added platform distribution POM to standard maven-deploy procedure
            42965: ALF-14353 - added alfresco-platform-distribution to provide a Maven release descriptor (dependencyManagement) per each Community / Enterprise release
               -- moved maven-ant-tasks not to be in the runtime lib
               -- added platform distribution pom in the SDK folder
               -- updated maven.xml to deploy filter and deploy the appropriate platform-distribution POM per each releae
               -- in maven.xml moved configure-release and configure-snapshot goals to maven-env-prerequisites
               -- updated sdk readme to explain the presence of alfresco-platform-distribution POM
            42912: -- updated README header on the POM specifying it's NOT usable to build Alfresco
               -- make a clear reference to the POMs that get deployed by pom-experimental.xml being usable for development
            42842: ALF-14353: Fix artifactId alfresco-jlan -> alfresco-jlan-embed
            41883: ALF-14353 - fixed multiple Maven build issues. Now mvn clean install -f pom-experimental.xml works fine. Also deployed Spring Surf 1.2.0-SNAPSHOT so proper Surf version is retrieved
            41882: added pre-requisites to build POMs successfully with mvn clean install -f pom-experimental.xml
      43634: Merged V4.1-BUG-FIX to V4.1
         43386: ALF-13091: Prevent bean post processor propagation to child application contexts. Remove Jsr250BeanPostPorcessor from the CXF configuration, to prevent strange interaction with component scanning. 
      43641: Merged V4.1-BUG-FIX to V4.1 (4.1.2)
         43639: ALF-16701: use newly released Spring Surf 1.2.0-M1 in POM files rather than a SNAPSHOT
      43645: Merged V4.1-BUG-FIX to V4.1
          43644: ALF-16527: webscript person.lib.ftl does not include all attributes for users out of the box.
              - added missing organizationId attribute.
      43660: Merged V4.1-BUG-FIX to V4.1
          43659: ALF-16006: MT: Document Library is absent after upgrade from 3.4.x to 4.1.x (eg. 3.4.10 -> 4.1.1)
              - More patch dependencies required
      43669: Merged V4.1-BUG-FIX to V4.1
         43666: ALF-16833 / MNT-187: Fixed regression in inbound rule firing caused by the fix to ALF-14744
         - Inbound rules were not firing for newly created content nodes that had null content properties (e.g. dataListItems)
         - Now the ALF-14744 fix has been revised so that inbound rules are only not fired for new nodes with zero-length content, as possibly created by the OSX / Windows 7 WebDAV clients during an upload, and only if policy.content.update.ignoreEmpty=true (the default)
         - OnContentUpdateRuleTrigger removed. Now all content property updates are handled by OnPropertyUpdateRuleTrigger so that we can have this subtle treatment of 'empty' content properties.
         - Reverted ALF-14744 changes to RuleServiceCoverageTest and added new tests for 'empty' content and ASPECT_NO_CONTENT
         - Updated RuleTriggerTest in line with changes
      43697: Merged V4.1-BUG-FIX to V4.1
         43689: Fix for ALF-14207 - cm:link not correctly handled in Share's doclist when users don't have permission
      43761: Merged V4.1-BUG-FIX to V4.1
         43760: Fixed ALF-16317 "Labels not displaying full text when creating a rule on a folder with IE8" part 2
      43796: Merged V4.1-BUG-FIX to V4.1
         43795: Fix for ALF-16254 - "Leave Site" behaviour for group based site membership:
          Blah, Blah, Blah!
   43883: Fix for ALF-12711.
      Separated preparation of email message from sending of email message as described in
      analysis in JIRA. Did not merge the fix provided as MailActionExecuter.java.diff but
      reimplemented a fix based on that.
   43888: ALF-16781: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      43887: ALF-16898 CLONE - Transformation Server history shows incorrect transformation "To" type for images
         - ImageTransformActionExecuter ("Transform and Copy Image") re-factored to use ContentService
           rather than hard coded to ImageMagick
   43900: Merged V4.1 to V4.1-BUG-FIX
      43898: Merged PATCHES/V4.1.1 to V4.1
         43708: ALF-16903 / MNT-203: ACL changes not propagated between two non clustered Alfresco instances hitting same Solr and Database
         - Although SOLRTrackingComponentImpl was not trusting the cache when tracking node transactions, it was still trusting the cache for ACL change sets
         - This mean that when the SOLR node is using an Alfresco out of the cluster (which we are supposed to support) it could see stale ACLs
         - Fixed this by using the same strategy we use in AbstractNodeDAO
         - Now the main acl CRUD cache is set to ignore the shared cache during SOLR tracking
         - All secondary ACL caches are keyed by ACL ID AND version, so it prevents the possibility of retrieving a stale cached ACL for an old version
         43713: ALF-16903 / MNT-203: ACL changes not propagated between two non clustered Alfresco instances hitting same Solr and Database
         - Fix test failures
         - deleteAccessControlEntries must 'touch' all the ACLs it affects to keep caches valid
         - createAccessControlList should return the newly-versioned ACL
         43736: ALF-16904 / MNT-204: Index showing no progress on Solr server
         - SAP's tracking thread got stuck indefinitely waiting on a content response after sending a request, probably due to some misbehaving proxy or balancer
         - Now we make it possible to recover from this
         - A new alfresco.socketTimeout parameter is now supported in solrcore.properties
         - It specifies the number of milliseconds SOLR will wait before giving up waiting for data on an HTTP connection
         - The default is still zero which means wait indefinitely
         43759: ALF-16904 / MNT-204: Fixed compilation error
      43899: Merged PATCHES/V4.1.1 to V4.1 (RECORD ONLY)
         43667: Merged V4.1-BUG-FIX to PATCHES/V4.1.1
            43666: ALF-16833 / MNT-187: Fixed regression in inbound rule firing caused by the fix to ALF-14744
            - Inbound rules were not firing for newly created content nodes that had null content properties (e.g. dataListItems)
            - Now the ALF-14744 fix has been revised so that inbound rules are only not fired for new nodes with zero-length content, as possibly created by the OSX / Windows 7 WebDAV clients during an upload, and only if policy.content.update.ignoreEmpty=true (the default)
            - OnContentUpdateRuleTrigger removed. Now all content property updates are handled by OnPropertyUpdateRuleTrigger so that we can have this subtle treatment of 'empty' content properties.
            - Reverted ALF-14744 changes to RuleServiceCoverageTest and added new tests for 'empty' content and ASPECT_NO_CONTENT
            - Updated RuleTriggerTest in line with changes
   43901: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      43571: Merged DEV to V3.4-BUG-FIX 
       43569: ALF-16222: It's impossible to delete a file/message via IMAP using Microsoft Entourage 2008 in MacOSX 10.8
         fixed: UID failed.Existing file or folder error on attempt to delete file if deleted items already contains file with the same name.
         modified: AttachmentExtractor modified to avoid code dublication.
      43599: Fix for ALF-16505 - Discussion topics are sorted in ascending order (oldest first and newest last) when selecting 'All topics'
      43610: Merged Dev to V3.4-BUGFIX (3.4.12)
         43416: ALF-16470: SPP:Meeting recurent events are displayed incorrect in share calendar in all tabs (Day, Week, Month)
            Incorrect lucene query to search for events (it was search for events ONLY after fromDate, that gets from browser query. And recursive events, that have startDate before browser's query date, wasn't included into summary query for search for events.
            Start date is incorrect and is sets two times.
            Interval for month of end date is to small.
            Recursive event, that was started in previous month, and ends in current month, isn't included into result of search.
            For events, that ends on next date after start date, displays (view by month) only start date.
      43625: ALF-11817: Cope with incomplete lock token headers from Microsoft-WebDAV-MiniRedir without the enclosing <> by just consuming the whole string
      43670: ALF-11817: Prevent auto-hidden dot underscore files from reappearing on a put by checking for a shuffle path before 'unhiding'
      43746: Merged DEV to V3.4-BUG-FIX (with corrections)
         43692: ALF-16808 Webdav: Two versions of document have been added after the document has been rewritten once more via drag and drop action.
         1. Checked whether the current content property is empty.
         2. Disabled the versionable aspect.
         3. Added the new content to the node. 
      43763: Fix for ALF-14828 - Incorrect behavior on delete action (WCMQS site)
      43771: Fix for ALF-12752 - Custom form appearance parameters not accounted for causing ovverlapped textareas xforms changing their height
      43773: Merged DEV to V3.4-BUG-FIX (3.4.12)
         42010: ALF-14040: Event start/end time displays incorrect on MS Outlook Calendar and Calendar of created Meeting workspace
         1) Send a date for "Site Calendar" dashlet in ISO-8601 format (like in v4.1.1), then after transformation to client's time zone it is displayed correct
         2) For "My Calendar" dashlet we need to take into account that if the event is "all day event", then date should be used without time zone transformation
      43804: ALF-12326 HomeFolderProviderSynchronizer fails to move any user space which has a rule configured on it 
      43837: Fixes ALF-12145: Date.js patches merged to 3.4
      Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX:
         36202: ALF-13483: Japanese: Incorrect date handle in a date Input filed
      Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX:
         43835: Fixed ALF-13595: Patches third party library date.js to prevent infinite loop.
      43839: ALF-16869: Merged PATCHES/V3.4.8 to V3.4-BUG-FIX
          43344: MNT-162: Merged DEV to PATCHES/V3.4.8
              43254: MNT-162: CLONE - Hidden folder "Comments" is available to searching
                  - Removed last '/' from COMMENT_QNAMEPATH constant.
   43902: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      43177: Merged DEV to V3.4-BUG-FIX
         43087: ALF-16474: Records Management groups were not deleted after removing RM site
            - Delete Records Management groups on ASPECT_RECORDS_MANAGEMENT_ROOT delete
      	  - Backport of RM-190 from RM 2.0
      43228: ALF-16266: Merged HEAD to V3.4-BUG-FIX
         32846: Fixes: ALF-10519: Issues with translation of roles.
         31413: Fixes: ALF-10519 - Internationalises the role names for the repo browser's manage permissions page & makes these available to other pages through common.properties
      43229: ALF-16266: Fix  conflict data left in the properties file.
      43624: ALF-11817: Merged PATCHES/V4.0.2 to V3.4-BUG-FIX
         43587: Merged BRANCHES/V4.1-BUG-FIX to PATCHES/V4.0.2
            42363: ALF-16213: renaming versioned file results in file being deleted.
            43478: MNT-181: Now WebDAV will ALWAYS preserve the original metadata and versions of ANY node that is temporarily 'moved out' in ANY kind of 'shuffle' operation
            - To make the source node temporarily invisible to WebDAV the client specific HIDDEN aspect features are used
            - WebDAVHelper.isRenameShuffle() method introduced, to parallel ALF-3856 CIFS fix and using similar system.webdav.renameShufflePattern global property to detect the start of a shuffle
            - WebDAVHelper converted to use proper dependency injection
            - CopyMethod has become a simple subclass of MoveMethod as all the hidden aspect munging is done by it
            - DeleteMethod now preserves hidden nodes
            - PropFindMethod now ignores hidden nodes
            - Listing methods will hide hidden nodes from WebDAV
            43483: MNT-181: Corrected typo
            43523: MNT-181: Corrections
            - WebDAVLockService.unlock() made 'harmless' to call on already-unlocked nodes
            - Delete method hides rather than deletes versioned nodes and working copies in case it is called by OSX Finder during a 'replace' operation
            43524: MNT-181: Correction
            - PutMethod now 'unhides' hidden nodes and behaves as though it created them
            43570: MNT-181: More corrections researched by Valery
            - Don't treat all moves to temporary locations as copies - just those from non-temporary locations. Avoids initial upload leaving lots of hidden files around.
            - Only copy the content, not the whole node including aspects to avoid versioning temporary files!
            - Don't version on changes to sys:clientVisibilityMask - avoids 'double versioning'
            - Recognize Mac .TemporaryItems folder and ._ files as temporary
            43586: MNT-181: Final correction researched by Valery
            - Corrected system.webdav.renameShufflePattern so that it matches .TemporaryItems folder and ._ files as a full match
      43671: ALF-16834: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
         43666: ALF-16833 / MNT-187: Fixed regression in inbound rule firing caused by the fix to ALF-14744
         - Inbound rules were not firing for newly created content nodes that had null content properties (e.g. dataListItems)
         - Now the ALF-14744 fix has been revised so that inbound rules are only not fired for new nodes with zero-length content, as possibly created by the OSX / Windows 7 WebDAV clients during an upload, and only if policy.content.update.ignoreEmpty=true (the default)
         - OnContentUpdateRuleTrigger removed. Now all content property updates are handled by OnPropertyUpdateRuleTrigger so that we can have this subtle treatment of 'empty' content properties.
         - Reverted ALF-14744 changes to RuleServiceCoverageTest and added new tests for 'empty' content and ASPECT_NO_CONTENT
         - Updated RuleTriggerTest in line with changes
      43842: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
          33387: ALF-12492 - Email with empty subject sent to Alfresco by SMTP cause Null pointer Exception
      43843: ALF-16717: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
          43314: ALF-16575 - Email server does not accept email where Subject ends with a period


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-11-23 16:46:57 +00:00
Dave Ward
37e8680261 Merged V4.1-BUG-FIX to HEAD
43386: ALF-13091: Prevent bean post processor propagation to child application contexts. Remove Jsr250BeanPostPorcessor from the CXF configuration, to prevent strange interaction with component scanning. 
   43402: Merged DEV to V4.1-BUG-FIX
      43330: ALF-16073: Share forms renders is slow when using sets.
      Optimize performance for fieldsVisibleInAnyMode populating in getFields and FormField obtaining in getVisibleFieldNamesFor.
   43412: ALF-16680 ImageMagick exit code 255 is not seen as an error 
   43420: ALF-16627 SOLR indexing does not provide TransformationOption when converting content to plain text for indexing
   43452: Fix for ALF-16296 - On site customization page, when a page containing apostrophe (') is renamed, a backslash (\) is added to the name
   43453: Fix for ALF-16105 - Disabled 'Follow' feature does not disable it for existing users
   43462: ALF-16715 : Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      43461: ALF-16713 Cannot disable metadata extractors
   43464: ALF-16715 : Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      43463: ALF-16713 Cannot disable metadata extractors
         - fix test failures - none set mimetypeService
   43471: Fix for ALF-16542 - Web application context for the onlineEditUrl variable is hard-coded to alfresco:
   Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/V4.1-BUG-FIX
      40565: CLOUD-23: core changes to allow overriding of "edit online" button's URL generation.
   43475: Fix for ALF-15859 - UploadContentServlet servlet /alfresco/upload can update the content, mime type and encoding but not the locale
   43476: Merged DEV to V4.1-BUG-FIX
       43401 : ALF-16587 GreenMail IMAP server does not clean up session handlers - memory leak
   43478: MNT-181: Now WebDAV will ALWAYS preserve the original metadata and versions of ANY node that is temporarily 'moved out' in ANY kind of 'shuffle' operation
   - To make the source node temporarily invisible to WebDAV the client specific HIDDEN aspect features are used
   - WebDAVHelper.isRenameShuffle() method introduced, to parallel ALF-3856 CIFS fix and using similar system.webdav.renameShufflePattern global property to detect the start of a shuffle
   - WebDAVHelper converted to use proper dependency injection
   - CopyMethod has become a simple subclass of MoveMethod as all the hidden aspect munging is done by it
   - DeleteMethod now preserves hidden nodes
   - PropFindMethod now ignores hidden nodes
   - Listing methods will hide hidden nodes from WebDAV
   43483: MNT-181: Corrected typo
   43498: Fix for ALF-16648 - Alfresco Enterprise artifacts in artifacts.alfresco.com do not provide POM files / dependencies declarations:
   Merged HEAD to V4.1-BUG-FIX (4.1.2)
      43380: -- added site content for alfresco-platform-distribution POM
      43379: -- added site documentation for alfresco-platform-distribution POM
      43378: -- added site documentation for alfresco-platform-distribution POM
         -- deployed site for 4.2.b Community at https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-platform-distribution/latest/index.html
         -- created repository for Enterprise docs and added url in the appropriate edition properties
      43273: Use property to define POI version
      42966: ALF-14353 - Added platform distribution POM to standard maven-deploy procedure
      42965: ALF-14353 - added alfresco-platform-distribution to provide a Maven release descriptor (dependencyManagement) per each Community / Enterprise release
         -- moved maven-ant-tasks not to be in the runtime lib
         -- added platform distribution pom in the SDK folder
         -- updated maven.xml to deploy filter and deploy the appropriate platform-distribution POM per each releae
         -- in maven.xml moved configure-release and configure-snapshot goals to maven-env-prerequisites
         -- updated sdk readme to explain the presence of alfresco-platform-distribution POM
      42912: -- updated README header on the POM specifying it's NOT usable to build Alfresco
         -- make a clear reference to the POMs that get deployed by pom-experimental.xml being usable for development
      42842: ALF-14353: Fix artifactId alfresco-jlan -> alfresco-jlan-embed
      41883: ALF-14353 - fixed multiple Maven build issues. Now mvn clean install -f pom-experimental.xml works fine. Also deployed Spring Surf 1.2.0-SNAPSHOT so proper Surf version is retrieved
      41882: added pre-requisites to build POMs successfully with mvn clean install -f pom-experimental.xml
   43499: Upgrade version in POM files to 4.1.3-SNAPSHOT
   43520: ALF-16694 POI becoming responsiveness and causing jvm to freeze for a while with certain XLS (fraction formats)
      - Patched POI to:
        - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second!
        - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part.
        - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format
        - handle -ve fractions (just did not work)
        - limitations:
          - custom text gets stripped (still better than before)
          - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before)
   43523: MNT-181: Corrections
   - WebDAVLockService.unlock() made 'harmless' to call on already-unlocked nodes
   - Delete method hides rather than deletes versioned nodes and working copes in case it is called by OSX Finder during a 'replace' operation
   43524: MNT-181: Correction
   - PutMethod now 'unhides' hidden nodes and behaves as though it created them
   43541: Merged DEV to V4.1-BUG-FIX
      43536: ALF-16200: WQS delete fails to publish to live projects onDeleteNode behavior
      The condition of "if" operator was modified. Now "if" operator evaluate to true if least one of the nodesToTransfer or nodesToRemoveOnTransfer sets is not empty. beforeDeleteNode() methods were updated for check for the ASPECT_PENDING_DELETE aspect on the node. enqueueRemovedNodes() call was moved from onDeleteNode() into beforeDeleteNode(). These fixes allow to automatically update the sites published to (i.e. live projects) to include the removal of the file and removal of file from any collection (asset list) when a content was deleted from an editorial project.
   43542: Fix for ALF-16618 - ScriptableHashMap does not have hasOwnProperty method
   43555: Fix for ALF-16494 - site collaborator has rights to modify comments made by another user.
   43556: ALF-15859: Prevent NPE on upload without NodeRef
   43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats
      - Original jar did not get removed in previous commit
      << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >>
   43570: MNT-181: More corrections researched by Valery
   - Don't treat all moves to temporary locations as copies - just those from non-temporary locations. Avoids initial upload leaving lots of hidden files around.
   - Only copy the content, not the whole node including aspects to avoid versioning temporary files!
   - Don't version on changes to sys:clientVisibilityMask - avoids 'double versioning'
   - Recognize Mac .TemporaryItems folder and ._ files as temporary
   43575: Fix for ALF-9317 - Links: Delete Link button in Selected Items menu is available for Consumer, Contributor and Collaborator
   43577: Upgrade POM files after following changes:
      43401: ALF-16587 patch greenmail
      43520: ALF-16694 Uprade POI and patch it
   43584: Merged V4.1 to V4.1-BUG-FIX <<Record Only>>
      43582: Merged V4.1-BUG-FIX to V4.1 (4.1.2)
         43402: Merged DEV to V4.1-BUG-FIX
            43330: ALF-16073: Share forms renders is slow when using sets.
            Optimize performance for fieldsVisibleInAnyMode populating in getFields and FormField obtaining in getVisibleFieldNamesFor.
      43557: Merged V4.1-BUG-FIX to V4.1
         43555: Fix for ALF-16494 - site collaborator has rights to modify comments made by another user.
   43586: MNT-181: Final correction researched by Valery
   - Corrected system.webdav.renameShufflePattern so that it matches .TemporaryItems folder and ._ files as a full match
   43591: ALF-16772: If the WebDAV path of a document exceeds 255 characters, documents opened in MSOffice cannot be saved back
       - Interpret null nodeLockToken as not locked.
   43594: Merged DEV to V4.1-BUG-FIX
      43540: ALF-12425: Can't launch activiti workflow console from Share when external / ntlm / kerberos authentication is used.
      New webscript that redirects to activiti admin console with URL holding current ticket. The webscript resides below wcs and allows to use alfresco connector in Share.
      43562: ALF-12425: Can't launch activiti workflow console from Share when external / ntlm / kerberos authentication is used.
      Activiti admin console webscript that allows admin console to be invoked behind wcs authentication.
   43595: Merged V4.1 to V4.1-BUG-FIX
      43376: Merged DEV to V4.1
         43339: ALF-16590 : java.lang.IllegalArgumentException while initiating In-Place import
                FilesystemContentDataFactory#contentIsInStore method was modified. Now files' absolute paths are compared.
      43390: ALF-15856: Test org.alfresco.repo.node.NodeServiceTest does not finish on DB2
      - Now inner-nested retrying transaction in testConcurrentArchive passes its exception straight through to the outer transaction, which unwraps and retries it if necessary
      43397: ALF-16021: RuleServiceImplTest never ends on DB2
      - Added endTransaction() call so that testDeleteSpaceWithExecuteScriptRule() doesn't hang indefinitely waiting for the outer transaction to complete
      43398: ALF-15856: Test org.alfresco.repo.node.NodeServiceTest does not finish on DB2
      - Now inner-nested retrying transaction runs in its own thread and we don't wait forever for it
      43404: ALF-16666: IMAP subsystem startup causes Tomcat crash
      - Stopped IMAP subsystem from depending on itself by using private rather than public IMapService!
      43408: Fixed latest DB2 hangs for Samuel (concurrent nested transactions)
      43424: Fixed latest DB2 hang for Samuel (concurrent nested transactions)
      43426: ALF-16692: Merged HEAD to V4.1 (with corrections)
         43425: Fixes issue with YUI SWF files (see: IT-9441)
      43450: Possible fix for workflow tests on DB2 - retrying txns where necessary
      43484: ALF-16702: Restored missing index in DB2 schema reference
   43596: Merged V4.1 to V4.1-BUG-FIX (RECORD ONLY)
      43589: Merged V4.1-BUG-FIX to V4.1
         43575: Fix for ALF-9317 - Links: Delete Link button in Selected Items menu is available for Consumer, Contributor and Collaborator


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43601 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-11-14 11:56:36 +00:00
Dave Ward
a1b12e2f0f Merged V4.1-BUG-FIX to HEAD
42174: ALF-14721: Merged PATCHES/V4.0.2 to V4.1-BUG-FIX
      41782: ALF-15751: Merged DEV to V4.0.2 (4.0.2.14)
         41704: ALF-15751: CLONE - Version History presents versions in wrong order
         'VersionHistoryImpl' now sorts versions by node DB id because version with greater version number can't have id which is lesser than id of version with lesser version number.
         Additionally, this approach should be quicker than sorting by 'Modification date' and 'Version number' label.
         << Did not merge unit test, which was doing things with version branches that we don't normally support >>  
   42179: ALF-16149: Merged PATCHES/V4.0.1 to V4.1-BUG-FIX
      41995: 41911: ALF-14127 User search retrieves all users from the DB regardless of search criteria
         - PeopleServiceImpl.getPeople(...) now calls a new method nonCannedGetPeopleQuery(...) rather than using the canned query which is slow with large numbers of users.
      42011: 41911: ALF-14127 User search retrieves all users from the DB regardless of search criteria
         - Avoid NPE on params
      42059: 41911: ALF-14127 User search retrieves all users from the DB regardless of search criteria
         - Ignore case broke one of the unit tests (now excluded from nonCanned version)
   42188: French installer corrections from Gloria
   42192: ALF-15906 - Share UI does not show the 'edit online' button for Visio documents
   42195: Refactor of imapSpacesTemplates.acp into imapSpacesTemplates.xml and exploded content.
   This work is a necessary precursor to the fix for ALF-15803, which will add new localisations.
   42220: Fix for ALF-16138. AbstractLinksWebScript doesn't cope with Links from deleted users.
   42233: Fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page
   and related CLOUD-760 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page
   42259: Fix to issue where multiple concurrent writes to same user preferences would cause exception to appear in Share when changing between old document library views and new views provided by a module.
   42266: ALF-16154 - IE9: script error when click on workflow from document details page
   42268: Fix for ALF-11152 - License Usage information always shows 0 users
   42269: Fix for ALF-15211 - TinyMCE corrupting hyperlinks
   42275: ALF-15993: alfresco log not removed if uninstalled on a different day
   - Fix from Bitrock
   - Also fixed for awe and share logs
   42289: Merged DEV to V4.1-BUG-FIX
      42276: ALF-1907: Check out rule is active for spaces
             - Unit test for checkout via action executer 
      Fixed line endings and split asserts
   42292: ALF-15937: updated the Javadoc of the checkin method to be in sync with what's in doc.alfresco.com
   42307: Fix handling of syncmodeconfig=OFF when running 4.1.X locally without doing full enterprise build.
   42308: Fix ALF-13968: Share DocLib sorting mixes files and folders
   - implicitly sort folders before files (~ pre 4.x) then selected sort option, such as name
   - also allow Alf-specific option with CMIS getChildren (eg. "orderBy=cmis:baseTypeId DESC,cmis:name ASC")
   42310: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_09_24 to BRANCHES/DEV/V4.1-BUG-FIX:
      42309: ALF-15707 (ALF-14691) - Any custom aspect or type (including ootb workflow) is not available for API calls like api/classes/<type or aspect>
   42338: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX
      42337: Fix for ALF-14764 - Moving a folder removes non-site Group permissions set, resets 'Inherit permissions flag'
   42339: Fix for ALF-15151 - Selected group is illegible(black) in Admin console if High contrast theme is selected
   42342: ALF-10362: Activities fail to log "name" changes with more than 1024 chars (eg. via Share "Create Content" form)
   - part I - fix Share config so that default "Create Content" form restricts to 255 chars as per other form config (eg. Edit Properties, inline rename, ...)
   42353: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      42281: Fix for ALF-9946 Need a supported solution for switching off content indexing (FTS) -> merge only to 4.1-BUG-FIX
      - remove references to isIndexed property which was removed in the back port
   42360: ALF-16146: Fixed QName of the data list item type.
   42361: ALF-10362: Activities fail to log "name" changes with more than 1024 chars (eg. via Share "Create Content" form) 
   - part II - belts-and-braces (with unit test)
   42362: Merged DEV to V4.1-BUG-FIX
      42336: ALF-16160: office 2010 doesn't notify users of files being locked when using sharepoint protocol
         MS Office (if we enabled notification about document unlocking) periodically sends PROPFIND requests to get info about active locks. This code makes PROPFIND be able to send an info about locks for the MS Office 2010 client if a document was locked for edit offline.
   42363: ALF-16213: renaming versioned file results in file being deleted.
   42368: Record only merge V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.2)
      42367: Merge V3.4 (3.4.11) to V3.4-BUG-FIX (3.4.12)
         42366: ALF-16137: Merge V4.1 (4.1.1) to V3.4 (3.4.11)
            42048: ALF-16005 Could not transform file size of 0 kb
               - Turns out that it was only doc ppt and xls zero byte files that had the problem.
               - Reverting part of revision 6473 (release 2.1 2007) AR-1251 (Version error when saving new content via CIFS)
                 Dave W tells me that this is no longer an issue due to other changes
   42381: Fixed ALF-16218: Solr GetNodes return status is 500 for Postgresql
    - Read-only webscript was calling through to "qnameDAO.getOrCreateQName",
      which could fail if the QName does not exist.  Issue is not critical because
      it will start working once the QName gets created.
   42384: ALF-15868	RepoTransferReceiverImplTest failing on MySQL
      Checked in a refactor of the transaction handling in the test to remove the suspicion that the current failure iis somehow a test error.  (Still fails on MySQL)
   42395: ALF-14353: Deploy pom files with dependencies to the Maven repo
   42405: ALF-15986: Upgrade to Bitrock 8.5.0 in order to improve font scaling and adaptive layout with Gtk
   - Helps I18N
   42407: Fixed 'state leak' from ActivityServiceImplTest
   42408: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/V4.1-BUG-FIX:
      42389: CLOUD-796: handle unknown custom content/folder type
      42396: CLOUD-796: handle unknown custom content/folder type
      42397: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
           41858: ALF-14444 - CloudSync: Ensure unknown properties when synced to Cloud are ignored properly
      42406: CLOUD-796: handle unknown custom content/folder type
   42409: CloudSync: CLOUD-796 / ALF-16226 -  hide sync props in forms (eg. edit props) for sync'ed custom content type
   42419: Fixes: ALF-11096 - Ensures event edit button is disabled if the event came from Outlook (this is because VTI connector is one directional & changes can't be pushed back).
   42420: Fix for ALF-16003 - Sync mode is incorrectly cached as off if repo hasn't started when the check is made.
   42430: More refactoring of RepoTransferReceiverImplTest.
   42441: Merged V4.1-BUG-FIX to HEAD
      42440: ALF-16247: Thumbnails not rendering for PDFs with standard fonts
      - Because GS_LIB wasn't set on Linux and OSX
   42452: Fix for ALF-15450 Share Lucene tool in admin console works incorrectly
   42457: ALF-14347: Document workspace is incorrectly deleted
      - Check returned status code from delete method before continuing to delete components.
   42458: ALF-15700: 'Imap Attachments' folder is not localized.
      - Added spaces.imap_attachments.childname property that allows the attachments folder to be localized
   42459: ALF-16103: No easy way to specify a timeout for LDAP connections
      - Added ldap-authentication/ldap-ad-authentication property (ldap.authentication.java.naming.read.timeout) to configure the com.sun.jndi.ldap.read.timeout for the initialDirContextEnvironment.
      - ldap.authentication.java.naming.read.timeout property is configured in milliseconds. Defaults to zero (infinite) which is the current behavior.
   42467: Fix for ALF-16275 SOLR include configuration to avoid indexing content
   - done and fixed all configuration to be treated as Java properties
   42472: ALF-16175: Merged PATCHES/V4.0.1 to V4.1-BUG-FIX (Record Only)
      42448: ALF-16096: Repo corruption in MT - clean-up assistance requested
         - Changed RepositoryAuthenticationDAO.getUserFolderLocation() to use getCurrentUserDomain() for its cache key.
   42473: ALF-14838 ALF-14839 Deploy Maven artifacts containing the config and the test-resources, using these as classifiers
   42475: ALF-14180 - CIFS - Cluster - doc and docx files are opened in read-only mode via MS Office 2003 and 2010 appropriately
      missed from check in 34544
   42477: ALF-5051: Define ThumbnailDefinition Beans Outside of ThumbnailRegistry Bean
      - Reverted imgpreview to enterprise 4.1 size of 480
   42504: Reverse Merge 42458 ALF-15700: 'Imap Attachments' folder is not localized. Causes unit test failures.
   42517: ALF-15700: Restoring duff revision 42458 so that we can finish the job and fix it
   42518: ALF-15700: Corrected internationalization of IMAP Attachments folder
   - RepositoryFolderConfigBean must look up paths by QName to be immune to localization and backward compatible
   - Must throw an error rather than using the store root if the path contains unresolved placeholders!
   - QName of attachments folder must remain "cm:Imap Attachments" because that's what it always was!
   42528: ALF-16282: Hybrid Sync: folder unsync - sub-children still have sync indicators
   - fix typo fallout from ALF-15420 (r40782) + add unit/regress test
   42529: ALF-16231: Corrected Imap Attachments English string
   42530: ALF-14838 ALF-14839 Fix enterprise artifacts + deploy jars instead of zips
   42531: ALF-14770 Cut / Paste triggers folder rules
       - Needed to disable rules on nodes being MOVED.
       - Added extra check to RuleTypeImpl when working out if a rule was disabled so that debug would not be misleading.
         No impact on logic, as RuleService does the same check later and discards the rules.
   42546: ALF-15737 Audit trail does not show user login events
       - Also does not show any failed login events
   42568: ALF-16077 CLONE: Incorrect activities if you try to add/edit/remove comment for document (if this document contains any title) 
      The original activity feed comment code would include the title of a document, folder or blog rather than its name if it was available.
      - name is a mandatory field for a document and folder.
      - title is a mandatory field for a blog entry and its name may not be set via Share.
      Changing activity feed comment code so that the:
      - name is always used for documents and folders
      - title is always used for blogs  
   42571: ALF-14838 ALF-14839 Deploy config and test-resoruces artifacts in the same batch as the main artifact, otherwise they get different snapshot versions
   42582: ALF-16255: CopiedFromAspectPatch fails on rules copied with a folder 
     - Checked to make sure that cm:copiedfrom target is a cm:object before attempting a cm:original association. 
     - Remove cm:copiedfrom aspect from source if cm:copiedfrom target is not a cm:object.
   42593: ALF-16255: CopiedFromAspectPatch fails on rules copied with a folder 
      - Corrections to log message and formatting.
   42605: ALF-16231: Fixed broken IMAP unit tests
   42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
   - protect from dodgey JSON output
   42624: ALF-14353: switch groupId to org.alfresco.enterprise, to be in sync with actual Maven deployment
   42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
   - configure in log4j-solr.properties  anywhere on the solr web app classpath ...
   42671: ALF-14353: fix facebook api dependency
   42679: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      42172: ALF-15262: Correct handling of linked rule deletion
      - When the last rule is removed from a folder and the ASPECT_RULES aspect is removed from its parent, we must cascade this removal to its secondary parents
      42173: ALF-14400: Only site members can Edit Online (sharepoint) although the site is public and permissions allow editing for everybody
      - Rationalized the fix provided by Alex Malinovsky
      - Don't bother checking site memberships - let ACLs handle that and just check for permission to read the document
      42182: Incremented version revision for 3.4.12
      42243: ALF-15262: Further correction by Dmitry: use beforeRemoveAspect because beforeDeleteChildAssociation is not invoked on deletion of primary child associations
      42278: ALF-12999: Correction by Alex M
      42586: BDE-101: make .MD5 files suitable for easy check with md5sum -c
      42627: Merged DEV to V3.4-BUG-FIX
         42537: ALF-16139: Impossible to connect to CMIS via AtomPub and Web Services
            Activation libraries (including all Geronimo versions) have been removed because of a conflict with libraries in JBoss CXF WS installation. Also, 'javax.activation' is part of the JDK 1.6 (http://docs.oracle.com/javase/6/docs/api/javax/activation/DataHandler.html)
      42677: Merged V3.4 to V3.4-BUG-FIX
         42380: ALF-16220: Merged V4.1-BUG-FIX to V3.4
            40590: ALF-15318: It was possible for a user with a disabled / expired account to log in via NTLM/SSO
            40663: Merged DEV to V4.1-BUG-FIX
               40661: ALF-15318 (part 2): It's possible to log in by disabled user (NTLM with SSO in a clustered env)
                  The onValidateFailed() methods were moved to BaseSSOAuthenticationFilter to response with a 401 for a disabled user.
         42556: ALF-15077: Site creation in Share is very very slow with over 15000 sites
         - Probably knock-on impact from us versioning secondary associations properly
         - Found old way of locating a leaf document to be ineffective as it would blow the caches (find all documents with the correct ID, then filter out the containers)
         - Effect was magnified when admin user was previously accessed via the explorer client and thus had an app:configurations child node, thus making admin a container and requiring its paths (e.g. zillions of nested group memberships) to be indexed
         - Instead, we have a new LEAFID field on leaves that we can use to efficiently locate a node to delete without hitting zillions of containers
         - Left backward compatible code to avoid requiring a full reindex
         42557: ALF-16202: Merged V4.1-BUG-FIX to V3.4
            40937: ALF-15702, ALF-15669: mmt-dependencies was messing up the SDK classpath
         42566: ALF-15077: Correction to category-handling logic in container generation to fix failing unit tests
         42608: Merged DEV to V3.4
            42543: ALF-16248 : IE specific: It's impossible to create any event due to script error
               Correction for the fix for ALF-13623 to support IE8, also added clearing of 'allday' checkbox.
         42622: ALF-16339: Group names incorrect in (non-site) "Manage Permissions" page
         - Site name was being used as the display name of all site groups!
         42632: ALF-16354: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
            42521: ALF-16231: Corrected LockUtils.isLockedOrReadOnly to properly handle the LOCK_EXPIRED status
            - Also fixed CheckOutCheckInService.checkout() to respect LOCK_EXPIRED but still disallow overwrite of unexpired WRITE_LOCKS
            42522: ALF-16231: Further improvements
            - Renamed to isLockedAndReadOnly because that's what it means!
         42644: ALF-16298: Cannot install RM amps on 4.1.1
            - Passed command line arguments from shell script to mmt utility
         42656: ALF-16298: Correction to DOS argument concatenation to allow multiple parameters separated by space
         42664: ALF-16358: NPE detected during benchmark test.
         - Guarding against this in LeafScorer
         42665: ALF-16360: Merged HEAD to V3.4
            42440: ALF-16247: Thumbnails not rendering for PDFs with standard fonts
            - Because GS_LIB wasn't set on Linux and OSX
            42447: ALF-16247: Thumbnails not rendering for PDFs with standard fonts
            - Fixes by Bitrock
      42678: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         42244: Merged V3.4-BUG-FIX to V3.4
            42172: ALF-15262: Correct handling of linked rule deletion
            - When the last rule is removed from a folder and the ASPECT_RULES aspect is removed from its parent, we must cascade this removal to its secondary parents
            42243: ALF-15262: Further correction by Dmitry: use beforeRemoveAspect because beforeDeleteChildAssociation is not invoked on deletion of primary child associations
         42279: Merged V3.4-BUG-FIX to V3.4
            42278: ALF-12999: Correction by Alex M
         42282: Merged V3.4-BUG-FIX to V3.4
            42281: Fix for ALF-9946 Need a supported solution for switching off content indexing (FTS) -> merge only to 4.1-BUG-FIX
               - remove references to isIndexed property which was removed in the back port


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42683 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-10-16 14:20:20 +00:00
Harpritt Kalsi
177d5c166b ALF-14964 - Tests to ensure Inherited inverted rules function correctly
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42511 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-10-11 09:39:37 +00:00
Harpritt Kalsi
fd25e87fa4 Added test to reproduce bug described by ALF-14964. Queued Policies (TRANSACTION_COMMIT) are causing the Versionable aspect to be re-added after the rules have fired.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42294 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-10-03 11:11:25 +00:00
Dave Ward
148df71e9e Merged V4.1-BUG-FIX to HEAD
42118: ALF-15878 ALF-15741: generate doc and src zip for web-framework-commons and jlan
   42134: ALF-15741: Fix build failing when creating jlan src jar
   42142: Added ignore for dev-log4j.properties
   42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
   42156: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      41336: TransformerDebug: Use debug rather than trace when there are transformers but they are all unavailable.
      41589: GERMAN: Translation updates based on EN rev41571
      41590: SPANISH: Translation updates based on EN rev41571
      41592: FRENCH: Translation updates based on EN rev41571
      41593: ITALIAN: Translation updates based on EN rev41571
      41594: JAPANESE: Translation updates based on EN rev41571
      41726: Merge DEV to V3.4-BUG-FIX (3.4.11)
        41582: ALF-5285: Workflow: Setting default value to data type <default>0</default>, value is not retained.
           Used a hashMap (initialized in constructor), containing the properties to be "ignored" and they used this for checking
      41769: GERMAN: Translation updates based on EN rev41571
      41770: FRENCH: Translation updates based on EN rev41571
      41771: SPANISH: Translation updates based on EN rev41571
      41772: ITALIAN: Translation updates based on EN rev41571
      41773: JAPANESE: Translation updates based on EN rev41571
      41776: Fixes: ALF-12999: Filters labels not showing correctly in RSS feed.
      41917: ALF-14892: Merged DEV to V3.4-BUG-FIX
         41668: Excessive number of unused transactions created with WQS publishing failure
      42002: ALF-4742: webscript person.lib.ftl does not include all attributes for users out of the box.
      42016: ALF-13282: When moving a hierarchy of nodes to a different store (e.g. on archiving) fire ALL beforeDelete() policies on the hierarchy BEFORE commencing the moving to save confusion
      42040: ALF-13282: Fix unit test failures
      42144: Fixes: ALF-11124 - removes country specific suffix from Sharepoint properties files.
      42150: ALF-16125: DTD error in web.xml
      42152: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         42149: Merged V3.4-BUG-FIX to V3.4 (3.4.11)
         42151: Merged V3.4-BUG-FIX to V3.4
            42150: ALF-16125: DTD error in web.xml
   42161: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      41586: ALF-15951: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
         40490: ALF-15455: Pass through windows specific environment variables (will not be set on unix) to make ImageMagick work on Windows with Bitrock layout
         40535: ALF-15455: Another attempt
         - Properly escape global variables so bitrock doesn't try to expand them
         - Force backslash paths on windows
         40539: ALF-15455: ImageMagick still not working on Windows because env variable setting was losing the system PATH
         - Did it ever work before?
         - Now, if variables are specified, the PATH is propagated from the parent environment. If a PATH is specified, it is prepended to the parent PATH.
      41749: BACKPORT from 4 <<< DO NOT MERGE TO V4.1-BUG-FIX >>>
         - ALF-9946 Need a supported solution for switching off content indexing (FTS) 
      41774: DO NOT MERGE TO 4.x (I have already refactored the code)
      Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2012_04_05 to BRANCHES/DEV/V3.4-BUG-FIX:
         35195: ALF-13623: Event info dissappears after choosing doc folder
      41775: DO NOT MERGE TO v4.x
      Fixes: ALF-13295: removes incorrect background colour.
      41844: ALF-16102: Merged HEAD to V3.4-BUG-FIX
         30913: ALF-1966 - Inbound email supports STARTTLS by default - however this requires Java + SSL configuration to be done to work
            Updated to latest SubEtha lib and added three new configuration properties.
         30952: ALF-1878 : Duplicate incoming email Subjects over-write each other
           new configuration property email.handler.folder.overwriteDuplicates added, defaults to true so existing behaviour is maintained.
         31269: ALF-10775 - Thumbnail is not created created for duplicate files uploaded via email
         31795: Added new test for Email Server to check configuration for EVERYONE group works.
         32731: ALF-11837 - now will authenticate via both from fields - also a refactor in anticipation of implemeting multiple recipeints and authentication.
         32732: File missed from last check in.
      Merged V4.1-BUG-FIX to V3.4-BUG-FIX
         41539: ALF-15899: Inbound email does not support multiple recipient folders
            - Fix by Dmitry Vaserin
      41854: Rollback of: BACKPORT from 4 <<< DO NOT MERGE TO V4.1-BUG-FIX >>>
         - ALF-9946 Need a supported solution for switching off content indexing (FTS)
      41901: BACKPORT from 4 <<< DO NOT MERGE TO V4.1-BUG-FIX >>>
         - ALF-9946 Need a supported solution for switching off content indexing (FTS) 
      42159: Merged V3.4 to V3.4-BUG-FIX
         42158: ALF-13282: Correction to invokeBeforeDeleteChildAssociation sequencing in moveNode().
   42162: Merged V4.1 to V4.1-BUG-FIX
      42048: ALF-16005 Could not transform file size of 0 kb
         - Turns out that it was only doc ppt and xls zero byte files that had the problem.
         - Reverting part of revision 6473 (release 2.1 2007) AR-1251 (Version error when saving new content via CIFS)
           Dave W tells me that this is no longer an issue due to other changes
      42051: Merged DEV to V4.1 (4.1.1)
         42035: ALF-15983: SPP: Meeting space: all-day event is displayed on the day before specified during creation
         -   Removing of time zone has been modified to cover the case, when UTC time zone is already configured for Java.
             This case leads to conversion of date to UTC time zone in both cases: using 'new Date(Date, DateTimeZone)' and 'new Date(Date)'
      42116: ALF-9300, ALF-16074: Add the aria plugins to our strange YUI variant to make AWE work on non-IE browsers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42163 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-09-28 16:00:23 +00:00
Dave Ward
ee8081b663 Merged V4.1-BUG-FIX to HEAD
41035: Fix for ALF-15225 - qt.length not performing as expected in search.lib.js
   41047: RUSSIAN: Translation updates based on EN r40961
   41049: GERMAN: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41050: SPANISH: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41051: FRENCH: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41052: ITALIAN: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41053: JAPANESE: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41054: DUTCH: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41055: RUSSIAN: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41061: ALF-11214 - IMAP subsystem is not successfully restarted after incorrect modification of IMAP properties via Admin Console
   41063: RUSSIAN: Translation updates based on EN r41033 (encoding fixes)
   41064: CHINESE: Translation updates based on EN r41033
   41073: ALF-15760: Merged V4.0 to V4.1-BUG-FIX (another lost meta-inf revision)
      34416: ALF-12992: Updated weblogic DD for SOLR
   41074: ALF-15419 / ALF-14438: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (PARTIAL)
      37373: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
         36821: ALF-13827 / ALF-14402: Make replicated caches recover from temporary comms failures by flushing when a change in peers is detected
         - We do not flush caches who replicate via copy (e.g. tickets cache) as these may not be recoverable
         37122: ALF-13919 / ALF-14403: Merged DEV to PATCHES/V3.4.6
         - Rework of Dmitry's implementation
         - Uses dynamic HQL query to retrieve JBPM workflow instances by specified query criteria
         - WorkflowInstancesGet web script no longer has to iterate over every workflow instance in the database!
         - DB index added to enable efficient querying by string variable
         - Hibernate tastic!
         37188: ALF-13919 / ALF-14403: Worked around HQL polymorphism issues by using explicit variable subclass names in from clause
         37204: ALF-13919 / ALF-14403: Fix to date range handling by Dmitry
   41077: ALF-10730: Fixed object finder drop-down tree to show parent icon type when icon type not available
   41089: ALF-13998: 'No items' error is highlighted in red, even that is not sever error.
   41109: Part fix for ALF-11297 Disabled test: test-system-build-test has been removed from the test target dependency list
   41118: Fixes: ALF-15765 and related issue ALF-15476: 
      - Corrects merge of r34405 and r40159
      - Adds people api to cloud proxy config
      - Cloud/Global Folder picker sites list now universally shows only those sites the user is a member of.
   41119: ALF-15419 / ALF-14438: Merged DEV to V4.1-BUG-FIX
      41117: ALF-15419 : CLONE Remove JBPM indexes present from upgrades
         The schema reference files were updated to contain JBPM_VARIABLEINSTANCE.IDX_VARINST_STRVAL index.
   41130: ALF-15590: FSTR transfer of custom content type with parent cm:content fails
   - Fix by Dmitry
   41131: ALF-15714: Bitrock Uninstaller: Uninstaller doesn't remove all files and folders in *nix
   - Fix provided by Bitrock
   41132: Fix for ALF-14388 - Edit Online option is not supported for '.docm', 'dotm', '.xlsm' files
    - corrected mimetypes to be lower-case
   41150: ALF-13287 Added the handling of UTC represented by "Z" within comparator
   41154: Check for authentication errors when validating a ticket, if an error occurs re-authenticate. ALF-15394
   41155: ALF-15569: User with '@' symbol in username cannot invite
   - note: since Ent 4.0.2(+) by default MT is pre-configured but not enabled
   41173: Merged V4.1 to V4.1-BUG-FIX
      41121: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
         41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
         41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
         41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
         41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
      41123: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
         41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
   41176: Attempt to debug unit test failure
   41181: Store leak in AVMServiceTest.test_ETWOTWO_570() causing unit test failure
   41184: ALF-15610: Copy Thai analyzer settings to its many SOLR locations
   41194: ALF-11297: re-enable system build tests
   41195: ALF-11297 ALF-15807: update activities system build tests after correction of ALF-4832
   41201: Fix for ALF-15767 Group query using cm:authorityName
   41202: Additional unit tests related to ALF-15731  TYPE:"..." queries no longer work for Lucene on 4.X
   41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
   - check it makes any difference
   41204: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_08_15 to BRANCHES/DEV/V4.1-BUG-FIX: (note: merging as-is ... refactor + unit test fix to follow in next commit)
      40926: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually)
      40974: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually)
   41205: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually)
   - review and refactor the proposed/merged fix (see previous commit)
   - fix unit test so that it accounts for previous content (as per the original issue)
   - also: add missing test to suite and fix that test to work with the new fix (ie. cleanup previous content, else need to account for it)
   41210: Part 2:  ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
   - do not expand authorities for thoses with the ADMINISTRATOR_ROLE as they can read all anyway
   41216: ALF-11297: system build tests need a database cleanup before running
   41222: ALF-15740, ALF-14744: Update rule firing broken for content created in Explorer
   - Old code lurking around that used to use the inline editable aspect to detect events handled by the CreateNodeRuleTrigger was removed from OnContentUpdateRuleTrigger and replaced with a check for ASPECT_NO_CONTENT
   41223: Added missing swf.languagedir setting to enterprise alfresco-global.properties
   41230: GERMAN: Translation updates based on EN rev41099.
   41232: SPANISH: Translation updates based on EN rev41099.
   41233: FRENCH: Translation updates based on EN rev41099.
   41234: ITALIAN: Translation updates based on EN rev41099.
   41235: JAPANESE: Translation updates based on EN rev41099.
   41236: DUTCH: Translation updates based on EN rev41099.
   41237: RUSSIAN: Translation updates based on EN rev41099.
   41239: CHINESE: Translation updates based on EN rev41099.
   41254: ALF-15628: Avoid edit online (SPP, WRITE_LOCK) clashing with edit offline (CheckOutCheckInService, READ_ONLY_LOCK)
   - Rationalization of work by Alex Malinovsky
   - WebDAVMethod.checkNode() now properly checks whether nodes without WebDAV lock info are writeable
   - CheckOutCheckInService won't allow checkout of a node with an existing WRITE_LOCK by the same user - they must unlock first
   - Propagation of correct status codes
   41264: ALF-15628: Fix CheckOutCheckInService test failures
   41265: ALF-15699: Reverse merged the following, thus downgrading us back to swftools 0.9.1
      40208: ALF-12831: Upgrade to swftools 0.9.2
   41266: Rush'n in some translation updates from Gloria
   41267: ALF-15628: Fix compilation problem
   41269: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      41224: ALF-14856: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
      41268: ALF-15459: Merged PATCHES/V4.0.2 to V3.4-BUG-FIX
         Merged V4.1-BUG-FIX to V3.4-BUG-FIX
   41274: ALF-15608: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      41272: ALF-15567: Allow links to be followed through WebDAV on port 80 using basic auth on XP
   41277: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually) 
   - fix test fallout after merge/fix (note: failed for PostgreSQL but not MySQL - although fix was not DB-specific)
   41278: ALF-15840 Error logged when "No thumbnail present in file" even though this is normal 
   41284: ALF-14875: Serialize direct permissions after inherited permissions so that they take precedence in any lookups in permission dialogs
   41290: JAPANESE: Translation updates based on EN r41099 Fixes: ALF-14565
   41296: ALF-15251	CIFS: Checked out document is not marked as locked in CIFS
   41299: ALF-15714: Bitrock Uninstaller: Uninstaller doesn't remove all files and folders in *nix
   - Additional fix provided by Bitrock
   41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
   - do not skip IO Exceptions
   41306: Incremented version revision for 4.1.2
   41309: ALF-15827: Added FORMACTION, FORMMETHOD and ACTION  HTML attributes to grey list to close security hole (updated Surf libs r1136)
   41318: ALF-15857: Lucene FTS indexer opens streams to all documents to be indexed in a transaction simultaneously
   - Now stream opening is delayed until the point where the document is being written to the index
   41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
   41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
   41326: ALF-15234: IE 8 or IE9 Download .pps as .ppt 
      -Switched the order of the filename headers to better support non-conforming browsers (rfc 5987).
   41330: ALF-14875: Reversed r41284 because it didn't solve the problem in the UI. Kev reviewing.
   41332: ALF-10688: Can't deactivate an account when alfrescoNtlm follows another authentication subsystem in the authentication chain
   - Now, if a account is known to be 'mutable' then the enabled flag is read from the mutable authentication service
   41337: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.2)
      41336: TransformerDebug: Use debug rather than trace when there are transformers but they are all unavailable.
   41339: ALF-15840 Error logged when "No thumbnail present in file" even though this is normal
      - Found some more cases where this is logged as an ERROR
   41342: ALF-11087 (Missing icon file: components\images\filetypes\generic-tag-32.png)
   41344: ALF-15863 (* search values): Merged HEAD to V4.1-BUG-FIX (4.1.2)
      40849: ALF-12839 "Share - Inconsistency in adding a user or a group into a group" part 2
      - Making the users console stop "*" searches, just like the groups console when the min search length is set to larger than 0.
   41346: ALF-15237 - REST API Group children lists username for fullName and displayName
   41350: Merge V3.4-BUG-FIX to V4.1-BUG-FIX:
   41065: Disconnect existing CIFS sessions from the same client when a virtual circuit zero session is opened. ALF-13815
   41280: Moved session cleanup config into the base authenticator, added support to passthru/base authentication. ALF-13815
   41351: Ported database filesystem changes to fix session disconnect, from V3.4.
   41352: Merge V3.4-BUG-FIX to V4.1-BUG-FIX:
   41067: Added session disconnect support to the Alfresco CIFS authenticator. ALF-13815.
   41281: Added session cleanup support to passthru authenticator, session cleanup config moved to base class. ALF-13815 
   41353: Update svn:mergeinfo
   41355: Fix for ALF-15869 - "Site Content" dashlet shows all documents from all the sites in Alfresco Share
    - mistakenly did a record-only merge of this from 4.1->4.1.1
   41363: Fix for ALF-14875 - Manage permissions shows the permission 'No privileges' for All Other Users
    - reworked the permissions dialog and permissions panels to correctly handle multiple permissions on a special permissions group such as GROUP_EVERYONE
    - now correctly gets/sets permissions for GROUP_EVERYONE
    - this also fixes ALF-12014 - in that it allows custom SiteXYZ permissions to work correctly again also (will need manual backport for 3.4.X though)
    - removed hacks related to previous attempts to fix the above issue
    - added lots of comments around relevant sections to add in future refactoring or understanding
   41371: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX (RECORD ONLY)
      41370: Fix for ALF-12014 - Share - Custom role causes incorrect display of permissions
   Manual merge of changes to 4.1.2
   41399: ALF-13438: java.lang.OutOfMemoryError appears in alfresco log when trying to create few thousands of sites consistently. 
   - The v4.0 parent assocs cache used to store every verion of every node's parent assocs, so as we added a node to 60,000 sites, we retained all previous versions of the user's parent association map
   - After creating 10,000 sites, the cache size was about 4GB, containing about 2 million parents
   - Now we use a specialized class that allows an upper limit to be set on the total number of cached parents as well as children.
   - Because the cache is keyed by node transaction ID, the cache can be non-clustered and non-transactional
   - Once the average number of parents is more than 8, the cache will drop its oldest entries
   - ParentAssocsInfo also now uses a compact TreeMap instead of a HashMap
   41401: ALF-13438: Small correction
   41406: ALF-13438: Fix failing unit tests
   - Removed unused node.parentAssocsSharedCache and corrected node.childByNameCache not to reference it!
   - Because parent assocs are cached by transaction ID, we must always invalidate them on an in-transaction version increment
   41409: Logging of unexepected errors on FTP
   41411: Fix possible FTP data session leak if client mixes PORT and PASV commands. ALF-15126
   41412: ALF-15845 : Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily
   41415: Fixes: ALF-15649: Removes country locale from files with it hard coded.
   41419: ALF-14599: Removed ftp.ipv6.enabled from enterprise overlay and bundles
   41426: ALF-15845 Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily
     Roll back changes to DiskDriver interface in favour of hacking NetworkFile.
   41440: JAPANESE: Translation update based on EN r41099
   41446: ALF-13091: Remove unecessary bean post processors from sub ssytem context and remove CXF's Jsr250BeanPostProcessor.
   41458: RUSSIAN: Further translation updates following linguistic review.
   41459: ALF-15897: Revert revision 41446, an attempted fix for ALF-13091
   41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
   Fix for ALF-15851
   Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
   41506: Merged DEV to V4.1-BUG-FIX
      41505: ALF-15879: PostgreSQL: upgrade 2.2.8 (577) -> 3.4.10 (703) -> 4.1.1 (159) failed.
             - Make dropping "store_id" index and "alf_node_store_id_key" constraint optional in 4.1.1 upgrade script
               because clean 3.4 has "store_id" index and doesn't have "alf_node_store_id_key" constraint,
               but 3.4 upgraded from 2.2  has "alf_node_store_id_key" constraint and doesn't have "store_id" index.
   41531: Fixed ALF-15687, so that any user (except for Admin) won’t be able to retrieve any other user’s preferences via REST API. Also, updated the preferences controllers for the Post and Delete.
   41539: ALF-15899: Inbound email does not support multiple recipient folders
   - Fix by Dmitry Vaserin
   41540: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      40794: Merged DEV to V3.4-BUG-FIX
         40793: ALF-13752 Saving Word (mac 2011) documents via CIFS into a folder with Versionable rules on Mac OS X Lion (Fix for 3.4)
            In ContentDiskDriver.renameFile() was added a check whether a node in the archive.
      40806: Fix for ALF-9787 - Hiding sites in Share with permissionsDefinitions.xml [creates a permissions error in the blog portion of the site]
      40922: Merged DEV to V3.4-BUG-FIX (reviewed by Frederik)
         40488: ALF-13357 : Empty outcome when a timer is invoked
            A check for transitionName was added to AlfrescoTimer to support custom transitions.
      40940: ALF-15696: Remove svnkit.jar - makes the build fail if the version of installed command line svn is 1.7. Using commandline binding for <svn> Ant task to be consistent with other parts of the build.
      41066: Various fixes to the database filesystem for session disconnect cleanup.
      41068: Updates to the Alfresco filesystem for session cleanup. ALF-13815
      41301: Merged PATCHES/V3.4.9 to V3.4-BUG-FIX
         40966: ALF-15846 / ALF-15709: OOM on cascading reindex
         - Avoid buffering of all the affected PATH documents in memory - used the set of 'visited' paths to delay generation to the final flush.
         41044: ALF-15847 / ALF-15748: Lucene indexer can make sub-optimal cascade reindex decisions during an LDAP sync.
         - When a user in 6 groups was removed from a massive group, the massive group was getting cascade reindexed rather than the user
         - Logic adjusted as follows:
            For nodes with 5 or less parents, we always cascade reindex the child node. For nodes with more than 5 parents, we cascade reindex the parent node if it has less children than the child has parents.
      41395: ALF-15715: Unable to edit properties whilst transformation in progress
         - Delayed all changes that would potentially lock the parent node row while the thumbnail is generating.
         - Reorganized RenditionContext to lazily instantiate its destination node.
         - Changed render destination to use temporary ContentWriter until render is complete.
      41396: ALF-15715: Fix for failing unit tests.
      41413: Fix for issue where user calendar remote api was generating invalid date searches for user dashlet calendar.
      41509: Merged DEV to V3.4-BUG-FIX
         41507: ALF-12833: Issues installing Alfresco on WebSphere when the server doesn't have internet access
            Context-param which Sets "http://apache.org/xml/features/nonvalidating/load-external-dtd" feature on the SAXParser to false if this parameter is false 
      41510: ALF-15171: After addition of a secondary parent association to a container, not all index paths were being regenerated due to a logic error
      41512: ALF-15919: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX
         41091: ALF-15723:  Merged DEV to PATCHES/V3.4.10
            26579: Switch the transformer to use Tika


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-09-12 19:10:54 +00:00
Dave Ward
dd0ea07bb6 Merged V4.1-BUG-FIX to HEAD
40713: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_08_15 to BRANCHES/DEV/V4.1-BUG-FIX:
      40604: ALF-15274  "I'm following" filter of "My Activities" dashlet doesn't work (PostgreSQL)
   40727: Fix for ALF-15469 from Alex Malinovsky - Cannot Edit Online files with special characters in names
   40733: Merged DEV (ALF-12358 and ALF-14496) to V4.1-BUG-FIX
      38973: DEV for ALF-12358 (upgrades and build plans)
      38975: Part of refactoring around the handling of deleted nodes.
             - Deleted nodes are now treated as real nodes by the NodeDAO
      38977: Fixed up queries related to bulk-loading
      38978: Fixed up Alfresco side of SOLR tracking APIs to handle removal of alf_node.node_deleted (ALF-12358)
      38979: Removed potential contention on cm:name during random file creation
      38980: Initial setup for patching of ALF-12358
      38981: Merged DEV/BELARUS/ALF-12358-4 to DEV/DEREK/ALF-12358-4
         36052: ALF-12358: Concurrency: Possible to create association references to deleted nodes
                .NodeDeleted. upgrade SQL patch for PostgreSQL is implemented:
                - SQL create scripts are updated to do not create .alf_node.deleted. column and its indexes;
                - schema references associated with .alf_node.deleted. column are updated;
                - Subscriptions DAO and schema reference are updated to use .sys:deleted. type instead of .alf_node.deleted. column;
                - .NodeStatus. receiving template was modified to receive .typeQNameId. for correct .deleted. state determination;
                - some other minor fixes
         36287: ALF-12358: Concurrency: Possible to create association references to deleted nodes
                'NodeDeleted' patch has been implemented for MySQL InnoDB, Alfresco Oracle 9, Alfresco SQL Server and PostgreSQL dialects. Not implemented for DB2 dialect!
                - DB creating scripts are modified in accordance with removal of 'alf_node.node_deleted' column and respective indexes;
                - iBATIS schema references are modified in accordance with removal of 'alf_node.node_deleted' column and respective indexes;
                - the code for handling subscriptions on deleted nodes removed;
                - subscriptions DAO schema reference is corrected respectively
         37284: ALF-12358: Concurrency: Possible to create association references to deleted nodes
                'NodeDeletd' updating patch for 4.0 version has been modified to recreate 'alf_node' table for all supported dialects.
                'SubscriptionServiceImplTest' has been extended to test whether subscriptions are being removed if node is archived.
                The new test creates fake user node and applies a custom aspect with 'archive=true' attribute
         37905: ALF-12358: Concurrency: Possible to create association references to deleted nodes
                Maintenance of the .idx_alf_node_txn_type. index has been added into the patch for all the dialects.
                SQL formatting has been changed to more compact and visually comfortable. Some minor changes for MySQL dialec
         Also:
         - Started move to 4.1 scripts
         - Fixed Schema reference files for alf_node column ordering
      38982: ALF-12358: Concurrency: Possible to create association references to deleted nodes
             - Moving scripts to V4.1 code base
             - Fixed upgrade with sequences for introduction of 'deleted' qname
      38983: Migration to 4.1 fix for ALF-12358
      38995: Fix scripts for ALF-12358
             - Fixed index removal for indexes that could not possibly have existed
             - Fixed ALF schema mappings to reflect new index names
             - Fixed PostgreSQL PK name check
      39027: Added in missing index idx_alf_node_txn_type (ALF-12358)
             - Merge note: Removed redundant index alf_node.fk_alf_node_txn
      39028: Fixed fallout from node deletion strategy (ALF-12358)
      39222: Minor test enhancements for diagnostics
   40738: ALF-11297: resurrect system-build-test (not plugged in yet, still a few failures)
   40740: Follow-up for DB2 upgrade for ALF-12358: New alf_node table ID column autoincrement value set
   40770: Merged DEV (ALF-12358) to V4.1-BUG-FIX
      39223: Merged 3.4.6HF to DEV (ALF-12358)
         39218: ALF-15109: Improved fix - must fire cascaded secondary association deletions at DbNodeServiceImpl
                level to ensure appropriate index events are fired and prevent out of sync indexes!
      39259: Merged V3.4.6HF to DEV (ALF-12358)
         39240: ALF-15109: Another attempt. Now we are firing all the right events on cascade removal of secondary associations
                           a lot of things are coming out in the wash!
                - Cascade delete secondary associations in a first recursive pass
                - Use a List of Pairs rather than a Map to avoid missing multiple associations to the same child
      39271: Added policy invocations for peer association removal when an aspect is removed
      39401: Utility class to walk a node hierarchy (primary) and gather all association data
             - Data gathered has to include secondary association pointing out of the hierarchy
             - Source and target associations gathered as well
             - TODO: Bulk queries for above
      39402: Follow up to ALF-15109: Break node deletion by removing deleteAssocsToAndFrom
             - TODO: Use NodeHierarchyWalker to gather data, fire policies and execute deletes
      39456: NodeHierarchyWalker: tests and fixes
      39457: ALF-12358: Remove in-txn manual recording of deleted and new nodes
      39917: ALF-12358: Use NodeHierarchyWalker to pick up all associations for a node hierarchy, fire policies and perform deletes
             - NOTE: Currently, in-process links back to the hierarchy prevent certain tests from passing.
             - TODO: Add detection for nodes that are about to be deleted
      40000: ALF-12358: Added support for 'beforeDeleteNodeAssociationPolicy'
      40001: ALF-12358: A node hierarchy walker to predetermine data required for deleting a hierarchy
      40002: ALF-12358: Spoof aspect 'sys:pendingDelete' that appears on all nodes within hierarchies being deleted
      40003: ALF-12358: Changes to prevent hierarchy modification during delete
             - The entire hierarchy is read before actual delete starts
             - All policies (including previously-missing assoc policies) are triggered from the recorded information
             - Nodes in the delete record cannot have new associations added / removed
             - All deletes are done on the same information so any underlying data shift causes concurrency violations
             - Archival:
               - Archival is a full copy of the hierarchy but all outbound and secondary associations are removed
               - Archival is followed by a full delete of the original hierarchy
      40128: ALF-12358: Test for linking to deleted nodes now fail even after having tested the recovery code
             - Recovery code shows this when activated: ...ERROR [...NodeDAOImpl] ALF-13066: Orphan child node has been re-homed under lost_found: (49179, ...)
      40129: ALF-12358: Added a more verbose message when association deletes don't find required rows
      40130: ALF-12358: Avoid incidental removal of associations when removing aspects if the associations are already scheduled for deletion
      40131: ALF-12358: Fix fallout for rules linking to avoid multiple deletions of the same association
      40371: ALF-12358: Fire beforeDeleteNode even when archiving
   40772: Merged DEV (ALF-12358) to V4.1-BUG-FIX
      40372: ALF-12358: Fallout in ML code
      40397: Fallout from ALF-12358: IMAP pre-commit handling must check for nodes having been deleted
             - Also fixed some TODOs and line endings for test
      40403: PersonService: Reinstated new getPeopleFilteredByProperty method
             - Also fixed test to rollback transaction after forced catch of exception
      40404: Fixed line endings, updated deprecated calls and removed unused code
      40494: ALF-12358: Fixed missing before- and after-create policy calls for the archive store
      40504: Fixed bug in rev 40494: ALF-12358: Fixed missing before- and after-create policy calls for the archive store
             - Used incorrect child node reference when calling policies and notifying indexer
      40529: ALF-12358: Fixed in-txn holding of nodes pending delete to cater for deletes triggering more deletes
      40530: Fallout from ALF-12358: Actions: Association act:scheduledAction multiplicity was not being enforced
             - act:actionSchedule nodes were not cleaned up when associated actions were deleted
             - Added onDeleteAssociation handling to clean up act:actionSchedule node
             - Fixed tests appropriately
      40556: Fallout from ALF-12358: Split out negative tests for deleteSite, which were absorbing exceptions
      40569: Tagging's beforeCommit behaviour was not checking for nodes having been deleted.
             - Added 'nodeServiceInternal' and used that to double-check that nodes still exist
             - Also removed heavily-used call to check if auditing is on
      40618: ALF-12358 fallout: Fixed policy callback details for associations of archived nodes
             - Also some more details when throwing concurrency violation when deleting associations
      40673: Fixed fallout from ALF-12358: Multilingual behaviours fixed
             - Listen to the association being removed from the ML container to the translation
             - Keep track of containers that must be deleted before committing rather than
               attempting to delete them immediately; this avoids attempts to delete associations
               that are about to be deleted (and the thing that ALF-12358 actually fixes).
      40680: Follow-up to rev 40673 (ALF-12358): Forgot to remove commented-out code
   40781: ALF-15587: Merged PATCHES/V4.0.2 to V4.1-BUG-FIX
      40780: Merged DEV to PATCHES/V4.0.2
         40777: ALF-15385 : Unable to set bpm:assingee and other properties in Activiti task via JS
            Added the initialization of runtimeService property.
   40787: Merge V4.1 (4.1) to V4.1-BUG-FIX (4.1.1)
      40782: Fix ALF-15420: Move: child files/subfolders aren't synced after moving from parent folder and updating in Alfresco on-premise/Cloud
       - Corrected the handling of moving a sub-folder out of its synced parent
      40718: Fixes: ALF-15498: Creates new nodeLock indicator (overrides locked) to cope with differences between content models when a node is locked directly using a nodeLock and when a node is locked due to it being a working copy.
   40790: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      40789: ALF-15598: Merged PATCHES/V3.4.9 to V3.4-BUG-FIX
         40671: Merged DEV to V3.4.9 (3.4.9.6)
            40658: ALF-15505: Build-up of lucene folder segments following CMIS queries (un-closed ResultSet objects?)
            - Close unclosed ResultSet.
            - Remove kind="org.alfresco.cmiskind" parameter from query.get and queries.post webscripts and now they use CMISQueryWebScript as implementation.
   40795: Fixed txn handling in the event of cleanup failure of test
   40797: Fix for ALF-15602 - XSS issue in OpenSearch Explorer webscript - unescaped search terms displayed in page
   40810: ALF-12358: Possible build fix (Derek, Neil and Jan to review)
   - Reinstate invokeBeforeMoveNode which seems to have disappeared in the refactor
   - Due to extra cascaded calls to onDeleteAssociation, SyncChangeMonitor must ignore certain events
   40827: ALF-12358: Possible build fix (Derek, Neil and Jan to review)
   - SyncChangeMonitor must ignore onDeleteAssociation calls on both sides of the association when a node is deleted
   40843: Stop deploying XAM connector to maven repo, it's gone
   40845: ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
      - Don't allow Quartz scheduler jobs for the OOoDirect subsystem, checking the connection to backup in a queue.
        Avoids multiple timeouts. Should just get one now. There is no need for multiple threads to be running anyway.
      - ALF-610 changes should stop the OOoDirect subsystem from running any of these Quartz jobs in the first place
        when using the default configuration in an enterprise release. So no timeout?
   40848: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX
      40847: Fix for ALF-15189 - Incorrect trimming of the date on the Advanced search by date range
   40887: ALF-15596: Deadlocks in DescriptorServiceImpl / LicenseComponent threads
   - Problem discovered by Gab
   - The two classes are mutually dependent and can end up deadlocking
   - Removed excessive synchronization from DescriptorServiceImpl
   - Now two key synchronization points - bootstrap and currentRepoDescriptor updates
   - Bootstrap synchronization controlled outside this class - no need to defend against it other than throwing IllegalStateException if accessed before bootstrapped
   - currentRepoDescriptorLock added to regulate currentRepoDescriptor accesses / updates
   - Uncovered problem in bootstrapping order - descriptorComponent must be bootstrapped before multiTenantBootstrap
   40889: ALF-15691: Poor cluster performance in user dashboard due to unnecessary cache replication
   40899: ALF-15691: Corrected duplicate property
   40900: ALF-12358 / ALF-15688: Finish the job! Make SOLR tracking work again and process deletes (Derek, Andy please review)
   - select_Txn_Nodes now uses a COALESCE query to substitute the original node ID when recorded in the PROP_ORIGINAL_ID property
   - NodesGet webscript extended so that it detects deleted nodes in the new way and also includes the noderef
   - CoreTracker avoids trying to retrieve the metadata of deleted nodes (possible because of NodesGet noderef extension)
   - SOLRTrackingComponentImpl doesn't barf when getNodesMetadata called for a cascade deleted node by CoreTracker.updateDescendantAuxDocs()
   40902: ALF-12358 / ALF-15688: Fixed unit test
   - Don't expect meta data for deleted nodes anymore (as this is generated on client side)
   - Also removed stray line of code from CoreTracker
   40917: ALF-13750: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      40915: ALF-15708: Trailing whitespace should be trimmed from properties.
         - Implemented custom properties persister to trim trailing whitespace from properties.
   40925: RUSSIAN: Translation updates based on EN r40357


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-08-28 13:37:05 +00:00
Dave Ward
cf2e12eebc Merged V4.1-BUG-FIX to HEAD
40170: Fix compile error following merge from 4.1.0 to 4.1.1
   40175: ALF-14002 (5108), ALF-14220 (5109), ALF-15419 (5110) patch versions for 4.1.1 that came from commits made to V4.0-BUG-FIX after 4.0.2 was released.
   40203: Fix 4.1 -> 4.1.1 merge error that was stopping start up of Share.
   Required change to extra config in 4.1.1 added for ALF-12524.
   There are other differences in the file for ALF-14812 and ALF-14813 but were not impacted.
   40206: ALF-15281 - FTP/FTPS: With preserve timestamps turned off, the modification date does not change.
   40208: ALF-12831: Upgrade to swftools 0.9.2
   40210: ALF-13933: First attempt at installing LibreOffice 3.5
   - Installed to a subdirectory called libreoffice
   - OpenOffice, Openoffice and OpenOffice.org replaced in all display strings
   40229: ALF-7278: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
      40227: ALF-15436 CLONE Alfresco 3.4c + Share + TIFF preview only shows the first page
   40237: Fix for ALF-14663 from Vadim Danilchenko - the 'edit online' button in Share fails but we do not send any error message
   40258: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_07_09 to BRANCHES/DEV/V4.1-BUG-FIX:
      39668: ALF-15214 patch.fixBpmPackages performs unnecessary work
   40261: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      38592: Fixed ALF-14929: NodeDAO might not be last node write to the database
       - Regression introduced when Hibernate was removed
       - Fix validated by unit test
      38596: Merged DEV to V3.4-BUG-FIX
         38594: ALF-14744: Documents uploaded via WebDAV mount from Windows 7, and copied by a jscript rule are zero-length
            Change CreateNodeRuleTrigger.onCreateNode() method:
            Search for property of "d:content" type in node TypeDefinition, AspectDefinitions of node aspects and don't fire rules if found.
      38781: Fixed ALF-14979: Long running AVM XPath queries on startup
       - Basic XPath was always fetching all siblings
      38896: ALF-14744: Fix rule-firing regressions plus unit test
      - CreateNodeRuleTrigger must remember new nodes, regardless of whether it fires to avoid an update being fired on a node created in the same transaction
      - Tests should not assume that inbound rule will be fired on a content-less node (when the node's type or aspects have content properties)
      38909: Merged DEV to V3.4-BUG-FIX (3.4.11)
         << Fix for issued identified by QA on 20/6/12 after verification of customer issues >>
         38849: ALF-11956: WCM accessibility
         Navigation between the fields with erroneous data has been modified to allow navigation between elements of composite widgets such as Date/Time pickers etc...
         - the fix for ALF-10804 is backported (required for the current fix);
         - ability of cancelling and reactivating the strict navigation sequence has been added (pressing the Escape key for cancelling and focusing the alert link for reactivating);
         - generation of duplicate ids for comboboxes of the 'MonthDayPicker' widget has been fixed
         38544: ALF-11956: WCM accessibility
         Draft implementation of 'FocusResolver' which introduces functionality of strict sequence for navigation between fields of the XForms widgets with erroneous data detected during validation
      38934: Fix for ALF-13658/ALF-14849
      38990: ALF-13048 Configuration of temp directories for converters (Openoffice and JOD)
         More general approach taken for JOD :
         - Allow an OpenOffice user template profile to be used by the JOD started OpenOffice process via
           the alfresco global property jodconverter.templateProfileDir
         - Among other settings, the profile contains values set in Tools|Options via the UI
           This includes the temporary directory: Tools|Options|openOffice.org|Temporary Files
         - If blank, a default profile is created. The user profile is recreated on each restart from the template.
           May be set to an existing user's profile such as: C:\Users\<username>\AppData\Roaming\OpenOffice.org\3
      39115: Merged V3.4 to V3.4-BUG-FIX
         38593: Merged DEV to V3.4
            38572: ALF-13578: CIFS: AlfJLANWorker threads (concurrency) - server not responding
               Add nodeServices.exists(nodeRef) check to errorHandler in ContentDiskDriver.closeFile() to hide InvalidNodeRefException here.
            38591: ALF-13578: CIFS: AlfJLANWorker threads (concurrency) - server not responding
               Replace "catch (AlfrescoRuntimeException e)"  with "catch (RuntimeException e)" in ContentDiskDriver.
               Add "catch (InvalidNodeRefException ex)" to ContentDiskDriver.renameFile() method and throw java.io.FileNotFoundException here.
         39063: Process the async packet queue at the end of CIFS NIO socket processing, before re-enabling socket events. ALF-13578.
      39117: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         39116: ALF-13578: Reversed r39063 due to QA time constraints. Fix will be made limited availability and in next service pack.
      39179: Merged DEV to V3.4-BUG-FIX (3.4.11)
         38911: ALF-14827: Cannot see metrics data to Alfresco Enterprise Content Store in Hyperic HQ
            The attribute "TotalSize" is no longer exists in the Alfresco 3.4.x 
            SpaceFree and SpaceTotal are added to the alfresco enterprise plugin.
         38910: ALF-15016: Cannot see services to FTP, NFS Server in Hyperic HQ
            Alfresco enterrprise plugin fixed so that FTP and NFS Server resources now available in resources tab.
      39230: ALF-15048 - Create Rule 'Execute Script'- 'Append Copyright to file'
         - Script that added the copyright was hidden in a .acp file (a zip file).
           .acp is normally used by wireshark so was not found in searches.
      39294: Merged V3.4 to V3.4-BUG-FIX
         39293: ALF-14698: Merged PATCHES/V3.4.6 to V3.4
            38786: Merged V4.0-BUG-FIX to PATCHES/V3.4.6 (partial rework)
               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
               34338: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
               - test fix (follow-on to r34279)
               34341: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
               - ano test fix (once more with feeling)
               34434: ALF-13066: Fix for intermittent failure (testConcurrentLinkToDeletedNode)
            38959: ALF-15136: Merged HEAD to PATCHES/V3.4.6
               32659: Fixed ALF-11946: Lucene index recovery startup can cause full table scans and file sorts
                - Made the backward timestepping work in bounded segments, whereas previously there
                  was no lower bound causing the database to creak under load and the whole process
                  to take a long time.
                - Seen during benchmark testing as well
            39211: ALF-15109: 'Touch' nodes in every case where we add / remove secondary parent associations. Causing group membership fallout at SAP.
            39218: ALF-15109: Improved fix - must fire cascaded secondary association deletions at DbNodeServiceImpl level to ensure appropriate index events are fired and prevent out of sync indexes!
            39240: ALF-15109: Another attempt. Now we are firing all the right events on cascade removal of secondary associations a lot of things are coming out in the wash!
               - Cascade delete secondary associations in a first recursive pass
               - Use a List of Pairs rather than a Map to avoid missing multiple associations to the same child
      39295: Fixed merge issue
      39381: ALF-12781 - Unable to set email contributors authority
      39595: Fix for ALF-12506 - utils.setLocale() override the value to a lower case.
      39932: ALF-9540: copy from drive to CIFS is slower than direct drive to drive copy by a factor of ~ 15
      39935: ALF-9606: JSF, WebDav + Kerberos - Browser goes to a previous visited page when done/cancel edit online document
         - User is now redirected to logon when session expires.
      39961: ALF-9540: Fix some broken unit tests caused by missing policies.
      40026: Return success status for CIFS set security descriptor call even when the SecurityDescriptorInterface is not implemented. ALF-15357
      Attempt to fix slow MS Office docx file save, unable to reproduce locally.
      40090: ALF-15388: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
         40022: Fix for ALF-15144 - Slow Share doclib high-level folder browsing due to version history retrieval
      Revision: 40159 
      Author: taksoy
      Date: Tuesday, August 07, 2012 1:44:29 PM
      Message:
      ALF-13636: ReferenceError: "containerId" is not defined - Exception thrown during folder rule creation
      ----
      Modified : /alfresco/BRANCHES/DEV/V3.4-BUG-FIX/root/projects/slingshot/source/web/modules/documentlibrary/global-folder.js
      40231: ALF-13575: Merged DEV to V3.4-BUG-FIX
         39879: Use of NetBIOS name versus DNS name in links accessed through CIFS
            - hostname is now determined from the path used to mount the drive on the client
      40251: Merged DEV to V3.4-BUG-FIX
         39667: ALF-4832: Incorrect behaviour of user's activities information in Moderated sites
            Introduce new method to ActivityPostService that accept userName.
            Post activity using new method when user is joined to site.
      40252: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
         39437: ALF-15458 / ALF-15184: ADMLuceneIndexerImpl debug can cause indexing to fail
         - Don't try to print the path of a deleted node!
         39520: Merged DEV to PATCHES/V3.4.6
            38728: ALF-15459 / ALF-14714 : A user can overwrite a "WRITE_LOCK" on a document created by a different user
               -The document owner is not considered to be the lock owner now.
               -ALF-12081 was backported.
         39581: ALF-15460 / ALF-15216: Need predefined JGroups configuration for FILE_PING
         - Now FILE_PING can be selected using alfresco.jgroups.defaultProtocol=TCP-FPING
         - New parameter alfresco.fping.shared.dir specifies its shared directory and defaults to ${dir.contentstore}
         39662: ALF-15461 / ALF-15243: "Failed to initialise config service" after a node comes back into the cluster
         - Nested writable transaction in a read only transaction 
         - Removed old school transaction management
         39768: ALF-15462 / ALF-10725: Account for local index impact of reparenting orphaned nodes
         - Unfortunately this means AbstractNodeDAOImpl now must talk to NodeIndexer but this may be revisited
         39770: ALF-15462 / ALF-10725: Fix test failure - an orphaned node WITH the root aspect must still have parents or it is unindexable!
         39816: ALF-15462 / ALF-10725: Revisit orphans once more
         - delete_ChildAssocsToAndFrom removed because it's evil and could orphan a node that's just shown up (read committed) from another transaction
         - Now only parent assocs of the deleted node are removed automatically and children are handled through normal cascading operations
         - The foreign keys will now block the deletion of a node with a new child created mid-transaction
         39846: ALF-15461 / ALF-15243: Fix unit test failures
      40253: Merged PATCHES/V3.4.9 to V3.4.-BUG-FIX
         39703: ALF-15463: More synchronization, TRACE logging and test for ALF-15215: Missing synchronization in RepositoryContainer.getRegistry()
         39885: ALF-15464 / ALF-15311: JGroups resends incorrect message for XMIT_REQ
            - Added new configuration files for heartbeat channel that removes NAKACK protocol as guaranteed delivery is not necessary for heartbeat.
   40262: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      36853: Merge DEV to V3.4-BUG-FIX
        31272 : ALF-8588 - IMAP Cannot attach two attachments with the same name.
      38923: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX
         32757: Fix for ALF-9365
      Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX
         35693: Fix for ALF-13806 - Get content webscript incorrectly returns text/plain mimetype for HTML files, not text/html
      Merged BRANCHES/V4.0 to BRANCHES/DEV/V3.4-BUG-FIX
         36560: Correctly size content length header after HTML stripping process (ALF-9365)
      39015: Merged in upgrade of truezip to 7.5.5 see ALF-14247
      39056: Merged V4.1-BUG-FIX to V3.4-BUG-FIX:
         ALF-15053: Ensure that sub-folders of "res" can be accessed in the DocLib
      39361: Added truezip-swing jar.  It seems that Truezip needs Swing :(


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40274 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-08-10 08:35:06 +00:00
Dave Ward
af53867778 Merged V4.1-BUG-FIX to HEAD
38321: Removing unused installer resource file
   38322: ALF-14652: Installation: Friendly message about busy Tomcat SSL port should be more exact
   - Translations from Gloria
   38336: Merged DEV to V4.1-BUG-FIX
      38212: ALF-13650: Double byte code white spaces in front and at the end of a file name should be removed as the same behaviour of Single byte code white space.
         Altered Alfresco.util.trim() in order to support double byte code white spaces. 
   38337: Fixed ALF-14117 "Unable to load 'old version' wiki page if the title is in Japanese"
   - Regression: The fixes for ALF-6737 & ALF-8427 provided 2 different solutions for the same problem resulting in a double encoding of the page title
   38344: ALF-14674: Deployment installer still doesn't work
   - Use ${installdir.escape_backslashes} instead of ${installdir}
   38345: ALF-14824 - About Share - animation on about dialog corrupts screen on iPad
   38400: ALF-14438: Accepted patch from BRANCHES/DEV/BELARUS/... with some modifications and using activiti-naming-conventions
   38415: ALF-14808 - patched YUI2.9.0 to handle 'touchend' event to correctly hide pop-up menus when a click/touch occurs outside the menu area.
   38417: Fix for ALF-14812 and ALF-14813 - evaluator config for Edit Online and Edit Offline actions.
   38421: Fix for ALF-14814 - correct height of previewer area when no preview is available. Also improved the handling of Previewer for iOS - skip the WebPreviewer plugin altogether - this removes the unhelpful message about Installing Adobe Flash etc.
   38471: ALF-14674: Deployment installer still doesn't work
   - Correction to use of ${installdir.escape_backslashes}
   38540: Corrected use of ?html and ?js_string operators for element ID
   38548: ALF-14829 - Removed delay added iPad specific CSS to increase hit area of actions in main and more menus.
   38549: ALF-11861: Maintain the same defuault root of WebDav for Alfresco 4.0 as was in pre-4.0
   Removed overriding protocols.rootPath property from installer and enterprise overlay versions of alfresco-global.properties so that correct setting in repository.properties is used.
   38575: ALF-14504: PostgreSQL: Schema differences upgrading from 3.4.8 to 4.0.2
   Allow for primary key alf_node_assoc_pkey to have an optional '1' at the end of its name (PostgreSQL) - for upgrade path 3.4.8 to 4.0.2
   38582: ALF-14504: PostgreSQL: Schema differences upgrading from 3.4.8 to 4.0.2
   Ignore avm_child_entries PK name differences.
   38585: ALF-14599 ftp.ipv6.enabled is configured in alfresco-global by default, but is not injected nor implemented for FTP
   38586: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      38354: ALF-14738: Add information to manifests in all war files
      38393: ALF-10804: WCM - Using multiple instances of the same TinyMCE plugin in the same form causes configuration inheritance issues
         - TinyMCE initialization and configuration moved into _createTinyMCE:function()
         - TinyMCE initialization moved to onLoadContent event callback
         - TinyMCE settings application uses init() now
      38406: ALF-14738: use correct property for build number
      38438: ALF-14856: Documents uploaded via WebDAV mount from Windows 7, and copied by a jscript rule are zero-length
      - Simplified fix. Don't fire on-create-node-trigger if on-content-create-trigger would fire, so that policy.content.update.ignoreEmpty=true is respected
      - policy.content.update.ignoreEmpty=true now the default as it is required by OSX and Windows 7
      38459: ALF-13567: "manager-osx" should be called "Application Manager" inside the installation folder
      - Fix from Bitrock
      38460: ALF-11817: No versioning when modify/save file content via mapped Webdav network drive
         - parseRequestHeader() now trys harder to parse the "Microsoft-WebDAV-MiniRedir" client's buggy  "Lock-Token" header.
      38476: Merged DEV to V3.4-BUG-FIX
         38475: ALF-14868:CLONE - 'Error 0x80070057: The parameter is incorrect' occurs often during upload of documents via WebDAV
            Port fix from ALF-14636:
            Make XML-streaming WebDAV Methods buffer their response in case of transaction retries
      38502: ALF-14876: awe.log and share.log were left after uninstalling Alfresco
      - Fix by Bitrock
      38561: Merged V3.4 to V3.4-BUG-FIX
         38414: ALF-14402: Merged PATCHES/V3.4.6 to V3.4
            38028: ALF-13827: Prevent excessive cache chatter by avoiding replicating the aspects, properties and parent associations caches
         38416: (RECORD ONLY) ALF-14852: Merged V3.4-BUG-FIX to V3.4
            37835: Fix for ALF-14429 - Recently Modified dashlet takes up to 30 seconds to load after upgrade to Alfresco 3.4.6.23


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-06-29 21:48:50 +00:00
Dave Ward
193546cc47 Merged V4.0-BUG-FIX to HEAD
37502: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      37159: ALF-12541: Fix EOL.
      37172: Merged HEAD to V3.4-BUG-FIX:
         33880: ALF-12777 / ALF-14259: MMT should not install AMPs which override pre-existing files in the war file, unless -force is provided. The MMT is moving toward more of a validation phase (checks things, calculate changes) then an execution phase (makes the changes).
   37526: ALF-11027: update URLs to our Maven repos
   37554: Follow-on fix to ALF-9661 - do not fire update rule (onDeleteAssociation) if node also no longer exists
   - will fail with concurrency/retry error (=> "Attempt to follow reference ... to deleted node")
   - fix targeted for 4.0.3 (requires merge from V4.0-BUG-FIX to V4.0)
   - required by CloudSync (ALF-13941) - eg. last target( SSMN) also deletes source (SSD)
   37564: Pull out some bits to constants, so downstream classes can more easily configure themselves
   37571: ALF-14055: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      37570: ALF-13751: Catastrophic indexing performance when a repository containing 60,000 sites, all containing the admin user is synced with an LDAP server containing an admin user
         - made LDAP sync only apply incremental changes to zones (rather than removing all and adding all) and made it preserve the AUTH.ALF zone if it is already there, as that contains all the site group paths


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@37572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-06-08 17:17:36 +00:00
Neil McErlean
14bb26158d Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD:
35751: Addendum to fix for ALF-11923. Fixing failing test case by tightening up delete behaviour.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@35753 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-04-26 09:27:53 +00:00
Neil McErlean
25d5daf40b Fix for ALF-11923. Linked rules can't be deleted if source folder was deleted.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@35737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-04-25 22:03:48 +00:00
Alan Davis
819988c518 ALF-12273: Merge V4.0-BUG-FIX to HEAD
33119: Merge V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1)
      33099: ALF-10412 Nonreducing 100% CPU Uploading Large Files to Share Site Document Library
      ALF-10976 Excel files bigger than 2mb cause soffice.exe to take 100% of one CPU for more than 2 minutes in previews.
         - Polish TransformerDebug
         - Better config for txt and xlsx to swf   
      33095: ALF-10412 Nonreducing 100% CPU Uploading Large Files to Share Site Document Library
      ALF-10976 Excel files bigger than 2mb cause soffice.exe to take 100% of one CPU for more than 2 minutes in previews.
         - Improvements to TransformerDebug so that calls to getTransformers use trace rather than debug level logging
           allowing one to see the wood for the trees  
      33016: ALF-10412 Nonreducing 100% CPU Uploading Large Files to Share Site Document Library
      ALF-10976 Excel files bigger than 2mb cause soffice.exe to take 100% of one CPU for more than 2 minutes in previews.
         - fix build errors - may not get all of them as not tested on Linux
      33005: ALF-10412 Nonreducing 100% CPU Uploading Large Files to Share Site Document Library
      ALF-10976 Excel files bigger than 2mb cause soffice.exe to take 100% of one CPU for more than 2 minutes in previews.
         - Disable transformers if the source txt or xlsx is too large - avoids transforms that don't finish
           txt limit is 5MB
      	 xlsx limit is 1MB
         - Added a general 2 minute timeout added (ignored by JOD transformers - which already have a 2 minute timeout 
      	 and OpenOffice transformers - would require more work)
         - Previous commit already limited txt -> pdf -> png so that only the 1st pdf page was created when creating a doclib icon
         - Earlier commit already reduced the priority of the background Thread used for transformations so that user interaction
           did not suffer.
      33004: ALF-10412 Nonreducing 100% CPU Uploading Large Files to Share Site Document Library
      ALF-10976 Excel files bigger than 2mb cause soffice.exe to take 100% of one CPU for more than 2 minutes in previews.
         - Added time, size and page limits to transformer configuration to allow one to avoid
           costly transformations and to stop them if they do occur. Limits avoid a transformer being
           selected if the source is too large, or make it throw and Exception or discard data after a given
           time, KBytes read or pages created.
         - Page limits currently only used by TextToPdfContentTransformer for thumbnail (icon) creation.
         - Time, Size and Page limits are currently ignored by JodContentTransformer and OpenOfficeContentTransformerWorker
           once running but the max source size limits may be used to avoid the selection of the transformer in the first
           place.
         - TransformerDebug added to be able to see what is going on. A real eye opener!
           log4j org.alfresco.repo.content.transform.TransformerDebug
      32136: ALF-10412 Nonreducing 100% CPU Uploading Large Files to Share Site Document Library
         Reducing the priority of the async thread pool that is used to perform the transformations so that normal activity (and even garbage collection) is not interrupted by transformations. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33223 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-01-13 17:25:32 +00:00
Roy Wetherall
4a73cf915b ALF-9937: Alfresco Share Icon on a folder that designates a rule
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32040 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-11-17 02:34:28 +00:00
Dave Ward
e18ab791d7 Merged V3.4-BUG-FIX to HEAD
31072: Incremented version.revision for 3.4.7
   31082: Merged DEV to V3.4-BUG-FIX
      31077: ALF-9661: Adding or removing associations does not trigger 'update' rule.
             1. Unit test for replicating.
             2. SingleAssocRefPolicyRuleTrigger now handles trigger of the rules on the list of parents.
   31115: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      30992: ALF-10029 : Webdav error when document type is missing
         Correcting directory listing. Display reader's mimetype if display label for mimetype couldn't be found.
   31116: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      31114: ALF-10309 : CLONE -WebDAV - Canceling "save as" upload will create 0 byte content
         Logic was added to PutMethod that removes empty files if a save operation is cancelled or fails.
   31157: ALF-10757: Merged HEAD to V3.4-BUG-FIX
      31154: Synchronize file writes from CIFS. ALF-10721.
   31188: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      31176: ALF-9979: Error thrown when adding user(s) to group in explorer if user already exists in group
         Implemented checking of the user presence in the particular group using getAuthService().getContainedAuthorities()
   31189: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      31174: ALF-9684: CMIS AtomPub: The combination of includeRelationships=both and returnVersion=latestmajor returns an internal server error
         Try-catch block was added for nodeService.getSourceAssocs(node, RegexQNamePattern.MATCH_ALL) operation. This operation is not supported for a version store.
   31190: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      20694: ALF-925: "title" property always gets populated with the name of a file when content without a file extension is added via Webdav.
         When user creates file through webdav, "title" property was populated with "name" property value.
         The code that was doing it has been removed. Now the title will be empty in such a case.
         This makes things consistent with CIFS and FTP, where you have to create a rule with action "Extract common metadata fields from content". 
   31217: ALF-10807: Share document download with SSL
   - Fix from Bitrock
   31226: ALF-10632: Added a sample configuration fragment for war-deployers-jboss-beans.xml because it's rather tricky to publish the correct configuration in the docs!
   31265: ALF-9999 Cannot search pdf files, which are written vertically.
      Sample configures PdfMiner as the pdf -> text and ??? -> pdf -> text transformer rather than PDFBox.
      PdfMiner is slower but does handle vertical text.
   31268: ALF-9093 Alfresco incapable of previewing text files including non Western European characters
      Sample file that configures OpenOffice as the default handler for text to PDF conversions
   31304: Merged BRANCHES/DEV/BELARUS/HEAD-2011_10_05 to BRANCHES/DEV/V3.4-BUG-FIX:
      31291: ALF-9460 : Archived discussion posts break display of the discussed node when users do not have access to the trash can
   31313: Fix for JBPM security issues with timers and async tasks.
   ALF-10776: Workflow timer fires a policy that causes a AuthenticationCredentialsNotFoundException
   ALF-6405: SecureContext issue if task node async property is set to "true"
   31314: Fixed ALF-10373 "There is no path to the folder for "Move" action inside the rule's description."
   31361: Fixed ALF-10930. Incorrect description of 'xam.archive.forceBackgroundStoreMove'
   31366: ALF-3756 - original fix didn't cope with existing MLText having one or more language variants. 
   ...upgrading to the fix would therefore not solve the problem properly. For example, if a property has en_GB text in it, then 'updating' that property with a locale of en_US will result in the addition of the en_US text rather than a true update (they're both English, and using two slightly differently configured browsers in this way leads to confusion).
   31387: ALF-10740: Flash upload - Working Copy label not removed on check in if non english locale is used in Share client   
   Two separate problems were fixed:   
   * Locale string as supplied by the flash uploader was being placed into the language portion of the Locale object in java, therefore no proper match was made when looking up the working copy label (e.g. "(Working Copy)") - fixed by using a proper locale string parser as supplied by Surf.   
   * Working copy label could still fail to be removed if document was checked out under one locale and checked in using another. Fix provided by recording the *original* working copy label against the cm:workingcopy aspect.   
   31395: ALF-3756: fixes broken FullNodeServiceTest
   31399: ALF-3756: fixing build failures from -c31366 (VersionServiceImplText.testRevert()) 
   A ConcurrentModificationException was being thrown, have changed the way that the hashmap is processed to avoid this.
   31401: Fix for ALF-2980
   31410: Fix for ALF-10961 - Share - Sites not displayed on dashboard
   31418: ALF-10768 Environment variables are being used to replace property placeholders in xml configuration files
      Modified ALL spring beans that are a PropertyPlaceholderConfigurer (including sub classes) and the 
      PropertyPlaceholderConfigurer created ChildApplicationContextFactory so that OS environment variables
      are not used in property place holder substitutions. Spring 3 started allowing OS environment variables
      to be used by default. This may explain why we have so many install problems.
   31420: ALF-3756 another compile error: This time StoreSelectorAspectContentStoreTest
   31425: ALF-10740: Fix from -c 31387 (compilation error)   
   This fix is in addition to -c31420. The compilation error was due to me not having the bug fix branch configured as an enterprise project.
   31458: Fix for ALF-10916
   31459: Fix for ALF-10915
   31482: ALF-10915
     - Fix build
   31491: Various oplock, access mode and CIFS protocol fixes ported from v4/HEAD. ALF-10331.
   31492: File open access mode checks ported from v4/HEAD. ALF-10331.
   31529: ALF-11144: NPE during incremental LDAP sync
   31530: Fixed ALF-11139: Audit concurrency exceptions do not trigger transaction retries
    - AuditMethodInterceptor allows audit exceptions to propagate out
   31606: ALF-10309 CLONE -WebDAV - Cancelling "save as" upload will create 0 byte content
       Changed name of aspect to be WebDAV specific (rather than using a CIFS value), so that it might be possible to tidy these up in future.
   31638: Fix for ALF-10597 - Share - Upload new version issue - OK button displayed during refresh
   31639: Fix for ALF-10297 JSF - Sort by First/Last Name in Groups Management not working
   31641: ALF-9776 - Fix for WCM - it allows users to submit contents to Staging with past Launch and Expiration Date
   31653: ALF-8906: Ensure entire IMAP service startup transaction runs as system, to allow for any auto-aspect adding / versioning during cache warming
   31654: Merged V3.4 to V3.4-BUG-FIX
      31327: ALF-10878 Merged HEAD to V3.4
           30225: ALF-10001 Update SiteService.listMembers to check group display names as well as group names, plus test
      31329: Merged V3.4-BUG-FIX (3.4.7) to V3.4 (3.4.6)
         30992: ALF-10029 : Webdav error when document type is missing
            Correcting directory listing. Display reader's mimetype if display label for mimetype couldn't be found.
      31462: ALF-10010 Document can not be found even after a full reindex.
         Sample configures xpdf as the pdf -> text and ??? -> pdf -> text transformer rather than PDFBox.
      31478: Merged BELARUS/V3.4-BUG-FIX-2011_10_13 to V3.4 (3.4.6)
         31460: ALF-10952: User is unable to edit own profile using Alfresco Share
            To compare two objects it needs to use equals() method instead of ==.
            Such a check was changed in UsageQuotaProtector.onUpdateProperties() method.
      31502: ALF-10324 Cannot disable Home Folder Creation
         2nd part to the problem. Folders were being created when "Show all" was pressed in the UI
      31504: Fix for ALF-9589 - Share - Advanced Search is not IE7 compatible for other themes
      31531: ALF-10324 Cannot disable Home Folder Creation
         There is a knock on effect to ContentUsageService when the user does not exist and we are not allowed to create missing users.
         Resulted in 2 DMDeploymentTargetTest failures
      31532: ALF-10955 No pooled task created for moderated site managers if any user requested to join
         Going with David Wards suggestion of still using getContainingAuthoritiesInZone with a null zone and a cut off at 100.
         The 100 might be too small, but probably is okay.
   31655: ALF-10187: Merged V3.3 to V3.4-BUG-FIX
      31180: ALF-9898: CIFS packet pool leaks
      - File state manager op lock break expiry thread was never getting started so some deferred packets were never getting released!
      - Synchronize around m_borrowed to prevent ConcurrentModificationExceptions in diagnostics
      - Synchronize around m_selector.keys() to prevent ConcurrentModificationExceptions during session reaping
      31244: Merged DEV/BELARUS/V3.4-BUG-FIX-2011_09_29_CIFS to V3.3
         ALF-10831: CIFS concurrency issues under load
            - Atomic synchronized write AND read operations in FileStateCache, TreeConnection, SrvSessionList, VirtualCircuit, VirtualCircuitList, ContentQuotaManager
      31245: Merged DEV/BELARUS/V3.4-BUG-FIX-2011_09_29_CIFS to V3.3
         ALF-9540: copy from drive to CIFS is slower than direct drive to drive copy by a factor of ~ 15
         - batchRemoveRequest added to ThreadRequestQueue, meaning that not all incoming packets are scatter-gunned across different worker threads and reducing context switching
         - Arseny's tests show that combined with 3.4.6 changes, the factor is now under 2!
      31246: ALF-9898: Merged HEAD to V3.3
         31154: Synchronize file writes from CIFS. ALF-10721.
         31233: Fixed a possible memory leak in the CIFS oplock timeout handler.
      31273: ALF-9540: Reversed batchRemoveRequest changes
      - Review by Gary. Thread pool may not be utilized properly when multiple virtual connections are being handled at once.
      31576: Changes to the CIFS idle session reaper so that it runs in the main socket event thread. ALF-9898.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-11-02 23:22:24 +00:00
Derek Hulley
3cd0091162 Fixed RuleService concurrency around enable/disable at NodeRef level
- Done while rolling in ALF-10839: Eliminate rule discovery overhead on property update when rules have been disabled
 - Some checking of rule state done BEFORE walking up the node hierarchy
 - Also fixes ALF-4216: disabledRules List is not thread safe


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-10-16 20:16:52 +00:00
Alan Davis
d257bbc9d0 Merged V3.4-BUG-FIX to HEAD
30744: ALF-9524: WCM: Defining a complex type with 'abstract' attribute to true does not allow other complex types to define elements with the same name 
      - Fix by Pavel
   30804: ALF-9524: Fix to NPE by Pavel
   30812: ALF-718: Rules Fire Emails before Transaction Commit/Rollback
   Added tests and moved email sending into a post commit callback.
   30820: Fix for ALF-10516 - 'My Sites' dashlet should indicate it is loading rather than say 'No sites'
   30824: Fixed ALF-10470: DeclaritiveRegistry is looping continuously and re-initializing
    - Only replicate removals for the cache.  The reset always does a remove first.
       <cache 
           name="org.alfresco.cache.webScriptsRegistryCache"
                                    ...
                                    replicateUpdates = false,
                                    ...
       </cache>
   30827: ALF-10513 60k Site Performance: Unable to delete user + request not acknowledged for 2 minutes
     Now about 3 to 4 seconds
   30828: Andy H recommended change to lucene indexer values
   30831: ALF-718: Fix for InvitationServiceImplTest
   Fixes behaviour broken by original fix for ALF-718: the send-after-commit does NOT work for the invitation service, so it was necessary
   to change the code to only send-after-commit in the context of a rule.  
   30843: Fixed ALF-7698 "Defects in tags picker in SHARE." according to feedback provided in ALF-9953 "Decide order where new items shall appear in the object finder."
   30844: ALF-9544 - Inbound email restricts file name to 86 characters or less.
     used QName.createQNameWithValidLocalName()  as suggested.
     added new EmailServiceImplTest
   30849: Fixed ALF-8776 "Rule details dialog handling of apostrophes"
   30862: Merged DEV/TEMPORARY to V3.4-BUG-FIX (with improvements)
      30856: ALF-10288: Regression of ALF-1997: non domain users cannot bypass SSO in Share using /share/page?pt=login
         In SSOAuthenticationFilter.doFilter() method added check (PAGE_SERVLET_PATH.equals(req.getServletPath()) && LOGIN_PATH_INFORMATION.equals(req.getPathInfo()).
   30864: SMTP Server, To and From address format.
     - Out standards for from and to address were stuck in the 1980s!
   30867: ALF-10517 - 'My Content' slow
    - performance improvements by reworking Lucene queries used to retrieve recently modified and recently created content for a user
    - converted queries to fts-alfresco
    - improvements from 3.5sec per page render down to 1.1 secs
   30874: MERGE DEV to V3.4-BUG-FIX
         30851 : ALF-9558 - Unchecked Return Value
   30882: - ScriptGroup.isRootGroup() now stops if it finds a single parent rather than doing a size on all parent groups.
     Not sure the logic (not changed by me) is correct as it includes parents that are site groups.
   - SiteServiceImpl now only gets the specified number of sites. Sometimes it would have return more if AuthorityDAOImpl
     switched approach used to get containing authorities.
   - Overloaded getContainingAuthorities to take a size parameter, deprecated other and switched calling code
     Done for isRootGroup activity.
   30910: - Fix build error
   - Found a better way to use filter in AuthorityDAOImpl.getContainingAuthoritiesInZone
     so that we don't need to reset the filter, by using the +ve hits from first approach
     if we switch to second approach.
   30925: - ALF-10501 60k Site Performance: Searching for a group to add to a site with a value that matches a few sites takes 2 minutes
     ALF-10502 60k Site Performance: Admin Console | Groups: search with a value that matches a few sites takes 70 seconds
     ALF-10504 60k Site Performance: Admin Console | Groups | Browse Groups page appears corrupt as it never finishes loading
     - All the above were slow as a result of ScriptGroup.isRootGroup()
     - ScriptGroup.isRootGroup() and ScriptGroup.isAdminGroup() removed - Checked with KevinR that these are not needed any more.
     - Removed code added on 30 Sep 11 to support isRootGroup (the size parameter to AuthorityDAO.getContainingAuthorities)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-10-03 16:23:14 +00:00
Dave Ward
cb4a571fa1 Merged V3.4-BUG-FIX to HEAD
29870: ALF-9952: Compatibility fix to allow mounting of Alfresco WebDAV as a network drive on Windows XP (without WebDrive)
   29872: Fixed ALF-7698 "Defects in tags picker in SHARE."
   - now checks added items to avoid duplicates
   29873: Made sure the onActionDetails doclib action generates SimpleDialog instance ids each time, to avoid multiple js class instances with the same id getting called for every dialog created.
   29878: ALF-9378: Use caching plus a read write lock, in a similar manner to ALF-7064, to avoid contention in SubsystemProxyFactory under load
   29881: Added helper text for the translators to the property file.
   29910: ALF-7433: a file deleted using the web UI still appears in a NFS mount but with NULL stats
   - timestamp propagation now enabled by default so NFS always works
   - timestamp propagation less agressive - only has to propagate on adds / deletes and renames
   29911: Values for recurrence strings updated now that I've read RFC-2445
   29944: ALF-9988: Merged PATCHES/V3.3.4 to V3.4-BUG-FIX
      28581: ALF-8944: Corrected sort parameter handling for datetime fields, based on analyzer and tokenization mode
   29955: Fixed ALF-9965: Property names matching fails if the property contains non Alphanumeric characters
   29956: Fixed ALF-9424: Webform(XSD): xf:switch switch group does not work based on "complexContent with Base" element.
   29964: Fixed ALF-9089: TinyMCE convert_fonts_to_spans parameter is not being picked up in Web Forms
   29977: L10N Updates from Gloria (based on rev29838).
   29980: Ignore virtual tomcat directory
   29981: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_08_19 to BRANCHES/DEV/V3.4-BUG-FIX 
       ALF-6808 : Incorrect Search Language Conversion for wild card characters (%, _) for MS SQL 
   29984: ALF-4753: Fix search query escaping in Alfresco Explorer
   - AWC-1743 / CHK-2171 fix restored
   29993: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      29989: ALF-9976: WebDAV Class 2 compliance issue with OPTIONS response.
         Class 2 incompliance connected with absence of 'PROPPATCH' method in the 'Allow' response header has been fixed
   30009: ALF-7239 : Documents from Records Manager cannot be viewed in Outlook   
   30012: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_08_19 to BRANCHES/DEV/V3.4-BUG-FIX:
      29986: ALF-7105: pdfbox returns errors in the logs but one cannot understand what file is affected (PDFBox)
   30014: ALF-6284: Fix for Share Kerberos SSO Websphere compatibility (by Pavel)
   30016: Merged DEV to V3.4-BUG-FIX
      29424: ALF-8715: NFS: Admin sometimes cannot edit content uploaded via JSF
             Fix for "Can't open file for writing" during saving file in VI-like editors connected with FileExpiry daemon:
             - 'getNodeOrNull()' method extracted to get and check on existence of the cached file object
                and then update cache timeout or remove it from the cache;
             - 'getNodeForPath()' was appropriately updated in accordance with logic extracted to 'getNodeOrNull()';
             - 'fileExists()' method was corrected to take into account existence of the cached file object 
   30017: Reverses an accidental check in made with the last L10N bundle update (r29977)
   30045: ALF-8664 - Custom 'mandatory' RM metadata causes editing issues   
   30053: ALF-9681: webScriptsRegistryCache size in ehcache-default.xml   
      webScriptsRegistryCache maxElementsInMemory size was incremented up to 1000
   30079: ALF-10027: Fix template alfresco-global.properties for custom tomcat ports
   - Obselete web.application.context.url removed
   - alfresco.host, alfresco.port, share.host and share.port added
   30080: Fixed parse error mentioned in ALF-9511 "RSS Feeds with HTTP Auth doesn't work with Feed dashlet"
    - In java regexps the . (dot) does NOT include the \r or \n by default, to change that a (?s) instruction was added in the beginning of the regexp
   30083: Fixed ALF-10048 "Multiple thumbnails in RSS feeds causes problem for RSS Feed dashlet"
   30088: ALF-7433: Fix unit test fallout from new timestamp propagation behaviour
   30089: ALF-7433: Further unit test fallout from new timestamp propagation behaviour
   - testPermissionsAndPolicies needs to get folder modification date in a distinct transaction after populating it
   30091: ALF-10050: CIFS: Coordinator is unable to delete content after IMAP has been enabled
   - Transactional cache null entry issue
   30096: ALF-9793: Allow auto-created NFS authenticated users to work
   - Also removed admin from default mappings to avoid security hole
   30102: ALF-8723 CIFS on Windows fails to start under certain conditions
      - Found another place >= was required rather than just >
   30104: ALF-9890 SiteService is not producing audit data.
      - Internal siteService rather than public SiteService was being used, so there was no audit advice.
   30119: ALF-9793: Fallout from previous fix. Prevent initialization error when there are no user mappings and NFS is not enabled.
   30120: ALF-9526: Work around the fact that Websphere ignores the response encoding unless you call response.setCharacterEncoding()
   - GlobalLocalizationFilter inserts a response wrapper that parses the charset parameter from the content type header, if it is present
   30121: ALF-9535: Alfresco ignores Accept-Language sent from Share
   - Ticket and webscript authentication (i.e. Share requests) will use the language set in request headers as the session language
   30130: ALF-10049: Fix by Andrey to enable Flash upload on Weblogic!
   30141: ALF-8732 Now if the adhoc workflow throws exceptions while sending a notification email then those exceptions are ignored.
   30226: ALF-9415: JSF - Copy/Paste vs Cut/Paste add aspect rule.
   30242: Added NodeService.getNodeRef(Long nodeId)
    - First step to remove Lucene search from inbound email server
    - Done while investigating ALF-9660
   30243: Fixed ALF-9660: Inbound emails are always stored with encoding=UTF-8 regardless the encoding the email client uses.
    - If the encoding is provided, then it is not guessed
    - Includes tweak to remove Lucene search and rather use direct node ID-NodeRef translation provided by NodeService
   30263: Incremented version revision
   30264: ALF-10187: Merged V3.3 to V3.4-BUG-FIX
      30003: ALF-9898: More defensive exception handling to avoid packet pool leaks and extra logging on packet pool exhaustion
   30265: Merged V3.4 to V3.4-BUG-FIX
      30259: ALF-6527 LangPack FR - [Search results' page] Incorrect label when search matches results
        - Added "(s)" to "trouvé(s) dans l'entrepôt."   (for a repository search - found in retest)
        - The original change:
          Added "(s)" to "trouvé(s) dans tous les sites."   (for an All Sites search)
          
          However this leaves the current site search. As a result I also:
          Added "(s)" to "trouvé(s) dans le site {0}."  (for a current Site search)
          and checked with a French speaker that this would sound correct.
          
          Note: all three labels are prefixed by a separate text label: "N résultat(s) "
      30261: (RECORD ONLY) Merged V3.4-BUG-FIX to V3.4 (3.4.5)
      30262: ALF-10186: Merged PATCHES/V3.4.1 to V3.4
         30126: ALF-10075: Concurrency during CMIS document update causes content stream to close prematurely.
            - Created BufferedRequest request wrapper in RepositoryContainer
            - If the content stream is accessed directly it is streamed to a temporary file so that requests can be retried
         30137: ALF-10075: Fixed NPE


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30271 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-09-06 16:14:53 +00:00
Derek Hulley
6ec3f44c29 Merged DEV to HEAD
- ALF-8806 RINF 41: Lucene Removal: Fix CopyService
     - ALF-9028: RINF 41: Fix Aspect cm:copiedFrom
   - ALF-9029 RINF 49: Lucene Removal: CheckOutCheckInService API
     - ALF-9032: RINF 49: fixes to cm:workingcopy aspect

   28996: Dev branch for De-Lucene work pending patches
   29004: Evaluator runs in read-only txn
   29006: Additional PermissionCheckedCollection.create method
          - Use an existing collection's permission check data (cut-off, etc) to wrap a new collection
   29007:
          CopyService and CheckOutCheckInService refactors to remove Lucene
          
          CopyService:
          
          Removed cm:source property from cm:copiedfrom aspect and replaced with a cm:original association.
          Added CQ-based APIs to query for copies
          Added APIs to support bi-directional walking of copy association
          Fixed sundry uses of cm:copiedfrom esp. all uses related to cm:workingcopy
          
          CheckOutCheckInService:
          
          Check-out now creates a source aspect cm:checkedOut with 1:1 relationship to cm:workingcopy via cm:workingcopylink
          Removed explicit use of cm:workingcopy aspect and replaced it with calls to COCI API
          
   29083: Audit tests fail when indexing is turned off.
          Also removed a getReader() call during rule evaluation, leading to a 'sub-action' read being recorded.
   29113: NodeDAO.getNodesWithAspects supports paging
   29135: Removed unused patch queries
   29139: Basic patch (still terminates with error) to upgrade cm:copiedfrom and cm:workingcopy
   29157: Tested patch for cm:copiedfrom and cm:workingcopy aspects


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29159 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-07-19 03:22:11 +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
Dave Ward
6ebc200a0e Merged V3.4-TEAM to HEAD
26804: Fixed line endings and removed sundry svn:mime-type properties after merge rev 26779
   26805: Merged BRANCHES/V3.4/ to BRANCHES/V3.4-TEAM:
      26803: Fixes: ALF-8138, adds a i18n property for a ToDo list's attachment title.
   26817: Fixes: ALF-7813 - Mini Calendar now highlights all events rather than only the ones valid for the current view.
   26821: Fixed ALF-7889: Auditable data should not change during archive and restore
    - NodeService archive (private method) and restore (public method) switch off cm:auditable behaviour
    - This is system-wide and not configurable
   26823: ALF-8152 - Simple view: incorrect file type icon
   26826: GDoc: Collections are now being correctly created in GDoc when document is checked out
   
   26829: Change initial load event back to onContentReady to keep Firefox & Firebug happy.
   26830: ALF-8151 - Filetype icon or is incorrectly displayed at the Content I'm editing dashlet. (Copied mappings across from alfresco.js)
   26833: Fixed ALF-8060 "Collaborator can't edit created links by other users"
   26836: Fix for ALF-8126
   26837: Fixes ALF-8124: Override default BitRock NLS readme strings
   26840: Fixed ALF-8127 "Inconsistence between Create and Edit user page"
   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.
   26844: Fixed ALF-8000, ALF-7997, ALF-8108 and ALF-7721. Partial fix for ALF-8156. All these issues relate to admin console form configuration.
   26845: Fix for ALF-8181 - Admin console - sometimes displays the 'previous' tool, one step behind mouse click
   26854: Fixed ALF-8179: The new HTML email templates are bootstrapped with a mimetype of text/html they should be text/plain as they are freemarker files. Being plain text allows the content to be edited without TinyMCE corrupting the raw source. I also made all the templates inline editable.
   
   NOTE: To see these changes you must start with a clean database as these changes are only applied during initial bootstrap.
   26865: Merged V3.4-BUG-FIX to V3.4-TEAM
      26864: ALF-8025: JMX forms will no longer persist invalid values and subsystem auto-start errors are non-fatal
         - Errors on bootstrap subsystem startup are logged and absorbed. So should still always be possible to bring the server up to a level where its configuration can be corrected
         - The JMX setAttributes() method, which sets multiple attributes at once, is now handled differently from an individual setAttribute()
         - It attempts to restart the subsystem with the new properties. If successful these are persisted and a reload message is broadcast across the cluster. If unsuccessful it rolls back to the old properties and restarts the subsystem with those. Then the error is passed on to the caller.
         - Unit tested through JMX by AuthenticationChainTest
   26871: Refactor of fix to ALF-7888 to address clarified/extended requirements.
     After discussions with various engineers & the product manager, it has been agreed that sites should not appear in the recycle bin as they cannot be recovered from there. This is not a change to existing behaviour.
     However, formerly sites were only hard-deleted if deleted via the SiteService & remained archivable via the Explorer client and presumably other protocols such as CIFS.
     Now sites will by default not be deletable at all. So any attempt to delete a site via Explorer, CIFS etc will fail with an exception. This is achieved with a policy/behaviour on Site deletion.
     But that behaviour is disabled within the SiteService.deleteSite thus allowing deletion (and hard deletion at that) via that service only.
     End result is that admins can't accidentally delete sites as most interfaces prevent it and Share allows it after the normal warning dialogs.
   
     Had to tweak the SiteLoadPatch to delete a site via the SiteService rather than the NodeService.
   26873: Merged BRANCHES/V3.4 to BRANCHES/V3.4-TEAM:
      26860: ALF-7101 and ALF-7866 - don't show the rules options to collaborators, as they shouldn't be able to create/manage rules
   26874: Previous check-in (svn r. 26871 for ALF-7888) slightly broke the sample site for Team.
   Refactored the SiteLoadPatch to fix that.
   26875: ALF-7835 - args["itemTitle"] and args["page"] are already decoded, so don't try to decodeURIComponent them a second time when building the activity feed, otherwise it'll fail with special characters
   26893: Fixed ALF-7821 & ALF-7967 by making the OpenOffice read-only as it's all pre-installed for Team and shouldn't be editable. Also removed the (Subsystem) from the OpenOffice label.
   
   Also updated forms to remove the 'operations' button and move back to a Save/Cancel button as since Dave's changes to setAttributes() all the logic (including rollback of invalid properties) is now handled, meaning we no longer have to call the start() operation on the MBean.
   26901: Merged V3.4 to V3.4-TEAM
      26900: ALF-8180: The installer shouldn't randomly delete a directory called tomcat that it didn't create
         - Fix provided by Bitrock
   26905: Fix for ALF-8207 - Themes are not translated (not resolving title ids)
   26910: Fixed ALF-8206 "ES - Layout dashlets"
   26913: ALF-7838 - When paging the comments, do the reverse ordering before we page, rather than after
   26920: More on ALF-7004. The notification templates (used in the send email action of a rule) now follow the look and feel of the mockups Linton did originally.
   
   For this to work the MailActionExcecuter action needed the shareUrl, as all other email sending processes go through this action they no longer need to pass the shareUrl in. There was some inconsistency in how the URL was structured (sometimes with a trailing slash, sometimes not) so this has been cleaned up, which did mean more template updates.
   
   As before, this will require a clean database to see the updated templates.
   26921: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      26349: ALF-6062 - Add sorting by display name to the Group REST APIs that support paging
      26375: ALF-6062 - Make sorting of groups in the rest API case insensitive.
      26376: Correct long-incorrect indent and style stuff (at Gav's request)
      26402: ALF-6062 - Paging and Sorting (Case Insensitive) for the Groups REST APIs
      26423: ALF-6062 - Support sorting and paging of the child authorities and users of a group in the REST API, where previously only child groups were sortable and pageable
   26924: Some of ALF-8223: Added form config for GoogleDocs properties currently present on MBean
   26931: ALF-8092 - Convert the archived nodes webscript to the new style paging, which fixes an array index issue
   26933: Fixed ALF-8156: Too many detailed options for filesystem configuration in Admin Console
   
   Also made the position of 'enabled' properties consistent i.e. the first thing in the form/section.
   26937: Build fix for FeedCleanerTest. Also a refactoring of the Site deletion prevention behaviour for ALF-7888.
   This pattern should now be reusable outside the site service.
   
   I took my BeforeDeleteNode behaviour off the st:site node type. It was registered in SiteAspect.java.
   This was causing the test case failure as when I disabled behaviours on a site node before deletion, I was
   disabling all behaviours, including the necessary FeedCleaner behaviour.
   
   Added new aspect cm:undeletable
   Sites now have cm:undeletable as a mandatory aspect
   
   The BeforeDeleteNode behaviour that was attached to sites is now attached to cm:undeletable in UndeletableAspect.java
   
   site-services-context.xml defines an undeletableAspect bean which registers the behaviour on cm:undeletable.
   This could perhaps be moved into the NodeService. Will discuss on Monday.
   
   26938: Fixes ALF-8196: Ensure that WebView title bar link is updated as soon as its set
   26940: Fix for ALF-8036. Incorrect permissions copied when copying folder with permissions from one site to another.
     Permissions on nodes held within share sites are now cleaned after a move or a copy to a different share site.
     Cleaning in this context means permissions relating to the old site are removed and permission inheritance is turned on again. In this way the relocated nodes will look like they have just been uploaded, as requested in the issue comments.
     A new method in the SiteService stack (cleanSitePermissions) is used to initiate this clean-up from the move-to, copy-to slingshot webscripts.
     This is delegated to a new class/bean SitesPermissionCleaner which encapsulates the clean-up operation.
     The cleanup must be recursive as there could be nodes anywhere within the relocated tree which have permissions directly set on them. The tree is walked using nodeDAOs for efficiency. The cleanup is performed with aclDAOs, again for efficiency.
   
     This fix was developed on 3.4.2, but was backed out of there and is now checked in (effectively for the first time) on Team. This check-in will need to be merged to 3.4.3 at some point.
   26941: Updating svn properties on root associated with check-in 26940 for ALF-8036.
   Sorry. I forgot to check these in a moment ago.
   
   26949: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      26945: ALF-3554 / ALF-8257 - Adding rules to a node applies a marker aspect, so update the Rules Service to remove this when all removes are deleted.
   26950: Fix failing tests caused by r26920. Now that we rely on the Mail Action Executor to set the share URL for the templates, it's no longer available at the mock level when not calling the MailActionExecutor. Switch to a different model variable to check
   26954: ALF-8232 - Paging controls in doclib can overlay on top of sorting controls at 1024 screen res when 8+ pages are present
   26955: Follow-up to r26954 (ALF-8232). Remove local i18n messages for Links component.
   26956: Fixed ALF-8223 "Google integration needs Admin Console to configure options"
   26963: Fixed ALF-8223 "Google integration needs Admin Console to configure options"
   26964: Fixed ALF-8226 "ES FR DE Site pages in Customise Site to be spaced"
   - tested in FF3.5, SF3 & IE6,7,8
   26966: Added missing theme ID string
   26968: Merged V3.4-BUG-FIX to V3.4-TEAM
      26967: Fix for ALF-8259 - Static Asset Cache use of the /res resource servlet has overwritten the cachecontrol values set by the filter.
   26969: Moving the cm:undeletable aspect out of the SiteService and into the NodeService. Loosely related to ALF-7888.
   The cm:deletable aspect has been renamed to sys:undeletable.
   The class which registers the default behaviour, UndeletableAspect, has been moved into repo/node.
   Various minor changes in model files & spring config required.
   26970: ALF-8267 - Data Lists: search for user should not require minimum characters
   26971: Fixed ALF-8280 "ALL LANG - conversor pdf2swf - untranslated"
   26976: ALF-8271 - "Repository" appears as a destination when creating/editing linked rules in Doc Library.
   Rules picker now switches available modes based on whether Repository browsing is allowed or not. Removed reference to non-existent file. Also made rules picker sensitive to changing picker mode or site.
   26977: Fixes: ALF-7812: Adds support for multiday events.
   26978: Fixes: ALF-6107 - Fixes Tab order isses with Add event form.
   26979: Fix for ALF-8264. My Tasks incorrect capitalization.
   26991: ALF-8276 - "Select" dialog when adding items to workflow shows more information than in should
   26992: Fix for ALF-8288 - ES - Typo in serach result and also variable doesn't seem to work. Translation error, corrupted {0} strings pattern.
   26993: ALF-8148 - Details page Permissions incorrectly shows No privileges
   26994: Follow-up to r26993 (ALF-8148) for folders.
   26995: ALF-8265 - Data Lists: inconsistent capitalization; tooltip text is wordy
   26998: Fixes ALF-8091: Decode page URLs when removing dynamic welcome dashlets
   27000: Merged V3.4-BUG-FIX to V3.4-TEAM
      26999: Update to correct latest spring-webscripts-api jar
   27001: Fixes: ALF-8119 (IE8 bugs) & ALF-8118 - Clears event data from form.
   27005: Fixes: ALF-8168 - JSON encoding issue in Calendar API
   27025: Slight tweak to login dialog for iOS user usability
   27026: Fixes ALF-7764: Remove fade effect on title bar actions in IE to ensure correct image rendering
   27035: ALF-8314 - Document Library: Comment displays poorly when first word of comment is short.
   27040: Fix for ALF-8126 - Incorrect title of Transformer ImageMagick - missed labels
   27076: Merged V3.4-BUG-FIX to V3.4-TEAM
      26668: Fixes ALF-7920: Updated Linux/OSX config to add support for missing TIFF files in ImageMagic (dependant upon r26667 in ALF-BINARIES)
   27084: Merged V3.4 to V3.4-TEAM
      27083: ALF-8124: Corrected ${} placeholders in Japanese installer strings
   27091: Merged V3.4 to V3.4-TEAM
      26834: Fixes ALF-7904, ALF-8063: BitRock config updates
   27093: Fix for ALF-8308. Cannot like a folder that has rules defined for it.
     Added a necessary fix which prevents the exception being thrown.
   27094: Fixed ALF-8223: Google integration needs Admin Console to configure options.
   
   Also fixed a couple of other strings broken in a previous commit.
   27102: Further fix for ALF-8223: Google integration needs Admin Console to configure options. Removed application name to leave just enabled checkbox, username and password fields.
   27105: Fixed ALF-8277 & ALF-8253: Tooltips are not translated
   
   The JMX attribute description is no longer returned by the form processor as 99% of the time they don't contain anything useful and they are not localised.
   27106: Fix for ALF-8321: Cancel workflows move it to trashcan
   27115: ALF-7826, ALF-7949, ALF-8180, ALF-7904, ALF-8063: Reconciled project-team.xml with changes in project.xml
   27118: Merged V3.4-BUG-FIX to V3.4-TEAM
      26669: Fixes ALF-7987: Ensure rollback directories are removed on uninstall
   27119: ALF-8128: Propagate Team project name into Linux installer builder
   27137: Merged V3.4 to V3.4-TEAM
      27136: Installer string updates from Gloria
   27140: Temporary workaround to prevent rules running on cm:rating nodes (which happened for 'liked' folders ALF-8308 & ALF-8382)
   
   27162: Fixed ALF-8427 "Language packs: It's impossible to view any version of the wiki page if it contains native characters"
   27166: Updates to the invitation email templates following delivery of new l10n files.
   These changes were 'hand-merged' due to missing styling markup in the delivered l10n files.
   The new files had all styling markup removed.
   
   For the record, here's what I did:
   
   I compared the new and old files foreach {de, es, fr, it, ja} and found that all changes were short, simple and easy to merge.
   So I pasted in the main content div from the new l10n files, leaving all other styling markup (meaning css) unchanged.
   For the record, here's what diff says changed in this check-in:
   
   DE
   53c53
   <                                              
   ---
   > 
   55c55
   <                                              hat Sie eingeladen, als ${args["inviteeSiteRole"]} an der Site  ${args["siteName"]} teilzunehmen.</p>
   ---
   >                                              hat Sie eingeladen, mit der Rolle ${args["inviteeSiteRole"]} an der Site <b>${args["siteName"]}</b> teilzunehmen.</p>
   62,63c62,63
   <                                              <br />Benutzername: ${args["inviteeUserName"]}
   <                                              <br />Passwort: ${args["inviteeGenPassword"]}
   ---
   >                                              <br />Benutzername: <b>${args["inviteeUserName"]}</b>
   >                                              <br />Passwort: <b>${args["inviteeGenPassword"]}</b>
   66c66
   <                                              <p>Wir legen Ihnen nahe, das Passwort bei der ersten Anmeldung zu ändern.
   ---
   >                                              <p><b>Wir legen Ihnen nahe, das Passwort bei der ersten Anmeldung zu ändern.</b><br />
   
   ES
   52,53c52,53
   <                                              <p>Hola ${inviteePerson.properties["cm:firstName"]!""}:</p>
   <                                              
   ---
   >                                              <p>Hola, ${inviteePerson.properties["cm:firstName"]!""}:</p>
   > 
   55c55
   <                                              le ha invitado a unirse al sitio ${args["siteName"]} con el rol de ${args["inviteeSiteRole"]}.</p>
   ---
   >                                              le ha invitado a unirse al sitio <b>${args["siteName"]}</b> con el rol de ${args["inviteeSiteRole"]}.</p>
   62,63c62,63
   <                                              <br />Nombre de usuario: ${args["inviteeUserName"]}
   <                                              <br />Contraseña: ${args["inviteeGenPassword"]}
   ---
   >                                              <br />Nombre de usuario: <b>${args["inviteeUserName"]}</b>
   >                                              <br />Contraseña: <b>${args["inviteeGenPassword"]}</b>
   66,67c66,67
   <                                              <p>Le recomendamos que cambie la contraseña la primera vez que inicie una sesión.
   <                                              Para hacerlo, vaya a <b>Mi Perfil</b> y seleccione <b>Cambiar contraseña</b>.</p>
   ---
   >                                              <p><b>Le recomendamos que cambie la contraseña la primera vez que inicie sesión.</b><br />
   >                                              Para hacerlo, vaya a <b>Mi perfil</b> y seleccione <b>Cambiar contraseña</b>.</p>
   
   FR
   53c53
   <                                              
   ---
   > 
   55c55
   <                                              vous invite à rejoindre le site ${args["siteName"]} avec un rôle de ${args["inviteeSiteRole"]}.</p>
   ---
   >                                              vous invite à rejoindre le site <b>${args["siteName"]}</b> avec un rôle de ${args["inviteeSiteRole"]}.</p>
   62,63c62,63
   <                                              <br />Nom d'utilisateur : ${args["inviteeUserName"]}
   <                                              <br />Mot de passe : ${args["inviteeGenPassword"]}
   ---
   >                                              <br />Nom d'utilisateur : <b>${args["inviteeUserName"]}</b>
   >                                              <br />Mot de passe : <b>${args["inviteeGenPassword"]}</b>
   66c66
   <                                              <p>Nous vous conseillons vivement de modifier votre mot de passe lors de votre première connexion.
   ---
   >                                              <p><b>Nous vous conseillons vivement de modifier votre mot de passe lors de votre première connexion.</b><br />
   70c70
   <                                              <p>Si vous souhaitez décliner l'invitation de ${inviterPerson.properties["cm:firstName"]!""} cliquez sur ce lien :<br />
   ---
   >                                              <p>Si vous souhaitez décliner l'invitation de ${inviterPerson.properties["cm:firstName"]!""}’, cliquez sur ce lien :<br />
   
   
   IT
   53c53
   <                                              
   ---
   > 
   55c55
   <                                              ti ha  inviatato a partecipare al sito ${args["siteName"]} con il ruolo di ${args["inviteeSiteRole"]}.</p>
   ---
   >                                              sei stato inviatato a partecipare al sito <b>${args["siteName"]}</b> con il ruolo di ${args["inviteeSiteRole"]}.</p>
   57c57
   <                                              <p>Fare clic sul collegamento per accettare l’invito dell'${inviterPerson.properties["cm:firstName"]!""}':<br />
   ---
   >                                              <p>Fare clic sul collegamento per accettare ${inviterPerson.properties["cm:firstName"]!""}'s l'invito:<br />
   62,63c62,63
   <                                              <br />Nome utente: ${args["inviteeUserName"]}
   <                                              <br />Password: ${args["inviteeGenPassword"]}
   ---
   >                                              <br />Nome utente: <b>${args["inviteeUserName"]}</b>
   >                                              <br />Password: <b>${args["inviteeGenPassword"]}</b>
   66c66
   <                                              <p>Si consiglia di cambiare la password quando si effettua l'eccesso per la prima volta.
   ---
   >                                              <p><b>Si consiglia di cambiare la password quando si effettua l'eccesso per la prima volta.</b><br />
   70c70
   <                                              <p>Per rifiutare l’invito dell’${inviterPerson.properties["cm:firstName"]!""}, fare clic su questo collegamento:<br />
   ---
   >                                              <p>Per rifiutare ${inviterPerson.properties["cm:firstName"]!""}’s l'invito, fare clic su questo collegamento:<br />
   
   
   JA
   53c53
   <                                              
   ---
   > 
   55c55
   <                                              ????${args["siteName"]} ??????${args["inviteeSiteRole"]}?????????????????????</p>
   ---
   >                                              ????<b>${args["siteName"]}</b> ????? ${args["inviteeSiteRole"]} ????????????????????</p>
   62,63c62,63
   <                                              <br />????: ${args["inviteeUserName"]}
   <                                              <br />?????: ${args["inviteeGenPassword"]}
   ---
   >                                              <br />????: <b>${args["inviteeUserName"]}</b>
   >                                              <br />?????: <b>${args["inviteeGenPassword"]}</b>
   66c66
   <                                              <p>?????????????????????????????
   ---
   >                                              <p><b>?????????????????????????????</b><br />
   
   27172: Fixed ALF-7856 "Team: DocLib action displaying incorrect tooltip text"
   27339: ALF-8330 - ALL LANG - "Assigned To" in Data List created displays untranslated
   27340: Fixes Encoding issue in L10N files.
   27471: Fix for ALF-8150 - check for visibility before applying focus to element for IE.
   27499: Drop one and two of updates from translators based on rev26820
   27501: ALF-8151 - Filetype icon or is incorrectly displayed at the Content I'm editing dashlet
   27507: ALF-8478: Default repeat interval for activity email notifications should be 1 day
   27520: Fixed ALF-8329 "Consumer can add comments to files, folders, links and blogs"
   27527: Fixes ALF-8409: Ensure that UTF-8 encoded characters in file names can be uploaded to folders (that may also contain UTF-8 encoded characters) via DND in FireFox 3.6
   27531: Merged V3.4-BUG-FIX to V3.4-TEAM
      27525: Merged V3.4 to V3.4-BUG-FIX
         27120: Resolve ALF-8187: Transaction retries of CMIS webscripts failing
   27543: Fixed ALF-8464 "Start Workflow: Search for groups still requires minimum 1 character"
   27562: Merged V3.4-BUG-FIX to V3.4-TEAM
      27560: Fix for ALF-8434 - AVMRemoteStore not setting UTF-8 response encoding for some methods
   27572: Fixes: ALF-7596 - Config values not being correctly read in FTL
   27573: Fixed ALF-8504: Non-admin users are warned about license expiry too soon
    - ALF-8502 Adjust admin warning period from 30 to 21 days
    - ALF-7259 RTEAM 33: RepoAdmin Web Script to report Red/Amber/Green
   27592: Fixes: ALF-8444 - JA properties file in incorrect location.
   27594: ALF-8508 - Document Library: Google Docs actions not correct
   27596: Fixed ALF-8484	"Consumer and Contributor should not be able to choose button "Revert" of the document"
   27598: Annotated properties file to indicate which text is exposed to the UI and therefore needs translating. Needed for: ALF-8442
   27615: Fix for ALF-8501 - License warning box needs to be toned down in colour
   27616: Tweak for IE
   27617: Fixes: ALF-8423 - string missed in earlier merge
   27619: ALF-7904: Synchronize alfresco-customteam-settings.xml with alfresco-customstack-postgres-settings.xml!
   27625: ALF-7518 - Update Team Help and Tutorial URLs once finalised. * DO NOT MERGE *
   Note: version.edition cannot be used as a placeholder due to the mismatch between "edition=Enterprise" and help URL containing "team"
   27626: Change default value for "useTitle" to true for Site DocLib
   27648: Fix for ALF-8552
   27649: Fixed ALF-8495: Alfresco Logo is incorrectly displayed in notify user letter
   
   Usual note with these checkins applies, clean database will be required to see the updated templates.
   27650: Fixed ALF-8425: Select Tags button is missing at the Edit Properties page for msg files
   27664: Issue checking in XSLX Google Docs (related to ALF-8580)
   
   27667: ALF-7518 - Update Team Help and Tutorial URLs once finalised
   New tutorial URL for Share, now hosted within main docs system; uh-tutorial.html topic page.
   27683: Merged BRANCHES/DEV/dwebsterTeam to BRANCHES/V3.4-TEAM:
      27675: DE: Drop 3 & 4 for Team translations based on r27552
      27676: ES: Drop 3 & 4 for Team translations based on r27552
      27677: FR: Drop 3 & 4 for Team translations based on r27552
      27678: IT: Drop 3 & 4 for Team translations based on r27552
      27679: JA: Drop 3 & 4 for Team translations based on r27552
      27680: L10N updates to system-messages.properties (for License messages exposed to UI)
   27686: Fixes: ALF-8266
   27694: Change related to ALF-8556. Sometimes Google Docs cannot be checked out.
   This change was suggested by Roy. cm:failedThumbnail nodes were deleted onUpdateProperties. Now they are only deleted if there are no locks preventing their deletion (e.g. due to being checked out.)
   27710: Fixed ALF-7721: There are no field rescrtictions on 'Edit: Fileservers' form and ALF-8558: There is no pattern for Username field in Google Docs
   27711: ALF-8590 - Check Out for some documents is not working
   ALF-8591 - CheckIn form Google docs for some documents is not working
   
   Google Docs-specific filter code added to Manage Aspects UI to remove "gd:googleEditable from the list of addable aspects unless the file's mimetype is supported (i.e. txt, doc, xls, ppt). Google Docs enabled ootb in team-config.
   27713: GDoc - Fix for checkout of .odt files (see ALF-8599)
   
   27723: Added back theme name string that was removed in rev 26971
   27740: Updates from Gloria following bundle completeness analysis.
   27755: Removed extra unused Japanese translation files.
   27756: ALF-8207 - ALL LANG - Themes are not translated
   27759: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      27758: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
           27757: Fix for ALF-8430.
   27761: JA Updates from Gloria following bundle completeness analysis.
   27767: Fixes: ALF-8279 - reloads translation Gloria sent.
   27768: ALF-8213 - Manage My Subscription link now directs to team.alfresco.com - tooltip from label added
   27769: Fixes ALF-8652: Add removed quotes and revert translations back to correct language
   27770: Fixes: ALF-8228: Column widening needed
   27771: Initial commit of these translated files from Gloria.
   27772: ALF-8555 - Incorrect behavior of enabling Google docs (Really: Forms get submitted twice in certain circumstances)
   27773: ALF-8329 - Consumer can add comments to files, folders, links and blogs
   Fixed: 8. Open details page for file and try to add comment --> comment added successfully;
   27774: Spanish Gender Changes following review from Gloria.
   27779: Final fixes from L10N completeness check.
   27792: Remove debugging code from r27772
   27804: ALF-8207 - ALL LANG - SpringSurf issue with default theme definition
   27826: Manually reverts (to a version prior to r27683) a file in each language that was incorrectly supplied in English, and ensures they match the current EN properties.
   27827: Fixes: ALF-8210
   27843: Fix for ALF-8449 - ALL LANG - site themes are not translated (Customise Site page)
   27873: Merged V3.4 to V3.4-TEAM:
      27871: Fixes ALF-8124: Ensure Spanish locale for installer shows product name correctly
   27883: Implementation of ALF-8737 Support for thumbnailing/previewing of additional mimetypes (Adobe). Also video/audio playbac
   k.
   
   This check in enables thumbnails for Adobe Photoshop, recent Adobe Illustrator files and previews for Adobe Photoshop, recent Adobe Illustrator files
   as well as metadata extraction for Adobe Illustrator files (PDF-based formats).
   
   It also enables video playback of .m4v files, where the browser supports it.
   I have also added placeholder icons for .m4v files.
   Adobe Photoshop (.psd) files are handled by ImageMagick. However our existing ImageMagick-based content transformer excludes most mimetypes that don't start with "image/". By allowing "application/photoshop" to be accepted, that transformer
    will now perform thumbnails and previews.
   Recent Adobe Illustrator file formats are pdf files and so can use the PDF transformers/extractors i.e. PDFRenderer and 
   PDFBox and pdf2swf.
   I have added a new complex transformer for .ai files which uses the existing PDF/ImageMagick component transformers.
   
   New JUnit test cases for these transforms.
   
   As part of testing, we discovered that IE9 will not play mp3s of mimetype == audio/x-mpeg, only audio/mpeg.
   The latter is the correct mimetype, the former is out of date, but Alfresco was using the former. So we've updated that MIME type in various places in the code.
   27888: Google Docs 
     - Updated client google doc api jars
     - Fixes ALF-8592: Incorrect behavior on permissions for Google docs
   
   27894: Minor fixes for iOS:
   . overflow content shown by default in dashlets
   . doclib long filenames no longer cause screen to resize
   . ipad css overrides
   . YUI dialogs no longer jump around the page during text entry input
   27904: Minor fixes for iOS usability:
   . Drag&drop doclist help removed for mobile devices
   . Create New DataList shows list as full height (not scrollable)
   . Removed default webkit inner shadow from input fields
   27915: Minor fixes for iOS usability: Forced scrollbar appearance on overflowed div elements


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@27939 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-05-20 13:30:26 +00:00
Dave Ward
419ecfb9e7 Merged V3.4-TEAM to HEAD
24882: Branch for Team
   24883: Version Edition label
   24906: Partial implementation of ALF-6566. Replace gears image...
     This check-in adds support for the feature as described in JIRA. However we do not yet have
     the icon graphics files. I have therefore used some temporary icons in order to flush out
     implementation issues and to enable browser-based testing.
     A future check-in will add the correct placeholder icons and if they follow the naming
     convention, no change in code should be necessary.
   
     Also added and modified some test cases.
   24909: ALF-6606: Configurable sorting for Share Document Library. Also change Show/Hide Folder button to icon. (Placeholder icons)
   24914: ALF-6564: Initial cut of JMXFormProcessor, will show all attributes of a given MBean and has the ability to persist an attribute value.
   24916: Initial Alfresco Team project structure and build targets
   24917: First tranche of thumbnail icons for ALF-6566. Replace gears icon.
     Have added icons for some basic mime types and removed some temporary icons.
     I had to do a clean repo build to flush out the temporary docx and jpeg icons.
   24919: svn ignore patterns
   24922: Missed files for team build targets
   24932: Add a simple AVM to Zip exporter service, initially for use by the site exporter
   24935: Start on a java backed webscript to export a site, including all the details (ALF-6567)
   24945: Removed two unnecessary TODOs from the RatingService code.
   24949: Improved documentation for RatingService webscripts.
   Added sample JSON responses for two webscripts.
   24956: Implementation of ALF-6792. RatingSchemes should allow self-rating.
     Formerly, the cm:creator of a node could never apply a rating to it. An unchecked RatingServiceException would be thrown if they attempted to do so.
     With this check-in ratingScheme beans have a new property: selfRatingAllowed. The exception will now only be thrown if a cm:creator attempts to rate their own content in a scheme where this property is false.
     The property is true by default and in particular, is true for "likesRatingScheme".
   24958: ALF-6599: First pass DND file upload - FireFox4/Chrome support for single/multifile DND upload with basic progress
   24961: Added additional data to the response coming from rating.post.
   I have added averageRating, ratingsTotal and ratingsCount to that response.
   24963: ALF-6625: Balloon Popup Framework. Initial checking. More work maybe required when we start using it, or when designs are complete.
   24964: ALF-6598 "Configure Site page refactor"
   - page.lib.js - Freemarker lib to sort out used pages and which links and labels to use
   - Drag n drop
     * now supports horisontal lists
     * improved tabfocus and keynavigations
     * callbacks can be attached on dnd events: delete-clicks, enter-clicks, element-moved, element-duplicated
   - Alfresco.util.isVisible - Checks if the element and all its parents are visible and displayed in the ui.
   - Alfresco.util.PopupManager.getUserInput now accepts a "input" parameter that can be set to "text" ("textarea" is default)
   - Automatic click listeners can be defined as: 
     <a href="#onRenameClick" class="${el}" rel="${page.pageId?js_string}">${msg("link.rename")}</a>
     which will call:
     onRenameClick: function(pageId, anchor) {}
   24965: Changing date format of appliedAt JSON property to xmldate.
   24971: ALF-6600: Event handling performance improvements for DND file upload
   24976: Added team.war to continuous assemble-tomcat
   24977: ALF-6600: Initial pass at DND upload highlighting
   24979: Add method AuthorityService.getAuthorityNodeRef, and unit tests for it
   24980: UI label change for Team install
   24981: Set security permission on the new AuthorityService.getAuthorityNodeRef method, in line with the other get methods
   24987: ALF-6607 - Likes, favourite and comment actions. Also DocLib panel redesign. Updates to Rating Service to better match Team use cases.
   24989: ALF-6601: Added JavaScript multipart data constructor for FireFox 3.6 support
   24990: Fix "Access Denied" error when navigating into a "Liked" folder.
   25000: Merged V3.4 to V3.4-TEAM
      24999: ALF-6764 - Updated copyright year to 2011
   25004: ALF-6601: Set file size limit, HTTP status code error handling
   25007: Add user, group and person ACP exports to the Site Export webscript.
   (The user export is provisional, pending a service level way to access the user NodeRef)
   25008: ALF-6788: Update dashboard template to provide full width component and presets updates to reflect new default layouts.
   25017: Initial check-in for ALF-6809. A service to managed deleted items.
   This check in adds a basic REST API for GETting and DELETEing deleted items from the archive store.
   JUnit tests of the REST API are included but are not yet complete.
   
   25018: Trivial fix for failing test case related to ALF-6809
   25019: A previous check-in (25017) accidentally included an extra Java file that wasn't ready.
   File is related to ALF-6809 and will be implemented today.
   This check-in removes the internals of the class to allow it to compile.
   The class is not injected into the spring application context and is essentially dead code pending its implementation later.
   25027: Adding nodeType to the archivednodes.get webscript response.
     Requested by UI as part of ALF-6809.
   25035: ALF-6789: Personal dashboard welcome (with wireframe styling)
   25036: ALF-6782 - Undelete administration console page (WIP)
   ALF-6784, ALF-6786, ALF-6787
   25037: ALF-6564: Added operations to default form, all parameter-less operations are displayed as a button on the form. Clicking a button executes the operation after saving all attribute values.
   25038: Added a node filter to the archivednodes.get webscript. Currently excluding cm:thumbnails.
     A new bean on the script's controller class that allows injection of nodetypes to be excluded.
     Should be trivial to exclude other node types later and easy to exclude based on other criteria.
   25039: Part of ALF-6809. Deleted items were returned from archivednodes.get in the wrong order.
   They are now sorted by archive datetime most recent first. (Was previously sorted with most recent last.)
   Also switched the test case, which was backwards too!
   25040: Changing some copyright headers from 2010 to 2011.
   25041: ALF-6564: JMX forms can now be configured with selective attributes and the set of operations. Also includes an example form configuration for the outbound email almost matching Linton's wireframes.
   25042: ALF-6788: Fix rendering of old (V3.4) user dashboards stored in AVM with new Team layout
   25044: Part of ALF-6809. Added displayPath value to archivednodes.get.
   25047: Part of ALF-6809. Reconfiguration of cm:thumbnail archive behaviour.
   Formerly, we were archiving cm:thumbnails on deletion and filtering them from the archivednodes.get webscript which was not ideal as they remained in the archive.
   This check in removes the filter on the GET webscript and prevents cm:thumbnails from being archived in the first place.
   25049: ALF-6782
    - added Trashcan to admin tools menu
    - cleaned up list, show display path
   25050: ALF-6782 - css tweaks
   25052: Added check for multiple calls to onHistoryManagerReady() as workaround for issue with multiple History Manager objects when using Alfresco.util.DataTable.
   25053: Test case refactoring as part of ALF-6809
   25055: ALF-6803: First drop of aggregate file upload progress information.
   25056: Part of ALF-6809. A preliminary PUT webscript that is used to restore nodes from the archive to their original loaction.
   Currently only works on a single node per call (which is what the JIRA requires).
   Test code currently incomplete. I'm checking in now to give UI something to work with.
   25057: Fix for failing test case, which was part of ALF-6566.
   25058: ALF-6567 - AVM importer, which can load a zip file's contents into a specified AVM filesystem. Includes a bootstrap wrapper around the main importer.
   25068: Part ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
     - Subtask of ALF-6832: AT17: License restriction reporting
     - Added RepoAdminService.getRestrictions in Java and Webscripts APIs
     - Currently nulls returned indication 'no restrictions'
     - Cleaned up unused AdminService
   25069: ALF-6625 - adds a switch to control what calendar views are enabled and switches off Day, Week and Month views in Team.
   25073: Test case overhaul and minor tidying of code. Part of ALF-6809.
   25074: ALF-6803: Style updates to upload progress info
   25075: ALF-6601: Updated in-memory file upload check so that failure is based on total (not individual) file size.
   25081: Merged V3.4 to V3.4-TEAM
      25051: Build Fix: ALF-6865 CopyServiceImplTest.testCopyToNewNodeWithPermissions failing on permission copying
   25082: Part ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
     - Subtask of ALF-6832: AT17: License restriction reporting
     - Added RepoAdminService.getUsage in Java and Webscripts APIs
   25084: Improve how the Site Exporter gets at the users for a site, and have the user authentication details export skipped if a non-repository based authenticator is enabled
   25085: Final part of ALF-6809. Support for paging the results from archivednodes.get.
   Follows the standard maxItems, skipCount convention and enables paging in the trashcan view automatically thanks to Kev's use of the convention.
   25088: Final, final part of ALF-6809. Throwing 4xx, 5xx exceptions for nodeArchiveService-level failures to restore nodes
   25090: ALF-6601: Updated in-memory upload limit to be configurable
   25096: ALF-6601: Updates to DND highlighting and behaviour, set correct upload limit in bytes, NLS updates
   25101: Fixing failing test cases. Fallout from recent changes to the JSON response formats in these webscripts.
   25103: ALF-6613 - SpringSurf improvements to allow easier refactoring of Document Details page
    - latest SpringSurf libs with RequestCachingConnector improvements
    - removed manual request level caching of remote calls responses in web-tier components - now completely automatic
   25104: ALF-6803: DND upload dialog styling
   25106: ALF-6802: Added feature detection to disable drag'n'drop events (disables for IE6, IE7 & IE8)
   25108: ALF-6564: Added a check to the JMXFormProcessor to ensure the current user is an administrator. Also relaxed the rules in the checkbox control so it can be used for string values not just boolean values.
   25113: ALF-6789: Updated CSS to support IE6/IE7
   25116: Prevent server-side exception when navigating trashcan; related to paging. (ALF-6809)
   25117: ALF-6824 - Only show "Like" and "Comment" actions if a user has the correct permissions. Additional fixes for IE7.
   25118: Fix incorrect category aspect name. Missing file from r25117
   25119: ALF-6645 - Share and Team branding updates
   25121: Removed erroneous comment block
   25123: Merged HEAD to BRANCHES/V3.4-TEAM:
      25115: Fixes: ALF-6336 - resolved incorrectly translated date formatting strings.
   25124: Add a new bootstrap component for bootstrapping Sites. Handles the contents, AVM and authentication, people and their group membership to follow. 
   (Uses singleton spring beans in line with the patch service's use, to ensure that when loaded from a bootstrap extension things still occur in the correct order)
   25128: Merged V3.4 to V3.4-TEAM
      25127: Merged V3.3 to V3.4
         25126: ALF-6903 - Share theme feature does not work. Also fixes issue with MultiThreadedHttpConnectionManager in SpringSurf.
   25130: Continue with the site bootstrapper - finish supporting the loading of the site contents ACP
   25132: Work on ALF-6832:TR25: License restriction reporting
    - ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
    - ALF-6911: RTEAM 02: Record and expose system attributes
    - Added RepoUsageComponent
      - Unit test incl. testLicenseUse
      - Persists and retrieves usage data using AttributeService
   25133: ALF-6789: Added "Close" link to dynamic-welcome dashlet and associated webscript
   25135: ALF-6789: Add missing localization
   25136: ALF-6601: Defensively code against missing config
   25137: Fix up of transfer test.
   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.
   25139: ALF-6804: Disable drop outside of document list
   25140: ALF-6887 - for sending HTML emails
   - prelim support - either text explicitly starts with "<html" and/or is passed via new HTML param
   25141: Updated version to 3.5.0 for Team
   25142: ALF-6834 - activities feed email notification (1st cut)
   - for sprint 1 demo (ALF-6928, ALF-6929, ALF-6931, ALF-6932)
   - note: to demo ... manually copy "activities-email.ftl" into repo (/Company Home/Data Dictionary/Email Templates/activities) and configure your own email address (for one or more users)
   25145: ALF-6602: Added first time instructions for DND upload
   25147: Merged HEAD to BRANCHES/V3.4-TEAM:
      25100: Fix for build issue Steve was encountering on new build boxes using Ant 1.8.x
   25151: ALF-6790: Updated CSS and images to match latest mockups
   25161: Basic support for canned queries
    - ALF-6910: RTEAM 01: Query support for system-wide attributes (ALF-6832)
    - At this stage it only has support for count-style queries
    - General-purpose change that will be needed for main Enterprise branches
   25162: Temporarily disables the balloon framework while I fix a bug in it.
   25163: Basic support for canned queries: extended tests
    - ALF-6910: RTEAM 01: Query support for system-wide attributes (ALF-6832)
    - General-purpose change that will be needed for main Enterprise branches
   25164: Further Site Export/Bootstrap work - support importing People (profiles for users), and placing them into the correct groups
   25165: ALF-6905 - RTEAM 04: Add restrictions to trial license
   25166: ALF-6644 - Theme per site.
    - Theme selection for a site and its child pages can be made in the Customise Site page
    - Framework now allows theme per application, site or page.
   25167: ALF-6790: First pass at new site dashboards welcome dashlets
   25168: ALF-6832 - RTEAM 19: Update DescriptorService
   25169: ALF-6906 - RTEAM 18: Report Team or Enterprise in startup log
   25171: ALF-6998 - activities feed email - reuse Share messages (including L10N)
   25172: ALF-6910: RTEAM 01: Query support for system-wide attributes
    - Added and call canned queries for users and documents
    - ALF-6832 TR25: License restriction reporting
   25175: ALF-6998 - activities feed email - fix build copy of activity-list*.properties
   25176: ALF-6962 - activities feed email - use configured share url (from sysAdminParams)
   => share.protocol, share.host, share.port, share.context (note: you may need to override for dev/demo env)
   25178: ALF-6564: TR12: Implement JMX Form Processor. Added tests, fixed a couple of bugs in form processor and added all Mike's form config for MBeans we're provisionally exposing.
   25187: ALF-6998 - activities feed email 
   - quick fix if running within repo-only context (eg. via Eclipse)
   25188: Prevented NPE with Enterprise edition built as community.
   25189: Expose getAllowWrite on the TransactionService API
    - This is a user-independent flag as opposed to isReadOnly, which makes allowance for the 'System' user
   25190: Work on ALF-6832:TR25: License restriction reporting
    - ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
    - Use TransactionService as the source of 'isReadOnly'
   25191: Fix to issue where null could be passed as URI Tokens
    - fixes issue where pages failed to render on first display since rev 25166
   25192: CSS tweak
   25194: I18N'd system startup message
   25195: Restrictions now sets current time and readOnly property.
   25196: ALF-6790: Added user prefs to enable site welcome dashlet visibility
   25198: ALF-6790: Fix user close welcome dashlet persistence. Added site welcome dashlet close reload.
   25200: ALF-6803: Update upload dialog title to display (encoded) folder name (not entire path)
   25203: ALF-6834 - TR15: Activities feed email notifications
   - ALF-6931 - RTEAM 23: update activity feed DAO to filter by min id and/or max items
   - ALF-6929 - RTEAM 21: now uses last feed id for each user
   - minor cleanup (eg. tweak template to deal with null message)
   25204: ALF-6790: Fixed broken site preference logic
   25206: Checkpoint ALF-6608 - Inline property editing - name field. Also paves the way for ALF-6611 - Inline property editing - any meta field. Currently does not constrain input values, nor handle repository errors (e.g. duplicate name).
   25212: ALF-6602: Updates to reflect latest designs
   25213: ALF-6564: More MBean form config
   25248: A new schema version range for 3.5
   25249: ALF-7049 - RTEAM 12: Disable Alfresco Explorer
   25252: ALF-7050 - RTEAM 09: Disable MT
   25263: Fix trailing comma for IE browsers
   25268: Implementation of ALF-6829 Popularity of a node (RatingService).
   
   This check-in is actually a fairly generic support for rolled up property values within rating schemes.
   Popularity is currently the only concrete rollup in the system, but it should be possible to add more without too
   much difficulty.
   
   Given the published API for the rating service, we have added rollups for "ratingCount" and "ratingTotal" for the built-in rating schemes (likes). Therefore searching/sorting on either cm:likesRatingSchemeCount or cm:likesRatingSchemeTotal, both of which are defined in an aspect cm:likesRatingSchemeRollups should give popularity for the likes rating scheme.
   
   
   Additions to the content model.
     I have added aspects, properties for the built-in rollups, namely count and total.
   
   Spring changes
     The rating scheme(s) now have rollups injected into them. These rollups are algorithm classes that know how to calculate the rolled up props.
     Naming conventions are used to determine the output property and are captured in RatingRollupNamingConventionsUtil.java.
   
   API changes
     New methods: RatingService.getRatingRollup(NodeRef, String, String)
     & RatingScheme.getPropertyRollups()
   
   Changes to the RatingService implementation and JUnit test code.
   
   To roll your own rating rollups:
     To add your own rating rollup, you need to reuse one of the existing AbstractRatingRollupAlgorithm subclasses or create a new one.
     That class will produce the value of the rolled up property by iterating the ratings in the given rating scheme for a given node.
     You need to inject your rollup algorithm into the rating scheme bean in rating-services-context.xml
     On applyRating() and removeRating() the RatingService will check the rating scheme for any registered rollup algorithms and will have them recalculated.
     It will then use the naming conventions described in the JIRA and in RatingRollupNamingConventionsUtil to get aspect/property names for each of the rollups.
     It will then add the property value in the normal way.
     Therefore, you need to extend the content model to include the expected aspect and property values. Follow likesRatingScheme for a sample.
   25273: Fix failing unit test.
   25274: DocLib sorting support for "popularity" (Likes rating scheme)
   25277: ALF-6602: Updated instructions to reflect new design. Info shown now dynamically based on site ownership/access rights/browser feature support
   25278: Merged BRANCHES/V3.4 to BRANCHES/V3.4-TEAM:
      25267: ALF-1070 - if site/user is deleted then immediately clean associated site/user feed
   25279: ALF-6601: Updated to handle 0 byte dropped files (or folders)
   25280: ALF-7009 WIP checkpoint
    - Also removed some code that is obsolete since ConsoleTool class extends Alfresco.component.Base
   25286: ALF-6599: Changed folder DND target back to image (not row)
   25298: ALF-7009 - Upload and replace Share logo
   25311: ALF-7080 / ALF-7002 - ActivitiesFeed subsystem (+ option to enable/disable job triggers)
   - moved ActivitiesFeed into subsystem for dynamic mgmt via JMX
   - FeedNotifier repeat interval can be dynamically changed
   - also added "enabled" property to AbstractTriggerBean => FeedNotifier job can be disabled / re-enabled
   25312: ROLLBACK (Partial) 25249 ALF-7049 Disable Alfresco Explorer.
   25313: ROLLBACK 25252 : ALF-7050 - RTEAM 09: Disable MT
   25317: ALF-6930 - bootstrap / patch activities email template
   25331: ALF-6890 - RTEAM 16: License-based restrictions: Number of users
   25333: Merged BRANCHES/V3.4 to BRANCHES/V3.4-TEAM:
      25319: Build/test fix (fallout from ALF-1070)
      25322: Build/test fix (fallout from ALF-1070)
   25356: ALF-6930 - bootstrap / patch activities email template
   - missed file, sorry !
   25358: ALF-6834 - Activities email: tweaks
   - pass through repeatInterval (to template model)
   - add exclude email list (eg. for default admin)
   25360: RTEAM 28: License restriction reporting: Force refresh
    - Added API for selective updates of usage data based on an enumeration: USAGE_USERS, USAGE_DOCUMENTS or USAGE_ALL
    - When people are added, for instance, usage will be updated and then retrieved for checking.
   25363: ALF-6639 - Default collaboration dashboard
    - NOTE: may need Team overlay version on merge if this change is *not* the default for Swift
   25364: Modified usage/restriction admin webscripts to use a common FTL lib for the json output and added some missing quotes around the license mode value.
   25365: ALF-6597: Added DashletTitleBarActions widget and applied to WebView dashlet
   25367: ALF-7082 - Remove Network Dashlet
    - Removed network dashlet from codeline
    - Support in WebScripts to allow hook for override of exception handling from webscripts for specific use cases
    - Surf LocalWebScriptRuntime overrides error handling looking for specific case of SC_NOT_FOUND - and silent ignores missing webscript components
    - Improved Share handling of missing webscript components that have already been bound into a dashboard (i.e. not a missing "slot" but an existing component binding that points to a missing webscript URL) - this will also allow for easier removal of other existing dashlets in the future without requiring repo-side patches or similar.
   25369: ALF-7042 (ALF-6832) RTEAM 28: License restriction reporting: Force refresh
    - Added unit test for update WebScript
   25375: Implementation of ALF-7024. Document versions service/webscript needs to return avatar url.
   The avatar url has been added to the JSON response as requested.
   If there is no avatar, a JSON null is returned as requested.
   25377: Add maxDocs, maxUsers and license mode to License JMX bean
   25378: Adding additional property to version.get webscript: a correctly-formatted ISO8601 date.
   This has been added as requested in the comments of ALF-7024.
   25381: Refactor of LicenseComponent and related to produce LicenseMode in descriptor (ALF-6907 RTEAM 19)
    - Need actual enum to do later usage updates according to mode
   25382: ALF-7053 - RTEAM 07: Disable Transfer
   25387: ALF-6564: Finished JMXFormProcessor (again). There is now a configurable list of operations to ignore, revert is ignored by default. The labels for the buttons are also localisable now.
   25390: Fixed up License MBean after changing the descriptor API
   25391: ALF-6911: RTEAM 02: Record and expose system attributes
    - Added job locking around individual usage queries
    - It is possible to concurrently update user and document counts
    - Exposed true/false return value on updates and added this to usages webscripts
   25392: Switched version edition back to Community
    - If we distribute Team using a community build, then we should know about it.
    - Team functionality is triggered by an Enterprise build or TEAM license.
   25393: Undid rev 25392
   25394: Work on ALF-6832:TR25: License restriction reporting
    - ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
    - ALF-6911: RTEAM 02: Record and expose system attributes
    - Added RepoUsageMonitor
      - Self-starting schedule
      - Only checks for restrictions that are in place
      - Issues warnings and errors; puts system into read-only mode on violation
   25403: ALF-6890 - Switch over of user query to database backed query.
   25408: WIP checkpoint for Agenda view refactor:
      - Adds Alfresco.util.friendlyDate to supply "Yesterday/Today/Tomorrow" style date
      - refactors getEvents into a common function in calendar-view.js (calendar-view-month not touched because it gets elements from the DOM rather than API)
      - Uses DataTables to display agenda events (currently unformatted)
   25410: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      25409: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
           25407: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
                25401: Allow continuous.xml database drop/create on postgresql and mysql to support the database being on a different machine
                25406: We no longer need a 2nd _test database for the unit tests, so remove the code that created/removed them during the continuous build
   25411: Fix to allow application logo to be uploaded with same filename as a previous logo.
   25416: Implementation of ALF-7100. Comments webscript doesn't return dates in iso8601.
   I added iso8601-formatted date fields jsut as for ALF-7024.
   25418: Implementation of ALF-7173. Remove the RatingService restriction whereby a single user can only rate a single node with one RatingScheme.
   Change to the RatingService javadoc so that it doesn't mention the restriction.
   Additional method in RatingService: getRatingsByCurrentUser - to return multiple ratings.
   Reimpl's testOneUserRatesInTwoSchemes test case from a -ve to a +ve test case.
   Rewrote the REST test cases slightly to cover the case of a single user multiply rating a node.
   Various changes through the apply() case to support this.
   25419: Change the Site Loading for ALF-6567 from a bootstrap to a patch. This means that if a site is loaded then deleted, it won't be re-loaded again.
   25420: Fixed unit test for ALF-6911: RTEAM 02: Record and expose system attributes
    - Forgot to prompt user usage changes to check numbers against
   25422: Addition of selfRatingAllowed field to ratingdefinitions.get webscript.
   As this is now a configurable property on a scheme, it should be reflected in the REST API.
   25423: Node rows that transition to the deleted state (not archive) are given type sys:deleted
   25425: Add an example extension context file to patch-load an exported Site, and allow the import path to use defaults to reduce the number of settings required
   25426: ALF-6597: Added temporary tooltip code for DashletToolbarActions (and updated to WebView dashlet to use it)
   25427: ALF-6789: Removed dynamic welcome dashlet from add dashlets menu
   25428: ALF-6599: Removed encoding of spaces in displayed location name on DND upload to folder
   25430: ALF-6890 - tweaks to query and person service for user limit stuff.
   25432: ALF-6597: Updated DashletToolBarActions to ensure fade in on first mouseover
   25433: Implemented ALF-6613, ALF-6614, ALF-6615, ALF-6616, ALF-6617, ALF-6618, ALF-6619, ALF-6620, ALF-6621, ALF-6622 - PART #1 
   - ALF-6613 TR22: Document Details page improvements
   - ALF-6614 Page redesign and refactor
     * Components are atomic and doesn't need global events to work.
   - ALF-6615 Document Actions panel
   - ALF-6616 Tags panel - NEW, replaces the old "info (tags+permissions)" component
   - ALF-6617 Share links panel
   - ALF-6618 Properties panel
   - ALF-6619 Permissions panel - NEW, replaces the old "info (tags+permissions)" component
   - ALF-6620 Workflows panel
   - ALF-6621 Version History panel
   - ALF-6622 Comment component redesign and refactor
   - alfresco-macros.lib.ftl
     * <#function uriTemplate id> 
       Helper for getting a uriTemplate in freemarker
     * <#function userProfileLink> 
        Helper fopr rendering a userProfile link in freemarker
   - alfresco-util.js - Rhino Javascript-helpers
     * function error(code, message, redirect) 
       Helper for redriting and throwing a webscript error
     * function param(name, defaultValue)
       Helper for placing a webscript "param" in the model, lloks for param in the following order args, page.templateArgs, properties, defaultValue. 
       If no value is found and no default value was given an error is thrown.
       Useful to avoid webscripts "crashing" when accessed from /service/ rather than from /page/ path, i.e. when refreshed/reloaded using ajax.
     * function getRepositoryUrl()
     * function getRootNode()
     * function getDocumentDetails(nodeRef, site)
   - alfresco.js
     * New in Alfresco.util.DataTable
       c.dataSource.doBeforeParseData - to modify response before rendering, i.e. if an array is the respons rather than an object
       c.dataTable.config.className - if another css class than alfresco-datatable shall be used
       c.paginator.history - set to false to avoid browser history management to kick in
       reloadDataTable() - to reload
       getData(record) - to get data related to a row in the table
     * sanitizeMarkup() - moved out code from request(), strips out <script> tags from html
     * New in Alfresco.base.Component
       - createYUIButtons()
       - attachLinkClickListeners()
       - refresh(url) - gets new markup from server and replaces the old and unregisteres the js component instance
   - base.css 
     * .alfresco-twister-actions - use this class to place actions in the twisters that are visible when twister is opened
     * .document-version - common css class for version label
     * .alfresco-datatable - Common styling for datatables created from Alfresco.util.DataTable, 
        gives list like appearence and removes headers and bprders.
   - NOTE! Tested in FF3.5 & SF4, PART #2 will contain: 
     x-browser testing, tidy up comments form, social gadgets in header, activities after new version upload
   25437: ALF-6789: Added confirmation dialog for welcome dashlet close
   25439: More WIP for Team's Agenda view. General clean up, code commenting and start of styling.
   25443: ALF-6597: Added actions to remaining dashlets
   25451: Site label suffix removed from title bar
   25452: ALF-7053 - Disable Replication Service
   25453: ALF-6599: Disabled DocLib DND upload when viewing non path filters (and fixed filter view bug that was previously introduced)
   25454: Stub out the user upload via CSV webscripts
   25455: Implemented ALF-6613, ALF-6614, ALF-6615, ALF-6616, ALF-6617, ALF-6618, ALF-6619, ALF-6620, ALF-6621, ALF-6622 - PART #2
   - components doesn't break when accessing a working copy OR a repository document (non site)
   - remove som unecessary code that slipped in with comments-list.js
   - "Add comments" now clears the editor before the next add
   - Comment paginator is only visible when necessary (happens to all paginators by default,force show with c.paginator.hide=false)
   - removed the document-details.ftl instantion of the javascript class
   - version panel isn't rendered on doc details page for working copies 
   - versions panel had white background under text "No previous verisions exist"
   - code commenting sweep 
   25457: ALF-6599: DND event listener fix
   25460: CSS tweak to document path
   25461: ALF-6790: Updated links for invite and upload for managers/contributors
   25462: ALF-6811: Added upload users CSV button to existing user admin console page. Stubbed code for invoking WebScript
   25470: Some build fixes
   - in general running without an authenticated user
   - getPerson -> getRestrictions without any security context
   25473: Added csv, xsl, xslx formats/mimetypes to default list for webscripts.
   25475: ALF-6608: Inline property editing - name field
   ALF-6625: TR04: Balloon popup (tooltip) component
   Also Document Library restyling: rollover style, text removed from most buttons, new icons.
   25476: Repository Browser brought up-to-speed with latest Site DocLib changes.
   25477: TEAM build fixes
   - fix unprotected service not to use public services - allows repoAdminService to be wired up to personService
   - There may be collateral damage to test using the messageService
   25482: Add the Apache Commons CSV library, and also fix the classpath breakage caused by the postgresql jdbc jar switch
   25483: Implementation of ALF-7005. TR24: Remove inappropriate rule script actions.
   Both sets of script actions (email templates and scripts) are built up using FolderContentsParameterConstraint objects.
   Using this class a location in the repo is specified and all cm:content children under that location (recursive) are included.
   I have added a new, optional property to that class which allows the specification of a list of file extensions, which is used as an inclusion filter for the content nodes.
   I decided against using a MIMEtype-based filter as there are situations where users add e.g. .js files as text/plain.
   Then I inject "js" and "ftl" as inclusion filters in the relevant action-constraint beans in the action service.
   We can easily add further file extensions should it be necessary.
   
   25484: ALF-6597: Fixed IE6 selector issue
   25486: ALF-6597: CSS correction to r25484
   25488: Small adjustments to descriptor logging during startup.
   25489: Team Eclipse project
   25491: ALF-6789: CSS tweaks to welcome dashlet columns
   25492: Get the basics in place for the user CSV upload - provides a sample csv file, loads it, process the contents and reports a JSON response, but doesn't yet create the users
   25495: ALF-6642: TR08: Site only view - remove Repository view.
   Copy and Move to dialogs only display Sites destination in this mode.
   Note: Page mapping not removed until it's clear how this will integrate with the installer; hence manually browsing to the Repository Browser is not pretty right now.
   25496: Minor follow-up fix for Repository Browser.
   25497: Support for ALF-6642 on details pages.
   25499: Document Library sort improvements: individual sort parameters can now be given a default sort order (like the Share search results page). Currently configured as name: ascending, popularity: descending.
   Also added support for "#upload" in URL to show the upload dialog.
   25500: ALF-7120: TR03: Test and integrate sample site into bootstrap process
   
   NOTE: This will install the Work In Progress sample site to your repository next time you start the repo. 2 new users will be added and will count towards your allocated users, you can safely delete the site and the users, they will not get re-loaded.
   25501: When generating the example file for the user CSV upload, have the webscript generate .xls and .xlsx versions, as well as the previous .csv one.
   25502: ALF-6790: Update upload link to #upload to get upload dialog
   25503: Team build fix: Fix message service tests after changing the beans wired up
   25505: New requirements for ALF-6617 "Share links panel", now only displaying link to current page
   25507: ALF-6640 - WIP. Initial styling pass, event actions, etc.
   25511: ALF-6789/ALF-6790: Removed old welcome dashlets
   25512: Resolve ALF-7099: Duplicate view:reference entries in an ACP export created using multiple noderefs
   25514: General cleanup of implementation and use runAs to query Admin-only service
   25516: More ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
    - Added 'licenseValidUntil' to web script returns (may be null)
   25518: Harden MessageServiceImplTest against leaked transactions
   25519: Refactor the common code for dealing with tenant usernames + tenant domain checking, during person creation, out to the person service
   25521: ALF-7099 export follow up: emit associations after all objects
   25523: Add support to the User CSV Upload webscript to actually create the people and users, using the new common service methods in common with share
   25524: Implementation of ALF-7093. Transfer/replication actions must not be displayed when the transfer service is disabled.
   
   Note: It is the ReplicationService which is enabled/disabled as opposed to the TransferService.
   A new webscript has been added (available at GET /api/replication-service-status) which returns 
   {"data": {"enabled": true}}
   
   Also a new REST test case.
   25525: ALF-6911: RTEAM 02: Record and expose system attributes
    - made getRestrictions() accessible to 'guest'
   25526: Update the user csv upload webscript with some debug log entries, and excel support
   25528: ALF-6602: Updated to new (temporary) images, updates to CSS
   25535: Removed deep svn:mergeinfo.  Please merge from base of code lines and remove spurious svn:mergeinfo
   25536: Merged V3.4 to V3.4-Team
      25399: Fix for ALF-6991: "Connection pool causes poor performance in some test suites"
             - applied constructor fix recommended by https://issues.apache.org/jira/browse/DBCP-330
      25400: Fix for ALF-6991: "Connection pool causes poor performance in some test suites"
             - commit missed file
      25474: Eclipse classpath tweaks to prevent element-based entry for Commons DBCP
   25537: ALF-7094: First cut of TR24: JSF-based login screens should warn unsupported when in Team mode. The wording needs reviewing and changing as does the position and styling of the text.
   25542: Implementation of ALF-7182. TR20: When a user 'likes' a document it appears in the activities feed.
   MikeH gave me the JavaScript changes for this in Share tier. Thanks Mike.
   I added some ftl and properties.
   25546: ALF-6602: Further image and CSS tweaks to doc lib assistance
   25548: Enhancements to user limit error reporting (ALF-6890: RTEAM 16: License-based restrictions: Number of users)
    - Report the usernames being added that generate the limit violation
   25549: ALF-6789: CSS updates
   25551: Fixed bug in Alfresco.util.DataTable when setting default css class name (appearing i.e. on trash can admin ui)
   25552: Minor cleanup in createPerson code.
   25554: ALF-6635 "TR12: Browser based administation - JMX admin console pages"
   25557: Updated version of sample site for Team, the full page width welcome dashlet is now present for both users.
   25559: First phase of ALF-6835:
    - Share now retrieves repository license/restrictions via REST API on first user login
    - Dynamically applies override config onto Alfresco config based on license info - allows Enterprise/Team specific tweaks to UI etc.
      - also constructs an object representing the license/restrictions that can be read by Surf components
    - Share Footer component now dynamically switches Community/Enterprise/Team logos and text based on config
    - Removed team project from source tree - NOTE: remove it from your local Eclipse projects
    - Removed team build targets - NOTE: devenv team targets will no longer work
    - Removed enterprise overlay for footer and share enterprise logo (no longer required due to dynamic footer configuration)
   25562: ALF-6835 - About Share dialog now displays appropriate edition logo and background based on license details
   25566: Allow users of the Mail action to pass in extra model options for their templates to use. 
   25568: When processing user CSV uploads, skip cleanly over blank lines
   25570: ALF-6811: Updated users admin console page and associated scripts to process WebScript feedback
   25572: ALF-6884 - TR25: Reload license file on live server via JMX operation on LicenseDescriptor mbean.
   25575: Agenda View WIP. Added add/edit/show more events functionality, bug fixes and styling. Updated Calendar API to include event description!
   25578: Bring user limit warnings in line with PersonService (create time) warnings
   25579: Repo usage monitoring done every 12 hours
   25580: ALF-6599: Update folder target highlighting & update temporary images
   25583: Fixes bug in Calendar Agenda view - number of days shown by default (was: from now - end of current month, is: from now until now + 30)
   25584: ALF-6602: Fix broken links on assistance panel
   25585: Branding and CSS tweaks from Linton
   25587: Wrap the User CSV upload result json in a data block, to better fit the current pattern
   25591: In the User CSV upload webscript, correct line numbers in error messages for excel uploads
   25593: Dashlet title rollover behaviour changes. Insitu edit balloon now removed when textbox loses focus.
   25596: Impl of ALF-7175 Comment order ... changed.
   This check-in adds a repo-side webscript parameter to reverse the order of comments
   25599: ALF-7233 remove doc for changing server.transaction.allow-writes
   25601: ALF-6811: Update to users.js to handle modified JSON response from WebScript
   25602: Agenda View, Bug fixes and CSS tweaks.
   25605: The empty 'Operations' set no longer appears in view mode and made the mail.password field behave like a password field
   25606: Tweak the JSON to better fit the current layout standards
   25607: Add a few more fields to the User CSV upload, based on the fields in Share
   25609: ALF-6645 - Branding tweaks
   25613: Help URLs moved to new edition based config - removed enterprise overlay.
    - NOTE: final 3.5 URLs still to be decided!
   25624: ALF-6789/ALF-6790: Updates to CSS/DOM to achieve completely fluid vertical and horizontal layout
   25626: ALF-6789: Updated profile to provide #edit hash and welcome daslet to make use of it
   25628: ALF-7207 - activities feed email / mail action executor
   - mail action executor should not get (+ auto-create) person when running as System
   - prepare / send email for each person as a separate txn
   - also: add actual / max feed item counts to template model  (as per ALF-6834)
   25631: Share Admin Console tool groupings
    - Implemented basic groups of tools in the admin console
    - First attempt at grouping tools - needs review by Linton/MikeF
   25644: Disable repository searching for team license configuration.
   25646: ALF-6835 - License details shown on License Descriptor admin page
    - Fixed up out-of-date JMX form bean names (changed on repo side since original JMX form config)
   25647: Team Agenda View - no events text, and other minor fixes
   25648: ALF-6811: Updates CSV WebScript response, added HTML format handling, added results panel to user console.
   25650: File missed from check in 25647
   25652: Start to convert the User CSV uploader to using localised error messages and error responses rather than non-localise exceptions
   25653: Added MikeF's url templates for ALF-6628 TR23: Preview support for Flash Video and HTML5 video.
   
   25654: ALF-6835 - Edition Interceptor improvements
   25655: Update how the User CSV Upload webscript returns messages and errors. Makes use of a property loaded via a resource bundle, and a new extension to WebScriptExtension which is driven by a supplied ResourceBundle, rather than the system-wide ones (which don't hold webscript specific messages)
   25656: ALF-6789/ALF-6790: Updated text, CSS/DOM tweaks & update to site-members to provide all members hash for welcome dashlet
   25658: ALF-6811: Updates to HTML format response for CSV request to support HTML uploader
   25659: Partial implementation of ALF-7230.
   This check-in changes the bootstrap data within the acp such that the sample JavaScript files in Data Dictionary/scripts are now bootstrapped as *.js.sample.  Their content has not been changed.
   Note that this applies to backup.js, example test script.js, backup and log.js, append copyright.js, alfresco docs.js and test return value.js.
   A separate solution will be provided for the command-*.js scripts.
   
   25660: Better reporting of the script causing stream errors
   25661: ALF-7231: RTEAM 32: FileFolderService method to get localised file
    - Locate the base translation using the well-known QName path (selectNodes) - this is the current way.
    - Call this additional method to locate any localized siblings
   25662: ALF-7263 - Track multiple reasons why we are read only otherwise we can't go back to read/write.
   ALF-7220 - Repo Usage Component Unlock
   25663: ALF-7256 - Ensure license reload does not damage server after upgrades
   25666: ALF-6811: Fix success message for all users uploaded
   25668: Increased user limit to 10 users for trial license
   25672: Some formatting
   25673: Minor comments format from Javadoc to inline
   25674: User count reporting: Keep track of disabled users on person
    - Disabling a user adds an aspect to the related person object
    - Should be able to export after disabling user
    - Don't count disabled persons
    - User count is reduced by 1 to cater for 'guest'
    - RTEAM 16: License-based restrictions: Number of users
   25679: A little more information is now returned if an error occurs whilst persisting MBean attributes or invoking an MBean operation.
   
   The sample site root node is prevented from being archived when it's deleted during the sample site bootstrap process.
   25681: ALF-6789: Change "Close" to "Remove"
   25685: Agenda View: Fixes Tagging.
   25686: IE fixes and slight change to the "automatic" binding from button/links against a component (value/rel attribute is now treated as a simple string instead of as an object)
   25688: Agenda view - new sketch logo from Linton for when there are no events
   25689: Feed edit icon css class
   25690: Invite test uses disabled users
   25691: ALF-7229 - partial (for Activities Feed Notifier)
   - also cleanup IoC deps
   25693: Work in progress ALF-6593: TR04: Update dashlets to provide consistent look & feel, include thumbnails, help text, action links where applicable
   25694: MERGED V3.4-BUGFIX to V3.4-TEAM
      24898 : Fix to FixUserQNamesPatch
   25695: ALF-6789/ALF-6790: Added new icons, removed old ones
   25697: ALF-7231: RTEAM 32: FileFolderService method to get localised file
    - Fixed extraction of 'base' name to be parts before *first* period
    - Changed unit test to use 'Something.html.ftl'
   25698: IE7 bug fix (a comma sign had slipped in by mistake)
   25701: Continued implementation of ALF-7230. Bootstrap data amendments and additions for Team.
   This changes the name of DataDictionary/EmailTemplates/NotifyEmailTemplates/notify_user_email.ftl to .../notify_user_email.ftl.sample.
   With this check-in there will now be no .ftl files available for the Rules UI's "send email" action. The "Use Template" dropdown will have no contents. A future check-in will add the new (i18n'd) ftl files.
   25702: Adds options support to Alfresco.widget.Resizer & updates console and calendar templates to use it. Tweaks styling on calendar to make it behave.
   25703: Update the FileFolder localised version tests to do both Standard.html/Standard_fr.html and Another.get.html.ftl/Another_fr.get.html.ftl so we test both cases
   25704: Provide a util helper for building Share and Alfresco (Explorer) urls up from SysAdminParams
   25705: ALF-6628TR23: Preview support for Flash Video and HTML5 video.
   - Customisable plugin architecture added for web-preview component, ootb plugins are:
     * WebPreviewer: for documents (and image & flash movies) in other words the "good ol previewer"
     * FlashFox: .mp4 & .flv videos for users w FlashPlayer 9
     * StrobeMediaPlayer: .mp4 & .flv videos for users w FlashPlayer 10
     * Video: HTML5 <video> element, support depends on the browser, but if youre lucky it might support .webm & .ogv movies
     * Image: Displays images using the <img> tag (if taken from the nodes content and the image is larger than 0.5 mb, a link must be clicked to get the conten displayed).
     * Flash: embeds flash content using swf-object
     * plugin kicks in depending on node's mimeTYpe & thumbnail in combination w rules defined in web-preview.get.config.xml
   - Added new mime types to repo:"video/ogg", "audio/ogg", "application/ogg" & "video/webm"
   25706: ALF-6628TR23: Preview support for Flash Video and HTML5 video. part 2
   - some strange white space characters had made their way in 25705
   25708: Add new notifyPerson method to the Person service. This sends an email to the newly added user telling them their credentials, where to log in etc. 
   (Email template patch to follow)
   25709: Use the new user notification method on the Person Service if requested, through the user CSV upload and person script service. It is on by default for CSV uploads, and off by default for javascript (Share)
   25710: Add security file missing from earlier PersonService.notifyPerson checkin
   25711: Further impl of ALF-7230.
     Ensuring that the (recently renamed) notify_user_email.ftl.sample file has a qname path which is .sample-based.
   25712: ALF-6835, ALF-7093 - Various improvements to Admin Console related to showing appropriate components based on license edition and admin console tool groupings.
    - JMX tools now only available when an appropriate Enterprise license is found
    - Subset of JMX tools available for TEAM edition
   25713: Library updates for rev 25712
   25719: Fix Alfresco.util.DataTable first request after r25693. Slight tweak to console tools list CSS for readability. Also modify how item separators work in social panel.
   25722: Fixes broken links in wiki page within Team sample site
   25732: Added quicktime move to the list of supported previews
   25733: Added localised model title and descriptions for all the cm:person properties
   25735: Revert non-English message bundles
   25736: Document Library folders defaulted to visible on first use.
   25739: Workaround for exceptions during bootstrap of clean db.
   Changes to the email template acp introduced an exception. The changes are related to ALF-7230.
   25740: Added read-write locking around veto code
   25741: Patches runAs 'System' to allow execution even in read-only environment
   25742: Patches runAs 'System' to allow execution even in read-only environment
   25743: Removed some javadoc-style comments within methods
   25744: Enhanced usage GET method
    - Currently, I have problems preventing real data from being returned; so see dummy data
    - Made usage GET a guest operation
    - Included 'level', 'warnings' and 'errors'; see usage.get.desc.xml.
   25745: Fix typo in error message
   25748: ALF-7094: TR24: JSF-based login screens should warn unsupported when in Team mode (final text from Linton/docs)
   25749: Make an unrestricted license available in the build classpath of each version
   25750: ALF-6622 "Comment component redesign and refactor"
   - Current user's avatar is displaye in add comment
   - editor is correctly configured and styled and uses full width
   25751: ALF-6602 - Final drag'n'drop icons and text from Linton/docs.
   25752: Email templates for new user notifications, and a patch for this (applicable to both new and existing installs)
   Note - acp may need a refresh later for tweaked templates, and description tweaks, but it shouldn't be a problem for anyone who gets this version now
   25753: Reduced property path console logging on startup
   25755: More acp hacking for ALF-7230.
     Now the property key is defined in bootstrap-spaces.properties. Oops. Mustn't forget that next time.
   25756: Update the User CSV scripts to use the new titles and descriptions for the person model, in both the template, and in the upload when skipping over title rows
   25757: Tweak the User CSV upload template to show the descriptions properly in all excel versions
   25758: Usage messages for usage web scripts
    - Fixed unit test fallout
    - Added license timeout as a restriction/usage element
   25759: Fix for making "poster" attribute to videos understand the filesuffix of a thumbnail
   25761: Fixed template to remove redundant 'warnings'
   25762: Add a note about why this class generates mail text itself, via dedicated template service calls, instead of following the new pattern of passing a template noderef + model to the Mail Action Executor
   25763: Update the site invitation mail action to enable the use of localised email templates (where present), and update to the new noderef+model pattern (rather than processing the template in the class)
   25764: Fixed bug where it was only possible to upload a new version once on the docuemnt detais page, also small css tweaking in the version list
   25765: Fix for ALF-7337 Email with content shorter than 5 chars causes exception in MailActionExecuter.
   A simple fix that tightens up some string comparison.
   25766: JMX MBean error handling: UI now shows the error message returned from the form processor. As the raw error message is being shown I have also localised the error messages on the server.
   25768: Sample site users are now loaded in a disabled state so they do not count towards the user count. The main wiki page also had a broken link to one of the images in the project library which is now fixed.
   25771: Removed organization id from the CSV upload as it's not used anywhere in the UI
   25772: Added protection for the usage.users or usage.documents properties being null
   25775: Removed unused warning suppress
   25776: Minor formatting
   25777: Added ability to get transactions that don't respect read-only vetos
    - Typically used by doing
          RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
          txnHelper.setForceWritable(true);
          ...
    - This ranks with the 'Run As System' for permissions, but allows a clean separation between permissions and transactions.
    - Don't have to force everything to run as 'System' to get a writable transaction, but 'System' will still have one.
    - ALF-7236 RTEAM 34: Reload Licence fallout
      - ALF-7256: Ensure license reload does not damage server after upgrades
   25778: Allow patches to run against read-only system
    - Made a write-forcing RetryingTransactionHelper available for patches and their offspring worker threads
    - main upgrade thread is already running as 'System' user
    - ALF-7236 RTEAM 34: Reload Licence fallout
      - ALF-7256: Ensure license reload does not damage server after upgrades
   25779: ALF-7257: Changed read-only setting to server.allowWrite to avoid mixing with Spring config
   25780: Further impl of ALF-7230.
     This check-in includes a patch which bootstraps a .html.ftl notification email template and placeholder templates for supported locales es, fr, de, it. (The notification email has a broken link in it. I will fix that today.)
   25781: Inbound Email admin console tool disabled for Team edition
   25782: Agenda View style fixes, non-default theme updates and description expand.
   25784: Added MBean form config for the IMAP susbystem.
   25786: ALF-6635 - Added IMAP admin console component
   ALF-6835 - License component improvements
   25790: ALF-6835 - Show license info warnings/errors. Show SysAdmin JMX console component so share host/port can be set for email templates.
   25791: Build fix for recent changes (labels being added, scripts being renamed and site membership URL cleanup)
   25794: Add missing admin user exclude to the people export with a site
   25795: Further impl of ALF-7230.
     Added a new acp containing a new example JavaScript file & a patch to bootstrap it in.
   25796: Removing unnecessary property values. As part of ALF-7230.
   25799: Improved the order of the fields in the sysAdmin MBean form, fixed typos in a couple of labels and provided more explicit labels (there were 2 fields each called Context, Host, Port and Protocol)
   25800: Removed the loading of the command-*.js files that end up in Data Dictionary/Scripts. If they turn out to be required by something (we can't find any code reference to them anywhere) then they will need to be added back but to a different location.
   25802: ALF-6884 "TR25: Reload license file on live server via JMX operation on LicenseDescriptor mbean."
   25804: Agenda View polishing: Style tweaks, removed refresh jump, added "Today" button (currently uses page refresh), new Sketch icon, etc.
   25805: Fix up license admin component after previous checkin
   25806: Update the new user email template acp to have localised descriptions for the templates
   25808: ALF-6621 "Version History panel"
   - activitiy filed after new version upload
   - fixed bug where revert didn't work
   - components refresh inline instead of page reload
   - made alfresco-macros.lib.ftl work when "page" attribute isn't present
   25811: Update the site invite email templates to be localised and html. For new installs, you will get the html versions from the acp. For old installs, the text version will remain in DD, and you'll get (+ start using) the new html ones.
   (Change also pushes some freemarker model logic from the people invite into template service, so the site import can use it.)
   25812: For new installs, don't bootstrap load the old invite-email.ftl, as we now get the new html ones from an acp patch that always runs
   25813: Merged V3.4-BUG-FIX to V3.4-TEAM (3.4.1 changes)
      24884: adding back runBare over-ride - test was deadlocking
      24894: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.4-BUG-FIX:
         24892: Fix ALF-6729: Corrected build paths for WQS following upgrade of commons-pool library
      24901: Fix ALF-6590: Requesting details of many assets using a GET request was causing Tomcat to close the socket connection. Changed so that we use a POST for this request.
      24905: Merged V3.3 to V3.4-BUG-FIX
          24904: Fixes ALF-5964: Installer height too small RHEL (records only)
      24928: Merged V3.3 to V3.4-BUG-FIX
         24927: Fixed ALF-5025 (ALF-6206): Support background processing of archiving
             - Added property: xam.archive.forceBackgroundStoreMove=false
      24930: Merged V3.3 to V3.4-BUG-FIX
         24929: Merged DEV/DAVEW/SAP to V3.3
            24925: ALF-6667: Fixed possible deadlock where index merger is never rescheduled under heavy load
      24941: Merged BRANCHES/DEV/BRIAN/wqs-caching to BRANCHES/DEV/V3.4-BUG-FIX:
         24613: WQS: Added caching layer for asset collections. Improves rendering time of homepage by 23% at steady state.
      24944: ALF-6662 - Transfer/replication servers need to be compatible versions
   25814: Convert the activities email templates patch/bootstrap from a single xml + classpath ftl, to an acp containing localised html versions following the new pattern
   25815: Merged V3.4 to V3.4-TEAM (RECORD ONLY)
      24946: Merged V3.4-BUG-FIX to V3.4 (RECORD ONLY)
         24752: Merged V3.4 to V3.4-BUG-FIX
            24751: Merged V3.3-BUG-FIX to V3.4 (RECORD ONLY)
               Restored V3.3-BUG-FIX mergeinfo, somehow truncated in revision 24274
         24757: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24756: Fix for ALF-6269: WebForm (Edit Web Content Wizard) ERROR on Alfresco Community Edition 3.4.b and 3.4.c
         24771: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24767: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
               24765: ALF-6547: fix intermittent test failure (AssetServiceImplTest renameFile/renameFolder) - fallout from ALF-1948
         24802: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24801: Fix for ALF-3055: "SecurityTestSuite hangs when run in DOD5015 context - failed authentication audit hangs on DB connection"
                - do failed audits in a separate thread (from a thread pool)
         24822: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24821: Fix for ALF-3055: "SecurityTestSuite hangs when run in DOD5015 context - failed authentication audit hangs on DB connection"
               - fix up unit tests
         24838: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24828: Merged BRANCHES/DEV/BELARUS/V3.4-2011_01_13 to BRANCHES/V3.4:
                24824: ALF-6361: web-client-config-custom.xml doesn't work in /alfresco/tomcat/shared/classes/alfresco/extension
         24857: Merged V3.4 to V3.4-BUG-FIX
            24853: Merged V3.3 to V3.4 
               24852: Fixed ALF-6573 "Incorrect name of subgroups on "Groups" page"
         24858: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24750: Limit installer builds to 2 threads
         24874: Merged V3.4 to V3.4-BUG-FIX
      24948: Merged V3.4-BUG-FIX to V3.4
         24718: Merged V3.3 to V3.4-BUG-FIX
            24717: Fix ALF-5555: It is impossible to edit review date from record's details page
         24719: Fix for ALF-6106: Error on Check In operation with % symbol (SPP)
         24733: Better fix for ALF-6106: Error on Check In operation with % symbol
         24734: Fix for ALF-6089: Incorrect order of fields at 'Create Series', 'Create Category' and 'Create Folder' forms
            The name, title and description fields are now placed in their own group on the server, all other non custom rm fields are put in an 'other' group, the client side config then declares a set for each group and orders them appropriately.
         24753: Merged V3.3-BUG-FIX to V3.4-BUG-FIX
            23870: Merge Dev to V3.3_BUG_FIX
               ALF-4243: F5 load-balancer sending regular HTTP requests to Alfresco server causing Faces Servlet to throw java.lang.NullPointerException (MyFaces upgrade to from 1.1.5 to 1.1.7)
            23897: Additional fixes and tweaks since introduction of MyFaces 1.1.7 library.
            23919: More JSF component id related fixes.
            23945: More MyFaces1.1.7 JSF page fix ups
            23959: Another MyFaces 1.1.7 dup id issue fixed.
            24008: ALF-4243
               - Upgraded MyFaces from 1.1.7 to 1.1.8 to fix a bug seen in 1.1.7
               - Added handling for the fact that valuebound properties that result in null now cause an exception where-as they were perfectly valid in 1.1.5.
            24419: Merge from V3.3 to V3.3-BUG-FIX
               r.24418 Fix for ALF-6075. Running out of /tmp space on the server is causing uploads to fail.
         24768: Fixes ALF-6295: Allows MySQL to not be installed via unattended installer invocation
         24779: Merge V3.3 to V3.4-BUG-FIX
            24497 : ALF-3092 - deployment service - catch Throwable from Begin.
            24684 : Merge DEV/BELARUS/V3.3-BUG-FIX-2010_10_04 to V3.3
               23498 : ALF-5498 In Windows XP, placing a Folder with a Name that already Exists Removes all Content of the Existing Folder
            24749 :  ALF-6174 - Transfer Service fails with double peer assoc custom content type
            24766 : ALF-5603 - It is impossible to assign workflow from workflow console to non-admin user
         24812: Fix ALF-6316: A new "spoof" multivalue text property (cm:tagScopeSummary) is now made available for TagScope nodes when accessed via the getProperty or getProperties operations on the standard node service. The values of this property take the form "<tagname>=<tagcount>". A new interceptor has been added to the node service to do this (TagScopePropertyMethodInterceptor). WQS has been tweaked to make use of this new property, and the now defunct behaviour has been removed.
         24820: Work in progress refactoring transaction handling of transfer unit tests.
         24834: ALF-6468 - Update the scheduled actions folder bootstrap to use localisable names and descriptions, following the normal pattern
         24836: Added system property 'system.cache.disableImmutableSharedCaches' (false by default)
            - Equivalent to disabling Hibernate L2 cache for *immutable* entities
            - Allows distinction between mutable and immutable cache entries
         24850: Fix ALF-6562: Moved property that is used to label the WQS dashlet on the "configure site dashboard" page out of the Slingshot project and into the WQS Share Module project. Corrected its value to "Web Quick Start" rather than "WCM Quick Start".
         24860: ALF-6673 - bootstrap folders and rename
         24870: Removed svn:mergeinfo from root
         24873: Merged V3.3 to V3.4-BUG-FIX (RECORD ONLY)
            21789: ALF-4333: Fix
               - Updated RepoPrimaryManifestProcessorImpl so it can handle deletions that are reported by either pre-delete noderef or archived noderef (previously only handled the latter).
               - Updated TransferManifestNodeFactory so that it handles the case where the status of the node to transfer is "deleted".
               - Updated UnitTestTransferManifestNodeFactory so that it handles the change to TransferManifestNodeFactory above.
               - Added new tests for deletion cases.
            23259: Merged HEAD to V3.3
               23256: Fix ALF-4573: Start Workflow action is absent for edited document and working copy in Share
            23346: Brought WebQS module in (including build process but not installer elements yet)
            23371: "Simply" added wcmqs to installer
            23391: ALF-5367: Copy dlls into tomcat/bin as appropriate.
            23485: Merged V3.4 to V3.3 (fix backported for V3.3.x lines)
               23472: Fixed ALF-5408: SQL Server missing ON DELETE CASCADE declarations
            23515: Merged PATCHES/V3.2.0 to V3.3
               23514: ALF-5554: Merged HEAD to V3.2.0
                  23153: When updating tag scopes following system shutdown/restore, be smarter about quickly skipping tag scopes that another (new) thread is currently working on
                  23283: More debugging level logging for tagging updates, to help identify the problem with periodic multi-threaded test failures on bamboo
            23535: Merged V3.4 to V3.3 (complements 23517: ALF-5552)
               23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs
            23564: ALF-5600: Merged V3.4 to V3.3
               23424: Fixes: ALF-2989 - Incorrect sideId reference in URL for event in Site Calendar Dashlet
                  Adds support for displaying events that start in the past but finish in the future (previously only events that start in the future were shown)
            23586: MERGED V3.4 to V3.3
               22864: Fix for ALF-5005: "Create and edit functions on AWE become "confused""
               23042: Fix ALF-5127: Impossible to create an article/blog (WCMQS) [Must clear panel hideEvent handler if manually hiding a YUI panel]
               23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size. 
                  Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call)
               23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events.
            23630: Backport of installer
            23631: Added 64-bit & deployment installers
            23664: Fixes ALF-5691: TransferService: Multi-byte characters are not encoded correctly
            23681: Fixes ALF-5699: TransferService: Snapshot file from source repo never contains complete MLText properties
            23695: Fixed bug exposed after fixing ALF-5699. Parsing of MLText properties out of the transfer snapshot file was incorrect, and that was causing multi-lingual property values to be duplicated
            23709: ALF-5699: Fix NPE in ManifestIntegrationTest
            23734: Merged V3.4 to V3.3
               23731: Fixes for ALF-3098 and ALF-3097
                  - Share - Security check on Personal Dashboard - only the owning user can view a user dashboard page
                  - Share - Security issue on Customize Site Dashboard - private and moderated site dashboard pages no longer visible to non-members, customise site and dashboard pages only accessible to SiteManager
            23747: ALF-5696: Merged V3.4 to V3.3
               23585: Fixed ALF-5372 "JavaScript error on Groups management dialog with IE8 : document.getElementById is null"
            23790: Fixed ALF-3823 "Share: RSS feed can't be read: http://cds-srv.sun.com:8700/rss/update/public/sunalert_update.xml - ok with other RSS client."
            23883: Fixes ALF-5759: WQS: Attempt to copy a website section fails
            23907: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_09_20 to V33
               22750: ALF-4846: Update rules are firing on inbound actions 
            23931: Undid rev 23907 (Reverse-merged /alfresco/BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_09_20:r22750)
            23961: Fixed ALF-5686 "Incorrect behaviour of "All" filter in "My Tasks" dashlet"
               - Variables assigned in a <#macro> shall always be assigned using <#local> (using <#assign> makes them globally available which might cause naming collisions)
            24132: Disable intermittent failing unit test
            24148: ALF-6007: Merged HEAD to V3.3
               23049: Fixed ALF-5099: Error when trying to go back in Create Web Content Wizard (only with certain XSDs)
            24263: Merged from V3.3-BUG-FIX to V3.3
            24264: V3.3-BUG-FIX to V3.3
               24262: Stress test code for ALF-5025: Support background processing of archiving
            24287: Added missing import
            24336: Merged V3.4 to V3.3
               23205: Fix for ALF-2111 - Download URLS are different on different pages, authentication fails when URL sent
            24353: Merged V3.4 to V3.3
               24352: Fix SQL fallout from ALF-6078
            24510: Merged V3.4 to V3.3
               21960: First round of date refactoring: Document Library pages now expect XML dates (ISO8601) from Share data webscripts
               21961: Share client-side I18N utility now emulates sever-side handling of doubled-up single quotes.
            24526: Merged V3.4 to V3.3
               24402: Fix for performance degredation related to ALF-3823. 
                  RSS feed processing in JavaScript relies on Rhino impl of regex - this is extreemly slow as Rhino regex is by far the slowest component of the library. 
                  Switched code to use the Java Regex libraries to improve performance and reduce memory usage.
            24587: Merged V3.4 to V3.3
               24564: Fix for ALF-3727: Custom permissions aren't visible in Explorer UI
            24604: Merged V3.4 to V3.3 
               24602: Build fix for RM permission model loading - collateral damage for R 24564
            24774: Merged BRANCHES/V3.4 to BRANCHES/V3.3:
               23492: Fixed ALF-5550: DB2: Unable to insert values into alf_string_value
            24813: Merged BRANCHES/V3.4 to BRANCHES/V3.3:
               24750: Limit installer builds to 2 threads
         24880: Merged V3.3 to V3.4-BUG-FIX
            24463: Fixed ALF-4398 "Path to rule set is not displayed" ($html alias was missing from a merge)
            24465: Merge V3.3 to V3.4 (RECORD ONLY)
               24463: Fixed ALF-4398 "Path to rule set is not displayed" ($html alias was missing from a merge)
            24493: Fix for Mac OS X CIFS logon problem, change UID to start at one as zero has special meaning, plus other minor fixes. JLAN-112.
            24569: Fix for ALF-5333: Webdav - Online editing of files in a folder with German umlauts does not report correct characters
            24611: Fix broken build due to merge #fail (r24460 / ALF-4015)
            24668: ALF-4557 - Upgrade of large repository to latest 3.3 fails on excession of mysql table lock size
            24707: Fix for handling of null first/last name in wiki page list
            24710: ALF-5535 - Fix to correctly format json number values (not as numeric human readable strings)
            24794: Fix for ALF-4984 - Outdated custom-slingshot-application-context.xml.sample file for share
            24798: Fix for ALF-5806: Lucene query does not return expected result.
               - Alfresco FTS now supports the prefixes ~ and = for phrase queries
            24814: Build fix after r24798: Fix for ALF-5806: Lucene query does not return expected result.
            24823: Synchronization improvements to RemoteClient and http proxy hosts
            24825: Fixed #3 of ALF-6308 "Share data issues"
               - Share falls back to use "html uploader" (in all browsers except IE) when "JSESSIONID" cookie is unreachable from javascript (like when "HttpOnly cookies" is activated on the server.
            24835: Fixed ALF-5484: Check-in does not update association
               - Copy code when copying over an existing target node was NOT processing associations
               - Fallout from refactor and subsequent fixes related to ALF-958 (Target associations aren't copied)
               - Some commented-out unit tests reintroduced
            24842: Fix for ALF-6308 item #4 - validate the redirect URL to ensure it is a relative url
            24845: Merged DEV/DAVEW/SAP to V3.3
               23874: ALF-5822: Correct Lucene throttling mechanism to prevent build up of excessive committed deltas
                  - Also correct BatchProcessor's mechanism for single-threading batches with cross dependencies
                  - Single-threaded batches must be sequenced in order
               23876: ALF-5822: Default lucene.indexer.mergerTargetOverlaysBlockingFactor to 2 for better write performance under load
               24022: ALF-5822: Refinement of fix
                  - Don't block a thread that has already entered the prepare phase with another indexer (e.g. a cross-store commit). Otherwise it could block indefinitely and never enter the commit phase
                  - Also added extra debug diagnostics and handle all Throwables on failure
               24023: ALF-5822: Minor correction to debug log message
               24421: ALF-6134: Do not export org.hibernate.jmx.StatisticsService through JMX to avoid excessive blocking under load
               24422: ALF-6135: Remove lock contention from concurrent Lucene searches
                  - Added a RW Lock and Thread local-based solution to org.apache.lucene.store.FSDirectory.FSIndexInput.readInternal() to avoid contention during multiple parallel Lucene searches. This is already recognized as a bottleneck by the Lucene developers, who offer NIOFSDirectory as an alternative, which unfortunately doesn't work on Windows.
                  - Added RW lock to org.apache.lucene.index.TermInfosReader.ensureIndexIsRead()
                  - Threads no longer hanging in lucene searches during load tests. Woohoo!
               24423: ALF-6136: Don't call through to org.apache.log4j.NDC unless debug is enabled as it's heavily synchronized. Also avoid dynamic method invocation by using a delegate.
               24426: ALF-6138 (SURF - PARTIAL): 'Warm' the java.beans.Introspector cache for key Freemarker accessible bean classes on loading in static initializers
               24428: ALF-6139 (SURF - PARTIAL): First log in to Share is expensive due to 'lazy' dashboard creation and excessive synchronization
                  - Added AVMRemoteStore.createDocuments() for creating multiple XML documents at once, all embedded within the same master XML document in the request body 
                  - Added corresponding saveDocuments() methods to Store, RemoteStore, Model, ModelObjectManager and ModelObjectPersister on the Surf side 
                  - Used this in PresetsManager 
                  - Removed excessive synchronization from StoreModelObjectPersister 
               24429: ALF-6140 (SURF - PARTIAL): Surf tweaks to allow concurrent execution of web scripts
                  - Use StrongCacheStorage instead of MruCacheStorage in RepositoryTemplateProcessor to avoid use of a synchronized cache
                  - Tweak cache sizes in FreeMarkerProcessor
                  - Use thread local object wrapper delegates in QNameAwareObjectWrapper and PresentationTemplateProcessor to work around synchronization in DefaultObjectWrapper
                  - Swap in the same object wrapper to WrappingTemplateModel
                  - Use a concurrent HashMap in ModelObjectCache and ModelHelper and remove excessive synchronization
                  - Use RW locks rather than synchronized blocks in AbstractWebScript
               24431: ALF-6141: Improvements to IBatis DAO performance under load
                  - Use lazyLoadingEnabled="false", enhancementEnabled="false" to avoid unnecessary blocking and generation of CGI proxies in IBATIS DAOs
                  - Use useTransactionAwareDataSource="false" to prevent Spring from agressively unwrapping DBCP connections and bypassing the prepared statement cache
               24432: ALF-6142: Remove dependency between RepositoryAuthenticationDAO and Lucene
                  - Reworked RepositoryAuthenticationDAO to use a node service lookup by child association QName
                  - This required adding a patch to 'upgrade' the qnames of existing authentication nodes, which previously all had the same QName
               24433: ALF-6143: Remove net.sf.ehcache.use.classic.lru setting from EhCacheManagerFactoryBean and InternalEhCacheManagerFactoryBean to prevent serialization of accesses to shared caches by multiple executing threads
               24434: ALF-6144:  DirtySessionMethodInterceptor was causing contention between multiple threads calling the same DAO.
                  - Unfortunately method.getAnnotation() is a synchronized call, and thus causes concurrent calls to the same method to contended with each other. 
                  - Added a non-blocking cache so that DAOs can be accessed in multiple threads without contending. 
               24435: ALF-6145: Use RW Locks in Subsystem Framework
                  - The operations relied on by the dynamic proxies wrapping subsystems were synchronized and thus caused contention when multiple threads were calling in to the same subsystem
                  - Replaced synchronized blocks with use of read write locks, thus allowing multiple concurrent readers
               24436: ALF-6146: Regulate PermissionModel accesses with RW locks, rather than synchronized blocks and an excessive number of concurrent hashmaps.
               24438: ALF-6136: Fix build classpath
               24439: ALF-6142: Fixed seeding of admin user password
               24444: ALF-6142: Fix unit test fallout
                  - InviteServiceTest needs a transaction
                  - RepositoryAuthenticationDao must listen for Person username changes and update authentication node qname accordingly
                  - Correction to MT handling in RepositoryAuthenticationDao
                  - Repository Authentication Component must 'normalize' the username before passing it through the DAO
               24445: ALF-6145: Correction to lock handling when propagating destroy() events
               24446: ALF-6142: Add new dependencies to unit test
               24448: ALF-6142: Further fix ups
               24461: ALF-6142: Fix unit test
               24664: ALF-6408: Prevent possible deadlock during reindexing
                  - waitForHeadOfQueue() now only called in beforeCommit() phase rather than afterCommit() to prevent deadlocking with Lucene throttler
                  - indexes are also flushed beforehand in beforeCommit() so that indexing work can still be parallelized
                  - also prevent potential deadlock caused by clearing of IndexInfo.thisThreadPreparing in a nested transaction
               24810: ALF-6653: Use read write lock in Hibernate ReadWriteCache to avoid needless contention on L2 cache reads
               24817: ALF-4725: Avoid excessive lock contention in dbcp by upgrading to 1.4
                  - also upgraded commons pool
               24818: ALF-6658: Remove synchronization from LockService - transaction local collections used anyway
               24844: ALF-6681: Don't let the PostLookup job stack up in multiple threads
                  - Now only executes in one thread at a time and skips scheduled slots where it is already running
            24864: Fix for ALF-5904: Explorer - Space model rights not duplicated when creating a space based on a template
               - copy service no longer uses hasPermission
               - added tests for permission copy scenarios with assorted rights
               - this fix assumed there is nothing special about templates - ie that they should always carry permissions and is the "default" copy behaviour to copy permissions if possible
            24865: ALF-6145: Fix failing unit test
            24878: ALF-6146: Correction to write lock around requiredPermissionsCache
         24881: Increment version revision
         24884: adding back runBare over-ride - test was deadlocking
         24894: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.4-BUG-FIX:
            24892: Fix ALF-6729: Corrected build paths for WQS following upgrade of commons-pool library
         24898: Fixed merge issue in FixUserQNamesPatch
         24901: Fix ALF-6590: Requesting details of many assets using a GET request was causing Tomcat to close the socket connection. Changed so that we use a POST for this request.
         24905: Merged V3.3 to V3.4-BUG-FIX
            24904: Fixes ALF-5964: Installer height too small RHEL (records only)
         24928: Merged V3.3 to V3.4-BUG-FIX
            24927: Fixed ALF-5025 (ALF-6206): Support background processing of archiving
               - Added property: xam.archive.forceBackgroundStoreMove=false
         24930: Merged V3.3 to V3.4-BUG-FIX
            24929: Merged DEV/DAVEW/SAP to V3.3
               24925: ALF-6667: Fixed possible deadlock where index merger is never rescheduled under heavy load
         24941: Merged BRANCHES/DEV/BRIAN/wqs-caching to BRANCHES/DEV/V3.4-BUG-FIX:
            24613: WQS: Added caching layer for asset collections. Improves rendering time of homepage by 23% at steady state.
         24944: ALF-6662 - Transfer/replication servers need to be compatible versions
   25816: Removed unused config files; superceded by subsystem configuration
   25817: Tweak how the html notification/invite template ACPs are patched/bootstrapped to better fit the pre-existing pattern
   25819: ALF-7230. Fixed the document link sent out in the notification email.
   This document link is now a Share link and requires the admin to have configured SysAdminParams with server config data such as port number etc.
   Added the SysAdminParams bean to the ServiceRegistry
   Added a helper method to TemplateNode to get the Share URL for a (document) node.
   Updated the email templates within the acp to use the helper method in TemplateNode.
   25820: Merged V3.4 to V3.4-TEAM
      24885: Fix ALF-6694: V3.4.0 schema inconsistencies
         - ALF-6712: DB2: alf_authority missing index 'authority' during upgrade
         - ALF-6714: ALL: alf_prop_unique_ctx missing FK index on upgrade from 3.3 and 3.2
      24889: Disabled intermittently failing test (ALF-6700) until it can be made more reliable.
      24951: Merged DEV/DAVEW/SAP to V3.4
         24950: ALF-6698: Allow clearBatchSize and updateBatchSize properties of userUsageTrackingComponent to be controlled through system.usages.clearBatchSize and system.usages.updateBatchSize global properties
      24966: Fixed ALF-6363: Transaction status incorrect during afterCommit phase
         - Covered by unit tests
         - afterCommit or afterRollback will report "Not in transaction"
      24969: Fixed ALF-4372: JavaDocs don't match code for Index Recovery Modes (VALIDATE)
      24970: WQS: Fixed web publishing transfer service Spring definition (hopefully permanently now) following change to TransferService requirements
      24974: Fix ALF-6813: WQS: Specifying the sort order in the query of a dynamic asset collection has no effect
      24978: WebDAV: minor debug logging fixes
         - fix WebDAVHelper logger name to be consistent (with rest of WebDAV and other filesys protocols)
         - log service call as info (separate from rest of debug)
      24983: Step 1 of ALF-3891: Policy beforeDeleteChildAssociation not fired on delete node
         - Clean up deprecated beforeCreateChildAssociation, which could only be used *after* the event
      24985: Attempt to fix ALF-6820: Slow CMIS unit tests on build box
      24994: Fixes: ALF-6815 - terminology change (also fixes encoding bug that was preventing files being loaded into translation memory)
      24995: ALF-6572 - WCM: virt svr - enable "lazyDeploy" by default
         - can be disabled (in server.xml)
      24997: correction/kludge of DescriptorServiceTest.
      25002: Fix up test.
      25029: Merged DEV to V3.4
         25009: ALF-5829: Cannot upload files to Records Management site using WebDav from Mac OS X
             - Configuration constant that maps User-Agent pattern to response status code was added to WebDAVMethod.
             - Method that determines response status for AccessDeniedExeption using ‘User-Agent’ header was added.
             - AccessDeniedException processing was changed to return appropriate status.
      25043: Merged DEV to V3.4
         25012: ALF-6758: Potential JGroups Locking issue requiring jgroups upgrade
         JGroups was upgraded to the latest available stable version 2.11.1 Final:
            - jar was upgraded;
            - sources were upgraded;
            - classpath of the ‘3rd Party’ project was upgraded;
            - AlfrescoJGroupsChannelFactory was upgraded according to extension in superclass 
      25061: Merged DEV to V3.4
         24920: ALF-1787: Slow performances when many workflow are opened
             1. Implementation of a custom query for JBPMEngine.getAssignedTasks.
             2. Uint test for creating and testing neccessary items in DB.
         25014: ALF-1787: Slow performances when many workflow are opened
             1. HQL query for TaskInstance properties chache. 
         Also:
            - Moved back to query.list() - no difference with scroll
            - Checked query plan for batching queries and found no problems
            - Batch queries *have* to be limited in the IN clause
            - Although not using scrolling, there was a missing close statement
      25072: Reversed change 25043: Slow performances when many workflow are opened
      25094: Resolve ALF-6736: CMIS Web Services: getObjectByPath() should return an objectNotFound error if the given path doesn't exist
      25107: Resolve ALF-6754: CMIS nameConstraintViolation errors are not returned to client
      25122: Merged HEAD to BRANCHES/V3.4:
         25115: Fixes: ALF-6336 - resolved incorrectly translated date formatting strings.
      25144: ALF-6841 - IMAP Sync Errors
      25148: ALF-6991: Connection pool causes poor performance in some test suites
         - Added explicit 'forceMultipleResultSetSupport=false' in case someone wants to change it.  
         - This is not a fix (or actually a change at all) just a documentation of the options available
      25149: Added transaction leak checks in security tests.
         - Just helpful for diagnosis when one test fails and brings the others down.
      25182: Merged PATCHES/V3.4.0 to V3.4
         25180: Merged DEV/TEMPORARY to PATCHES/V3.4.0
            25150: ALF-6918: Editing a Share document simultaneously using Share HTTP and Webdav breaks the document - working copy relationship.
               User can't unlock and edit original node that was checked out by him. 
               WebDAVMethod-> checkNode() was changed to return Http Status 423 if node has a working copy
         25181: Merged DEV/TEMPORARY to PATCHES/V3.4.0 (with corrections)
            25102: ALF-6894: Share IMAP - Modifier and date/time incorrect.
               ImapServiceImpl.checkForFlaggableAspect() method was modified to  disable "auditable" behavior before adding "flaggable" aspect and then enable it again.
      25193: Fix ALF-7039: Unable to specify target MIME type for renditions generated by the TemplateRenderingEngine
         The "mime-type" parameter is now exposed by any rendering engine that is derived from the BaseTemplateRenderingEngine
      25205: Merged V2.2 to V3.4
         25184: ALF-6914: Use RetryingTransactionHelper in WorkspaceClipboardItem
            - Also decoded the mysterious looping logic
      25214: Merged BRANCHES/DEV/BELARUS/V3.4-2011_01_13 to BRANCHES/V3.4:
         25045: ALF-6435: SPP doesn't work with MT users
      25216: Merged HEAD to BRANCHES/V3.4:
         25100: Fix for build issue Steve was encountering on new build boxes using Ant 1.8.x
      25219: Fix for ALF-6312: "Incorrect work of AWE functionality"
      25222: Merged BRANCHES/DEV/BELARUS/V3.3-2010_12_20 to BRANCHES/V3.4:
         24943: ALF-6103: Explorer - Version type not set by auto version
      25224: Fixed ALF-6992: PersonUsagePatch is sequenced incorrectly and is too slow
         - Added direct SQL update for cm:sizeCurrent (adds a type NULL property just like the Java patch did)
         - Removed the Java patch; ensured that new patch has the old as an 'alternative' and that the old patch is now a NoOp.
         - Tested with 50K users upgrading from 2.1
         - Can be backported safely to 3.2 and later.
         - Will provide instructions in the JIRA for working around.
      25225:ALF-6992: PersonUsagePatch
         - Fixed alf_applied_patch entry
      25229: Fix for ALF-6661: Fixed issue with navigation handling in JSF client, although seen via WebDAV in the bug description, it's actually the same for any inline editing.
      25237: Fix for ALF-6463: Collaborator and Editor cannot rename items via WebDav
      25244: Fix for ALF-6858: Uninitialized FormUI options parameter causes UI to be unusable
      25245: A new schema version range for 3.4.1
      25246: Merged BRANCHES/DEV/BELARUS/V3.4-2011_01_13 to BRANCHES/V3.4:
         25226: ALF-6348: Edit the event to reccurent and backward doesn't work
      25253: ALF-7059: Excessive webscript loading times in v3.3 and v3.4
         - Corrected escaping of Lucene document searches in RepoStore
         - The '-' character was getting interpreted as an operator when searching for package-desc.xml
      25256: ALF-5143: Eliminate use of non-I18N friendly FileWriter
      25258: Undid fix for ALF-6992 revs 25224 and 25225
      25259: Fixed ALF-6992: PersonUsagePatch is sequenced incorrectly and is too slow
         - Fixes ALF-6954, too: CLONE - Attempt to login into Alfresco fails for previously created users ...
         - Follows previous fix removal
         - Moved SQL from bootstrap to patch execution, but still do a mass update
         - Ensure that QNames are present prior to SQL execution
         - 'patch.authorityDefaultZonesPatch' depends on 'patch.personUsagePatch'
      25261: Merged DEV to V3.4
         25160: ALF-1787: Slow performances when many workflow are opened
             1. Implementation of a custom query for JBPMEngine.getAssignedTasks.
             2. Uint test for creating and testing neccessary items in DB.
             3. HQL query for TaskInstance properties chache.
             4. HQL query for ContextInstance variables chache.
      25270: Fix for ALF-6271. ThumbnailRegistry loading definitions without transaction.
      25275: Merged DEV to V3.4
         25243: ALF-6583: when a LDAP admin removes its own account, account cannot be useed anymore and cannot be recreated
             - Full path to node calculating logic was extracted from ‘org.alfresco.filesys.repo.NodeMonitor.beforeDeleteNode()’ policy handler:
             - ‘NodeMonitor’ performs lookup operations as 'System' user
         25251: ALF-6583: when a LDAP admin removes its own account, account cannot be useed anymore and cannot be recreated
             - Additional persons’ cache controlling was added:
                - currently, ‘org.alfresco.repo.security.person.PersonServiceImpl.getPersonOrNull()’ checks all ‘User Home’ NodeRefs before using;
                - all inexistent NodeRefs will be removed from the cache 
      25281: Attempt to prevent build hang in ChainingUserRegistrySynchronizer
      25287: Merged DEV/TEMPORARY to V3.4 (with correction)
         25284: ALF-5596: Alfresco WebDAV does not work when repository is in read only mode.
      25295: Merged DEV/DAVEW/SAP to V3.4
         25207: ALF-6856: Avoid checkout failures under heavy load
            - Stop absorbing all exceptions in checkin / checkout / cancel-checkout
            - Propagate object wrapping code, message and cause instead
         25208: ALF-7062: Use a shared cache in RepositoryAuthenticationDao
         25209: ALF-7063: Use nodeService.exists() instead of a Lucene search in Search.findNode()
         25210: ALF-7064: Use caching plus a read write lock to avoid contention in SubsystemChainingAuthenticationService under load
         25211: ALF-7065: Use cached authorityService.getContainingAuthorities() method to improve performance of SiteServiceImpl.getPermissionGroups()
         25220: ALF-7062: MT fix
         25221: ALF-7062: Fix AuthenticationTest
         25223: ALF-7065: Refinement to use of cached authorities in SiteServiceImpl.getPermissionGroups() that preserves current 'direct memberships take precedence' semantics.
            - First fetch cached recursive group memberships. If there are zero or one, they can be returned immediately.
            - Otherwise, fetch immediate group memberships and work it out from there.
         25230: Extend ehcache cluster sample with socketTimeoutMillis=10000. Increase timeout from its 1 second default to avoid lots of RMI and cache integrity errors under load.
      25297: Fixed merge issue in 25295
      25302: ALF-6067: Unable to run read-only server without error
        - The latest error could not be reproduced
        - Added double-check to bypass audit if the system is in read-only mode (TransactionService.getAllowWrite())
      25306: ALF-5596: Merged DEV/BM to V3.4
         24726: BM - tweak WebDAV propfind (to use read-only txn)
      25326: Fixes for DB coverage: ALF-1787: Slow performances when many workflow are opened
         - Refactored query to use neat JOIN syntax
         - Added back batch size limiting to prevent Oracle blow-outs
         - Added in parameters to cover boolean query conditions
      25334: Added missing quotes in invitation service properties file
      25336: Merged V3.3 to V3.4:
         - 24918: ALF-6496: Browsing large File Plan is slow			
         - 24940: - Fix up issue with over enthusiastic caching of capability results.
              - Rename troublesome capability test so as not to hold up the build.  				
         - 24947: Fix-up to capabilities test.
         - 24973: Unit test fixes
         - 25046: Build fixes
         - 25080: RM: Fix transaction cache key
         - 25260: ALF-7000: RM: Cuttoff action for folder is missing when record is frozen
      25344: Updated capability tests.  More to come.
      25370: Fix for ALF-3339 - Modifying the properties of a link on a Folder does not show up after pressing the OK button but after pressing the 'close' button
      25374: Fix for ALF-6691 - Incorrect behavior of RSS feed for Wiki. Also fixes other minor RSS feed validation issues (pubdate format).
      25389: RM: Build fixes
      25414: Fix for ALF-3202: ALL field not fully implemented in LuceneQueryParser for wildcards, prefixes, and fuzzy
        - all current fields behave sensibly or throw unsupported
      25424: Fix for ALF-6576 - Search by tags shows not empty results on the site which has no content
      25467: Resolve ALF-7074: CMIS web services do not appear to allow ticket authentication
      25508: Fix for ALF-7110 - JSF custom component Form submit value encoding
      25538: ALF-6497: Updates to disposition schedules in progress do no complete with large record sets
         - Updates to records under the control of an edited disposition schedule is now performed in the background
         - A quartz job manages the record updates
         - UI updates to show whether there is a unpublished update to the disposition action pending 
      25539: RM: Ensure not "all" behaviours are switched off when processing disposition action defintions updates.
         - rm search information is now being populated and shown in the Ui correctly post publish
         - see ALF-6497
      25545: Merged V3.3 to V3.4
         ALF-7196: Records only
      25573: Deleted : /alfresco/BRANCHES/V3.4/root/modules/dod-5015/source/java/org/alfresco/module/org_alfresco_module_dod5015/model/FilePlanComponentAspectTest.java
      25603: Updated Postrgresql install switch
      25608: Fix Eclipse classpath after Postgres driver move
      25620: Fix for escalated issue ALF-7218: Advanced Search in Share breaks with custom type which contains underscores in type name
      25622: Merged BRANCHES/DEV/BELARUS/V3.4-2010_12_14 to BRANCHES/V3.4:
         24647: ALF-6307: Compliance for Third Party jars with Source Modified
      25623: ALF-6309: Changes to notice.txt and addition of license files
      25627: Fixes ALF-7222: Updated linux installer window height (with taller image to hide additonal background)
      25633: Fix intermittent unit test failure - retrying txn in RecordsManagementAuditServiceImplTest
      25637: Merged DEV/TEMPORARY to V3.4
         25215: ALF-6696 : Upgrade from 2.1.7 to 3.3.4 failing Due to "out of memory"  
            All large db scripts for all supported dialects was modified to follow batching approach.
         25325: ALF-6696 : Upgrade from 2.1.7 to 3.3.4 failing Due to "out of memory"
            1. Upgrade scripts for all supported dialects was corrected to follow mysql style after David's review of batching porting work.
         25398: ALF-6696 : Upgrade from 2.1.7 to 3.3.4 failing Due to "out of memory"
            Some errors was corrected in upgrade scripts after David's review.
      25643: Initial commit of reworked Japanese language pack
      25669: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
         25665: Spanish Language Pack update from Gloria
      25671: Updated installer with simple Easy install.  Fixed binaries inclusion.
      25684: Fixes: ALF-7102 - minor (consistent) typo in i18n string.
      25692: ALF-7293 - Handle error condition of unsupported RSS XML format (RDF in this case)
      25707: ALF-6993 Fixed AlfrescoTimer so that it no longer ends the task if the Timer is set to repeat.
      25715: Fix intermittent failing unit test by increasing time window
      25718: Merged PATCHES/V3.4.0 to V3.4
         25700: Fix for ALF-7059: Webscripts: Startup: webscript loading takes about 10 minutes to complete.
            - QNAME:simpleToken will go down an optimised route
      25720: Fix for ALF-7318: patch.calendarNamespaceUri fails as the TYPE field no longer supports prefix queries
         Part fix for ALF-6291: Inconsistencies in lucene search queries with wildcards and single letters.
      25721: Fixed ALF-7319.  Removed ';'.
      25734: Updated copyright to 2011
      25738: Fix to issue with groups display and wrong panel returned to after cancel group edit
      25773: Merged BRANCHES/DEV/BELARUS/V3.4-2011_02_16 to BRANCHES/V3.4:
         25747: ALF-6307 Compliance for Third Party jars with Source Modified
      25798: Merged PATCHES/V3.4.0 to V3.4
         25789: Merged DEV/TEMPORARY to PATCHES/V3.4.0
            25783: ALF-7079: concurrent access to share site using the Share web UI and webdav by two users break the copy.
               1. The WebDAV MOVE and DELETE methods were modified to properly handle the "MS Word shuffle" for working copies.
         25793: Merged DEV/TEMPORARY to PATCHES/V3.4.0
            25395: ALF-7079 : concurrent access to share site using the Share web UI and webdav by two users break the copy.
               UnlockMethod (webdav) was modified to correctly handle working copies.
      25803: Merged V3.3 to V3.4 (RECORD ONLY)
         25015: ALF-6749: Merged V3.4 to V3.3
            24601: Fix for ALF-6032: It's impossible to create meeting items
         25062: Merged V3.4 to V3.3
            25061: Merged DEV to V3.4
               24920: ALF-1787: Slow performances when many workflow are opened
                   1. Implementation of a custom query for JBPMEngine.getAssignedTasks.
                   2. Uint test for creating and testing neccessary items in DB.
               25014: ALF-1787: Slow performances when many workflow are opened
                   1. HQL query for TaskInstance properties chache. 
               Also:
                  - Moved back to query.list() - no difference with scroll
                  - Checked query plan for batching queries and found no problems
                  - Batch queries *have* to be limited in the IN clause
                  - Although not using scrolling, there was a missing close statement
         25276: Merged V3.4 to V3.3
            25261: Merged DEV to V3.4
               25160: ALF-1787: Slow performances when many workflow are opened
                   1. Implementation of a custom query for JBPMEngine.getAssignedTasks.
                   2. Uint test for creating and testing neccessary items in DB.
                   3. HQL query for TaskInstance properties chache.
                   4. HQL query for ContextInstance variables chache.
         25328: Merged V3.4 to V3.3
            25326: Fixes for DB coverage: ALF-1787: Slow performances when many workflow are opened
                - Refactored query to use neat JOIN syntax
                - Added back batch size limiting to prevent Oracle blow-outs
                - Added in parameters to cover boolean query conditions
         25373: Merged HEAD to V3.3
            25100: Fix for build issue Steve was encountering on new build boxes using Ant 1.8.x
      25807: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4:
         25785: Add the WQS client API to the "generate-javadoc" build target
         25792: Fix ALF-7345: WQS: Unable to place a WQS on the root context of a web container easily. This fix enables the web context of a WQS website to be set to "/" to indicate that it lives at the root of the URI namespace of the web container.
      25809: Merged V3.3 to V3.4
         24899: (RECORD ONLY) Merged V3.4-BUG-FIX to V3.3
            24898: Fixed merge issue in FixUserQNamesPatch
         24913: Merged BRANCHES/DEV/BELARUS/V3.3-2010_12_20 to BRANCHES/V3.3:
            24890: ALF-837 Firefox: Incorrect behaviour of Insert/Edit image option on creating content based on web form
         24962: (RECORD ONLY) Merged PATCHES/V3.3.3 to V3.3
            24959: ALF-6780: Merged V3.4 to PATCHES/V3.3.3
               23385: Fix for ALF-5166: After restore of indexes - AUTO hangs
                  - bulk deletes are now handled as such during index tracking and rebuild (as they are normally)
         25011: Attempt to resolve latest build deadlock: Specify inputstring="" in junit invocations in order to work around Ant bug https://issues.apache.org/bugzilla/show_bug.cgi?id=37887
         25012: Reverse previous checkin.
         25033: ALF-6535: Changes to enable session sticky sessions for SPP
         25034: Merged DEV/TEMPORARY to V3.3
            25026: ALF-6763 : Malformed web.xml prevents 3.3.5 340 JBoss deployment, org.apache.myfaces.ERROR_HANDLING param should be replaced
               1. Web.xml was modified for web-client to allow bootstrap alfresco on Jboss EAP 5.1.0.
         25060: (RECORD ONLY) ALF-6114: Rules for updated items are triggered before users commit any changes.
         25063: Merged DEV/TEMPORARY to V3.3
            25059: ALF-608 Errors when uploading content via CIFS result in zero byte files
               Closing file operations wrapped by transaction in ContentDiskDriver.
               Catching IOException in NTProtocolHandler.procCloseFile() was changed to catching Throwable to avoid delay.
         25067: For for ALF-6807: TinyMCE: This is a follow up of: http://issues.alfresco.com/jira/browse/ALF-5420 (escalation)
         25177: ALF-6855: Adding versionable aspect as rule in share site causes errors
         25186: Merged PATCHES/V3.3.3 to V3.3
            25065: Fix for ALF-6780 Full re index seems to not ends up under certain circumstances.
               - A full rebuild only creates nodes
               - Fixed issue repeating all previous deletes already processed in the transaction (for deletes and updates to nodes)  with every delete/update in the transaction
               - Closed TermDocs enumerations
         25372: ALF-5933: Updated mysql collate encoding
         25456: Fix for ALF-7078: CLONE -Impossible to reject invitation due to script error
         25478: Fix for ALF-6756 - JSON delete should not pass body for request
         25498: (RECORD ONLY) ALF-5964: Updated installer window height for linux
         25533: ALF-6946: Correction to WAS libraries.xml
         25558: (RECORD ONLY) Fixes ALF-6268
         25560: Fixed ALF-7210: User workflow tasks query fails on RHEL
            - Case-sensitivity in the table aliases cause failure on unix
            - Must be 'processInstance' not 'processinstance'
            - Fallout from ALF-1787: Slow performances when many workflow are opened
      25810: Merged V3.3 to V3.4 (RECORD ONLY)
         25070: Reversed revision 25062
   25822: First embryo of social items on doc details page.
   25823: ALF-7336 - License file to be loadable from configurable location
   25824: ALF-7333: TR24: IMAP, CIFS, WebDAV & FTP should not mount company & user home by default
    - Added global property 'protocols.rootPath' defaulting to protocols.rootPath=/${spaces.company_home.childname}
    - Included 'protocols.rootPath' in file-servers config and IMAP config
    - TODO: Get 'protocols.rootPath' into WebDAVServlet
   25825: Fixed Eclipse classpath which contained a reference to someone's Tomcat directory
    - To avoid having to update the classpath, create a project in Eclipse called "Enterprise Runner"
      and pull in the "Enterprise Repository" into that.  Then run tests in context of "Enterprise Runner".
      Additional jars and paths can be pulled in as required.
   25826: Merged V3.4 to V3.4-TEAM
      25301: (RECORD ONLY) Merged V3.4-TEAM to V3.4
         25189: Expose getAllowWrite on the TransactionService API
      25821: ALF-5841 Applied fix to queryTasks() to stop the process definition hibernate query exceeding the limit of 1000 arguments.
   25828: New i18n labels for social interactions
   25830: Working "likes" added to document header on doc details page, using the Alfresco.Like widget found in share.js
   25831: More work in progress ALF-6593: TR04: Update dashlets to provide consistent look & feel, include thumbnails, help text, action links where applicable
   25832: Remove placeholder text (unused)
   25833: Some improvements on the "likes" in share.js, such as calling it Alfresco.Like instead of Alfresco.Favourite...  :-)
   25835: Build fixes for RM related tests
   25836: Added "favourite" on doc details page's header suing Alfresco.Favourite foun din share.js ALF-6614 "Page redesign and refactor"
   25837: Update the new html templates - remove the share_or_team flag (switching to just being "Alfresco"), and rationalise on shareUrl rather than a mix of shareUrl and share_url
   Also tweaks how shareUrl is injected into the model
   25838: I have no idea why FormServiceImplTest is failing on the build server, it runs fine locally. In the interest of getting a successful build this weekend I'm disabling the failing checks until I have time to investigate the environment difference on the build server.
   25839: Fixes to siteURL macro and param reader following recent refactoring.
   25841: ALF-7358 - RTEAM 38: User count is not decremented when users are removed
   ALF-7378 - RTEAM 39: Excess users error is not accurate for an end-user
   25842: Removed deep permission checks in RepoUsageComponent
   25844: Url fix for "like activity" posted from doc details page ALF-6614 "Page redesign and refactor" activities
   25847: ALF-6614 "Page redesign and refactor" added missing peice "comments" in doc detail header
   25848: Update the InviteSenderTest to work with the new way of passing the template details+model to the MailActionExecutor, rather than rendering the text itself
   25856: Change the User CSV Upload webscript to handle the transaction itself. This means that if the transaction commit fails (eg user limit exceeded, custom person validation fails) then we get to send the client our own error message+status code. 
   (Previously the commit failure was trapped by RepositoryContainer, and so the webscript had no control over the error reporting process, which is required in this case to meet share UI needs)
   25858: When generating WebScriptExceptions from a resource bundle (instead of the more usual system properties), ensure that the underlying cause (if present) is included
   25864: Added back logging of subsystem start/stop.
   25865: Removed unused code and comments
   25871: General license fixes
    - Apply forced read-write to transactions
    - Heartbeat code synchronization around enable/disable
    - Fixed license test to check for heartbeat state correctly
   25872: Merged V3.4 to V3.4-TEAM
      25849: Fixed ALF-7379: PostgreSQL patch.migrateAttrAVMLocks error when upgrading to Enterprise 3.4
         - PostgreSQL doesn't accept column aliases without 'as'
         - Probably version-dependent
      25850: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
         25843: Updated FR files received from Gloria 2011-02-25
         25845: Updated IT files received from Gloria 2011-02-25
         25846: Updated DE files received from Gloria 2011-02-25
      25859: Merged PATCHES/V3.4.0 to V3.4
         25857: ALF-7376: Detect concurrency problems in PutMethod
      25867: Fixes: ALF-5628 - Meeting Workspace Calendar Entry issue.
      25868: ALF-7274: Reinstate &characterEncoding=UTF-8 into default MySQL JDBC URL, using proper encoding of & for an XML file (&amp;)
   25882: License tests: Narrow down failures (doesn't fail locally) and also deal with logging problems
   25883: ALF-6593: TR04: Update dashlets to provide consistent look & feel, include thumbnails, help text, action links where applicable.
   New placeholder filetype icons @ 32x32.
   New avatar get URL (internal): /slingshot/profile/avatar/{username} or /slingshot/profile/avatar/{username}/thumbnail/{thumbnailname}
   Added "avatar32" thumbnail preset.
   25885: Remove reference to non-existent file. Add folder icons back into path on the details page.
   25886: Added new avatar photo placeholder icons from Linton
   25893: Fixed Legal and License url in About dialog
   25895: Fix for ALF-6622 "Comment component redesign and refactor"
   * show new comments component where required
   * comments in correct order 
   * displaying ok in 1024x768
   25897: Fix for ALF-6622 "Comment component redesign and refactor" part 2 (#svnuserfail)
   * show new comments component where required
   * comments in correct order 
   * displaying ok in 1024x768
   25907: Clean up redundant javadoc
   25909: Wrapped setup and tearDown work in retries
   25910: More ALF-7120: TR03: Test and integrate sample site into bootstrap process
    - Pulled everything into first-level patch
    - Removed build-time dependencies
    - Fixed authentication wrapping
    - Fixed I18N messages for patch
    - Note: The patch ID has changed, but this will not cause problems on re-application
   25912: Fixed test fallout from rev 25910 (ALF-7120: TR03: Test and integrate sample site into bootstrap process)
   25926: Even more ALF-7120: TR03: Test and integrate sample site into bootstrap process
   - Removed exclusions from build script for XML file no longer present
   - Fixed an re-enabled JavaScript test in SiteServiceImplTest that was disabled earlier
   25928: - Added form config for ActivitiesFeed MBean ready for addition to admin console
   - Made all boolean fields use a checkbox
   - Re-ordered Fileservers fields to tidy up form and fixed labels
   25937: Build fixes, updated counts for groups as there are now more groups in a default repo due to sample site being created.
   25940: Added Activities feed admin console component
   Fixed label reference in IMAP admin console component
   25955: Merged V3.4 to V3.4-TEAM
      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!
      25954: ALF-7191 - Generate _en bundles for all message bundles for Explorer and Share - using known location of message bundles
   25959: Extra logging around ALF-7336: License file to be loadable from configurable location
   25962: Updated example JavaScript patch to include an example that starts a pooled review and approve workflow for all the members of the site the document being acted upon belongs to. The script has no effect if the document lives outside a site.
   25965: Fixes and tweaks from Alfresco Team UI review meeting
   25973: Fixed issue where some form field labels were not returned, was caused by a bean in the enterprise forms context file having a duplicated name.
   
   Also re-enabled the forms tests I disabled as these should now be fixed too.
   25977: More TR28: Prevent the IMAP 'Email Actions' folder from being created during bootstrap. The folder structure contains rules that point to the scripts we also no longer bootstrap. This folder is used for optional IMAP functionality which can be enabled by manually importing the ACPs if required.
   25982: Merged V3.4 to V3.4-TEAM
      25890: Fix for ALF-5796 - It's impossible to add tag in Japanese language (IE specific)
      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
      25916: Updated support URL in readme
      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
      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
      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
      25974: Reverted rev 25964 - as fix is scheduled for 3.4.2
      25979: Disabling intermittent failing unit test. ALF-7443 logged.
   25989: ALF-7457: Update to Team UI following 01/03/2011 review
   25990: Fix initial load of my tasks dashlet. Dashlet pagination now hidden if dashlet empty.
   25991: Agenda View: fixes minor bugs & attempts to slightly improve usability of Event Info box.
   25993: Fix for ALF-7444: RTEAM 41: ActivitiesFeedNotifier fails to send emails (when built using exploded target)
   25997: License management debug logging
   25998: Temporary logging for license and heartbeat
   26008: Merged BRANCHES/V3.4/ to BRANCHES/V3.4-TEAM:
      25891: Fixes: ALF-7363 (updated JA translation)
      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
      25915: Updates TinyMCE translation as requested in ALF-6486.
      25917: Fixes: ALF-6482, wrong word order in FR has been corrected.
      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.
      25919: Fixes: ALF-6655 updated to allow enough space for verbose languages (e.g. FR, ES)
      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
   26009: Fixes double byte comma issue in JA.
   26010: License loading: Further use of the license change callback
    - Added notification for license failures
    - Heartbeat uses callbacks
    - ALF-6884, ALF-6905, ALF-6888
   26015: Updated sample site, now contains images that can be distributed.
   26016: Temporarily disable failing test: runs locally
   26018: Final version of English HTML email templates.
   26025: Debug logging to test to trace during builds.
   26029: Team unit test fixes and analysis
    - Reintroduced UserUsageTrackingComponentTest with debug logging to aid trackability
    - Fixed at least one LicenseComponentTest (Trial license generation for forcing read-only mode)
    - Added further logging of failed licenses to aid tracability on build box
    - Removed temporary debug logging (build box debug logging working fine)
   26031: Fixed embedded license loading and logging
   26038: Updated Contents.acp of sample site, fixes the broken image link in the wiki's main page
   26041: Merged V3.4 to V3.4-TEAM
      26024: ALF-7466 - Links do not appear correctly in the management Console (RM)
      26033: Correct database cleaning behaviour of continuous build - dir.test.data was never set. dir.root was never getting cleaned.
         - dir.test.data replaced with dir.root
      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 additional background)
      26039: Fix intermittent failures in InviteServiceTest.tearDown()
      26040: Fix intermittent failures in InviteServiceTest.setUp()
   26046: Test cleanup of license restrictions
   26047: Prevent real embedded license from being picked up during unit tests of embedded license
   26053: Added in loop to wait for asynchronous post-failure auditing (ALF-3055)
   26054: Separation of embedded license location for HeartbeatTest
   26055: Merged V3.4 to V3.4-TEAM
      26014: ALF-7087 - Cannot override webscript files in case of using jboss 5.1GA
      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!
   26062: ALF-7492 - MT support for new Team/Enterprise license info retrieval in web-tier.
   26064: Fixed ALF-7419: RTEAM 40: Duplicate warning and error messages when user limit reached
   26066: Fixed ALF-7489: Team - default outbound email settings need removing
    - Now: mail.host=smtp.example.com
    - Added this to build env. on bamboo and bamboo2: mail.host=smtp.alfresco.com
   26069: Removed unused remote-api bootstrap files
   26070: Use PropertyCheck to check for valid property values
   26071: Extra debugging during 'split person' processing
   26072: ALF-7333: TR24: IMAP, CIFS, WebDAV & FTP should not mount company & user home by default
    - WebDAV obeys 'protocols.rootPath'
      - Use dedicated bean to ingest properties so that Spring takes care of the placeholders
      - Servlet gets the bean instead of using web.xml config values
    - Added global property 'protocols.storeName' and injected it into protocol configurations
   26073: Follow-up on rev 26069: Removed unused remote-api bootstrap files
   26074: ALF-7468: Update to Team UI following 03/03/2011 review
   ALF-7474: Check supported mimetypes for new icon support
   26075: Latest dashlet help balloon and empty content text. Missing file from r26074. Consolidated Site and Repository DocLib renderers.
   26076: Fix to base style for Content I'm Editing dashlet
   26078: Fixed the "RM part" of ALF-7013 "Fix up refactored Document Details page and components for RM and WCMQS modules"
   26079: Merged V3.4-BUG-FIX to V3.4-TEAM
      26057: Fix for ALF-6691 - Incorrect behavior of RSS feed for Wiki. Resolves a number of niggly auth related issues with RSS feeds and auth.
      26060: Improvements to error 500 handling page for Share. Complete exception output as HTML comment for administrators and developers. Web-tier server errors now output to the console again also.
   26080: ALF-7358 - RTEAM 38: User count is not decremented when users are removed
    - Added listening during modification of user (enable/disable)
    - Use common warning and error logging: the same logging that is displayed to admin
    - Also fixed erroneous logging of person splitting when a user was changed (it was not actually doing anything)
   26083: JA file moved to reflect changes made while translation was being done.
   26085: Fixed ALF-7529 "No doclib action on details" - caused by double encoding of vtiServer property
   26086: ALF-6835 - Report license errors to all users and warnings+errors to admin on first login.
   26087: Final implementation of ALF-7230.
    - Changed ImapServiceImpl to look for localised siblings of the Imap Email templates. Using the normal FileFolderService method, email templates for IMAP clients will be selected based on server locale.
    - Added new email templates for locales: de, es, fr, it.
    - Changed existing default locale to use ACP for consistency.
   26090: Updated sample site, now includes a video file to highlight new video previewing capabilities
   26091: Fixed ALF-7013 "Fix up refactored Document Details page and components for RM and WCMQS modules" part 2 - WCMQS
   26092: Addition of patch for non-default locale templates for Imap Clients. (ALF-7230)
   Also stepped the db version number.
   26098: Minor updates to dashlet help text.
   26103: Fixed test after default config for email settings were changed.
   26105: ALF-7533: Drag and Drop no longer works into FF3.6 browser
   ALF-7532: Content Rule on RM site (other than Folder) creates 'GUID' folder in Share (fixed as part of general RM fixes)
   
   Also: RM and WCM QuickStart Document Library extensions patched to latest code. WCM QuickStart toolbar extension removed. Drag and Drop refactored to work in Repository Browser and WCM QuickStart; switched off for RM. English property files created when using Slingshot exploded target. Header conditions updated to use correct Community edition string.
   26106: Remove debug output.
   26108: Fix for ALF-7331. Thumbnails in Share do not change from initial generic filetype icon...
   The fix is to have StreamContent.java use the actual resource's modification timestamp for the Last-Modified header.
   It was using the mod-time of a newly created file, which held a copy of the classpath resource.
   This led to a race condition between putting a timestamp on the placeholder and putting a timestamp on the cm:thumbnail node.
   26113: Fix slingshot-exploded target - missed commit from yesterday.
   26114: Merged V3.4 to V3.4-TEAM
      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.
      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
   26118: Made the JMXFormProcessorTest more resilient to changes in the email configuration.
   26122: Fix customize site page following refactoring in r26078. Added Data List page icon.
   26126: Merged V3.4-BUG-FIX to V3.4-TEAM
      26099: Resolve ALF-7539: Tomcat sessions are created unnecessarily when invoking CMIS web scripts from Web Quick Start
   26129: ALF-6929: RTEAM 21: activities feed notifier - add per user on/off flag
   26149: Removed old System.out
   26150: Fixed ALF-3856: Version History lost when Versionable Content renamed via CIFS
    - Added fileservers property: filesystem.renameShufflePattern=(.*\.tmp)|(.*\.wbk)|(.*\.bak)|(\\~.*)
    - Any rename that does not match the pattern on either the source or target names will not be shuffled
    - Requires retesting of use cases involving CIFS and MS Word.
   26151: ALF-6626 TR15: Email notification preferences
   Cleanup to related components
   26161: Fix full installer.
   26162: Updated calendar help with latest icons and styling to match.
   26168: Use new install builder 7.0.3
   26169: Localized installer.
   26173: Tweak to display of warnings/errors after login - reduced impact on server
   26200: Locate Postgres data within alf_data directory
   26209: Locate Postgres data within alf_data directory for Team
   26210: Set license path to include install dir, and set protocol root to Sites
   26215: The ContentTransformerRegistry and the ContentService used to only expose the 'best' transformer for a given (srcMime, targetMime, options). This check-in adds access to the full list of active transformers for any (srcMime, targetMime, options) to those two classes.
   As part of a subsequent fix for ALF-5084, the ThumbnailService will use this list to improve create-thumbnail retry behaviour for problem files.
   26227: Merged V3.4-BUG-FIX to V3.4-TEAM
      26226: Merged DEV/SWIFT to V3.4-BUG-FIX
         26225: 'renameShuffle' detection pattern needed extending and logic was slightly incorrect
                 - Fallout from fix for ALF-3856 detected by new unit tests
   26235: Merged V3.4 to V3.4-TEAM
      26233: Fixes ALF-6019: Ensure PostGres services deleted after installation cancel
   26264: ALF-7653 - sys-admin panel no longer editable
   26265: Merged V3.4-BUG-FIX to TEAM
      26263: Merged DEV/SWIFT to V3.4-BUG-FIX
         26262: Fixed regex patterns to cater for .properties file escapes (ALF-3856)
   26266: ALF-7651 - WebM and OGG Video have 'unknown' mimetype in Team
   26267: ALF-7578 - When importing from an ACP a node with the versioned aspect on it, have an initial version history created starting at the current version label.
   26268: ALF-7687 - Ability to use wild character in People search - Should add configuration to allow zero characters for all search in Team config.
   26272: ALF-7578 - Add unit test for versionable ACP import, and fix the default aspect includes now that we handle versionable
   26287: Fixes ALF-7439: Prevent check on alfrescowcm component
   26290: Fixes ALF-7439: Ensure that virtual server shortcuts don't get created for Team
   26294: Fixed @since tags and some minor coding standards fixes
   26316: Fix for ALF-5084, ALF-5644 and general thumbnail improvements in the area of failing thumbnails.
   
   This check in adds extra functionality to the create-thumbnail action in order to improve how Alfresco handles failing thumbnails.
   The requirements agreed between Services & Prod Mgt were
    - When thumbnails fail we should limit how often they are retried. So the system should remember when a thumbnail has failed for a node. 
    - The retries will be initiated in the same way they are now: by users navigating to a page that asks for the thumbnail (lazy creation), primarily doclib. 
    - Retries will occur at a throttled rate (all the below parameters to be configurable by sys admin, but not yet by JMX). 
    - Initially, retries will be limited to a maximum rate e.g. 1 per minute. 
    - These retries will be allowed up to a maximum count e.g. 2 failed attempts. 
    - After that count is reached, the content will be considered "difficult" and thumbnail creation should be retried at a much reduced maximum frequency e.g. once a week 
    - Retries of difficult content shall be enabled by default, but can be disabled.
   
   This check-in adds a new aspect and a type to the content model. These hold the thumbnail failure information.
   The create-thumbnail action now has a compensating action which is run when it fails.
     AddFailedThumbnailActionExecuter decorates the content node with failure information.
   create-thumbnail now has an action-condition, which means that it will only run if a node is "eligible" for a thumbnail creation attempt.
   Eligibility is controlled by some new properties and is configurable. Default behaviour is as described above.
   
   There should be no change in behaviour for most content nodes in Alfresco.
   However, for those documents which fail to produce doclib or webpreview thumbnails - and most especially those which consume 100% cpu for some time before failing - we expect to see the same behaviour initially on upload (cpu grind as Alfresco or a 3rd party library attempts to produce a thumbnail), but that as time passes, Alfresco should prevent thumbnail creation that will likely not succeed. This should save cpu on the repo server.
   
   And tests. Of course.
   26323: Upgraded login warning to WARN_ALL when user limit reached
    - This now matches the specification document
    - ALF-6832:TR25: License restriction reporting
   26326: Merged V3.4 to V3.4-TEAM
      26142: Merged PATCHES/V3.4.0 to V3.4
         25999: ALF-7377: Validate and reject partial WebDAV requests sometimes produced by NetDrive
      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)
      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
      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
      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
   26336: Fixes ALF-7713: Prevent folder/documents from being draggable in DocLib
   26348: Fix for ALF-7751 - encode all params on new Team dynamic welcome dashlet
   26351: Removed svn:mergeinfo
   26353: ALF-7745 - Add pop-up balloon validation helper to create site dialog.
   URL Name (shortName) is now also auto-generated from the site name (siteTitle) by removing characters other than 0-9, a-z, A-Z and "-", replacing spaces with "-" and converting to lower case. Auto-generation is stopped if the user edits the URL Name field themselves and restarted if they empty the field.
   Update to Preference Service to allow "-" character in preference keys.
   26355: ALF-7743 - Increase delay on "More actions panel" in document library
   26361: ALF-7758 - Site Dashboard: Welcome widget isn't removed immediately
   26364: Updated UI Text strings following review by Linton.
   26366: Fix for ALF-7757 - Calendar agend view encoding
   26368: Fix for ALF-7739 - Click activity link for a file after DnD upload results in an error
   26369: Merged V3.4-BUG-FIX to V3.4-TEAM
      26340: Fixed ALF-6377 "Incorrect behavior of Overdue filter in My Tasks Dashlet"
   26374: Further UI text updates from Linton
   26377: Updates to ACPs as part of ALF-7382 Translate/Localise HTML email templates.
     This check in adds localisations in de, es, fr, it, ja for the following email templates:
       activities-email
       imap_message_text_html
       imap_message_text_plain
       invite-email
       new-user-email
       notify
   26381: Set site invites on by default for Team.
   26384: ALF-7733 - Data list's type isn't included for deleted activities
   26385: ALF-3709 - User Status on Profile
   26389: Merged V3.4-BUG-FIX to V3.4-TEAM
      26372: Fix for ALF-7791 - no longer spews masses of exceptions when doc details page for a missing node is displayed.
             Node Metadata retrieval service now returns valid JSON in all cases.
   26390: Fixed ALF-7689 "Team: Dashlet names don't match dashlet titles"
   26391: ALF-7718 - Handle excel files without a freezepane, eg those created by hand rather than using the friendly template
   26394: Merged V3.4-BUG-FIX to TEAM
      26392: Removed code which sets the cm:title property to the filename in the upload webscript. This was causing an unnecessary auditable update.
      26393: Line endings
   26403: Fix for ALF-7832 - Licence warning for all users on WARN_ALL
   26409: ALF-7763 - Updates to dashlets in Team following usability studies, including: presentation of "no data" made consistent. Page-level inline JavaScript wrapped in module mark-up.
   26410: Fix license location for Win installs
   26425: Fixed ALF-7726: 'Repository Descriptor (Originally Installed)' form doesn't contain Name and Edition information.
   
   Also updated the 'Heartbeat Disabled' field in the License form to use a checkbox control.
   26426: ALF-7742 - Remove title field on simple edit metadata pop-ups
   26427: ALF-7665 - Team: Duplicate Help links in toolbar
   26434: ALF-7875 - CLONE -Unable to browse into folders in Share Site
   26435: Moved of Ent/Team logos to overlays, empty logos in place
   26437: Merged HEAD to V3.4-TEAM
      24723: ALF-5799: Type-ahead functionality for tags
   26438: Merged BRANCHES/DEV/dwebster to BRANCHES/V3.4-TEAM:
      26431: Latest Spanish language Pack updates
      26429: Latest Italian language Pack updates
      26428: Latest French language Pack updates
      26422: Latest German language Pack updates
   26444: Merged V3.4-BUG-FIX to V3.4-TEAM
      26186: Improvements to tree node handling and Bubbling library following investigation for ALF-6960 and ALF-7296
      26189: (Partial merge due to refactoring) ALF-7077 - Unable to set a Repository library root node by XPATH
             Merged HEAD to V3.4-BUG-FIX
                24021: Share Repository Browser support for xpath starting location. See comments in "RepositoryLibrary" section of share-config-custom.xml.sample.
                26183: ALF-6960 - Actions "Copy to..." and "Move to..." Repository don't display the Path. ALF-7296 - Copy or Move content from a site document library to the repository do not work.
      26191: Prevent MooTools JavaScript library being compressed on every build. Added minimized file to source tree. Added target "minimize-mootools-javascript" which inserts a reminder comment to the top of the minimized file.
             Also reverted inadvertant line-endings swap in build.xml from r25479
      26282: ALF-6728 - Unable to open office documents via Share Site > Document Library > All Documents > Edit Online
             Reworked calculations around the "location" field so that the attributes within are returned more consistently.
      26297: ALF-3113 - Data Lists: Delete/duplicate multiple items should affect only selected items on current page
      26298: ALF-7609 - Items numbering in document library in Share appears quite ambiguous in case of documents with working copies
      26312: ALF-4220 - Alfresco Share - Tag component - Unable to view more than 100 tags
             Object finder-based pickers now look for "maxSearchResults" in the control params (rather than the args property bag)
   26445: Merged V3.4 to V3.4-TEAM:
      26443: Installer build updates
   26447: Merged V3.4-BUG-FIX to V3.4-TEAM
      25975: ALF-5625 - When viewing properties in version history hitting close results in loop
      26174: *Record only* Fix spring-surf library versions after merge in rev 26144
      26175: Fix for ALF-7201 - Unable to create group with other name if group identifier is already exists
      26187: Fix for ALF-7297 - Share Advanced Search does not work if the property name include a minus (or any symbol not supported by SQL92 identifier standard)
      26240: Fix for ALF-7462 - Share - User profile / Non-ASCII characters display (double encoding of user description field)
      26242: ALF-3767 - Creating account with 0 quota in Share gives unlimited quota
      26279: ALF-7682 - Fix to correctly take the 'external-auth' config setting into account when testing for login auth against the default alfresco endpoint.
      26280: Fix for ALF-7391 - In the search properties in share, repository is spelt wrong.
      26401: Fix for ALF-7428 - Share: User cannot add comment to content when the 'admin' user is not in administrator group
      26405: Fixed ALF-7224 "Share - Scrollbar issue on dashboard customization page"
   26451: Merged V3.4-BUG-FIX to V3.4-TEAM
      26399: Fix for ALF-5863 - DOCLIB: large number of tags slows doclib rendering to unusable.
             Number of tags to display in the Tags filters is now configuration and defaults to 100 items. Can be configured with value of -1 to show all tags.
   26456: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4-TEAM:
      26450: Latest Japanese language Pack updates
   26458: Merged BRANCHES/V3.4/ to BRANCHES/V3.4-TEAM:
      26417: Fixes: ALF-7414, confused and hardcoded date-formatting & date formatting translations fixed.
      26414: Fixes: ALF-7697 - Rewording the URL help text on the create site dialogue
      26413: Fixes: ALF-7765 - ensures naming consistency
   26461: Merged V3.4-BUG-FIX to V3.4-TEAM
      26243: Fixes ALF-7301: IE6 CSS updates to prevent layout corruption on datagrid
      26404: Fixes ALF-7348: Copy to/Move to width changes for IE6 & IE7
      26453: Fix unreported issue with the appearance of tags in the object finder being stacked vertically rather than horizontally for IE6 and IE7.
   26464: Merged V3.4-BUG-FIX to V3.4-TEAM
      26463: Follow-up fix to r26453 for full-page edit mode
   26465: ALF-7869 - Layout is broken if many tags are added to the item (Document Library browse view)
   26466: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4-TEAM:
      26459: Fixes incorrectly translated stirngs.
   26467: Merged V3.4-BUG-FIX to V3.4-TEAM
      26334: Fixed ALF-6289 "Contributor is absent in Permissions section at the details page" part 2 - now also on folder details page
   
   26468: Fixed bug when content size was 0, now the "Preparing previewer..." message is replaced with a message saying "This document has no content"
   26469: Fixed ALF-7744: Ensure that new options.limit gets set when updating RSS feed results
   26472: Activity list: css class for each activity type into config
   26473: Remove references to non-existent client-side "document-details.js" file
   26475: Calendar UI Bug fixes & improvements from usability feedback (inc. ALF-7592, ALF-7588, ALF-7590, ALF-7594, ALF-7589, ALF-7595, ALF-6959)
   26477: IE6/IE7 css fixes: Fix footer layout and prevent unnecessary horizontal scrollbar
   26482: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4-TEAM:
      26480: Latest Update from Translators via Gloria.
   26485: Fix for ALF-7728. Incorrect information at the Trash page.
     The 'archived by' as returned from the REST API was not the user who archived the node, but was instead the
     original owner of that node. This has now been corrected.
   26494: Small fix from translator
   26496: Installer NLS updates
   26498: Merged V3.4-BUG-FIX to V3.4-TEAM
      26486: Fix for ALF-7602, ALF-7734 - Incorrect behavior of groups - groups in non-default zone displayed in Share UI
   26501: Added translations for "Contributor" role.
   26506: Merge V3.4 to V3.4-TEAM:
      Fixes ALF-7735: Update to postgres.xml to make use of vcruntime on 64-bit windows (fix dependent upon additional update to ALF-BINARIES)
   26513: Merged V3.4-BUG-FIX to V3.4-TEAM
      26512: Fix for ALF-7921 - Script error occurs when is added 'Image preview' dashlet.
   26516: Fixed ALF-7791 "Clicking the activity link for a file after deleting that file results in an error"
   26517: Removed unused component files since document details page refactor
   26532: ALF-7946 - It's impossble to destinate More+ administrator menu.
   combinePaths() function reworked to maintain trailing "/" if the last argument ends with one.
   26536: ALF-7948 - IE Specific - It's impossible to download document via Download button at the details page
   26541: Fixed ALF-7868: Import site doesn't work (QA were trying a scenario that we aren't supporting, removing the old sample context file to avoid problem/confusion)
   26545: Fixed ALF-7001 "Customize site drag and drop - page item is added to end of list if quickly dragged and dropped"
   26550: Fixes: ALF-7935, typo in message string.
   26556: UI improvements and Ajax-ified performance improvements to Image Summary dashlet
   26561: Fix for ALF-7888. Sites are not recovered.
   The fix applied is to mark site nodes with the sys:temporary aspect within the SiteService in order to have them be fully deleted immediately and not go into the trashcan.
   26562: ALF-7925 - Incorrect behaviour of Categories cloud at the Document Library page
   26563: ALF-7912 - Incorrect behavior of items marked as favorite - IE specific
   26570: Update build to correct installer file names.
   26572: Team installer build tweak (added back project filename removed during merge)
   26573: Merged V3.4-BUG-FIX to V3.4-TEAM
      26564: Fix for ALF-7965 - Content page of user profile not updating properly (modified docs always shown in the recently added list)
             Improvements to show filetype icon - FreeMarker macro to mirror basic functionality of Alfresco.util.getFileIcon
   26574: ALF-7962 - Team: Create Site dialog fields aren't cleared on Cancel
   26575: ALF-7970 - Links 'Show Earlier Events/Show Later Events' don't work in IE browser
   26578: Merged V3.4 to V3.4-TEAM:
      26542: Fixes ALF-7954: Ensure that installer copies SWFTools to correct location
   26586: Added script model object "msg" helper to retrieve I18N messages for template level JS controller (mirroring the support in WebScript component JS model)
   26595: ALF-7982 - Filetype icon isn't displayed for topic's reply in activities
   26597: Fixes ALF-7845: Provide tooltip assistance when DocLib upload dialog launched from site welcome dashlet (when DnD is available)
   26605: Fixed ALF-7681 "Renames of Document Library not reflected in page title."
   26617: removed svn:mergeinfo
   26622: JMX Admin pages UX fixes:
   - The Save & Cancel buttons on the jmx admin console pages have been configured not to be displayed.
   - A a "Cancel" link is present instead. 
   - The "Operations" header has been removed
   - The "save operation" button now has an "Update" label instead of "Save"
   26625: Reduced distribution artifacts to minimum (now no E3.5 planned)
   26653: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
     26619: ALF-6244 - Creating the initial version of a node shouldn't update the Auditable properties
     26623: Add new Version Service method "ensureVersioningEnabled".
     26624: ALF-6121 + ALF-6244 - When activating lazy versioning for share, use a ScriptNode call to the Version Service
   26654: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      26631: Improvement related to ALF-6650. Secured PDFs in Acrobat 9 fail to rendition.
   26657: Merged V3.4-BUG-FIX to V3.4-TEAM
      26655: Add parameter comments around ensureVersioningEnabled() function call.
   26660: Fixes ALF-7955: Update error message when dropping zero byte size files or folders into doc lib
   26662: Merged V3.4-BUG-FIX to V3.4-TEAM
      26661: ALF-8053 - Document Library is attempting to create thumbnails for types that are not subtypes of cm:content. Also prevent thumbnail webscripts from attempting to generate thumbnails for in the same cases.
   26665: Fixed ALF-8042 "Renamed page component reverts to default name when moved (Customize Site page)"
   26673: Merged V3.4-BUG-FIX to V3.4-TEAM
      26672: Consolidate multiple occurrences of "#yui-history-iframe" style into base.css
   
   Also fixed markup issue in console-tools that was confusing MSIE browsers.
   26676: Additional fix for ALF-7687 "Ability to use wild character in People search - Should add configuration to allow zero characters for all search in Team config."
   - start workflow component now picks up global min & max search length config
   26677: ALF-8019 - Delete folder window has incorect name
   26678: Merged V3.4-BUG-FIX to TEAM
      26383: Fixed ALF-7692: Non-admin users can move content into Company Home
      26430: More ALF-7692: Non-admin users can move content into Company Home
      - Handles duplicate ALF-7923
   26679: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      26439: Probable fix for ALF-7482. Custom ImageMagick parameters not being accepted on Linux Alfresco server.
   
   26680: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      26474: Fix for ALF-6730 Preview and thumbnails are not update with new revision of the document is uploaded.
          Added a compensating action to ensure that renditions are deleted when re-renditions fail on new content.
   26682: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      26675: Fix for ALF-7334 Could not upload new Version all Dokuments.
            Issue was resolved by adding "RunAs System" boilerplate to the few places that load (and in the case of the WQS, delete) rendition definitions.
            We purposely did not add this boilerplate within the RenditionServiceImpl.loadRenditionDefiition() method as we want to retain effective permission controls for normal client code.
            Added some javadoc to highlight the permissions issues involved.
            I also took the opportunity to add a convenience method to the RenditionService, namely render(NodeRef, QName) which will allow client code to execute built-in rendition definitions (e.g. thumbnails) without worrying about permissions on Data Dictionary. That method wraps the equivalent render(NodeRef, RenditionDefinition) in a RunAs System.
   
   26685: Fixed ALF-7880 "Download version form version history shows incorrect document name"
   26688: ALF-7919 - Use 'Properties' instead of 'Metadata' in actions, titles etc.
   26690: Partial fox for ALF-8014. thumbnail and file type aren't generated for *.eps files
     A placeholder 'doclib' icon is now available for .eps files.
   26697: ALF-7004: TR28: Create HTML email templates (Implemented Linton's richer HTML email template design)
   
   Also removed the timestamp from the email subject for the Activities email as the timestamp is now within the body of the email.
   
   NOTE: You need to start with a clean database in order to see the new templates.
   26698: Build fix since label change of Start operation button in admin console (JMX) forms.
   26699: Fixed ALF-7886 "Click here to Download gives incorrect document name"
   26700: Fixed ALF-7801 "Incorrect hint for Upload new version action in Versions pane"
   26702: Fixed ALF-7857 "Team: Inconsistency between DocLib action and tooltip text"
   26703: Fixes ALF-7762: Add tooltips to dashlet toolbar actions
   26704: Fix for ALF-7785 - Agenda View doesn't always update list after Edit/Delete of an item
   26708: Merged V3.4-BUG-FIX to TEAM
      26664: Fix build (DOD5015 security context and test refactor)
   26709: Slight reworking (and rewording) of the tooltip on the upload dialogs when drag and drop is available (the "#upload" use case)
   26710: Move style fixes into IE specific CSS files to avoid breaking layout on other browsers
   26712: Merged V3.4-BUG-FIX to V3.4-TEAM
      26711: ALF-3833 - Share - Phrase tags
   26714: ALF-8081 - W3C: a highlighting of drop-down menu (Sites, People) in toolbar is invisible in Safari.
   26715: Tweak to imagesummary dashlet node cloning performance
   26716: ALF-8082 - W3C: it's impossible to select a lot of links in Safari
   ALF-8083 - W3C: it's impossible to select Site Pages in Safari
   26718: Fixes for ALF-7874, ALF-8012 - Mimetype map additions, filetype icons.
   - also replaced worlds-largest if-else freemarker statement with inline map for Forms mimetype lookup
   26719: Further fix for ALF-8014. Thumbnail and filetype not generated for *.eps files.
     I've added a -file-48.png for the .eps mimetype.
     I copied it from one of the other image -48.png files as they're all generic 'img' icons anyway.
   26721: Fix for ALF-7963 Team: Can edit another user's email notification settings
   26722: Collapsed/expanded state of Properties panel wasn't being remembered on Details page. Removed "collapsed" parameter for Alfresco.util.createTwister which won't work with our current implementation. Pre-empted "alfresco-twister" class for slow-loading components.
   26723: Changed component initialisation event from onContentReady to onAvailable which should improve appearance/decoration times slightly.
   26724: ALF-8089 - W3C: a highlighting of "Show Earlier Events" and "Show Later Events" links in toolbar is invisible in Safari
   26731: ALF-8095 - Error shown after clicking the accept or reject link in a site invitation email
   26733: Merged V3.4 to V3.4-TEAM
      26530: Fixes ALF-7949: Remove service script on uninstall
      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.
   26734: Merged V3.4 to V3.4-TEAM (RECORD ONLY)
      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)
      25980: Merged V3.4-BUG-FIX to V3.4
         25978: ALF-7394 - Alfresco Network dashlet, now Alfresco Support information
      26056: Merged V3.4-TEAM to V3.4
         26053: Added in loop to wait for asynchronous post-failure auditing (ALF-3055)
      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
      26127: Merged V3.4-TEAM to V3.4
         26120: Fix postgres.bki on Win builds
      26165: Merged V3.4-TEAM to V3.4
         26161: Fix full installer.
   26737: Google Docs: Added better handling of unsupported mimetypes
   
     * Meaningful exception raised when mimetype unsupported by GDoc (rather then non-specific error from google)
     * Message not reflected in UI, but log contains details of failure
   
   26738: Clarified browser relevance for "in-memory-limit" config parameter following ALF-8093 being raised.
   26740: Quick build fix following Google Docs updates in r26737
   26741: Build Fix
     * Added missed exception class
     * backout previous fixes
   
   26746: Fixed ALF-8080 "WebM playback not working for Team and Chrome"
   26750: Prettifying the delete url for comments to avoid two ampersands following each other, i.e: "&&". This is NOT a fix for deleting content with "%" in the name.
   26753: Fixed ALF-7807 "It's possible to rename component with spaces"
   26756: ALF-8102 - Edit Properties, Edit tags, Manage permissions, Start workfow icons are not visible - IE 7 specific
   26758: ALF-8106 - "Go Back" button doesn't work on the "User Profile" page
   26763: Fixes: ALF-7815 - Added .ics extension and site name to downloaded file.
   26779: Merged V3.4 to V3.4-TEAM
     26760 : Enterprise unlimited licenses get invalidated turning the system into read-only mode
   26782: Fixed ALF-7001 "Customize site drag and drop - page item is added to end of list if quickly dragged and dropped"
   26784: Minor height adjustment to "My Documents" dashlet on first use
   26786: Correction to merge 26779


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@26789 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-04-11 14:24:38 +00:00
Dave Ward
4fd1a07713 ALF-6352: Merged V3.4 to HEAD
24063: Merged V3.3-BUG-FIX to V3.4:
      24050: Merged V3.3 to V3.3-BUG-FIX
             23692: Merged DEV/TEMPORARY to V3.3
             23690: ALF-5576: Cannot write to CIFS when RM is installed.
                    Add missing security levels for ContentService.getStoreTotalSpace and ContentService.getStoreFreeSpace in RM.
                    Remove duplicate entry of ContentService.isTransformable in public-services-security-context.xml.
             23968: ALF-4846: Update rules are firing on inbound actions
      - Fixes duplicate issue ALF-5272: Update rule works incorrecly 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-01-06 13:52:42 +00:00
Gavin Cornwell
d317abfa36 Merged BRANCHES/V3.4 to HEAD (to fix ALF-5837)
23478: ALF-5303: Upload new version fails when file uploaded to sub-folder and parent folder has rule for update

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24245 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-12-06 15:36:56 +00:00
Gavin Cornwell
1c20bf7ded Merged BRANCHES/V3.4 to HEAD:
24143: Fixed licence header

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24153 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-12-02 11:32:28 +00:00
Dave Ward
3a06341ff4 ALF-4851: Inbound content rules not executing due to change in onAddAspect sequencing
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23068 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-13 10:59:41 +00:00
Dave Ward
10da961097 Merged V3.3-BUG-FIX to HEAD
21981: Fixed ALF-2390: ContentService needs to return total/available space values where possible
      - Added ContentService getStoreTotalSpace and getStoreFreeSpace
      - Supported by underlying ContentStore methods
         - getSpaceUsed: Actual binary storage size (was getTotalSize, which is not deprecated)
         - getSpaceTotal: Total storage space on partition
         - getSpaceAvailable: Remaining storage space on partition
      - Added JMX methods
      - Note: getSpaceUsed is NOT exposed as a service method as it is too easy to abuse
   21982: Follow-up to Fixed ALF-2390: Patch uses new 'getSizeUsed' instead of deprecated 'getTotalSize'
   21983: Fixed ALF-766: Allow cache peer URLs to be set in ehcache-custom.xml
      - Was investigating settings required for client, so just added this in
      - By default, the 'cacheManagerPeerListenerFactory' uses no system properties, but
        a comment has been added on how to define hostName, port and socketTimeoutMillis.
      - Variables associated with that have been added to repository.properties and are
        exported to the Java system properties environment for EHCache to pick up.
   21984: More ALF-766: Allow cache peer URLs to be set in ehcache-custom.xml
      - Added alfresco.ehcache.rmi.remoteObjectPort (see ALF-765)
   22011: Fix for ALF-3005 - Blog and Discussion components not correctly checking length of modified HTML content
   22074: Fix for ALF-4447 - Failure when publishing a Post - some reverse proxies changing the response header to lower case
   22075: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/V3.3-BUG-FIX:
      22073: Resolve ALF-4522: Accessing document via /alfresco/service/api/path doesn't work - "Company Home" token is duplicated
   22091: Merged PATCHES/V2.2.7 to V3.3-BUG-FIX (RECORD ONLY)
      19832: Merged BRANCHES/V3.1 to PATCHES/V2.2.7:
         17255: Fixed ETHREEOH-3180: Error appears when trying to search resources on Manage Task page
      19778: Incremented version label
      19769: ALF-2011: Backported dependencies
         ALF-2360: Merged V3.1 to PATCHES/V2.2.7
            17314: ETHREEOH-3158: Fix RepoServerMgmt to work with external authentication methods
               - AuthenticationService.getCurrentTicket / getNewTicket now call pre authentication check before issuing a new ticket, thus still allowing ticket enforcement when external authentication is in use.
         ALF-2361: Merged V3.2 to PATCHES/V2.2.7
            17456: Fix for: ETHREEOH-1465: It's impossible to get the login history for a given user (Audit)
               - all authentication routes (SSO and password) can now audit getting a new ticket for a session. SSO does not authenticate via the alfresco AuthenticationService API
               - you can now use auditing to track new sessions for users.
      19558: Created hotfix branch off TAGS/ENTERPRISE/V2.2.7
      19557: Tagged V2.2 build 533 Revision 19303 as TAGS/ENTERPRISE/V2.2.7
   22092: Merged PATCHES/V3.1.0 to V3.3-BUG-FIX (RECORD ONLY)
      21274: Merged PATCHES/V3.1.2 to PATCHES/V3.1.0
         21264: ALF-3889: JBPMDeployProcessServlet not accessible by default
            - Should only be enabled in development environment
      20242: ALF-2733: Recreate corrupt authorities produced by LDAP import
      20240: ALF-2733: Recreate corrupt authorities produced by LDAP import
      19032: Moved V3.1.0-ENTERPRISE-FINAL into ENTERPRISE/V3.1.0
      13776: Tagged V3.1 rev 13700 (build 142) as V3.1.0-ENTERPRISE-FINAL
   22093: Merged PATCHES/V3.1.1 to V3.3-BUG-FIX (RECORD ONLY)
      21570: ALF-3687: Build classpath fix
      21549: Merged PATCHES/V3.1.0 to PATCHES/V3.1.1
         20221: Merged PATCHES/V3.1.2 to PATCHES/V3.1.0
            20217: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2
               19793: Merged HEAD to V3.2.0
                  19786: Refactor of previous test fix. I have pushed down the OOo-specific parts of the change from AbstractContentTransformerTest to OpenOfficeContentTransformerTest leaving an extension point in the base class should other transformations need to be excluded in the future.
                  19785: Fix for failing test OpenOfficeContentTransformerTest.testAllConversions.
                     Various OOo-related transformations are returned as available but fail on our test server with OOo on it.
                     Pending further work on these failings, I am disabling those transformations in test code whilst leaving them available in the product code. This is because in the wild a different OOo version may succeed with these transformations.
                     I had previously explicitly disabled 3 transformations in the product and I am moving that restriction from product to test code for the same reason.
                  19707: Return value from isTransformationBlocked was inverted. Fixed now.
                  19705: Refinement of previous check-in re OOo transformations.
                     I have pulled up the code that handles blocked transformations into a superclass so that the JodConverter-based transformer worker can inherit the same list of blocked transformations. To reiterate, blocked transformations are those that the OOo integration code believes should work but which are broken in practice. These are blocked by the transformers and will always be unavailable regardless of the OOo connection state.
                  19702: Fix for HEAD builds running on panda build server.
                     OOo was recently installed on panda which has activated various OOo-related transformations/extractions in the test code.
                     It appears that OOo does not support some transformations from Office 97 to Office 2007. Specifically doc to docx and xls to xlsx. These transformations have now been marked as unavailable.
      21548: Incremented version label
      21547: ALF-4121: Merged V3.2 to PATCHES/V3.1.1
         16827: ETHREEOH-2678 - Unfriendly system error occurs when trying to view Workflows information on content Details page if workflow was canceled
      21275: Merged PATCHES/V3.1.2 to PATCHES/V3.1.1
         21264: ALF-3889: JBPMDeployProcessServlet not accessible by default
            - Should only be enabled in development environment
      21235: Removed old source zip
      21233: Merged PATCHES/V3.1.2 to PATCHES/V3.1.1
         20890: ALF-3687: Apply LUCENE-1383 patch to Lucene 2.1.0 to reduce memory leaks from ThreadLocals
         20891: ALF-3687: Build classpath fix
      21227: Merged PATCHES/V3.2.1 to PATCHES/V3.1.1
         21207: Extra debug logging to track index triggering activity
      21225: Merged V3.2 to PATCHES/V3.1.1
         19598: Backported (merge not possible) HEAD rev 18790 for IndexInfo fixes
            - Hit problem where re-index threads were all waiting for merging, which had nothing to do
      21223: Merged V3.2 to PATCHES/V3.1.1
         16923: Lucene performance: avoid too many index deltas getting created by throttling transactions when the number of index entries gets above a configurable size
            - Stops performance degradation over time and out of memory errors under load
      21222: Merged V3.2 to PATCHES/V3.1.1
         16799: Fix for ETHREEOH-2843:  lucene.indexer.minMergeDocs , lucene.indexer.mergeFactor and lucene.indexer.maxMergeDocs are never read / used
            - removed unused properties and parameterised the remaining unexposed properties
      21220: Created hotfix branch off TAGS/ENTERPRISE/V3.1.1
      19033: Moved V3.1.1-ENTERPRISE-FINAL into ENTERPRISE/V3.1.1
      14897: Tagged V3.1 rev 14748 (build 229) as TAGS/V3.1.1-ENTERPRISE-FINAL
   22096: Merged PATCHES/V3.1.2 to V3.3-BUG-FIX (RECORD ONLY)
      22033: ALF-4504: Fix unit test classpath
      22031: ALF-4503: Removed spurious mergeinfo
      22030: ALF-4503: Merged V3.2 to PATCHES/V3.1.2
         19518: ALF-757: Corrected audit config resource URL so that it resolves inside Tomcat as well as JUnit!
      22028: Incremented version label
      22026: ALF-4504: Merged HEAD to PATCHES/V3.1.2
         19958: Updating pdfbox and fontbox libraries.
            The 3rd party libraries apache pdfbox and apache fontbox have been updated from version 0.8.0-incubating to version 1.1.0.

            Apache states that: [...] notable changes in this release include basic support for tagged PDF, various font handling improvements and better handling of CJK character sets.

            Source is available as before for pdfbox, but is no longer included for fontbox.
      22025: ALF-4503: Merged V3.2 to PATCHES/V3.1.2
         18000: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2
            17719: ETHREEOH-3393: AuditConfig file is read every time the audit method is called in HibernateAuditDAO
         19501: Merged DEV/BELARUS/V3.2-2010_02_24 to HEAD (with corrections)
            19243: ALF-757: Cannot start up on JBoss 5.1 due to audit configuration error
               - Removed getPath() method because it is incompatible with JBoss and other app servers where resources can't be resolved to a file
               - Now use Spring ResourceLoader instead of creating FileInputStream
               - getLastModified() still returned where the resource resolves to a file; otherwise the server startup time
      21699: Incremented version label
      21697: ALF-4275: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2
         20349: Merged V3.3 to PATCHES/V3.2.0
            20346: ALF-2839: Node pre-loading generates needless resultset rows
               - Added missing Criteria.list() call
         20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows
              - Split Criteria query to retrieve properties and aspects separately
      21696: ALF-4275: Merged V3.3-BUG-FIX to PATCHES/V3.1.2
         20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
            - Handles warm caches more efficiently
            - Doesn't regress on ETWOTWO-949
            - Can be backported safely
      21694: ALF-4275: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2
         20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows
      17041: Merged V3.2 to V3.1
         17023: Fixed parentAssocCache bug when adding assocs against an empty cache   
      16987: Merge 2.2 to 3.1:
         13089: (record-only) Fix "Read-Write transaction" exception, when the user does not exist. ETWOTWO-1055.
         13091: (record-only) Fix for NFS server "Read-Write transaction started within read-only transaction" exception. ETWOTWO-1054.
         14190: (record-only) Fix for cut/paste a folder from Alfresco CIFS to local drive loses folder contents. ETWOTWO-1159.
         14191: (record-only) Additional fix for CIFS 'No more connections' error. ETWOTWO-556
         14199: (record-only) Fix for NFS problem with Solaris doing an Access check on the share level handle. ETWOTWO-1225.
         14210: (record-only) Added support for FTP EPRT and EPSV commands, on IPv4 only. ETWOTWO-325.
         14216: (record-only) Fixed FTP character encoding, ported UTF8 normalizer code from v3.x. ETWOTWO-1151.
         14229: (record-only) Remove unused import.
         14655: (record-only) Convert content I/O exceptions to file server exceptions during write and truncate. ETWOTWO-1241.
         14825: (record-only) Add support for the extended response to the CIFS NTCreateAndX call, back port of ETWOTWO-1232.
         15869: (record-only) Port of desktop action client side EXE fixes from v3.x. ETWOTWO-1374.
      16727: Fix for unable to connect via FTP via Firefox (when anonymous logons are not enabled). ETHREEOH-2012.
      16718: Fix for Alfresco and AVM spaces are empty when viewed by FTP and Alfresco is run as non-root. ETHREEOH-2652.
         Triggered when CIFS server uses default ports on Linux/Unix/Mac platforms and fails to start.
      16717: Fixed setAllowConsoleShutdown setting in standalone server can cause infinite loop. JLAN-38.
      16710: Added CIFS NT status code/text for the 'account locked' status, 0xC0000234. ETHREEOH-2897.
      16709: Fixed the FTP not logged on status return code, now uses reply code 530. JLAN-90.
      16666: Fix for CIFS cannot handle requests over 64K in JNI code, causes session disconnect, standalone server. JLAN-91.
      16559: Fix for ACL parsing in the standalone JLAN Server build. JLAN-89.
      16556: Fix for CIFS session leak and 100% CPU when connect/disconnecting quickly. ETHREEOH-2881. 
      16555: Fix for processing of NetBIOS packets over 64K in the older JNI code. Part of ETHREEOH-2882.
      16309: Merged V2.2 to V3.1 (for rev 16305)
         16304: Fix ETWOONE-335: Parallel Review does not store Priority and Due Date set at task creation
      16305: ETWOONE-335: Parallel Review does not store Priority and Due Date set at task creation
      16163: Added timstamp tracking via the file state cache, blend cached timestamps into file info/folder search results.
         Added support for . and .. pseudo entries in a wildcard folder search.
      16162: Add support for the . and .. pseudo entries in a folder search.
         Return EA size as zero in CIFS file information levels.
         Added more debug output to notify change handler.
      16160: Minor change to debug output
      15827: Fixed bug in delete node event processing.
      15780: Fix for MS Office document locking issue. ETHREEOH-2579.
      15628: Update svn:mergeinfo
      15627: Merge 3.2 to 3.1:
         15626: Fixed NetBIOS reports an invalid packet during session connection, and connection stalls for a while. JLAN-86.
      15572: Update svn:mergeinfo
      15571: Merge 3.2 to 3.1:
         15549: Check for null ClientInfo in the setCurrentUser() method and clear the auth context. Part of ETHREEOH-2538.
         15550: Fixed performance issue in the continue search code, add warn level output of folder search timing.
      15570: Merge 3.2 to 3.1:
         15548: CIFS server memory leak fixes (clear auth context, session close). ETHREEOH-2538
      15231: Fix for cut/paste file between folders on CIFS. ETHREEOH-2323.
         Added debug flags to the Alfresco filesystems, implemented in the ContentDiskDriver. Changed debug output to be single line. ENH-515.
      14930: Updated svn:mergeinfo
      14921: Merge HEAD to V3.1:
         14599: Fixes to file server ACL parsing, part of ETHREEOH-2177
      14916: Fixes for local domain lookup when WINS is configured. ETHREEOH-2263.
      14523: Add trailing 'A' to CIFS server name, removed by recent checkin.
      14484: Merged HEAD to v3.1:
         13943 Added FTP IPv6 configuration, via the <IPv6 state="enabled|disabled"/> tag. Added the ftp.ipv6 property. MOB-714.
      14483: Merged HEAD to v3.1:
         13942 Added FTP IPv6 support. MOB-714.
   22097: Merged PATCHES/V3.2.0 to V3.3-BUG-FIX (RECORD ONLY)
      21556: Incremented version label
      21555: ALF-4208: Merged PATCHES/V3.1.1 to PATCHES/V3.2.0
         21225: Merged V3.2 to PATCHES/V3.1.1
            19598: Backported (merge not possible) HEAD rev 18790 for IndexInfo fixes
               - Hit problem where re-index threads were all waiting for merging, which had nothing to do
      17875: “Tagged V3.2 build 304 Revision 17823 as TAGS/V3.2.0-ENTERPRISE-FINAL”
   22098: Merged PATCHES/V3.2.1 to V3.3-BUG-FIX (RECORD ONLY)
      17876: Fix CMIS repo and folder browser web scripts. This can now be used as sample stand-alone JSR-168 portlet.
      18309: ETHREEOH-4003: Impossibility to declare email as record
      18378: ETHREEOH-4034: Permission exception when creating non-electronic records ...
      18468: ETHREEOH-4105: Frozen Records Can Be Destroyed
      18470: Part of ETHREEOH-4089: StoreModelObjectPersister fails to load model object
         - Added toString() methods to aid with diagnostics
      18471: Fixed ETHREEOH-4089: StoreModelObjectPersister fails to load model object
         - If the XML fails to parse, then it is treated the same as a missing document.
         - Rather than having the system fail, the XML failures are reported (turn DEBUG
           on for full XML dump) and the document is treated the same as
           "store.hasDocument() = false"
         - Merges to HEAD will need merging to SpringFramework
      18494: ETHREEOH-4089: StoreModelObjectPersister fails to load model object
         - Handle document parsing exceptions as well
      19170: Fixed ALF-730: MLText is not fully carried during cut-paste or copy-paste
         - Fetching of properties for copy now uses 'mlAwareNodeService'
      19286: Fix for https://issues.alfresco.com/jira/browse/ALF-626 "Using 'null' as an authority argument in clearPermissions() cause a java.lang.NullPointerException"
      19406: Fix for ALF-649 - Web Service query() no longer returns metadata in 3.2
      19597: Gave PropertyBackedBeanExporter a shorter name for it's cluster region name
      19599: Fix ETHREEOH-2583: Make the index tracking "hole" retention period more configurable
         - Added property 'index.tracking.maxVoidRetentionTimeMinutes', which defaults to the 'maxTxnDurationMinutes'
         - Even more usefully, added 'index.tracking.minVoidCheckPeriodSeconds' that allows void checking to be less frequent
           defaulting to only doing it every 60s
         - Added explicit logging for voids: log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker.voids=DEBUG
      19654: Fix blog test
      19718: Merged HEAD to BRANCHES/V3.2:
         19678: Fix PostgreSQL handling for null Serializable values (ALF-1614)
            - Provides generic way of targeting BLOB behaviour for different dialects
            - Fixes ALF-2301 by the way
      19759: Fix for CIFS/CheckInOut.exe save of working copy breaks lock on original file. ALF-2028.
      19760: Fix for working copy checked out via CIFS is not accessible until FileStateReaper expires file state. ALF-962.
      20048: "Tagged V3.2 build 499 Revision 19935 as TAGS/ENTERPRISE.V3.2.1"
      21166: Merged V3.3-BUG-FIX to PATCHES/V3.2.1
         21165: Fixed ALF-3867: SQL format error when re-instating orphaned content URL
            - Parameter was not bounded with #
            - Added unit test to ensure SQL generated is correct
   22101: Resolve ALF-4522: Accessing document via /alfresco/service/api/path doesn't work - "Company Home" token is duplicated
   - /cmis... urls accept paths relative to CMIS root path (which is /Company Home)
   - /api/path... urls accept paths relative to root of store
   22103: Merge from HEAD to V3.3-BUG-FIX
      22099: Fix for ALF-3733.

      Note that this should also fix ALF-4465.
   22104: Merged V3.3 to V3.3-BUG-FIX
      21690: ALF-3991: Disable audit behaviour when applying the RenditionModel.ASPECT_RENDITIONED aspect
      21722: Merged PATCHES/V3.3.1 to V3.3
         21721: ALF-4039: Extend store name encoding to all non-ASCII characters, as otherwise these are incorrectly mangled by the Tomcat 5 virtualization server when they appear in a web app path
            - Also use -x instead of _x so that the full encoded user name can be included in a DNS name
            - WCM preview now working with variety of user sandboxes with exotic characters in the user name!
      21767: ALF-4234: CMIS Relationships (fix issue with source and target relationship type checking)
      21789: ALF-4333: Fix
         - Updated RepoPrimaryManifestProcessorImpl so it can handle deletions that are reported by either pre-delete noderef or archived noderef (previously only handled the latter).
         - Updated TransferManifestNodeFactory so that it handles the case where the status of the node to transfer is "deleted".
         - Updated UnitTestTransferManifestNodeFactory so that it handles the change to TransferManifestNodeFactory above.
         - Added new tests for deletion cases.
      21808: Fix for ALF-1908 - encoding for all arguments to all templates associated with WebScripts that can be exposed and executed via a URL.
         - this includes any freemarker templates in /components and /modules that can be executed via url and do not touch context objects that would cause them to be invalid when executed via that url, for example any component or template that touches page.* cannot be executed via a url in the browser, but those that do not *could* be exposed via a clever scripted URL and be manipulated to potentially contain XSS code.
      21837: ALF-4039: In WebProjectServiceImpl.getWebUserRef() do not trust results of Lucene search alone. Certain special characters are ignored or treated as equivalent. Do string comparison to ensure exact match.
      21843: Merged V3.3-BUG-FIX to V3.3
         21137: ALF-3841: Alfresco Explorer SSO Authentication Filters now accept ticket parameters too
            - Can be turned back off with ntlm.authentication.browser.ticketLogons=false or kerberos.authentication.browser.ticketLogons=false
            - Wiki updated
      21856: ALF-4391: Fix Share URL rewrite configuration
         - The URL rewrite configuration was not including the query string in the source URL meaning that it got lost in the rewritten URL (for some reason only on Websphere)
         - Solved this by using the urlrewrite.xml from ALF-260 and adding use-query-string="true"
         - Need to retest on Tomcat and WAS
      21873: Fix ALF-2974: Locate file action is absent for documents in I'm editing tab in Repository
      21907: ALF-4401: Web services not working on Websphere 7 (ever?)
         - Added in Sun SAAJ and JAXP reference implementations to shared library in order to make CXF work
         - Removed old Sun SAAJ libraries as these are embedded into JDK 1.6
      21911: ALF-4399: Broken Repository Document library in Share on Websphere.
         (Fixing fallout from argument encoding in r21808)
      21924: Further fixes for ALF-1908 - XSS argument encoding fixes in Forms runtime
      21987: ALF-4187: Fix bitrock installer config so that the RMI communication ports are randomly selected and do not clash with the RMI registry port
      21998: ALF-4323: Fix ability to use ECMA-357 ECMAScript for XML (E4X) expressions in Share on Weblogic (and Rules Management)
         - Use child first loading of org.apache.xmlbeans.* packages
         - Makes sense because it was originally donated by BEA
   22105: Merged PATCHES/V3.2.r to V3.3-BUG-FIX (RECORD ONLY)
      21082: Fixes for ALF-3777 and ALF-3778 - improvements to XSS attack mitigation.
      21375: Fix ALF-3951 - XSS attack mitigation for IE6 browser. Also minor wiki code formatting fixes & HTML entities appearing in wiki dashlet.
      21400: Merged BRANCHES/V3.2 to PATCHES/V3.2.r
         19144: Added PRE tag to whitelist of safe tags for HTML stripping in Share.
         19363: Fix for ALF-1952 - multi-pass HTML stripping
         19814: Fix for ALF-2322 - discussion topic containing non-ascii characters cannot be saved
      21759: Fix for IE6 XSS issue ALF-4307
   22106: Merged PATCHES/V3.3.1 to V3.3-BUG-FIX (RECORD ONLY)
      21838: Merged V3.3 to PATCHES/V3.3.1
         21837: ALF-4039: In WebProjectServiceImpl.getWebUserRef() do not trust results of Lucene search alone. Certain special characters are ignored or treated as equivalent. Do string comparison to ensure exact match.
      21941: ALF-4424: Merged V3.3-BUG-FIX to PATCHES/V3.3.1
         21659: Workaround for ALF-4230: use of flash technology to upload documents into a share site makes the use of (some) external authentication methods difficult (or impossible)
            - The Flash uploader can be disabled via share-config: DocumentLibary / file-upload / adobe-flash-enabled
      21944: Incremented version label
      22079: ALF-4458: Merged PATCHES/V3.2.1 to PATCHES/V3.3.1
         21606 ALF-4044: Introduced new policy.content.update.ignoreEmpty setting, that when true causes the repository to behave as it did before the fix to ALF-254. I.e. writing empty content will not trigger onContentPropertyUpdate policies or inbound content rules. This enables better compatibility with mac clients using CIFS or WebDAV; they actually create and close a file before appending its data.
      ALF-4458: Merged V3.3 to PATCHES/V3.3.1
         20855: Fix for ALF-3690. Unable to FTP files into Share site documentLibrary folder.
            This fix corrects what it essentially a typo. The dictionaryService was injected twice into the CreateNodeRuleTrigger bean, rather than the dictionaryService and the ruleService.
      22082: Incremented version label
   22107: Merged PATCHES/V3.3.1 to V3.3-BUG-FIX
      21943: ALF-4402: Use normalized repository user ID when doing filesystem quota tracking
      22080: ALF-4458: Fixed broken logic in CreateNodeRuleTrigger.onAddAspect()
         - hasAspect() check was inverted because onAddAspect() is called before aspect is actually added


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20885 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-07-01 08:25:06 +00:00
Dave Ward
9963da3d51 Merged V3.3 to HEAD
20794: Merged DEV/V3.3-BUG-FIX to V3.3
      20792: Fix for unit test failures introduced by check in 20771
      20791: ALF-3568: Include axiom jars in WAS shared library to solve Quickr connector issues
      20785: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_06_14 to DEV/V3.3-BUG-FIX
         20644: Function for the browser window closing was implemented. For IE browser the trick with window opener was used. Fixes ALF-1004: After closing Details Space, user doesn't return to his previous location
      20784: Fix for ALF-3516: Enterprise 3.X / Impossible to Create a Blog with Special Characters in the Title (?/!)
      20783: Fix for ALF-1087: Documents checked-out from Share do not have "Upload new version" action in Alfresco Explorer
      20782: Added multiday timed event handling to week view
      20775: Merged V3.3 to DEV/V3.3-BUG-FIX
         20670: Fix for ALF-3260: XSS attack is made in Wiki tab if First/Last user name contain xss. Also fixed double encoding errors found during regression testing.
      20772: Update to node browser to show namespace of attributes.
      20771: ALF-3591 - transferring rules.
         - also extends the behaviour filter.
      20770: ALF-3186 - action parameter values are not fully transferred - need to handle d:any
      20768: AVM - ALF-3611 (OrphanReaper + PurgeTestP + additional NPE fixes)
      20765: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
         20708: DB2 build - add create/drop db ant targets (use DB2 cmdline - since not possible via JDBC/SQL)
         20722: DB2 build - run db2cmd in same window (follow-on to r20708)
      20764: Fix unreported JSON encoding issue with links components
      20762: Fix ALF-2599: Share - Cannot search for user currently logged on
      20759: DB2: fix FullNodeServiceTest.testLongMLTextValues (ALF-497)
         - TODO: fix create script when merging to HEAD
      20756: DB2: fix JBPMEngine*Test.* (ALF-3640) - follow-on (upgrade patch)
      20746: DB2: fix WebProjectServiceImplTest.testCreateWebProject (ALF-2300)
      20744: DB2: fix JBPMEngine*Test.* (ALF-3640) - missed file
      20743: DB2: fix JBPMEngine*Test.* (ALF-3640)
      20729: AVM - fix purge store so that root nodes are actually orphaned (ALF-3627)
         - also prelim for ALF-3611
      20720: (RECORD ONLY) ALF-3594: Merged HEAD to V3.3-BUGFIX
         20616: ALF-2265: Share 'Uber Filter' part 2
            - WebScriptNTLMAuthenticationFilter detached from its superclass and renamed to WebScriptSSOAuthenticationFilter
            - Now the filter simply chains to the downstream authentication filter rather than call its superclass
            - This means the same filter can be used for Kerberos-protected webscripts as well as NTLM
            - Wired globalAuthenticationFilter behind webscriptAuthenticationFilter in the filter chain in web.xml
            - Configured webscriptAuthenticationFilter for Kerberos subsystem
      20719: Merged DEV/TEMPORARY to V3.3-BUGFIX
         20696: ALF-3180: when using NTLM SSO, a user needs to log in first into the web UI before being able to mount alfresco using CIFS
            The absence of the missing person creation logic in “the org.alfresco.filesys.auth.cifs.PassthruCifsAuthenticator.authenticateUser()” method was fixed. 
      20718: Merged DEV/TEMPORARY to V3.3-BUGFIX
         20659: ALF-3216: Incomplete settings for Lotus Quickr
            The protocol,host,port and context are removed from properties and a dependency on the org.alfresco.repo.admin.SysAdminParams interface is introduced.
      20711: Latest SpringSurf libs - fix for ALF-3557
      20710: Merged HEAD to BRANCHES/DEV/V3.3-BUG-FIX:
         20705: Fix ALF-3585: AtomPub summary can render first part of binary content resulting in invalid XML
      20691: Merged DEV/TEMPORARY to V3.3-BUGFIX
         19404: ALF-220: Editor can't rename files and folders via WebDav
            The Rename method of FileFolderService was used in case of file renaming instead of move method in WebDAV MOVE command.
      20663: ALF-3208 RenderingEngine actions should no longer appear in the list of available actions that can be fired using rules.
      20656: ALF-2645: LDAP sync now logs 'dangling references' for debugging purposes
      20651: ALF-485: FTP passthru authenticator logs authentication failures at debug level to avoid noise in the logs
      20646: Merge V2.2 To V3.3
         14301 : RECORD ONLY - ETWOTWO-1227 - fix to serialize FSR deployments.
         14618 : RECORD ONLY - Merge HEAD to 2.2 13944 : After rename project deploy option disappears.
      20637: ALF-3123: Avoid NPE on Oracle when loading empty string values persisted through JMX and the attribute service
      20633: ALF-2057: LDAP synchronization lock now persists for a maximum of two minutes (instead of 24 hours!)
         - The exclusive lock gained for LDAP sync from the JobLockService is now refreshed at 1 minute intervals and never persists for more than 2 minutes
      20628: ALF-1905: Allow use of anonymous bind for LDAP synchronization (NOT authentication)
         - Previously synchronization AND authentication shared the same setting for java.naming.security.authentication, meaning that if you tried to use anonymous bind for the synchronization side, the authentication side would complain.
         - Now there are two independent environments declared for the 'default' synchronization connection and the authentication connection
         - A new property ldap.synchronization.java.naming.security.authentication declares the authentication type used by synchronization. Set to "none" for anonymous bind.
      20623: Fix for ALF-3188 : Access Denied when updating doc via CIFS
      20620: Merge DEV to V3.3-BUG-FIX
         20456 -  ALF-1824 : Setting alfresco.rmi.services.host on linux does not use specified host/IP
      20617: Merged DEV/BELARUS/V3.3-2010_06_08 to V3.3-BUG-FIX (with corrections)
         20606: ALF-651: Web Services client ContentUtils.convertToByteArray is broken
            - org.alfresco.webservice.util.ContentUtils.convertToByteArray() method has been updated to cover large Input Streams conversion.
            - org.alfresco.webservice.test.ContentUtilsTest is a test for the new functionality implemented in the ContentUtils class.
            - org.alfresco.webservice.test.resources.big-content.pdf is a large content for the ContentUtilsTest.testInputStreamToByteArrayConversion() test.
      20613: Fixed ALF-1746: Metadata extractors are unable to remove ALL aspect-related properties
         - putRawValue keeps hold of 'null' values
         - All policies keep hold of 'null' values
         - Only affects 'carryAspectProperties=false'
      20609: Merged HEAD to V3.3-BUG-FIX
         20578: ALF-3178 - Transfer Service - to transfer rule (ie. ruleFolder with it's children) the PathHelper should allow "-" (dash character)
         20608: ALF-3178 - fix r20578 (mis-applied patch)
      20594: WebDAV BitKinex compatibility fix - Let the XML Parser work out the body encoding if it is not declared in the Content-Type header
      20588: (RECORD ONLY) Merged V3.3 to V3.3-BUG-FIX
         - Merged across all differences from V3.3
   20778: Added revision to version label.
   20777: Fix for ALF-2451 - installer correctly configure Share port
   20722: DB2 build - run db2cmd in same window (follow-on to r20712)
   20721: DB2 build - fix create target and add "/c" to exit "db2cmd"
      - TODO: add wait/timeout target, ideally checking for created DB 


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


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-06-09 14:53:24 +00:00
Jan Vonka
16c4b49359 Fix ALF-2210 - incorrect version history (version label incremented twice, in certain cases)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-04-19 13:51:59 +00:00
Derek Hulley
f27434f2c6 Merged BRANCHES/V3.2 to HEAD:
19177: (RECORD ONLY) Updated record-only entries for V3.1 branch
   19321: (RECORD ONLY) Removed deep svn:mergeinfo
   19331: (RECORD ONLY) Merged HEAD to BRANCHES/V3.2:
        19324: Follow-up on ALF-765 by upgrading EHCache to 2.0.0Performing merge across the whole of the branch
   19526: Moved ContentServicePolicy static QNames onto policy classes
   19539: (RECORD ONLY) Merged HEAD to V3.2
         19538: Build fix - fix build speed
   19541: Added extraction of custom, mapped metadata from PDF documents
   19543: (RECORD ONLY) Removed deep svn:mergeinfo
   19598: (RECORD ONLY) Backported (merge not possible) HEAD rev 18790 for IndexInfo fixes
   19626: Fix for ALF-732:  Possible memory leak using the .getNodeRefs() method against a ResultSet ...
   19629: (RECORD ONLY) Merged HEAD to V3.2
        19625: Fix to allow Share logo to swapped out for a different one without having to modify the header CSS.
        19628: Corrected Share header component height.
   19649: ALF-885: Cannot retrieve cm:title from an AVM node in FreeMarker (if persisted with actual type set to MLText)
   19694: (RECORD ONLY) Merged V3.2 to HEAD: r19310 bad back merge - record-only
   19713: (RECORD ONLY) Removed svn:mergeinfo


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19719 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-04-01 01:05:03 +00:00
Roy Wetherall
27d6bddcf5 ALF-2036 : Can't link to a folder due to fodler already containing rules (but it doesn't)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19563 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-24 19:44:31 +00:00
Roy Wetherall
0219778d77 SAIL-348 : Reorder rules returns 200 OK but with error message
- This fix includees some refactoring
 - Tests updated



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19415 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-19 17:18:42 +00:00
Kevin Roast
1c897ae1fb Latest SpringSurf libraries:
- Cleanup and improvements to RequestContext related classes.
 - Removal of obsolete Alfresco util classes.
Fixed up imports back to Alfresco versions of unused SpringSurf util classes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19322 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-16 19:06:54 +00:00
Roy Wetherall
546c0fb262 Work around to ensure rules are fired for empty inline documents
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-11 17:59:29 +00:00
Roy Wetherall
1544887f4e Link rules now automatically re-links
- Calling link rules on an already linked folder will automatically unlink from the exisiting folder before linking to the new one.
 - Unit tests updated



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-04 00:15:09 +00:00
Roy Wetherall
7d80cb0867 Added reordering action
- the actioned upon node is the node that has the rules
- the rule nodes are provided as a multi-value property (list of node refs) and then reordered in the order found on the list
- additional existance checks where added to the link/unlink actions



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-02 00:27:35 +00:00
Paul Holmes-Higgin
cefda8c965 Updated header to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 22:48:39 +00:00
Paul Holmes-Higgin
43e93f3c14 Updated header to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18926 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 22:09:17 +00:00
Roy Wetherall
f8ab3f22a7 Merge DEV/BELARUS/HEAD-2010_02_22 to HEAD
18845 : SAIL-200: Enhance webscript (Get all folder rules for folder) with inherited, linked rules



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18870 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-02-26 05:10:46 +00:00