23368: Merged V3.3-BUG-FIX to V3.4
23363: Merged V3.3 to V3.3-BUG-FIX
23358: (RECORD ONLY) Removed redundant svn:mergeinfo
23359: Minor I18N fix on patch.updateMimetypes2
23360: Fixed ALF-3167: Websphere/Db2 SchemaBootstrap.dumpSchema is failing due to result set is closed error
- SchemaDump uses nested resultset reads, which is incompatible with SchemaBootstrap's auto-commit connection
- Also pull back some changes to fix MySQL builds after MySQL upgrades
23361: More patch I18N
23362: Merged V3.2 to V3.3
23333: Fixed ALF-5396: Missing FK indexes on non-MySQL databases
23324: Fixed ALF-5396: Missing FK indexes on non-MySQL databases
- Create scripts were manually ported and required full clean-install testing in addition to upgrade testing
23372: Fixed ALF-5421: update_ChildAssocsIndex ibatis statement does not include child_node_id
23523: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
23490: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
23470: Merged V3.2 to V3.3
23395: Merged BRANCHES/DEV/BELARUS/HEAD_2010_09_21 to V32
22821: ALF-4203: WCM 2.2.7 case-sensitivity causes errors after upgrade to 3.2.x.
23055: ALF-4203: WCM 2.2.7 case-sensitivity causes errors after upgrade to 3.2.x (record-only, used only part of this checkin).
23198: ALF-4203: WCM 2.2.7 case-sensitivity causes errors after upgrade to 3.2.x.
23398: ALF-4203: fix for "WCM 2.2.7 case-senstivity causes err rs after upgrade to 3.2.x"
- updated template for patch.eliminateDuplicates
23433: Fix for ALF-4203: "WCM 2.2.7 case-sensitivity causes errors after upgrade to 3.2.x"
- revised fix
23752: Fixed ALF-5453: Remove old Audit tables from schema create scripts
23957: Fixed ALF-5308: SQL error when changing name for record / folder with dispostion schedule applied
24250: Fix typo in original fix of ALF-5308 and add unit test
24345: Merged V3.3 to V3.4
24337: Fixed ALF-6078: WCM: alf_lock table version number fails during roll-over.
- Added specific, minor fixes for 3.4
24352: Fix SQL fallout from ALF-6078
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24354 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
15422: Fix deploy-virtual-tomcat macro for Spring 3
15391: Fix ContentStoreReplicatorTest for Spring 3
15390: Upgrade CXF to version 2.2.2 for Spring 3 compatibility
15385: Correction to previous checkin
15384: Fix ClassPathStore.createRelative() to work with Spring 3
- Relative resource path resolution with directory resources has changed
15346: Merged V3.3_SPRING3 to SPRING3
15310: Spring 3: Change to the way that FileContentStore broadcasts its existence to interested parties (for enterprise-only monitoring)
- Introduced new SafeEventPublisher singleton that queues up events until after the application context has finished refreshing
15309: Use AUTODETECT_NONE auto detect mode for JMX exporters to be compatible with Spring 3
15308: Fix IBATIS integration to be compatible with Spring 3
15307: Added missing runtime dependencies
- org.springframework.expression-3.0.0.RC2.jar
- org.springframework.asm-3.0.0.RC2.jar
15289: Move Alfresco stack to Spring 3
- Stage 1: get it compiling in eclipse and update ant scripts
- Still requires Web Framework contributions from Uzi
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17624 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
13037: PostgreSQL upgrade scripts from 2.1.6, 2.2.0, and 2.2.1
12995: Fix build: account for change of path to log4j jar in 3rd party project
12981: Added support for monitoring of installed modules via JMX
12971: Correction to 12970 - better handle case when log4j not available.
12970: Work around log4j bug to allow editing of the "threshold" property of HierarchyDynamicBean through JMX
12926: Merged V3.0 to V3.1
Merged V2.2 to V3.0
12861: ETHREEOH-19, ETHREEOH-24, ETHREEOH-113, ETHREEOH-115, ETHREEOH-449, ETHREEOH-537, ETHREEOH-561, ETHREEOH-566, ETHREEOH-572, ETHREEOH-1072: Retry failed transactions from MS SQL Server in snapshot mode
12924: Avoid direct log4j dependencies
12918: Avoided Log4J imports by using introspection
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
11557: ETHREEOH-666 - Consumers should not be able to create calendar entries. ETHREEOH-667 - Consumers should not be able to create/update wiki pages.
11559: Command line utility to help with schema comparisons and upgrades
11560: Fixed: ETHREEOH-518 Unfriendly error for "Create Site" when session has timed out. Fixed: IE7 prompt and messages now looks ok.
11563: Need to add connection strings and hibernate dialect examples. Fixes ETHREEOH-445
11565: Fixed ETHREEOH-538: Only support AlfrescoOracle9Dialect
11566: Discussions "Said" changed to "said" plus missing space inserted
11569: Fix for ETHREEOH-12 and ETHREEOH-592.
11572: Skip unit tests when usage monitoring is disabled
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
