20025: Created Enterprise branch V3.3
20026: ALF-2597 : IMAP : permissions on home space.
- now, by default, people can't read other's mail.
20030: Merged BRANCHES/V3.2 to BRANCHES/V3.3:
19919: Merged BRANCHES/V3.1 to BRANCHES/V3.2:
19766: Fixed ALF-2351: Oracle upgrade scripts need enhancements from 2.2SP7
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
20032: Merged HEAD to BRANCHES/V3.3 (RECORD ONLY)
20031: Fix ALF-2626 - Share Repository browser broken
20035: Enterprise branding for Share & Explorer - DO NOT MERGE (RECORD ONLY)
Also: SAIL-282: Update the Help URLs for 3.3 Enterprise
20039: Fix ALF-2393 - Alfresco Comunity 3.3 deployment error on JBoss v6
20044: Fix ALF-750 (versioning does not persist node associations)
- TODO: review version migrator (if upgrading directly from Ent 2.x to Ent 3.3)
20049: Merged PATCHES/V3.2.r to BRANCHES/V3.3
20047: Fix for ALF-2640: Share: Edit Offline and Upload New Version fails with HTML uploader on FF3.5, works on IE
20054: Fix ALF-750 (versioning does not persist node associations)
- update version migrator (only applies if not already run, ie. upgrading directly from Ent 2.x to Ent 3.3)
20057: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
20033: Accordion example was broken when FDK is deployed as a JAR
20064: Fix for ALF-2623: Alfresco 3.3G's Share site is prone to cross site scripting attacks
- Bug is actually in the wiki components
20065: Fix unreported issue (auto-versioning for metadata-only updates stops working after checkin) & additional improvements to LockService
- explicitly remove lockable aspect (rather than nullifying properties) for unlock / checkin
- use txn resource to track ignorable nodes (for lockable aspect behaviours)
- note: currently affects Alfresco Explorer only (since Alfresco Share explicitly disables autoVersionOnUpdateProps)
20066: Increased PermGen space for tests to 256M from 128M
20071: AVM - check for circular layered directories (ALF-813 / ALF-910)
20073: Fix LockService tests
- fix typo (introduced in r20065)
- TODO: review LockOwnerDynamicAuthorityTest.testCheckOutCheckInAuthorities
20076: Fix LockOwnerDynamicAuthorityTest.testCheckOutCheckInAuthorities
20078: Fixed ALF-2464 "Missing i18n labels when rules fail to run"
20081: Fixed ALF-1626 "The position:absolute behaviour of the Flash preview container needs a re-think"
- Now handles long file names (resize was already fixed)
20083: Fix for ALF-2708: Unmodifiable exception thrown when Web Script f/w attempts to report error (latest Spring Surf webscripts libraries)
20084: Fixed ALF-253 "Unfriendly message appears when trying to login with username which contains symbol '\'"
- also fixed bug whereerror messages for illegal characters was displayed as undefined for FF on Mac
20085: Merging HEAD into BRANCHES/V3.3:
20074: ALF-959 The invitation email 'subject' can now be set as a localizable property in invitation-services.properties:
20080: Fixing failing test InvitationServiceImplTest.
20087: ALF-1498: RM web script puts Alfresco in endless loop
This was a general issue with the onUpdateProperties behaviour in the versionable aspect. This code now disables the behaviour whilst it is executing to prevent the endless loop occuring.
20088: Fixed an issue when uploading 2 or more documents for a new site.
- A failure occured since it asynchronously tried to create the documentLibrary container twice and the second attempt failed since it already existed.
20089: SAIL-356: Action label changes
20090: Dynamic models: minor improvements to DictionaryModelType
- add (optional) concurrency locking
- remove duplicate bean def
- bind remaining class behaviours (onCreateNode, onRemoveAspect) based on type
20091: Fixed ALF-1046 "Leave button is displayed for admin on Site Finder page near private site where admin is not invited"
20092: Merged DEV/BELARUS/V3.2-2010_03_17 to V3.3
20043: ALF-928: Upgrade from 2.1.7 to 3.2 with lots of content items - GC overhead limit exceeded exception
Call getChildAssocs(NodeRef, QNamePattern, QNamePattern, boolean) with a value of 'false' for the preload argument to avoid preloading all the child nodes
20093: Fix for ALF-2721: Upgrade clean 2.2.current + 20k users to 3.3.current fails in CalendarModelUriPatch updating URI that does not exist
20094: ALF-2630: LDAP differential sync was failing to sync group memberships of users who themselves hadn't changed
- New post process deals with group associations of unprocessed users
- Modified unit test to properly simulate differential sync
20095: Fix for ALF-2715: Rule creation in Alfresco Share 3.3G leads to an "Internal Server Error" failure message
20096: Fix webview and wiki dashlet titles in yellow and gdocs themes.
20097: Follow-up fix to cross-browser WebView dashlet (iframe) resizing
20098: Workaround for ALF-2211: Share - Accessing User homes from Share/JSF integration freezes the browser.
- The tree control has been given a configurable maximum folder count setting for both Site and Repository working modes. By default these are "unlimited" in Site mode and 500 in Repository mode. These values can be overridden in share-config-custom.xml - see the sample configuration file for details.
- The workaround is to display a "Too many sub-folders to display" message when the maximum number of folders has been reached.
- To aid users to select their User Home space (or sub-folder thereof) for Copy and Move actions, a new "My User Home" button is provided on the folder picker control.
20099: Fix for ALF-2606: Manage Permissions on multiple nodes.
- Toolbar action removed when in Repository Browser, as the fine-grained permissions page does not support multiple nodes.
20100: Merged Outlook Meeting Workspace integration from BRANCHES/DEV/BELARUS/V3.2-2010_01_11
20102: Fix for ALF-478: Authority CRC calculations must use UTF-8
20103: Follow up from ALF-253 (Unfriendly message appears when trying to login with username which contains symbol '\')
- Making lastName mandatory in Share ui since service otherwise complains
20106: Fixed ALF-1041 "Revert action is available for SiteContributor and SiteConsumer" (and added a missing msg key for blogs)
20108: ALF-2235: Permission exception when creating non-electronic records by Power User with Read and File permssions
20109: Fix for ALF-2706 "ConcurrentModificationException in AsynchronousActionExecutionQueueImpl"
20110: Merge Dev to V3.3
ALF-1980 - Huge UIDVALIDITY giving IMAP client problems
20111: Latest webeditor JAR containing change to orientation strings in WEF
20113: Fix Share DocLib copy/move actions from recent refactor. Picker now appears with correct Site/Repository mode set upon opening.
20114: Fix for ALF-2726: 'Transform and Copy content' action causes error.
20115: Fix for ALF-2697 - File encoding is hard-coded for upload.post.js (Webscript API)
20116: Fix for ALF-1090
20119: ALF-2734 - Incorrect behaviour on creating google docs in Repository Browser
20120: Enterprise build fix for Index check tests
- disable user usage updates
- this should not be required
20121: ALF-959 The site name/title should now correctly appear in the invite email subject, replacing '{0}'.
20123: Merged HEAD to V3.3 (RECORD ONLY)
20122: First part of fix for ALF-2718: DOD5015 module breaks CMIS Atom DiscoveryService webscripts
20126: Fix rule rest api json so numbers are not incorrectly formatted.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20565 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- undeleted and reinstated use of org.alfresco.util.Pair
- undeleted org.alfresco.util.PropertyCheck which is used in the deployment code.
- undeleted other org.alfresco.util.* classes which probably should never have been moved to spring surf.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17410: Merged V3.1 to V3.2
16667: (record-only) Fix ETHREEOH-2477 - group-based perms (MT env)
16883: Fix ETHREEOH-1544 - cannot paste an item, if cut from another web project (modifyLock errror)
16918: Fix ETHREEOH-3053 - Deployment of non-stale file in a stale layered folder removes the file from FSR
16947: (record-only) Temporarily comment-out testSubmitChangedAssets1 (intermittent permission failure)
17162: Fix ETHREEOH-2850 - submitting delete of (web form) xml instance does not submit the associated deleted renditions
17319: Fix ETHREEOH-3111 - ManageReviewTaskDialog (fix-up contributed patch)
17418: Merged V3.1 to V3.2
17141: Fix ETHREEOH-3088: Cut/Paste into self causes stack overflow
17216: Fixed ETHREEOH-3170: DB errors on MSSQL with Snapshot Isolation enabled while CIFS copying
17255: Fixed ETHREEOH-3180: Error appears when trying to search resources on Manage Task page
17419: Fix for ETHREEOH-3296: Enterprise 3.X / Permissions Error When Cut & Paste on Sub-Folder
17421: Review and tweaks of DB script port
17423: Follow-on for ETHREEOH-3088
17424: Missed check-in for ETHREEOH-3032 (CHK-10240)
17437: ETHREEOH-2790 - OpenOffice-startup-context.xml needs to also initiate the connection to OpenOffice
17441: Build fix: Fix AVM permission inheritance to match DM and fix common permission dao component
17470: Fix for ETHREEOH-3350: Admin Console - Viewing user properties for user without home folder throws exception
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r16667,16883,16918,16947,17141,17162,17216,17255,17319
Merged /alfresco/BRANCHES/V3.2:r17410,17418-17419,17421,17423-17424,17437,17441,17470
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17667: Branch for SpringSurf integration - from HEAD r17665
17668: Fix to ensure included scripts files are not loaded from a cached classpath loader.
17670: Part 1 of SpringSurf integration - changes relating to spring-surf-core-1.0.0.CI-SNAPSHOT.jar
17674: Part 2 of SpringSurf integration - changes relating to spring-surf-core-configservice-1.0.0.CI-SNAPSHOT.jar
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17002: Merged V3.2 to V3.2
14187: (record-only) Fix for ETHREEOH-2023: LDAP import must lower case the local name of the association to person.
14941: Merged V2.2 to V3.1
14830: Fix for ETWOTWO-389: Alfresco will not fix up all the permissions if the UID is changed
14849: Build Fix: Remove the constraint to avoid the creation of duplicate users (it stops permission assignment before user creation)
14867: Build Fix: Disable tests for concurrent creation of groups and people (it leaves an odd group around and is not currently used)
14880: More for ETWOTWO-389: restrict fix ups for uid/gid to case changes only. Other changes are rejected.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17013 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12994: Merged V3.0 to V3.1
12931: Merged V2.2 to V3.0
12635: Fix for ETWOTWO-995: Diff performance degrades on large data sets
12742: Fix for ETWOTWO-981: WCM - regression - revert fails (eg. for content publisher)
12743: AVM - add missing tests to test suite & fix existing tests (including base setup)
12759: AVM - build/test fix - follow-on to r12742
12781: Fix PersonDAO - fixes AuthorityServiceTest which failed after adding AVMServicePermissionsTest
12932: Merged V2.2 to V3.0
12763: Support for ETWOTWO-975: AVMDifference now implements Comparable<AVMDifference>
12782: Fix for ETWOTWO-939: Content Contributor cannot edit their own items
12809: Test fixes after r 12782
12818: ETWOTWO-977 (Orphan Reaper) - removal of comment questioning cache interaction.
12933: Merged V2.2 to V3.0
12306: (record-only) Final set of XSS and HTML encoding fixes for ETWOONE-90 - already merged (see r12310)
12934: Merged V2.2 to V3.0
12311: (record-only) Fix for ETWOONE-389 - Current page number not always visible on the browse screen - already merged (see r12312)
12935: Merged V2.2 to V3.0
12320: (record-only) Fix for ETWOONE-87: Behavior of delete cascade - already merged (see r12324)
12322: (record-only) Fix merge issue (marked as Do Not Merge - see CHK-5607)
12936: Merged V2.2 to V3.0
12775: (record-only) ETHREEOH-872: Editing Email-notify-rules fails w/ ClassCastException (back-port of r11966)
12937: Merged V2.2 to V3.0
12780: Fixed ETWOTWO-1003: DuplicateChildNameException not generated correctly (on Oracle)
12820: Update to ETWOTWO-926 (WCM Form Inline callouts to Web Scripts)
12825: Further ETWOTWO-926 update: provide compatibility with old token scheme as the original patch has already made its way into 3.0.1
12850: ETWOTWO-975 - Show Conflicts in Modified Items List
12938: Fix merge typo (follow on from r12931)
12941: Fix merge typo (follow on from r12931)
12998: Cleaned up svn:mergeinfo entries
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r12931-12938,12941
Merged /alfresco/BRANCHES/V2.2:r12306,12311,12320,12322,12635,12742-12743,12759,12763,12775,12780-12782,12809,12818,12820,12825,12850
Merged /alfresco/BRANCHES/V3.1:r12994,12998
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12083: Fix for ETHREEOH-790 - when using external auth such as NTLM the Change Password and Logout features are no longer available in the Share UI.
12085: ETHREEOH-565: Failure to generate flash preview for PPT file
12086: ETHREEOH-903 Sites drop-down Favorites UI improvements
ETHREEOH-904 My Sites dashlet Favorites UI improvements
ETHREEOH-547 User who is not a site manager can delete sites: my sites dashlet and sites page
12093: ETHREEOH-861, ETHREEOH-928
12094: Remove __MACOSX folder that has appeared in Share webapp
12096: Removed spurious files from YUI 2.6.0 distribution
12100: ETHREEOH-929 Tightening up transport adapters field (should never be shown for ASR)
12104: Fix for ETHREEOH-944. Admin now able to reset user home location again ((regression).
12105: Fixed: ETHREEOH-934 Multi-clicking Site favoriate icons can cause multiple requests before others finish and effectively cause a browser lock-up until page refresh
12106: Exception needs to be rethrown after releasing packet to the memory pool on a Winsock NetBIOS receive. ETHREEOH-628.
12110: An i18n message didn't work for failures. Related to ETHREEOH-934 Multi-clicking Site favoriate icons can cause multiple requests before others finish and effectively cause a browser lock-up until page refresh
12115: Added unit test to check for cm:folder-derived type support
12116: Removed unused, old patch-related query
12117: Merged V2.2 to V3.0
11454: Fixed ASH-7: QName fetching is inefficient when run without L2 cache
12118: Fixed compilation error after merge
12119: DM User Usages - 2nd pass (fix ETHREEOH-677)
12122: UserUsage does nothing if system is READ-ONLY.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12500 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
11498: Improvements to DM ACL upgrade
11502: Edit Details button text updated to Edit Site Details to avoid confusion
11503: ETHREEOH-577 - It is possible to create empty comment at document details page
11504: ETHREEOH-576 - Cannot create calendar event with name containing certain characters such as : /
11505: Merged V2.2 to V3.0
11337: Tidy up the deletion of unused ACEs when authorities are deleted - ETWOTWO-749
11339: Fix permission checks under RunAs to use the effective user's groups - ETWOTWO-753
11506: Fixed ETHREEOH-579: RuntimeExec can not handle commands and arguments that contains spaces
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
9018: MT: system-wide jobs should run across all stores/indexes
9204: Merged V2.2 to V2.9
8633: Merged V2.1 to V2.2
8629: Merged V2.1-A to V2.1
8493: Fixed ADB-51: ImporterBootstrap doesn't use transaction retrying
8494: EHCache and JGroup patches and upgrades
8546: ACT-1650: performance optimization
8550: Fixes to transactional cache handling
8553: Fixed tests: MLText is a Map, but will always have at least one entry, even that entry is null.
8583: ACT-954: IndexInfo files now reopen when they close (for whatever reason)
8640: Merged V2.1 to V2.2
8638: Used correct exception type for IO channel reopen logic
9102: Unit test to check that transactional cache size overrun is handled
9106: Merged V2.1 to V2.2
9043: Fixed AR-2291: SchemaBootstrap lock is only required before first SQL execution
9045: Fix AR-2291: SchemaBootstrap lock is only required before first SQL execution
9047: Fixed AR-2305: Index tracking in AUTO mode doesn't report anything on bootstrap
9048: Fixed AR-2300: Random-based GUID instead of time-based GUIDs
9049: Fix patches to only run once
9050 <Defered>: Changed getString() method to use the available buffer length rather than a hard coded value.
9060: Fixed ETWOONE-109 and ETWOONE-128: RetryingTransactionHelper fixes and improvements
9061: Fixed NodeRefPropertyMethodInterceptorTest
9075 <Defered>: Added delete permission check when marking a file for delete on close. ETWOONE-141/ACT-2416.
9080: Fixed EHCache source zip
9081: Fixed ETWOONE-118: Tomcat failed bootstrap doesn't clean up EHCache cluster structures
9085: Fixed ETWOONE-154: Added JSR107 Jar to WAR
9115: Fixed test: TransactionalCache uses LRU so repeatedly checking if a entry is there keeps it in the cache.
9206: Merged V2.2 to V2.9
8857: Improvements to ACL performance for large ACLs
8951: Always check permission entry changes are made at position 0
9219 <No change>: Made NTLMLogonDetails class Serializable, port of r8973.
9220: Added delete permission check when marking a file for delete on close. Port of r9075.
9222: Merged V2.1 to V2.9
8683: Early warning for nodes indexed in the wrong store (ACT-964)
8684: Enhanced tests
8685: Enhanced tests
8686: Additional tests
9223: Merged V2.2 to V2.9
9120: Merged V2.1 to V2.2
8740: Fix for AR-2173 - do no recheck case of the user name when validating tickets (it has been done)
9122: Additional unit test from support case.
9224: Merged V2.2 to V2.9
9076: Fixed ETWOTWO-426: Upgrading alfresco from 2.1.1 to 2.2 throws errors with Mysql 5.0.51
9104: Merged V2.1 to V2.2
9025: Fixed AR-2314, AR-2299: Optimizations after profiling
9105: Merged V2.1 to V2.2
8745: Fix AR-2233 (regression introduced by fix for AR-2221)
9121: Merged V2.1 to V2.2
9017: Fix index back up failing due to background index merge/deletions (inlcudes back port of CHK-2588)
9137: Incorporated additions from Will into AVM console (ETWOTWO-439)
9225: Merged V2.1 to V2.9
8641: Merged V2.1-A to V2.1
7729: Fix to Repository Web Service (queryAssociated) to allow reverse association lookup (ie. given target, get the source)
8673: Fix for AR-2098 - shorter URL form now has NTLM filter mapping example in web.xml
8682: Fix for AR-2005
8695: AR-2054.
8696: Improved sort test to include prefix form of field name
9226: Fix ALFCOM-994 (see also earlier change in r9223)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8405: Added causal exception to the runtime generated
8408: AR-2136, AR-2137, AR-2138
8410: WCM-1110, WCM-1111
8417: Stopped chiba:match() function from being inserted into bindings for xforms model elements of type xs:integer.
8419: Fixes for correct use of .empty in name spaces of QNames
8420: Finally fixes WCM-1108 and WCM-1109
8489: Merged V2.1 to V2.2
8482: Fix For AR-2163
8507: Merged V2.1 to V2.2
8504: Fix for AR-2165 - respect repo read only setting during authentication
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8083: Merged V2.1 to V2.2
8066: RM-31 and related issues (ACT-729)
8068: Fix for AR-1997
8084: Fixed script error on notify page of invite website user wizard
8086: Merged V2.1 to V2.2
8075: Clear()ing a hibernate session, is not always enough to guarantee that transactions not use unbounded amounts of memory
8076: Turn off test that needs to be fixed real soon now.
8092: Implementation for: http://issues.alfresco.com/browse/AR-1744
8093: Fixed upgrade scripts for V2.1.2 to V2.2 upgrades
8096: Fix for AWC-1578 and AWC-1814
8097: Added new indexes missing from scripts and made index names consistent.
8098: Fix for AWC-1548
8100: Removed use of QName from alf_permission table
8102: Fix for AWC-1690
8103: test was == on id that used to be long but is now a Long
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7732: Support to cache null QName look ups ...
7733: Support for store ACLs
7741: Fix for over keen stiore ACLs ....
7794: Fix for WCM-1019, tasks show all assets as modified when only one has
7996: Fix for AWC-1519: cancelling discussion creation results in error
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7575: Permission changes for AVM.
7577: Incorporated most of the feedback provided by Kevin C earlier today
7578: Removed directory not removed by patch
7579: EmailServer bug fixes
AR-1902: Double posts when emailing to a document
AR-1904: Attachments via email should be allowed on forum posts
AR-1903: (Partial Fix) Text attachments should be treated the same way as other attachments
7583: Fixed WCM-961 & WCM-962: Added confirm dialog for 'Delete All Deployment Reports' and 'Release Server' actions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8434 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
