This included some overrides of getParamDisplayLabel() in the RenditionService classes to support i18n key-value pairs which are common across many rendering engines.
These actions and their parameters have been hidden by Erik in the default Alfresco config. The changes contained in this check-in mean that 3rd parties could show these actions and parameters and see useful labels.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20009 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- modified repository checkin to take into account name change on pwc (if it's changed, the checkin will rename the original)
- updated coci unit tests
- performed alfresco explorer tests
- updated Chemistry TCK to re-enable update of name on checkin test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
19614: ALF-1890: Merged V2.2 to V3.2
17709: Merged DEV_TEMPORARY to V2.2
17700: ETWOTWO-1393: concurrent writes to webdav lead to data loss (0kb resulting file)
19613: Merged DEV/BELARUS/V2.2-2010_02_03 to V2.2
19157: ALF-1890: concurrent writes to webdav lead to data loss (0kb resulting file)
19562: Merged DEV/BELARUS/V3.2-2010_02_24 to V3.2
19244: ALF-1816: Email templates can no longer be selected when creating a rule for the action 'Send email to specified users' following an upgrade
- New patch has been created to create invite email templates and notify email templates folders if those are absent. Also it moves
default notify and invite templates into appropriate folders.
19561: Merged DEV/BELARUS/V3.2-2010_02_24 to V3.2 (With improvements)
19294: ALF-929: email to invite external users does not allow external users to login (no credentails)
- Always create a password for created users if the authentication chain allows account creation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Includes sub-tasks: SAIL-102 - Data list view page, SAIL-103 - Simple render of datagrid, SAIL-105 - Create new list page, SAIL-107 - Edit list as pop-up, SAIL-108 - Delete functionality, SAIL-111 - Filtering, SAIL-114 - Data lists sidebar component
Merged BRANCHES/DEV/DATALISTS to HEAD
17779: First cut of datalist prototype
17877: Addition of icons, lists sidebar and first cut of new list dialog
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19389 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
18335: Added RM and Quickr options in custom install (record-only)
18352: Remove separate RM & OOo-only installers
18371: Removed version option from Quickr config (record-only)
18431: updated installers for RM option (record-only)
18515: Remove .svn dirs from install (record-only)
18546: Removed Share as a portlet config - js libraries don't play nice with Liferay
18626: Update version to 3.2.0r.1 for patches prior to 3.2.1 (record-only)
Removed non-English messages files
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
18363: WCM clustering - ETHREEOH-3962 (duplicate root node entry)
19091: Fix Part 1 ALF-726: v3.1.x Content Cleaner Job needs to be ported to v3.2
19159: Fixed ALF-726: Migrate pre-3.2 content URLs to new format and pick up tag existing orphaned content
19169: Fix fallout from 19159 for ALF-726: Migrate pre-3.2 content URLs to new format and pick up tag existing orphaned content
19262: ALF-726 Multithreading for content URL conversion
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Added NodeCrawlerFactory interface and standard implementation
- Removed test actions from the context files
- ensure that the temporary store node is deleted when the transfer ends
- Added missing error messages from the transfer properties file
- Inserted abstract NodeFinder and NodeFilter to clean those interfaces up a little
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19213 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
18665 : Switch over to using new surf <formdata multipart-processing="false" /> configuration option.
- now the PostContentCommandProcessor and PostSnapshotCommandProcessor handle their own MimePart processing.
18683 : SAIL-288 Implementation of TransferService client side cancelAsync.
18716 : Adding TransferEventBegin missed from asyncCancel work.
18734 : Transfer format : implementation of null properties and Serialized base64 Java objects for type d:any
18749 : SAIL-290: Added features that provide asynchronous commit on the receiver end and the ability to query commit status, as well as code that writes a progress report on the server side (currently only plain text) and the functionality to allow a transfer to be cancelled
18750 : New files that should have been checked in with previous commit but weren't...
18770 : Various transfer service work.
- correction to transfer report name.
- use surf Base64 Encoder
- implementation of async commit to the TransferServiceImpl
- implementation of the statusCommand through the HttpClientTransmitter.
18773 : transferId was null.
18780 : Changed the server-side commit to occur asynchronously.
Added two test actions to transfer a single node or a tree of nodes.
Tweaked TransferDefinition to provide varargs version of setNodes.
18793 : SAIL-290: Added a couple of test actions.
Added varargs versions of transfer and transferAsync on TransferService.
18794 : SAIL-290: Added "targetExists" operation to the TransferService interface.
18804 : SAIL-36: Fixed an issue where transfer could fail if numerous nodes with the same cm:name value are transferred.
18805 : SAIL-36: Added model file that should have been with last commit.
18808 Continuing work on transfer report.
18825 TransferServiceImplTest green line.
18836 : Added a little more output to the server-side transfer report.
18848 : More work on transfer report.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18865 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17716 : Copied alfresco/HEAD to alfresco/BRANCHES/DEV/BRIAN/DM-DM_deployment.
17721 : Moved alfresco/BRANCHES/DEV/BRIAN/DM-DM_deployment to alfresco/BRANCHES/DEV/DM-DM_deployment.
17809 : Bare Bones of TransferService.
17813 : more bones
17824 : bootstrap of the transfer spaces
17826 : Added username, path, and a getter for the password.
17832 : createTransferTarget, getTransferTargets() working.
17836 : transfer target
- duplicate name detection
- delete transfer target by name
- get transfer target by name
- TransferException added along with transfer-service.properties
17840 : transfer target
- enable / disable
- update properties
17851 : Added the notion of a transmitter for the transfer service, and an HttpClient implementation of it.
17852 : Added the web script needed for the receiving end of a transfer, along with a command processor for clients to
check availability of the service and credentials.
17856 : Added a Mockito-based test for HttpClientTransmitterImpl
17857 : Corrected javadoc for test class
17858 : Added test for overriding SSL socket factory
17859 : Wired up the transfer service to the transfer transmitter.
17896 : Rework to spring for app:transferDefinitions it's now app:transfer_definitio
- Add throws clauses to TransferService
- Bare bones of interface for begin and sendManifest
17944 : Work in progress on manifest file
17947 : added parent and child associations to the snapshot.
17956 : Now has the parent path implemented and introduces the TransferManifestNodeFactory.
17965 : Added content, MLText and collections.
17978 : addition of source and target peer associations.
17982 : Fixing parentNode information.
18008 : XML Manifest Reader checkpoint. (Still incomplete but lots working)
18040 : ParentPath is transmitted, fixes for source and target assocs.
18048 : SAIL-30: Initial commit of functionality for begin, sendManifest, and sendContent parts of the transfer process
18049 : Fix for parse of Locale type.
18054 : Added TransferManifestNodeHelper and more tests
18066 : Work in progress check in
- Implemented the content chunker
- sketched out more interfaces on TransferTransmitter.
- Please note that the chunker is not yet connected to the manifest file, that will come next.
r18069 : Wired up manifest reader to content chunker.
r18089 : Fiest cut of callback interface for review.
r18091 : added hashCode implementation which was missing from ContentData
r18095 : Start of the server-side commit. Note that this is an interim commit - not tested.
r18096 : Initial entry of a ContentData implementation of HttpClient's "Part"
r18155 : Work in progress check in.
TransferEvent - incomplete
HttpClientTransmitter - first cut complete (not tested)
Server side - first cut complete (not tested)
18156 : TransferMessage missing from last check in.
18166 : check in command processors
18167 : Work primarily on the transfer commit operation
18170 : corrected spring errors.
18176 : Further testing and fixing of transfer commit
18206 : Work in progress.
18236 : Work in progress - generally adding debug logging and sorting out exception handlers.
18240 : Fix to call "end" correctly after exception is thrown with "commit"
18242 : Aligning the manifest part names.
18243 : PostSnapshot calls the correct method on the receiver service.
18267 : First node has transferred.
18274 : Fixing abort to call end, debug statements, formatting code brackest
18275 : First code to handle updates. Also improved error messages passed back to client
18289 : Checked in work in progress. Content upload not working.
18290 : Update to ensure file type.
18300 : Added more log output and some of the error messages.
18301 : Work in progress
18302 : Added log output
18307 : Added a noddy transfer action
18315 : Sprint 2 complete - transfer and update one node.
18354 : Now the manifest file has deleted nodes.
- Adding copyright headers
18384 : Plumbing for unit tests on one box.
18416 : First end to end unit test working. (one node create and update)
18421 : Added path based update test and many send test.
18458 : Added the functionality to transfer deleted and restored nodes.
18481 : Implementation of transferAsync
18491 : SAIL-32, SAIL-35
- Added node crawler for DM-DM Transfer F6 and F9.
18620 : Basic transfer report implementation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18858 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
1. parameters on simple-workflow actin made mandatory as requested
2. major version and version description parameters added to create-version action
3. shortened action and condition labels
4. did not remove encoding from import action but have made it optional. Defaults to UTF-8 if not set.
5. text parameter now optional on mail action
6. no action taken
7. no action taken .. dont want to upset current default operation behaviour
8. operator assumed to be equals for mimetype comparison so operation removed from parameter list
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18743 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
These include type, aspect, property, mimetype, email templates and scripts. Constraint results unit tested.
TODO - still need to go through all the actions and link each constraint to the appropraite properties.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
An action parameter constraint provides a way to list the valid values that an action or action constraint parameter can take. This
means more information about the action or action condition is available to the user of the action.
Currently there is only an implementation for enum parameter values, but this will be extended as the existing action implementations
are reviewed and value constraints are added as required.
The REST API can now be extended to provide this additional information.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17701: Fix for ETHREEOH-3691 - Blocker issue deleting a group
17703: ETHREEOH-3688 - Impossibility to open Edit Metadata page for folders from Details page
17705: ETHREEOH-3707 - Script error occurs when trying to invite external user to site
17706: ETHREEOH-3678 - Blocker issue: the column 'Path' is empty for 'Move to' and 'Copy to' actions at 'View Detail' page
17724: Merged DEV/TEMPORARY to V3.2
17720: ETHREEOH-3703: Bootstrapped content refers to ALC
17733: Fixes for ETHREEOH-3726, ETHREEOH-3660 and ETHREEOH-3629.
17960: *RECORD ONLY* Fix for unclosed InputStream in PresentationContainer (already fixed in SpringSurf/3.3).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18163 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17363: Fix to DbNodeServiceImple to allow restored nodes.
17384: Minor comments
17451: Fix ETHREEOH-2751 / ETWOONE-340 - specialising a node through an action doesn't set default values from model
17459: ETHREEOH-2391 - Invite pending task now has lots of properties
17465: Repo side fix for ETHREEOH-3010: Inbound and outbound Mltext multiple property are not converted correctly
17478: Fix ETHREEOH-3340 - WCM - Revert to snapshot failure (fix AVM getListing -> AVNSync compare -> WCM revertSnapshot)
17483: (record only) Merged V3.1 to V3.2 (record-only)
17482: (record-only) due to earlier back-merge
17493: Fix for ETHREEOH-3342: index.recovery.mode example is incorrect
17494: Fix for ETHREEOH-3027: missingFullTextReindexTrigger (from index-recovery-context.xml) job does not work.
17510: Fix for ETHREEOH-1147: Indexing large indices can lead to Java Heap space.
17511: Fix for ETHREEOH-1271: It is possible to add one category more than one time to the same content or space
17513: ETHREEOH_3366: Altered DictionaryDAOImpl so that passing a null QName into getType and getAspect does not result in an NPE
17531: ETHREEOH-1186: Corrected rssfeed.get.js so a user can configure a RSS Feed dashlet that has been placed on their own dashboard
17550: ETHREEOH-2317: Rule not fired when document has no content
17556: Fixed ETHREEOH-1229: Can't delete space that contains "translation without content"
17558: Fix for ETHREEOH-3356: Forms fail to persist if property or association name has an _ (underscore) in it
17572: Changed caching of person NodeRefs so that duplicates are detected better
17573: Fixed UTF-8 for file with encoded chars
17576: LockAcquisitionException message specific to failed release of taken-over lock
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.2:r17363,17384,17451,17459,17465,17478,17483,17493-17494,17510-17511,17513,17531,17550,17556,17558,17572-17573,17576
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18140 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17475: ETHREEOH-3295: Fix to AuthorityMigrationPatch
- Forces transaction retry if worker thread reaches child authority before a parent authority
- Tested on Kev's 3.1.1 repository with ~20,000 bulk loaded users and ~2,000 Share sites
- Now completes in 5 minutes as opposed to 45
17461: ETHREEOH-3268: Added MutableAuthenticationService.isAuthenticationCreationAllowed () to allow conditional display of external user invitation UI
17450: ETHREEOH-2762: Correction to previous fix. Do not generate new name when working copy copied back on check in.
17440: ETHREEOH-3295: Fixed logging in FixNameCrcValuesPatch
17439: ETHREEOH-2762: Improved behaviour when a working copy is copied
- Working copy aspect already removed the working copy aspect on copy
- Now derives a new name from the node checked out from and a UUID, preserving the extension
17438: ETHREEOH-2690: Fix sequencing of jgroups system property setting
- declared dependency between internalEHCacheManager and jgroupsPropertySetter
17436: ETHREEOH-3295: Further performance improvements to AuthorityMigrationPatch
- authority created at same time as all its parent associations to save lots of reindexing, as per LDAP sync
- multi-threaded BatchProcessor (as used by LDAP sync, FixNameCrcValuesPatch) used to process work in 2 threads in batches of 20, report progress every 100 entries and handle transaction retries
- BatchProcessor now promoted to its own package
17394: Fix for license issue in local enterprise builds.
- Replace Community with Enterprise in version.properties during enterprise war building
17365: ETHREEOH-3229: Visited and fixed all SearchService result set leaks
17362: ETHREEOH-3254: Eliminate needless ping to LDAP server in LDAPAuthenticationComponentImpl.implementationAllowsGuestLogin()
17348: ETHREEOH-3003: Fix NPE in Hyperic when LicenseDescriptor has null fields
17316: Merged V3.1 to V3.2
17315: ETHREEOH-3092: PersonService won't let you create duplicate persons anymore.
17314: ETHREEOH-3158: Fix RepoServerMgmt to work with external authentication methods
- AuthenticationService.getCurrentTicket / getNewTicket now call pre authentication check before issuing a new ticket, thus still allowing ticket enforcement when external authentication is in use.
17312: ETHREEOH-3219: Enable resolution of JMX server password file path on JBoss 5
17299: Merged V3.2 to V3.1 (Record only)
17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly
17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters
17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly
- thanks Kev!
17292: ETHREEOH-1842: Ticket association with HttpSession IDs tracked so that we don't invalidate a ticket in use by multiple sessions prematurely
- AuthenticationService validate, getCurrentTicket, etc. methods now take optional sessionId arguments
17269: Fix failing unit test
- reinstate original behaviour of AbstractChainingAuthenticationService.getAuthenticationEnabled()
17268: Fix InvitationService
- Runs as system to do privileged AuthenticationService actions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17163: org.alfresco.repo.domain.hibernate.AclDaoComponentImpl.updateAuthority() needs to flush/dirty the session in order to work
17160: Fix HeartBeat
- Lazy initialization in scheduled job needed its own transaction
17146: Fix failing unit tests
- HibernateNodeDaoServiceImpl.moveNodeToStore() must invalidate parentAssocsCache now that it contains NodeRefs
17145: Fixes to patches for new CRC schema changes
- Sequenced patch.fixNameCrcValues-2 before all other patches
- Fixed typos in schema upgrade script and added CRCs for the repository descriptor nodes, so that the descriptor service and patch service can boot up
- HeartBeat initializes lazily so that it doesn't try to load information before the patch service has bootstrapped
- Made FixNameCrcValuesPatch industrial strength by using BatchProcessor to handle multi threading, progress reporting and transaction delineation
17097: Removal of spurious logs directory accidentally introduced in 17096
17096: Performance tuning for improved throughput during high volume import from LDAP directory
- Lucene indexer will now no longer index and then reindex the same node in the same transaction
- lucene.indexer.mergerTargetOverlaysBlockingFactor reduced to 1 (improves indexing performance and no excessive throttling observed during 10 hour test)
- HomeFolderManager fixed so that it pays attention to the eager home folder creation flag
- HibernateNodeDaoServiceImpl.parentAssocsCache 'upgraded' to hold information about root nodes and node refs so that recursive methods such as prependPaths can run entirely out of the cache
- Boolean argument added to getChildAssocs() so that preloading of all child nodes is optional
- qname_crc column added to alf_child_assoc to allow efficient lookup and indexing of child associations by QName. CRC of (qname_namespace, qname_localname).
- idx_alf_cass_qnln on qname_localname replaced with idx_alf_cass_qncrc (qname_crc, type_qname_id, parent_node_id)
- All node service lookup queries involving qname_localname modified to include qname_crc in WHERE clause
- schema patch provided
- existing org.alfresco.repo.admin.patch.impl.FixNameCrcValuesPatch extended to also fill in qname_crc column and forced to run on newer schemas
- Optimized ChainingUserRegistrySynchronizer so that it doesn't have to look up the entire set of authorities during an 'empty' incremental sync
- ChainingUserRegistrySynchronizer no longer starts an outer transaction around all its smaller transactions (used to die due to timeout)
- rule service disabled for LDAP batch processing threads
- org.alfresco.cache.parentAssocsCache and org.alfresco.cache.storeAndNodeIdCache size increased to 80,000
- Fixed case sensitivity issue with person caching in PersonServiceImpl
- Cache the people container in PersonServiceImpl for faster person lookups
- PersonDAO removed and replaced with now more efficient node service child assoc lookup methods
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16708: Fix for ETHREEOH-2247: "patch.authorityDefaultZonesPatch" patch is quite slow on DB with many users/groups - it does not output any progress indicator during the time that the server is apparently frozen during startup
16712: Fix for ETHREEOH-2291: Atomic index property in contentModel.xml
16799: Fix for ETHREEOH-2843: lucene.indexer.minMergeDocs , lucene.indexer.mergeFactor and lucene.indexer.maxMergeDocs are never read / used
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17011 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16713: ETHREEOH-2379 deployment missing crypto libraries.
16722: ETHREEOH-2798 - java.lang.NullPointerException while deleting a folder node with emptyTranslation
16752: ETHREEOH-2946 - Release a test server from inside an Approve/Reject task
16796: ETHREEOH-1841 - MBean error when running in a WebSphere cluster
16920: ETHREEOH-2796 - Word 97 To Text transformation fails
16955: Merge V3.1 to V3.2
14275: Invitation change for ETHREEOH-1456, Missed change from check in 14222.
14222: ETHREEOH-1456 - accepting a rejected invitation.
16963: ETHREEOH-3029 - Strange defaltOnLoadListsner in hibernate-context.xml
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16652: Fix ETHREEOH-1052 - usage is not displayed (for admin & guest - after initial bootstrap, before restart)
16778: Fix ETHREEOH-3009 - Patch required for UserUsageTrackingComponent so that new queries work on upgraded repository
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
15596: Merged V3.1 to V3.2
14017: Fix ETHREEOH-1880 - remove (double-)reverse of WCM staging snapshot order
14112: Fix ETHREEOH-1758 - apply contributed patch
14447: Merged V2.2 to V3.1
14276: ETWOTWO-1224 / WCM-948 - browsing staging area during (commit of) large submit can cause AVMNotFoundException: Path /www/avm_webapps not found.
14452: Add WCM services-based unit test for ETWOTWO-1224 / WCM-948
14589: ETHREEOH-1646 - User Sandboxes aren't visible for Content Publisher
15604: Merged V3.1 to V3.2
14734: Merged V2.2 to V3.1
14718: ETWOTWO-1244 - unable to revert some snapshots ("Does not exist: xxx")
14852: Merged V2.2 to V3.1
14720: ETWOTWO-1183 - "Show All Sandboxes" checkbox should only be visible for "Content Publisher" or "Content Manager"
15032: Fix ETHREEOH-2240 - delete WCM web project (does not clean-up workflow sandboxes and also appears in archive store)
15037: Fix ETHREEOH-2240 - follow-on for Alfresco Explorer's Manage (Review) Task Dialog
15056: Fix ETHREEOH-2297 - WCM layered folder - problem deleting file
15072: Minor - fix remote AVM test
15605: Merged V3.1 to V3.2
15082: Merged V2.2 to V3.1
15081: AVM - add tests only
15083: Fix ETHREEOH-2296 - user conflict when updating an AVM layered file
15118: Merged V2.2 to V3.1
15115: Fix ETWOTWO-1265 - WCM locking not working as expected (+ add WCM services test)
15137: Fix ETHREEOH-2309 and ETHREEOH-227 - including refactor (& clean-up) of WCM-related actions
15156: Fix ETHREEOH-2078 & ETHREEOH-2040 - WCM - deploy to localhost causes "Must have at least one store" errors
15175: Fix ETHREEOH-2309 and ETHREEOH-227 - further clean-up of WCM submit/undo actions (for consistency)
15190: Minor: message updates for WCM submit/undo actions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16858 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
15506: Fix for ALFCOM-3274 - removed double-encoding of webview dashlet title when set from Configure dialog.
15543: Fixes for ETHREEOH-2596 and ETHREEOH-2392. Any Admin user now forced to enter old password when editing themselves in the Share User Admin console.
15620:Merged V3.1 to V3.2
15595: Merged DEV-TEMPORARY to V3.1
15446: Appropriate JSP page was modified to align radio buttons.
15597: Fix for ETHREEOH-2575 - all PNG files now appear in IE6, note that PNG transparency is not supported in IE6.
15598: Merged DEV-TEMPORARY to V3.1
15593: ETHREEOH-2445: Localization Issues [Email Templates and RSS Templates ACPs I18N]
15599: Merged DEV-TEMPORARY to V3.1
15491: ETHREEOH-2460: Localization Issues - Email template
15601: *RECORD ONLY* Merged V3.2 to V3.1
15504: ETHREEOH-2447: My Content page localisation failing. [backport from V3.2]
15613: *RECORD ONLY* Removed reference to portlets message bundle - as per CHK-8518
15784: Minor performance improvements to data dictionary classes relating to Permission evaluations.
15791: Merged V3.1 to V3.2
15693: Merged DEV-TEMPORARY to V3.1
15648: ETHREEOH-2549: Templates in 3.1 will need localising
15743: ETHREEOH-2586: JP:Layout error, the word "....." (cancel) should be in the same line
15745: ETHREEOH-2493 - HTML and XML encoding fixes to Alfresco OpenSearch keyword and person search HTML/ATOM/RSS feed templates.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
14326: Fix ETHREEOH-2091 - version migrator should not skip subsequent nodes (after error), also add unit tests
14420: Fix ETHREEOH-1832 - VersionMigrator optimisations (disable indexing of version2Store, if first migration then don't check if already migrated)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14961 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13857: Merged V2.2 to V3.1
7028-13041: (Record only) New merge path
13343: (Record onlY) Merged V3.1 to V2.2:
13330: Fix ETHREEOH-1408: Incorrect button name at "Manage Task: Submitted" page
13337: Fix for ETHREEOH-1409 and further fix for ETHREEOH-1408
13363: Fix ETWOTWO-1022 (Virtual website not found - Bad host name)
13386: Fix ETWOTWO-1145: WCM Form web script include is not handling ${} token format
13387: (Record only) Removed dev from version label
13621: (Record only) Merged V3.1 to V2.2
13497: Fixed ETHREEOH-1431: Authentication case sensitivity switch doesn't work
Fixes ETWOTWO-1012
13828: ETWOTWO-1171 - checkpoint (alternative patch: resetWCMToGroupBasedPermissions)
13845: ETWOTWO-1171 - alternative patch: resetWCMToGroupBasedPermissions (part 2 of 2 - set layered/shared acls)
13855: Fixed line endings
13856: ETWOTWO-1171 - minor fix: wcmPostPermissionSnapshot patch target schema should be 95
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.2:r7028-12305,12307-12310,12312-12319,12321,...
Merged /alfresco/BRANCHES/V3.1:r13857
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13853: Merged V3.0 to V3.1
13008: Merged V2.2 to V3.0
12824: (record only) Change admin access to the web project staging store to be read-only in the virtualization view - ETWOTWO-933
13031: (Record only) AMP fix for ETWOTWO-968: Space rules are not run when saving from MS Word
13040: Merged V2.2 to V3.0
12824: (record-only) - already done via r13005 (ETWOTWO-933)
13145: Merged V2.2 to V3.0:
13089: (record-only) Fix "Read-Write transaction started within read-only transaction" exception. ETWOTWO-1055.
13091: (record-only) Fix for NFS server "Read-Write transaction started within read-only transaction" exception. ETWOTWO-1054.
13508: ETHREEOH-1548 - allow config to reset (even if null/cache)
13514: ETHREEOH-1548 (follow-on fix) - to allow config to reset (even if null/cache) and also reduce 5 caches to 1
13848: Merged V2.2 to V3.0
13188: *RECORD ONLY* Using correct ooo startup context - does not work for *nix. Fixed in 3.0sp1
13212: *RECORD ONLY* AMP for ETWOTWO-984
13342: *RECORD ONLY* Merge info stuff
13435: Merged V2.1 to V2.2
12307: Merged DEV/V2.1SP7 to 2.1
11927: ETWOONE-396
12112: ETWOONE-396
13442: *RECORD ONLY* Updated version to 2.2.4dev
13468: *RECORD ONLY* Removed svn:mergeinfo crud
13470: I18NUtil doesn't cause NPE if message key doesn't exist
13471: Fixed ETWOTWO-1133: Incorrect CRC32 Values for non-ASCII names
13475: Test fix: I18NUtil.getMessage() no longer returns null, leading to NPEs if message bundle is missing
13476: Reverted back to null return values. Will save for fixing on HEAD.
13749: Fixed ALFCOM-2655: MLTranslationInterceptor doesn't handle getType method
13803: ETWOTWO-710
13819: *RECORD ONLY* ACT-6420 - Office 2003 "Install for all users" - DO NOT MERGE
13827: ETWOTWO-1172 - authority exists now checks nodeRef result
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r12824,13008,13031,13040,13089,13091,13145,13848
Merged /alfresco/BRANCHES/V2.2:r12824,13188,13212,13342,13442,13468,13470-13471,13475-13476,13749,13803,13827
Merged /alfresco/BRANCHES/V3.1:r13853
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14763 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
