15341: Update svn:mergeinfo
15220: NestedSQLException containing causal exceptions with word "deadlock" will trigger a retry
Added "constraint" search as part of the merge
15565: Update svn:mergeinfo
15569: Merge 3.1 to 3.2:
15231: Fix for cut/paste file between folders on CIFS. ETHREEOH-2323, + ENH-515. (Record only)
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r14561-14562,14922,15155,15233-15234,15258,15326
Merged /alfresco/BRANCHES/V3.2:r15231,15341,15520,15565,15569
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16857 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
15471: MOB-279: Heartbeat now uses destination URL embedded in the license (if present) and also sends the following new parameters
- memFree
- memMax
- memTotal
- numUsers (this was there already)
- numGroups
- repoName
15349: Merged V3.1 to V3.2
15348: Fix ImportTest following fix to ETHREEOH-2219
15344: Merged V3.1 to V3.2
15339: ETHREEOH-2219: Give ImporterBootstrap its own retrying transaction helper with specific parameters tuned to its longer-running setup transaction. Should avoid startup errors on clustered installations.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16856 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
15154: Performance optimization for AuthorityDAO - based on 3.1E Share use case analysis.
- improves performance for create, find and general get of authorities via the DAO
- also potentially improves LDAP import etc. - anything that goes via Zones
- takes 3.2E performance ahead of 3.1E performance for Share use case (20,000 user and 2,000 site DB upgraded from 3.1.1E)
15447: Static asset web filter added to web.xml for Explorer client and Share webapp.
- Adds a 30 day public cache expiry header (configurable) to all static assets for performance and proxy usage
- Also prevents browsers such as IE causing conditional GET requests for images etc. on restart of the browser
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16846 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- KEYWORDS macro changed to keywords
- Added macros without cm: namespace for common cm attributes
- Added macros without recordSearch prefix for search roll-up attributes
- Made rma default search namespace so say "originator:someone" will work rather than "rma:originator:someone"
- Fix to minor UI issues when empty results shown
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16631: Merged HEAD to V3.2 (record only)
16623: MOB-1665 (part one): HibernateNodeDaoServiceImpl must flush before calls to iBatis contentDataDAO to avoid 'content data leaks'
16585: Correction to IndexReader reference counting
- Handling of the first reader in the chain
16577: Fixed IndexReader reference counting issues introduced by move to Lucene v2.4.1
- Problem manifested itself in IndexReaders never being closed and deleteableReaders queue growing infeasibly large
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Transactional caches were flushing last in the post-commit phase
- New transactions in the post-commit phase would see cache data out of synch with the DB-committed data
- Affects DOD5015 post-commit audit actions, which were not generating full datasets for the first-pass data import
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16627 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
- Added marker data extractor to record the presence of a key in the audit data
- AuditMethodInterceptor applies a marker key in the case of success (failure already has a key)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16519 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- This will pull back the correct number if you request less than the total number of audit entries
- TODO: You can still get N-1 entries if you request more than the total number of entries
- TODO: Reverse order of limited queries (last N)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16518 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Two new repo properties to control auditing:
audit.enabled=false
audit.useNewConfig=false
- Auditing was enabled by default, but it is not enabled any more!
The property has to be set in alfresco-global.properties
- Unit tests for auditing successful and failed authentication attempts
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16496 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Ensure uniqueness across any three (incl. null) Serializable values
- Required to support RM rma:identifier contextual uniqueness
DB Update for MySQL:
drop table if exists alf_prop_unique_ctx;
CREATE TABLE alf_prop_unique_ctx
(
id BIGINT NOT NULL AUTO_INCREMENT,
version SMALLINT NOT NULL,
value1_prop_id BIGINT NOT NULL,
value2_prop_id BIGINT NOT NULL,
value3_prop_id BIGINT NOT NULL,
UNIQUE INDEX idx_alf_prop_unique_ctx (value1_prop_id, value2_prop_id, value3_prop_id),
CONSTRAINT fk_alf_prop_unique_ctx_1 FOREIGN KEY (value1_prop_id) REFERENCES alf_prop_value (id) ON DELETE CASCADE,
CONSTRAINT fk_alf_prop_unique_ctx_2 FOREIGN KEY (value2_prop_id) REFERENCES alf_prop_value (id) ON DELETE CASCADE,
CONSTRAINT fk_alf_prop_unique_ctx_3 FOREIGN KEY (value3_prop_id) REFERENCES alf_prop_value (id) ON DELETE CASCADE,
PRIMARY KEY (id)
);
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16417 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
