28236: ALF-8810: Removed trailing space from discussion.discussion_for Italian translation
28241: Incremented version revision for 3.4.4
28284: ALF-835 - WCM/AVM: copy (empty) folder into itself
28285: ALF-6863: More than one cifs device breaks the web UI (explorer)
28290: ALF-8840: user-*.atomentry.ftl
28291: ALF-6863: Continuation of fix by Arseny
28336: ALF-8768: Fixed typo in comment on wcm-bootstrap-context.xml
28363: Merged DEV to V3.4-BUG-FIX
28262: ALF-8847: WCM: OrphanReaper contention throws error after 39 retries.
Checkin Comment:
Use JobLockService to make sure that only one OrphanReaper job is working.
Generate list of nodes that must be processed in OrphanReaper.doBatch() transaction.
28386: ALF-9100: Merged PATCHES/V3.4.1 to V3.4-BUG-FIX
28249: ALF-8946: Avoid one full table scan per batch in full reindex
- Now each batch scans a single time sample, dynamically adjusted based on the number of transactions
in the previous sample, always aiming for 1000 transactions per sample.
28394: Fixed ALF-9090: NPE during inter-cluster subsystem messaging
- Bean ID is a List<String> and might not be recognized on receiving machine
- Log warning when bean ID is not available (unsymmetrical configuration, perhaps?)
28396: Merged DEV to V3.4-BUG-FIX
28384: ALF-6150: Initial state lost when non-versionable document is saved for the first time
Creation of new version of document before writing its content was added to
- AbstractAlfrescoMethodHandler->putDocument (this method is used by Office 2003, 2007)
- VtiIfHeaderAction->doPut (this method is used by Office 2007 and 2010 on Windows 7)
Creation of new version was added twice to AbstractAlfrescoMethodHandler to avoid affecting
initial version when transaction is committed.
28432: Merged DEV to V3.4-BUG-FIX
28431: ALF-8530: Pressing the info icon creates an unrecorded file in the ContentStore
Use ContentService.getTempWriter() in BaseContentNode$TemplateContentData.getContentAsText() method.
28435: Merged DEV/TEMPORARY to V3.4-BUG-FIX
28428: ALF-9015: cm:modifier not updated when document is updated via CIFS
In ContentDiskDriver.closeFile() added ContentModel.PROP_MODIFIER property update.
28436: ALF-8550: Number of http requests (currentThreadsBusy) increases when session times out during creation of webform
- Corrected use of read and write locks
28465: Fix for ALF-8023 Share preview doesn't work if...
fixed as outlined by Dmitry.
28478: Merged BRANCHES/DEV/ALAN/AUDIT to BRANCHES/DEV/V3.4-BUG-FIX:
28062-28477 (28062,28063,28080,28081,28302,28303,28334,28340,28464,28469,28477) ALF-8438 Need higher level audit of user actions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28481 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13077: Abstracted ContentStore MBean operations
13099: Merge V3.0 to V3.1
13096 Merged V2.2 to V3.0
13071: Fix ETWOTWO-1058: Hibernate exception while concurrently submitting from and updating same user sandbox.
13079: Fix ETWOTWO-1117: Misleading exceptions reported during AVM flatten and update
13102: [no comment]
13112: Merged V3.0 to V3.1
13111: Merged V2.2 to V3.0
13110: Fix 2.1 -> 2.2 upgrade on Postgres
13114: Build/test fix (Enterprise Remote API project does not yet have any Java files to generate Javadoc)
13117: DM Index Check - unit test improvements
13123: *RECORD ONLY* Removed svn:mergeinfo fluff
13124: Used newer, more efficient NodeService.addProperties method instead of many NodeService.setProperty calls
13125: Added M2Binding for 'child-association': propagateTimestamps'
13126: WCM unit tests - reduce build/test time to check (async) submits
13127: Minor test fix - to allow it to run locally (on Mac OS X)
13130: Support for 'maxRetries' of zero or less
13131: Merged V3.0 to V3.1
13025 *RECORD-ONLY*: Removed unnecessary svn:mergeinfo
13026: Merged V2.2 to V3.0
12964: Fixed ETWOTWO-968: Space rules are not run when saving from MS Word
12993 *RECORD-ONLY*: added openoffice bootstrap context to sample-extensions
13009 *RECORD-ONLY*: Avoid default OOo config from causing problems on zip/gz installs
13132: Updated svn:mergeinfo
13134: ETHREEOH-1202 - initial fix and unit tests
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r13005,13025-13026,13030,13039,13042,13050,13053,13096,13098,13111
Merged /alfresco/BRANCHES/V2.2:r12964,12993,13009,13071,13079,13110
Merged /alfresco/BRANCHES/V3.1:r13077,13099,13102,13112,13114,13117,13123-13127,13130-13132,13134
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12513 Implementation of Asset.getProperties
12469 Implement paths relative to web app. And unit tests. Asset Test is now clean of TODOs.
12413 Implementation of WCM Asset. Still work remaining but this is 80% of the implementation.
12404 WCM Services
- asset service - fix rename/move folder issue (folders are not locked)
- sandbox service - fix delete sandbox test
12374 WCM Services - optimise get/is web project
12347 WCM Services - "asset service" - add/remove/has aspect, get aspects
12341 WCM Services - "asset service" checkpoint (locking fixes, bulk import, more tests added)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261