19546: (RECORD ONLY) Merged V3.2 to PATCHES/V3.2.r
19432: Merged V3.1 to V3.2
19427: Merged V3.0 to V3.1
19423: Merged V2.2 to V3.0
19391: Fix for ALF-2076: AUTO does not work if a document has been added and deleted since the index backup
19419: V2.2 Build Fix
19421: Fix for ALF-2076: AUTO does not work if a document has been added and deleted since the index backup
19463: Merged V3.1 to V3.2
19459: Merged V3.0 to V3.1
19457: Merged V2.2 to V3.0
19449: Addition Fix for ALF-2076: AUTO does not work if a document has been added and deleted since the index backup
19493 Merged V3.1 to V3.2
19471: Build fix after changes for ALF-2076 were merged forward. Index checker correctly understands INDETERMINATE state of indexed transactions
19547: (RECORD ONLY) Incremented version label
19555: (RECORD ONLY) Merged V3.2 to PATCHES/V3.2.r
19552: Merged V3.1 to V3.2
19551: Further fix after changes for ALF-2076 were merged forward. Final fix to check for InIndex.No
19566: (RECORD ONLY) Merged V3.2 to PATCHES/V3.2.r
19539: Merged HEAD to V3.2
19538: ALF-2076: Build fix - fix build speed
19802: (RECORD ONLY) ALF-2382, ALF-2383: Merged V3.2 to PATCHES/V3.2.r
19647: ALF-2231: Merged DEV/BELARUS/V2.2-2009_12_01 to V3.2
17704: ENH-681: alfresco webdav does not respect webdav locks
19624: ALF-2231: Merged DEV/BELARUS/V2.2-2009_12_01 to V3.2
17704: ENH-681: alfresco webdav does not respect webdav locks
19623: ALF-1890: Correction to previous checkin to allow defaulting of request body charset
19617: ALF-1890: Improvements to make ALL WebDAV methods retryable
- Solution from PutMethod promoted to request wrapper that will handle ALL calls to getInputStream and getReader
19614: ALF-1890: Merged V2.2 to V3.2
17709: Merged DEV_TEMPORARY to V2.2
17700: ETWOTWO-1393: concurrent writes to webdav lead to data loss (0kb resulting file)
19613: Merged DEV/BELARUS/V2.2-2010_02_03 to V2.2
19157: ALF-1890: concurrent writes to webdav lead to data loss (0kb resulting file)
19803: ALF-558: File servers (CIFS / FTP / NFS) can now handle concurrent write operations on Alfresco repository
- ContentDiskDriver / AVMDiskDriver now use retrying transactions for write operations
- Disable EagerContentStoreCleaner on ContentDiskDriver / AVMDiskDriver closeFile() operations so that they may be retried after rollback (Sony zero byte problem)
- Allow manual association of AVM ContentData with nodes so that closeFile() may be retried
- Propagation of new argument through AVM interfaces
19804: (RECORD ONLY) Merged PATCHES/V3.2.0 to PATCHES/V3.2.r
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.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20004 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
17246: ETHREEOH-3208: User profiles for users authenticated by immutable subsystems are now read only
- Introduced MutableAuthenticationService interface, only implemented by Alfresco native authentication service
- Split out those methods from AuthenticationService that mutate the user store and added isAuthenticationMutable()
- Now both Alfresco Explorer and Share user profile / password edit link rendering is conditional on isAuthenticationMutable
- Works with authentication chain containing mixture of internally and externally authenticated users
17247: Fix failing unit tests
- rm-public-services-security-context.xml needed to be brought in line with public-services-security-context.xml (and will forever more!)
17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters
17253: *RECORD ONLY* ETHREEOH-2885: web.xml must conform to the schema to work on JBoss
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
14587: Added new node service method getNodesWithoutParentAssocsOfType to public-services-security-context.xml (or at least my best guess at it!)
14586: Use US spelling of synchronization in filenames for consistency
14585: Lower the default user registry sync frequency to daily instead of hourly. Now users and groups are pulled over incrementally on login of missing users.
14583: Unit test for ChainingUserRegistrySynchronizer
14571: Migration patch for existing authorities previously held in users store
- Uses AuthorityService to recreate authorities in spaces store with new structure
14555: Authority service changes for LDAP sync improvements
- Moved sys:authorities container to spaces store
- All authorities now stored directly under sys:authorities
- Authorities can now be looked up directly by node service
- Secondary child associations used to model group relationships
- 'Root' groups for UI navigation determined dynamically by node service query
- cm:member association used to relate both authority containers and persons to other authorities
- New cm:inZone association relates persons and authority containers to synchronization 'zones' stored under sys:zones
- Look up of authority zone and all authorities in a zone to enable multi-zone LDAP sync
14524: Dev branch for finishing LDAP zones and upgrade impact
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14588 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6580: AVM bulk import performance tweaks.
6582: WCM-767, WCM-768
6583: Fix for AWC-1528 (potential NPE in ErrorsRenderer)
6584: Fix for AWC-1256 (Links produced by inline HTML editor are incorrect)
6585: AR-1635: event listeners added in a beforeCommit event are now executed successfully
6586: AR-1561 Update Web Scripts readme.html to be consistent with "Category Search Sample" (or vice-versa)
6587: Fix for AWC-1390 (Paste all doesn't work for forum items)
6588: AR-1701 Script getDocument call doesn't check for non-existent content
6589: Fix for AWC-1530 - Saved search does not work for custom properties of type d:text with list constraint
6591: Improvement for submit speed.
6592: Removed obsolete tests.
6594: Index tracking sample to include AVM index tracking
6595: Added the AVM helpers methods from the FreeMarker AVM API that were missing from the JavaScript API
6597: Rationalize post commit execution hooks for deployment receiver
6598: Properly escape path names for ProgramRunnable.
6599: AVM store name lookup cache is (theoretically) clusterable.
6600: Some or other gramatically incorrect stuff about Chiba.
6601: Fix for AR-1121 and AR-1673
6602: AR-1655: Versioning is not MLText aware
6603: Updated messages from lang packs
6604: Fixed AR-1476: JCR import end element escaping
6605: Updated Japanese lang messages
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6746 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
