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
15151: IndexCheckServiceImplTest - build/test fix (ent-only)
15152: Formatting-only
15360: Fix for ETHREEOH-2567: Index check includes nodes in the unindexed version store - these should be excluded
15630: Merged V3.1 to V3.2
14424: Fix build/test - indexing of version store(s) is disabled
14438: Fix index check (related to ETHREEOH-1832 - disable indexing of version2Store)
14526: ETHREEOH-1759 - fix getVersion (affects IBM JVM => WebSphere)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16592 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13625: Fix ETHREEOH-1644
13634: Merged V2.2 to V3.1
13632: Preparation for fix of ETHREEOH-1663: ML Document Editions Broken by Upgrade to 3.1
13636: Fixed ETHREEOH-1663: ML Document Editions Broken by Upgrade to 3.1
13638: Fixed ETHREEOH-1665: Copy/pasting a Specialised Folder changes the assoc qname
13639: Fixed ETHREEOH-1663: ML Document Editions Broken by Upgrade to 3.1
13640: Fixed ETHREEOH-1672: Manage Multilingual Content JSP breaks when viewing all Related Content
13641: Fixed ETHREEOH-1657: Manage Multilingual Content fails with NPE when document was previously versionable
13774: Fix for ETHREEOH-1629
13775: Fix for ETHREEOH-1645
13784: SchemaBootstrap now auto-generates a mostly-canonical schema description on new DB and on upgrades
13804: Added option to finish schema bootstrap, dump schema structure and exit
13807: Further pretty formatting of schema dump
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.2:r13632
Merged /alfresco/BRANCHES/V3.1:r13625,13634,13636,13638-13641,13774-13775,13784,13804,13807
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13912 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13424: ETHREEOH-1242: Sample LDAP authentication config breaks site invites in Share
13427: Fixes for ETHREEOH-1157: Propagate exceptions using ReportedException
13428: Fix ETHREEOH-1493: Upgrade from 2.1-A to 3.1 uses incorrect patch id and fixes_to_schema
13429: Specific fix for ETHREEOH-1157: duplicate/triplicate users not properly prohibited
13436: Merged V2.2 to V3.1
13435: Merged V2.1 to V2.2
12307: Merged DEV/V2.1SP7 to 2.1
11927: ETWOONE-396
12112: ETWOONE-396
13437: Fixed ETHREEOH-1498: Mismatched closing XML tag in ehcache-custom.xml.sample.cluster
13439: Fix for ETHREEOH-1157: JSF Dialogs Absorbing Exceptions
13456: Fixed ETHREEOH-1472: Changes to systemBootstrap cause bootstrapping ACP's not to work
13469: Upgrade patch to update internal version2Store counter (follow-on fix for ETHREEOH-1540)
13491: Chaining example for DOC-84
13492: Fixed paths in zip file
13494: Fixed GenericBootstrapPatch when overriding bootstrap views
13495: Added @version javadoc
13496: Minor logging updates
13497: Fixed ETHREEOH-1431: Authentication case sensitivity switch doesn't work
13500: Temporary fix for Sharepoint issue raised last week
13502: ETHREEOH-1575: It's impossible to create Change Request task
13511: Fix for ETHREEOH-1549: Impossible to create HTML web content
13529: Fix for ETHREEOH-1595
13531: Fix for ETHREEOH-1607: Error on chaining example xml - malformed comment
13537: Build fix ... exclude the system user from auto creation
13538: Build Fix - further contraints to aviod auto-creation of guest
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1:r12307
Merged /alfresco/BRANCHES/V2.2:r13435
Merged /alfresco/BRANCHES/V3.1:r
13424,13427-13429,13436-13437,13439,13442-13450,13452,13454-13456,
13469-13473,13475-13476,13479-13480,13491-13500,13502,13511,13529-13538
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
