19453: Merged BRANCHES/DEV/BELARUS/V3.2-2010_03_17 to BRANCHES/V3.2:
19407: ALF-254: empty files (0 bytes) do not trigger content rules
- Some Javadoc cleanup added
19601: Follow-up fix for ALF-254: Empty files (0 bytes) do not trigger content rules
- CIFS uses 'sys:noContent' instead of 'sys:temporary'; the latter has other behaviour attached
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19639 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
ALF-2190 - Datalists: "New List" button should be disabled for users who do not have write permission
Modified sample To Do list model to add attachments. Data Lists now handle associations to many endpoints correctly. Files and folders linked to appropriate non-site details page. CSS changes following UX review session.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19604 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
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
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
17717: This check-in contains changes in Java and .NET TCK tests related to CMIS-43 and CMIS-44 JIRA tasks. Also some bugs were faced out and fixed in
17727: CMIS-69: Alfresco to CMIS ACL mapping: Part 1: API
17732: Merge HEAD to DEV/CMIS10
17756: MOB-563: SQL Tests - Lexer
17764: CMIS-69: Alfresco to CMIS ACL mapping: get ACL support
17802: More for CMIS-69: Alfresco to CMIS ACL mapping. Implementation for applyAcl.
17830: Fixes for CMIS lexer and parser tests
17838: Access fix ups for access by the WS/Rest layers
17869: 1) remote-api:
17874: SAIL-146: Alfresco to CMIS ACL mapping: Support to group ACEs by principal id
17883: Adjust version properties for dev/cmis10 branch.
17885: Update OASIS CMIS TC status.
17889: Fix issue where objectid is not rendered correctly for CMIS private working copies.
17890: SAIL-146: Alfresco to CMIS ACL mapping: Fixes for ACL merging when reporting and ordering of ACEs. Report full permissions and not unique short names.
17902: Fix issue where CMIS queries via GET used incorrect defaults for paging.
17909: Fix CMIS link relations for folder tree.
17912: Fix CMIS type descendants atompub link
17922: Update AtomPub binding to CMIS 1.0 CD05 XSDs.
17924: SAIL-146: Alfresco to CMIS ACL mapping: Test set using full permissions (as opposed to short unique names)
17927: Fix content stream create/update status to comply with CMIS 1.0 CD05.
17934: Resolve encoding issues in CMIS AtomPub binding.
17973: SAIL-171: CMIS Renditions REST binding
17975: SAIL-146: Alfresco to CMIS ACL mapping: Completed AllowedAction and Permissions mapping. Added missing canDeleteTree.
17990: Update CMIS AtomPub to CD06
17996: Updates for cmis.alfresco.com for CD06 in prep for public review 2.
18007: WS-Bindings were updated with CMIS 1.0 cd06 changes.
18016: CMIS web services: Add missing generated files from WSDL
18018: CMIS index page updates for cmis.alfresco.com
18041: Merged HEAD to DEV/CMIS_10
18059: SAIL-227:
18067: SAIL-157: Strict vs Non-Strict Query Language: Enforce restrictions on the use of SCORE() and CONTAINS()
18080: Fix for SAIL-213:Bug: Query engine does not check that select list properties are valid for selectors
18131: SAIL-156: Query Language Compliance: Fix support for LIKE, including escaping of '%' and '_' with '\'.
18132: SAIL-156: Query Language Compliance: Fix support for LIKE, including escaping of '%' and '_' with '\': Fix underlying lucene impl for prefix and fuzzy queries to match wildcard/like
18143: SAIL-156: Query Language Compliance: Fix and check qualifiers in IN_TREE and IN_FOLDER. Improved scoring for CONTAINS()
18173: SAIL-245: Exclude thumbnails from normal query results
18179: SAIL 214: Query Language Compliance: Check for valid object ids in IN_FOLDER and IN_TREE
18210: SAIL-156: Query Language Compliance: Support for simple column aliases in predicates/function arguments/embedded FTS. Check property/selector binding in embedded FTS.
18211: SAIL-156: Query Language Compliance: Support for simple column aliases in predicates/function arguments/embedded FTS. Check property/selector binding in embedded FTS.
18215: SAIL 156: Query Language Compliance: Fix CMIS type info to reflect the underlying settings of the Alfresco type for includeInSuperTypeQuery
18244: SAIL 156: Query Language Compliance: includeInSuperTypeQuery -> includedInSuperTypeQuery: First cut of cmis query test model. Fixed modelSchema.xml to validate
18255: SAIL 156: Query Language Compliance: First set of tests for predicates using properties mapped to CMIS Strings.
18261: CMIS-49 SAIL-163: Alfresco to CMIS Change Log mapping - New CMIS Audit mapping is implemented. ChangeLogDataExtractor was added.
18263: Build Fix
18285: SAIL 156: Query Language Compliance: Restrictions on predicates that may be used by single-valued and multi-valued properties
18287: SAIL-186: Changes to make CMIS Rendition REST bindings pass new TCK tests
18291: Fix Eclipse classpath problems
18323: CMIS-44 SAIL-187: Change Log tests (WS) – Java and .NET tests for change log were implemented.
18325: SAIL 156: Query Language Compliance: Fixes and tests for d:mltext mappings
18329: Updated Chemistry TCK jar including Dave W's rendition tests.
18333: Fix compile error - spurious imports.
18334: Fix issue where absurl web script method failed when deployed to root context.
18339: Update CMIS index page for start of public review 2.
18387: SAIL-147: CMIS ACL REST bindings + framework fixes
18392: Fix typo
18394: SAIL 156: Query Language Compliance: Fixes and tests for d:<numeric>
18406: SAIL 156: Query Language Compliance: Remaining type/predicate combinations. Restriction of In/Comparisons for ID/Boolean
18408: CMIS Query language - remove (pointless) multi-valued column from language definition
18409: Formatting change for CMIS.g
18410: Formatting change for FTS.g
18411: CMIS TCK tests were updated to CMIS 1.0 cd06 schemas.
18412: SAIL 156: Query Language Compliance: Tests and fixes for aliases for all data types in simple predicates (they behave as the direct column reference)
18417: Update Chemistry TCK which now incorporates Dave W's ACL tests.
18419: Update CMIS index page to include public review end date.
18427: SAIL 156: Query Language Compliance: Expose multi-valued properties in queries. Tests for all accessors. Fix content length to be long.
18435: SAIL 156: Query Language Compliance: Use queryable correctly and fix up model mappings. Add tests for baseTypeId, contentStreamId and path.
18472: SAIL 156: Query Language Compliance: Tests and fixes for FTS/Contains expressions. Adhere strictly to the spec - no extensions available by default. Improved FTS error reporting (and stop any recovery).
18477: SAIL-164: CMIS change log REST bindings
18495: SAIL 156: Query Language Compliance: Tests and fixes for escaping in string literals, LIKE and FTS expressions.
18537: SAIL 156: Query Language Compliance: Sorting support. Basic sort test for all orderable/indexed CMIS properties.
18538: SAIL-164: CMIS change log fixes for TCK compliance
18547: SAIL 156: Query Language Compliance: Ordering tests for all datatypes, including null values.
18582: Incorporate latest Chemistry TCK
18583: Update list of supported CMIS capabilities in index page.
18606: SAIL-156, SAIL-157, SAIL-158: Query Language Compliance: Respect all query options including locale. Fixes and tests for MLText cross language support.
18608: SAIL-159: Java / Javascript API access to CMIS Query Language
18617: SAIL-158: Query Tests: Check policy and relationship types are not queryable.
18636: SAIL-184: ACL tests (WS)
18663: ACL tests were updated in accordance with last requirements by David Caruana.
18680: Update to CMIS CD07
18681: Fix CMIS ContentStreamId property when document has no content.
18700: CMIS: Head merge problem resolution.
Phase 1: Merge up to and including revision 18700, as this the point where both AtomPub and Web Services TCK tests succeed completely on dev branch.
Note: includes CMIS rendition support ready for integration and testing with DM renditions.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17850 : Addition of AVM - DM deployment.
17905 : ETHREEOH-3809 - WCM - First test server deploy fails.
- added yet another transaction to read the previous snapshot transaction.
- added a new system test based upon the WCM services. The beginnings of testing against layered authored sandboxes.
17907 : ETHREEOH-3806 - WCM Contributor cant release test server.
- release test server now runs without permissions checks (like the deploy action does)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17102: Add Date svn:keyword
17103: - mask out cmis-tck-ws build/classes folder, fix JRE dependency in cmis-tck-ws .classpath
17106: MOB-1330: Upgrade Web Services Repository to 0.7.
17117: Now moved to Chemistry.
17120: CMIS Update to v1.0 Committee Draft 04
17123: Checkin mistake.
17129: Updated Chemistry AtomPub TCK with appropriate UTF-8 encoding.
17138: Fix reference to CMIS change list in CMIS Front Page.
17142: Move all CMIS web scripts into same package.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17259 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
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
16740: Fix for ETHREEOH-2563 and ETHREEOH-2899.
16741: Fix for ETHREEOH-1781 - web-client-config-custom.xml.unicode.sample has incorrect comment.
16757: Merged DEV-TEMPORARY to V3.2
16730: ETHREEOH-2749: Entering a search containing a single quote breaks the script that performs next/previous page in OpenSearch JSF component
16731: ETHREEOH-2411: Error message appears when trying to create advanced workflow with long description
16732: ETHREEOH-1944: Navigation via shortcuts brings up incorrect dialogs
16761: Merged DEV-TEMPORARY to V3.2
16750: ETHREEOH-2405: system error if user goto Web Projects space from any web project which was deleted by another user.
16762: Displaying error title when error text is displayed
16763: Merged DEV-TEMPORARY to V3.2
16756: ETHREEOH-258: System Error message appears while clicking "Manage Task" icon in "My Completed Task" component for the task, if the user to whom the workflow was assign to is deleted.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16911 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- The <archive> setting on model class definitions (controlling archival on node deletion) is now paid attention to for aspects as well as types
- Archive is on by default for aspects and off by default for types
- If a node's type or any of its aspects has archiving off then it will be purged rather than archived
- Only the cm:content and cm:folder types currently have archiving switched on
- RM subtypes of cm:content and cm:folder plus rm:record aspect switch off archiving
- A module can now include global property overrides in classpath*:alfresco/module/*/alfresco-global.properties
- The RM module currently sets two global properties:
system.content.eagerOrphanCleanup=true # Switches on synchronous content purging
rm.ghosting.enabled=true # Enables the new RM ghosting functionality
- When ghosting is switched on, for nodes with the rma:record aspect the DestroyAction synchronously removes all content properties and applies the rma:ghosted aspect
- TODO: Any properties required for rma:ghosted?
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15990 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
14587: Added new node service method getNodesWithoutParentAssocsOfType to public-services-security-context.xml (or at least my best guess at it!)
14586: Use US spelling of synchronization in filenames for consistency
14585: Lower the default user registry sync frequency to daily instead of hourly. Now users and groups are pulled over incrementally on login of missing users.
14583: Unit test for ChainingUserRegistrySynchronizer
14571: Migration patch for existing authorities previously held in users store
- Uses AuthorityService to recreate authorities in spaces store with new structure
14555: Authority service changes for LDAP sync improvements
- Moved sys:authorities container to spaces store
- All authorities now stored directly under sys:authorities
- Authorities can now be looked up directly by node service
- Secondary child associations used to model group relationships
- 'Root' groups for UI navigation determined dynamically by node service query
- cm:member association used to relate both authority containers and persons to other authorities
- New cm:inZone association relates persons and authority containers to synchronization 'zones' stored under sys:zones
- Look up of authority zone and all authorities in a zone to enable multi-zone LDAP sync
14524: Dev branch for finishing LDAP zones and upgrade impact
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14588 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
13973 Replace CMIS XSDs / Sample XML files with 0.6 versions.
- fix issues with some of the samples
- CMISSchemaTest passes
13981 AtomPub binding complies with CMIS v0.6 XSDs and Namepaces.
- Tests passing
13982 Running list of implemented changes between CMIS v0.5 and v0.6
13986 AtomPub binding comply with CMIS v0.6 data model & API (part 1)
- Tests are passing
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14172 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- further simplification of CMISDictionaryService and fixup fallout
- added logging
- consolidate & fix property definition handling (only one definition per property)
- include support for aspect properties
- fix property.isInherited
- open up the door for types outside of CMIS doc, folder, rel & policy
Dictionary Service
- add isOverride() to PropertyDefinition
Invite Workflows
- ensure they create their own namespace for new types/props
- NOTE: the previous way uses a hole in the DictinaryService which has been there
unnoticed for over 4 years, till now. At some point, the hole will be filled in.
Tests pass for CMIS REST / Web Services and Query.
Tests pass for Invitation Service.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- incl. taking Hibernate libs from 3.1 and adding missing file from earlier merge
13321: Fix ETHREEOH-1407: System error occur during "Undo Selected" action if no items are selected
13322: ETHREEOH-1206: Throwing Alfresco Exception on OnUpdateProperties behaviour resets Encoding field to Big (first entry)
13326: (RECORD ONLY) Removed 'dev' from version label.
13330: Fix ETHREEOH-1408: Incorrect button name at "Manage Task: Submitted" page
13337: Fix for ETHREEOH-1409 and further fix for ETHREEOH-1408
13338: Removed svn:mergeinfo
13346: Make startup bat script check JAVA can be found.
13351: ETHREEOH-1386 validate ASR and FSR hostname.
13359: ETHREEOH-1435: Share doesn't extract document metadata correctly
13360: Fix ETHREEOH-821: SDK dependencies
13369: Fixed distribute-sdk target for when it's run locally
13382: ETHREEOH-1437: Container creation induces an unexpected permission allocation in Share
13391: Shutdown backstop continues if logging throws errors.
13394: Fix ETHREEOH-1457 - MT coci issue with bootstrap (eg. data dictionary) content
13400: Activate JAWS-223: Adobe LC Hibernate Dialect Loading
13401: Support for JAWS-215, mysql and oracle
13413: Fix ETHREEOH-1458 - MT delete->archive
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r
13321-13322,13326-13327,13330,13337-13339,13341-13347,13351,13354-13355,13358-13363,
13365,13367,13369,13382,13385-13392,13394,13400-13403,13405-13406,13413
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13175: Basic implementation of timestamp propagation
13176: Fixed ETHREEOH-1172: NodeService.getProperties sometimes returning instance of "Collections.SingletonList"
13184: Merged V3.0 to V3.1
13179: Merged V2.2 to V3.0
13141: Fix for ETWOTWO-1109: WCM - content publisher cannot submit modified assets (2.2.3-dev regress)
13144: Fix for repopened ETWOTWO-1082: AVM has concurrency limitations via CIFS/NFS/FTP ...
13180: Merged V2.2 to V3.0
13144: Fix for repopened ETWOTWO-1082: AVM has concurrency limitations via CIFS/NFS/FTP ...
13185: Logging enhancements to FileFolderService to aid debugging of ETHREEOH-1247
13187: Changed NPE to IllegalArgumentException
13191: Fix for ETHREEOH-1267 malformed JSON.
13203: Fix ETHREEOH-1309 regress
13205: Fixed typo of UNKNOWN
13206: DM index check - allow index transaction tracker to be reset, etc
13213: Fixed ETHREEOH-1313: System Property Overrides not working when using the installer
13214: WCM services - add/update unit tests - CRUD using different roles
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r13179-13180
Merged /alfresco/BRANCHES/V2.2:r13141,13144
Merged /alfresco/BRANCHES/V3.1:r13172,13175-13176,13179-13181,13184-13189,13191,13203,13205-13206,13210-13215
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13610 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12994: Merged V3.0 to V3.1
12931: Merged V2.2 to V3.0
12635: Fix for ETWOTWO-995: Diff performance degrades on large data sets
12742: Fix for ETWOTWO-981: WCM - regression - revert fails (eg. for content publisher)
12743: AVM - add missing tests to test suite & fix existing tests (including base setup)
12759: AVM - build/test fix - follow-on to r12742
12781: Fix PersonDAO - fixes AuthorityServiceTest which failed after adding AVMServicePermissionsTest
12932: Merged V2.2 to V3.0
12763: Support for ETWOTWO-975: AVMDifference now implements Comparable<AVMDifference>
12782: Fix for ETWOTWO-939: Content Contributor cannot edit their own items
12809: Test fixes after r 12782
12818: ETWOTWO-977 (Orphan Reaper) - removal of comment questioning cache interaction.
12933: Merged V2.2 to V3.0
12306: (record-only) Final set of XSS and HTML encoding fixes for ETWOONE-90 - already merged (see r12310)
12934: Merged V2.2 to V3.0
12311: (record-only) Fix for ETWOONE-389 - Current page number not always visible on the browse screen - already merged (see r12312)
12935: Merged V2.2 to V3.0
12320: (record-only) Fix for ETWOONE-87: Behavior of delete cascade - already merged (see r12324)
12322: (record-only) Fix merge issue (marked as Do Not Merge - see CHK-5607)
12936: Merged V2.2 to V3.0
12775: (record-only) ETHREEOH-872: Editing Email-notify-rules fails w/ ClassCastException (back-port of r11966)
12937: Merged V2.2 to V3.0
12780: Fixed ETWOTWO-1003: DuplicateChildNameException not generated correctly (on Oracle)
12820: Update to ETWOTWO-926 (WCM Form Inline callouts to Web Scripts)
12825: Further ETWOTWO-926 update: provide compatibility with old token scheme as the original patch has already made its way into 3.0.1
12850: ETWOTWO-975 - Show Conflicts in Modified Items List
12938: Fix merge typo (follow on from r12931)
12941: Fix merge typo (follow on from r12931)
12998: Cleaned up svn:mergeinfo entries
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r12931-12938,12941
Merged /alfresco/BRANCHES/V2.2:r12306,12311,12320,12322,12635,12742-12743,12759,12763,12775,12780-12782,12809,12818,12820,12825,12850
Merged /alfresco/BRANCHES/V3.1:r12994,12998
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12867: Part 1: JAWS-220: Fix existing tests and tests for sort
12879: JAWS-219: Part 1: First cut of support for CMIS objectid = objectid joins
12891: Complete minimalist support for Policies
12912: CMIS Query: JAWS-219: Tests, fixes and better checking
13062: Fix for ETHREEOH-1162:Issue with skipCount parameter for CMIS query service
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13224 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
11867: Fix issues raised by Mike's code review
11906: Finish Links Dashlet
12080: Fix bugs raised by 3d code review
12142: Missed Dashlet Code
12405: Final run-through of Links component before merge to HEAD
12406: Further minor edits to Links
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12416 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
