17620: Merged DEV_TEMPORARY to V3.2
17599: Fix for ETHREEOH-3308: xf:switch cannot be used in repeating field type
17634: Put back AVM concurrency checks (reverse r17405)
17644: Fixed up some comments and added return value to in-txn recording of deleted nodes
17647: Fixed read-only detection of ContentStoreCleaner
17648: Merged DEV fixes for ETHREEOH-3473 and ETHREEOH-3454 - DB script and iBatis-related changes
17649: Fixed problem after merge-in: ETHREEOH-3641: build 270: cannot install on PostgreSQL
17652: Fix ETHREEOH-3376 - Reindexer failure: requires rollback (Cluster)
17658: Removed failing concurrency test for split person cleanup
17659: Merged V3.1 to V3.2
17308: Fixed ETHREEOH-2310: Upgrade from 2.1 E Sp7 to 3.1.1 E build 225 - Duplicate alf_node_status entries detected
Fixes ETHREEOH-3606 (same as CHK-10454)
17661: Fixed DB2 iBatis problems related to http://issues.apache.org/jira/browse/IBATIS-536
17666: ETHREEOH-3376 / ETHREEOH-3637 - reindexer failure in a cluster (dictionary repo bootstrap)
17678: Follow-on to r17666 (for RM custom model)
17685: Merged DEV_TEMPORARY to V3.2
17676: ETHREEOH-3187: Creating Web Content based on Web Form with most elements-read-only/default failed
17695: Temporarily comment-out testSubmitChangedAssets1
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_24:r17632,17636,17676
Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_09:r17599
Merged /alfresco/BRANCHES/V3.1:r17308
Merged /alfresco/BRANCHES/V3.2:r17620,17634,17644,17647-17649,17652,17658-17659,17661,17666,17678,17685,17695
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18165 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17574: Merged in DEV work for ContentStoreCleaner: ETHREEOH-2813
17432: Build up for fix of ETHREEOH-2813: ContentStoreCleaner doesn't scale
17546: ContentStoreCleaner fixes and further tests
17524: Unit tests and bulk queries for orphaned content
17506: W.I.P. for content cleaner for V3.2: ETHREEOH-2813
17575: Missed check-in (other DB create scripts look OK)
17577: Re-activated 'contentStoreCleanerTrigger'
- Added system property: system.content.orphanCleanup.cronExpression=0 0 4 * * ?
- Other useful properties:
system.content.eagerOrphanCleanup=false
system.content.orphanProtectDays=14
17578: Fixed MT test and sample contexts after recent content cleaner changes
17579: Fixed DB2 unique index creation for content URLs
17580: First pass at fix for ETHREEOH-3454: Port enterprise upgrade scripts for ContentStoreCleaner changes
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.2:r17574-17575,17577-17580
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18151 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17502: Merged V3.1 to V3.2 (Fixes ETHREEOH-3155 & ETHREEOH-2653)
17501: Merged V2.2 to V3.1
17358: Improved debugging in Schema2XForms utility to help with resolving of repeating switch support for ETWOTWO-490
17488: Fix for ETWOTWO-1006: xforms.js DEBUG output can cause performance issues with web forms
17491: More XForms debugging improvements
17503: Failover content transformer
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.2:r17358,17488,17491
Merged /alfresco/BRANCHES/V3.1:r17501
Merged /alfresco/BRANCHES/V3.2:r17502-17503
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18146 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17385: Minor performance tweaks and code cleanup/consolidation in SiteServiceImpl.
17386: ETHREEOH-3066 Added supporting logging
17387: Minor javadoc updates pertinent to the FreeMarker API chapter updates.
17392: Fix to unreported issue in User Profile where a recent fix incorrectly encoding javascript values as ?html.
- values passed into JS components in FreeMarker template should use ?js_string operator - not the ?html operator.
17399: ETHREEOH-3269, ETHREEOH-3271 - Dropdown markup changed for keyboard access
17400: ETHREEOH-3278 - Navigator is very wide
17401: Concatenate DocLib JavaScript files
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17294: Fix for ETHREEOH-3194 - It's impossible to find Blogs and Discussions by title.
17301: Activity Service fixes (ETHREEOH-1362 & ETHREEOH-1741)
17302: Fix for ETHREEOH-2849 JPG to GIF transformation fails when using imagemagick cmd line options listed in our wiki
17305: AVM - fix AVMStoreDescriptor ( creator/createDate) returned by getStores
17306: Fix for ETHREEOH-1578 - Incorrect behavior of Calendar in Month view ...
17318: Merged V3.1 to V3.2
17317: Fix for ETHREEOH-3236 It is impossible to change start location, everything is reverted to My Alfresco
17320: Merged V3.1 to V3.2
17287 - Fix for ETHREEOH-110- It is impossible to browse events by tags
17326: iBatis mapping fixes for AVM on Oracle (including ETHREEOH-3205)
17327: Merged V3.1 to V3.2
17324: Fix for ETHREEOH-2723 Script error appears when trying to edit Home Space Name for user
17329: Merged V3.1 to V3.2
17180: Merged V2.2 to V3.1
17164: Fixes for deletion of large hierarchies: (ETHREEOH-2161 and ETHREEOH-2650)
17179: (RECORD ONLY) Merged V3.1 to V2.2 ...
17330: Fix for SiteActivityTest failure (caused by earlier -ve test data)
17331: Merged V3.1 to V3.2
17190: Further fixes for ETHREEOH-2161: Delete process hangs when deleting large directory structure (with rules applied)
17207: Fix fallout from work on ETHREEOH-2161: Delete process hangs when deleting large directory structure (with rules applied)
17215: Added back firing of policies for archive stores
17351: Build fix check in to DBNodeService. Will be followed by full fix when available.
17353: Applied TransactionListenerAdapter
___________________________________________________________________
Modified: svn:mergeinfo
Reverse-merged /alfresco/BRANCHES/V3.1:r13091
Merged /alfresco/BRANCHES/V2.2:r13089,13091,14190-14191,14199,14210,14216,14229,14655,14825,14869,17164,17179
Merged /alfresco/BRANCHES/V3.1:r17180,17190,17207,17215,17287,17317,17324
Merged /alfresco/BRANCHES/V3.2:r17294,17301-17302,17305-17306,17318,17320,17326-17327,17329-17331,17351,17353
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18056 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
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
16971: Merged V3.1 to V3.2
14282: (RECORD ONLY) Updated version to 3.1.1
14565: (RECORD ONLY) Updated version to include revision number (x.y.z)
14848: (RECORD ONLY) Updated version number
15029: (RECORD ONLY) ETHREEOH-441 and ETHREEOH-1862 Exceptions in server when certain PDFs are uploaded.
- Probably done already without merge info
- Renamed source zip to help tracking
15985: ETHREEOH-2292: Deployment failure in case of IPv6 on Win 2k8
16164: Fixed ETHREEOH-2690: JGroups TCP doesn't bind to specified address
16240: (RECORD ONLY) Fix typos in installer
16726: Fix ETHREEOH-2677 - user usages (when taking ownership)
16745: Fix ETHREEOH-2991 - Deployment exception, unable to deploy - when deploying a manual snapshot with a stale file
16771: (RECORD ONLY) Fix to ETHREEOH-441
- Probably merged without merge info
16822: Merged DEV/BELARUS/V3.1 to V3.1
16753: ETHREEOH-1951: when versionable aspect is active, using the Microsoft Word option ...
16825: Fixed ETHREEOH-803: Incorrect mimetype is displayed for .pps and .pot files
16862: Fix for ETHREEOH-801 Fail to extract some kind of PDF file metadata
- Resolved merge by prefering merged-in fix
16880: Merged V2.2 to V3.1
13966: (record only) Updated to use ALF-BINARIES version of installjammer
14340: (record only) Fix so deployment installers build
14719: (record only) Tweaks to AMP
15153: (record only) Fix ETWOTWO-1264 - PHP integration
15287: Fixed ETWOTWO-989: MS Sql server upgrade from 2.1.6 failed
15351: ETWOTWO-1345 (script not matching patch ID)
16928: Fixed shutdown: Task threads are now daemon threads
16986: Merged V3.1 to V3.2
16932: Moved Lucene ResultSet prefetch code to use NodeBulkLoader (backed by common code in Node DAO)
16945: (RECORD ONLY) Merged V3.2 to V3.1
16931: Fixed build unit test path for recent Chiba lib change
16957: Removed Hibernate event listener after 3.2.3 CGLib fixes
16959: Applied fix for ETHREEOH-2121: ContentUtils.getContentAsString does not pass JSESSIONID into the request
16961: (RECORD ONLY) Updated db settings in configs
16964: (RECORD ONLY) Merged V3.2 to V3.1
16308: ETHREEOH-2833: The Content rule with 'Items with specific text value in property' condition can't be created.
16968: Fixed ETHREEOH-2120: Recently Modified Documents Dashlet failed to load after a big upload
16983: Build fix: avoid queries for parent assocs if no nodes were found during child node in caching
16991: Merge V3.1 to V3.2
15136: (RECORD ONLY) : changes have already been merged.
MERGE 2.2 to 3.1
14985 - ETWOTWO-1174 - Preview of protected PDFs results in an error
14305 - ETWOTWO-951 - contribution
14601 - ETWOTWO-1236 - Make FSR deployment case sensitive.
17022: MT - fix fallout from r16924 - add inbound collection support to MT node service interceptor (caught by MultiTDemoTest.testCreateGroups)
17023: Fixed parentAssocCache bug when adding assocs against an empty cache
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17025 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
15608: Merged V3.1 to V3.2
14111: MT - fix ETHREEOH-914 (tenant domain mismatch in getting workflow pooled tasks)
14855: MT - minor fix to result set (for tenant-based parent nodeRef)
14865: MT - continuation fix for ETHREEOH-210 (Lucene search with QNAME)
15108: Fix ETHREEOH-2014 - custom folder's children disappear after full re-index (MT w/ dynamic model)
15146: Fix ETHREEOH-2452 - Cluster & MT: "Unable to find a writer. 'selectWriteStore' may not return null" ...
15610: Merged V3.1 to V3.2
15175: Cont ... fixup merge (delete file)
16308: ETHREEOH-2833: The Content rule with 'Items with specific text value in property' condition can't be created.
16334: (record only) Undo change of version.properties
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r14111,14855,14865,15108,15146
Merged /alfresco/BRANCHES/V3.2:r15608,15610,16308,16334
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16871 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
15200: Fixed ETHREEOH-2480: Cannot upload files with .doc extension owing to exception from ContentMetadataExtracter
15203: ETHREEOH-2246: Rework patch.authorityMigration to be more performant and report progress
15254: ETHREEOH-2339: Fixed NullPointerException when editing LDAP-synced user who doesn't have an email address
15267: Applied patch for ETHREEOH-1448: Exception when using the move up/down button when editting a web form
15270: Mereg (sic) - Record only 15238
15285: Merged V3.1 to V3.2
15281: Merged V2.2 to V3.1
15280: Absorb all metadata exceptions at all levels
15282: Merged V2.2 to V3.1
15273: Merged V3.2 to V2.2
15200: Fixed ETHREEOH-2480: Cannot upload files with .doc extension owing to exception from ContentMetadataExtracter
-------------------------
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.2:r15273,15280
Merged /alfresco/BRANCHES/V3.1:r15281-15282
Merged /alfresco/BRANCHES/V3.2:r15200,15203,15254,15267,15270,15285
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16854 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Content move is now done in a post-commit phase because rollback is not possible on content stores
- Added unit tests for case
- Added onAddAspect handling to detect auto-addition of aspect
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14380 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Some collapsing of common code in Constraint hierarchy.
- Added aspect 'cm:storeSelector' with property 'cm:storeName'.
- Defined a new, unused content store 'storeSelectorContentStore' (see content-services-context.xml).
If this store is used, then setting the 'cm:storeName' property will force content to be stored in one
of the named stores. A LIST constraint is indirectly enforced for the 'cm:storeName' property.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14329 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Update xstream library to v1.2.2 to be compatible with IBM JDK
- Custom patch to truexml-1_29.jar to enable free trial period license to work on IBM JDK
- Bugfix FileContentStore so that it doesn't respond to refresh events sent by child application contexts
- Fixes to web.xml: data source now Unshareable and all empty env entries now of type java.lang.String
- Share fix: webframework.classpathstore.contentassociation and webframework.classpathstore.pageassociation class path stores now have mustExist = false, because Websphere doesn't unzip empty directories
- Addition of META-INF/ibmconfig directory to alfresco-enterprise.ear so that it can be installed on Websphere with classloading set up automatically
- Additional artefact generated by the continuous build: myfaces1_1-websphere-shared-lib.zip - unzips to $WAS_INSTALL_ROOT to provide myfaces 1.1 shared library referenced by .ear file
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14278 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- All supporting classes moved out to thirdparty subsystem
- Open Office service automatically started if available
- All utility locations editable via JMX (and subsystem can be reinitialized with new values without rebooting tomcat)
- New ContentTransformerWorker interface introduced in order to allow separation between ContentTransformer registry and third party utilities
- Existing JMX query capabilities preserved
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13860 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13323: *RECORD-ONLY* Enterprise branding (ETHREEOH-1352 - Community logo in Enterprise version) - DO NOT MERGE
13325: ETHREEOH-102/ETHREEOH-981 - Thumbnail service doesn't support animated GIFs and no placeholder returned
13329: ETHREEOH-1417 - Clicking "Create Link" button in Site Links dashlet opens user's dashboard in IE7
13340: Fix for TinyMCE image-library button image not appearing in all browsers
13379: Wiki dashlet - added link to configured wiki page
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13597 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
