17332: ETHREEOH-2020: Original tag disappears after a new one has been added to a wiki page
17711: Fix ETHREEOH-3720 - blocker (upgrade from 2.x)
17712: Build/test fix (FeedCleanerTest.testConcurrentAccessAndRemoval)
17726: DownloadContentServlet wraps call in read-only RetryingTransactionHelper
17736: Fix ETHREEOH-2821 - deployment of layered file (fix for 3.2 deployment)
17745: Fixed broken PostgreSQL (AVM, audit, etc) and Oracle (audit)
17746: Merged V3.1 to V3.2
17290: Merged V2.2 to V3.1
17282: (record-only) Fix for ETWOTWO-1387: Node deletions transactions not properly detected ...
17381: (record-only) Putting explicit version name on PDFRenderer.jar
17413: (record-only) Removed dev from label
17749: Type handler fixes for PostgreSQL: Use LONGVARBINARY
17750: Fixed propval mappings for DB2
17754: Fixed "invalid character" in Oracle port of propval
17757: Re-added fix for ETHREEOH-2789 that got lost in a merge.
17762: Fix FeedCleanerTest (for Oracle 10g) + exposed feed cleaner issue (maxSize)
17765: Assorted minor build fixes for Oracle
17767: Empty String property values are persisted as '.empty'
17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2
17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch
17772: Fix build (JBPMEngineUnitTest) - fallout from r17765
17774: Fix JSONtoFmModelTest
17781: Build/test fix (AVMCrawlTestP)
17791: Fix for ETHREEOH-3793: Oracle unit test failure for JobLockServiceTest - Missing unique indexes for all DB ports
17795: ETHREEOH-3696: Attempt to navigate into any existent web-project or create new one after upgrade from Enterprise 2.1.7 ...
17799: ETHREEOH-3796: org.alfresco.repo.importer.ImporterComponentTest fails
17807: Fix ETHREEOH-3723 - MT blocker (can't restart)
17816: Merged DEV/BELARUS/V3.2-2009_12_15 to V3.2
17814: ETHREEOH-3808: Upgrade fails if content cm:name contains curly brackets ('{}')
17822: Fix for ETHREEOH-3828: Mistake porting AlfrescoPostCreate-3.2-PropertyValueTables.sql script to mssql dialect
17823: Fix for ETHREEOH-3829: SQLServer index limit reached for 'idx_alf_props_str'
17831: Fix ETHREEOH-3818 - upgrade from Community 3.2r2 to Enterprise 3.2
17862: Merged V3.1 to V3.2
17722: Fix ETHREEOH-3643 - WCM layered folders (flatten) - also add unit test
17835: ETHREEOH-3763 - fix for WCM layered folders - also add unit test
17871: Merged V3.1 to V3.2
17855: ACT 12915 - create web project performance (-> setPermission -> buildIndirections)
17863: ETHREEOH-3852 - perf tweak (WCM layered files)
-------------------------------------
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_24:r17758
Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_12_15:r17814
Merged /alfresco/BRANCHES/V2.2:r17282
Merged /alfresco/BRANCHES/V3.1:r17290,17381,17413,17722,17835,17855,17863
Merged /alfresco/BRANCHES/V3.2:r17332,17711-17712,17726,17736,17745-17746,17749-17750,17754,17757,17762,17765,17767-17768,17772,17774,17781,17791,17795,17799,17807,17816,17822-17823,17831,17862,17871
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17363: Fix to DbNodeServiceImple to allow restored nodes.
17384: Minor comments
17451: Fix ETHREEOH-2751 / ETWOONE-340 - specialising a node through an action doesn't set default values from model
17459: ETHREEOH-2391 - Invite pending task now has lots of properties
17465: Repo side fix for ETHREEOH-3010: Inbound and outbound Mltext multiple property are not converted correctly
17478: Fix ETHREEOH-3340 - WCM - Revert to snapshot failure (fix AVM getListing -> AVNSync compare -> WCM revertSnapshot)
17483: (record only) Merged V3.1 to V3.2 (record-only)
17482: (record-only) due to earlier back-merge
17493: Fix for ETHREEOH-3342: index.recovery.mode example is incorrect
17494: Fix for ETHREEOH-3027: missingFullTextReindexTrigger (from index-recovery-context.xml) job does not work.
17510: Fix for ETHREEOH-1147: Indexing large indices can lead to Java Heap space.
17511: Fix for ETHREEOH-1271: It is possible to add one category more than one time to the same content or space
17513: ETHREEOH_3366: Altered DictionaryDAOImpl so that passing a null QName into getType and getAspect does not result in an NPE
17531: ETHREEOH-1186: Corrected rssfeed.get.js so a user can configure a RSS Feed dashlet that has been placed on their own dashboard
17550: ETHREEOH-2317: Rule not fired when document has no content
17556: Fixed ETHREEOH-1229: Can't delete space that contains "translation without content"
17558: Fix for ETHREEOH-3356: Forms fail to persist if property or association name has an _ (underscore) in it
17572: Changed caching of person NodeRefs so that duplicates are detected better
17573: Fixed UTF-8 for file with encoded chars
17576: LockAcquisitionException message specific to failed release of taken-over lock
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.2:r17363,17384,17451,17459,17465,17478,17483,17493-17494,17510-17511,17513,17531,17550,17556,17558,17572-17573,17576
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18140 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
15596: Merged V3.1 to V3.2
14017: Fix ETHREEOH-1880 - remove (double-)reverse of WCM staging snapshot order
14112: Fix ETHREEOH-1758 - apply contributed patch
14447: Merged V2.2 to V3.1
14276: ETWOTWO-1224 / WCM-948 - browsing staging area during (commit of) large submit can cause AVMNotFoundException: Path /www/avm_webapps not found.
14452: Add WCM services-based unit test for ETWOTWO-1224 / WCM-948
14589: ETHREEOH-1646 - User Sandboxes aren't visible for Content Publisher
15604: Merged V3.1 to V3.2
14734: Merged V2.2 to V3.1
14718: ETWOTWO-1244 - unable to revert some snapshots ("Does not exist: xxx")
14852: Merged V2.2 to V3.1
14720: ETWOTWO-1183 - "Show All Sandboxes" checkbox should only be visible for "Content Publisher" or "Content Manager"
15032: Fix ETHREEOH-2240 - delete WCM web project (does not clean-up workflow sandboxes and also appears in archive store)
15037: Fix ETHREEOH-2240 - follow-on for Alfresco Explorer's Manage (Review) Task Dialog
15056: Fix ETHREEOH-2297 - WCM layered folder - problem deleting file
15072: Minor - fix remote AVM test
15605: Merged V3.1 to V3.2
15082: Merged V2.2 to V3.1
15081: AVM - add tests only
15083: Fix ETHREEOH-2296 - user conflict when updating an AVM layered file
15118: Merged V2.2 to V3.1
15115: Fix ETWOTWO-1265 - WCM locking not working as expected (+ add WCM services test)
15137: Fix ETHREEOH-2309 and ETHREEOH-227 - including refactor (& clean-up) of WCM-related actions
15156: Fix ETHREEOH-2078 & ETHREEOH-2040 - WCM - deploy to localhost causes "Must have at least one store" errors
15175: Fix ETHREEOH-2309 and ETHREEOH-227 - further clean-up of WCM submit/undo actions (for consistency)
15190: Minor: message updates for WCM submit/undo actions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16858 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
10953: Merged V2.1 to V2.2
10904: AVM - add test suite wrapper, update existing tests to purge test stores (rather than all stores)
10909: AVM - unit test updates only (exposed further tests via test suite)
10947: AVM - unit test update only (extra checks)
10969: Merged V2.1 to V2.2 (cont)
10904: AVM - add test suite wrapper, update existing tests to purge test stores (rather than all stores)
11054: Fixed blind failures in AVM unit tests
11064: AVM - unit test error handling
11068: Temporarily remove AvmTestSuite from the build
11074: AVM - unit tests - added error stack on concurrency tests (to show failure in build output), removed 1 hour freeze, put back AVM test suite
11218: Merged V2.1 to V2.2
11217: AVM - unit test fix ("n must be positive")
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11224 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
