19177: (RECORD ONLY) Updated record-only entries for V3.1 branch
19321: (RECORD ONLY) Removed deep svn:mergeinfo
19331: (RECORD ONLY) Merged HEAD to BRANCHES/V3.2:
19324: Follow-up on ALF-765 by upgrading EHCache to 2.0.0Performing merge across the whole of the branch
19526: Moved ContentServicePolicy static QNames onto policy classes
19539: (RECORD ONLY) Merged HEAD to V3.2
19538: Build fix - fix build speed
19541: Added extraction of custom, mapped metadata from PDF documents
19543: (RECORD ONLY) Removed deep svn:mergeinfo
19598: (RECORD ONLY) Backported (merge not possible) HEAD rev 18790 for IndexInfo fixes
19626: Fix for ALF-732: Possible memory leak using the .getNodeRefs() method against a ResultSet ...
19629: (RECORD ONLY) Merged HEAD to V3.2
19625: Fix to allow Share logo to swapped out for a different one without having to modify the header CSS.
19628: Corrected Share header component height.
19649: ALF-885: Cannot retrieve cm:title from an AVM node in FreeMarker (if persisted with actual type set to MLText)
19694: (RECORD ONLY) Merged V3.2 to HEAD: r19310 bad back merge - record-only
19713: (RECORD ONLY) Removed svn:mergeinfo
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19719 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
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5141 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@51352 .
- FLOSS
- Some files will need a follow-up
-root/projects/repository/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java (not yet on HEAD: 5094)
-root/projects/repository/source/java/org/alfresco/filesys/server/state/FileStateLockManager.java (not yet on HEAD: 5093)
-onContentUpdateRecord (not on HEAD)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- expects .msg files in native Outlook format
- uses POI library for the parsing of the horrid OLE2 compound document format
- extracts addressee(s), sent date and originator email address
...for the future - could be modified and used as a transformer to allow full-text indexing of Outlook format emails
. Add new aspect "emailed" to the contentmodel to support properties for above extractor
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- added new aspect called "cm:author" with a single text property "cm:author"
- fixed the content meta-data extractors to set the new cm:author property rather than the system cm:creator property (which was causing a couple of bugs spotted recently)
- fixed the web-client to set the new cm:author property rather than the cm:creator property from user entered data into the UI
- fixed web-client config of document properties screen to display cm:author
- fixed client to not allow editing of the cm:creator value
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
