Merged DEV/LIVECYCLE-3.1 to V3.1
12665: Merged V2.1-A to DEV\LIVECYCLE-3.1
8615: Cluster startup and property setting enhancements
8657: Fixed shutdown procedure for JGroups
8676: Enable system property overriding of more JGroups TCP stack properties
- ${alfresco.tcp.start_port:7800}
- ${alfresco.tcp.port_range:3}
8678: More logging of cluster view changes and channel factory config during startup
12667: Merged V2.1-A to DEV/LIVECYCLE-3.1
9188: Index recovery job only calls through if property 'alfresco.cluster.name' has been set
9197: Fixed unit test after bean property name change
12793: Merged V2.1-A to DEV/LIVECYCLE-3.1
7765: Requested mimetypes
8526: Updated Mimetypes
8610: Mimetype changes
Many branding and other non-core changes were omitted
12848: Fixed JAWS-223: Adobe LC Hibernate Dialect Loading
- Hibernate dialect can be null or empty and will be autodetected from the database metadata
- Property 'hibernate.dialect' is set on the System
- iBatis loading (activities) checks for 'hibernate.dialect'
- SchemaBootstrap checks for 'hibernate.dialect'
12854: Merged V2.1-A to DEV/LIVECYCLE-3.1
8681: Fixed mimetype 'application/photoshop'
12856: Merged V2.1-A to DEV/LIVECYCLE-3.1
9008: Fixed ADB-64: NPE when applying aspect cm:mlDocument
12857: Merged V2.1-A to DEV/LIVECYCLE-3.1
9032: ACT-2303: "Namespace is displayed in the Node browser is www.alfresco.org ...
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1-A:r7765,8526,8610,8615,8657,8676,8678,9188,9197
Merged /alfresco/BRANCHES/V3.1:r12894
Merged /alfresco/BRANCHES/DEV/LIVECYCLE-3.1:r12665,12667,12793,12848,12854,12856-12857
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13518 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Merged DEV/LIVECYCLE-3.1 to V3.1
12581: Merged V2.1-A to DEV/LIVECYCLE-3.1
8675: Set FileServers configuration properties using system properties
12603: Merged V2.1-A to DEV/LIVECYCLE-3.1
8702: Added bindto as a property-enabled value
8703: Added bindto as a property-enabled value
8705: Filter out a bind to address of '0.0.0.0'
12631: Merged V2.1-A to DEV/LIVECYCLE-3.1
8551: JGroups Channel factory
12633: Merged V2.1-A to DEV\LIVECYCLE-3.1
8552: Wired in JGroups heartbeats
8554: Re-delete file
8573: Failed hearbeat still must still wait before trying again
8582: JGroups EHCache heartbeat fixes for TCP stack
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1-A:r8551-8552,8554,8573,8582,8675,8702-8705
Merged /alfresco/BRANCHES/V3.1:r12893
Merged /alfresco/BRANCHES/DEV/LIVECYCLE-3.1:r12581,12603,12631,12633
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13517 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13037: PostgreSQL upgrade scripts from 2.1.6, 2.2.0, and 2.2.1
12995: Fix build: account for change of path to log4j jar in 3rd party project
12981: Added support for monitoring of installed modules via JMX
12971: Correction to 12970 - better handle case when log4j not available.
12970: Work around log4j bug to allow editing of the "threshold" property of HierarchyDynamicBean through JMX
12926: Merged V3.0 to V3.1
Merged V2.2 to V3.0
12861: ETHREEOH-19, ETHREEOH-24, ETHREEOH-113, ETHREEOH-115, ETHREEOH-449, ETHREEOH-537, ETHREEOH-561, ETHREEOH-566, ETHREEOH-572, ETHREEOH-1072: Retry failed transactions from MS SQL Server in snapshot mode
12924: Avoid direct log4j dependencies
12918: Avoided Log4J imports by using introspection
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12864 *RECORD ONLY*: Created V3.1 branch from HEAD (Labs 3D)
12871: Fix UTF-8 encoding for activity feed (ETHREEOH-1197 on V3.1 branch)
12872: Fix WCM refactor which affected "My Web Files" (ETHREEOH-1207 on V3.1 branch)
12892: Updated svn:mergeinfo for DEV/LIVECYCLE-3.1 to V3.1
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r12864,12871-12872,12892
Merged /alfresco/BRANCHES/DEV/LIVECYCLE-3.1:r12580,12768,12886
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12923: New Enterprise Examples project containing hyperic plugin and README.txt
12908: A few fixes to improve consistency in JMX object naming
12889: Fix failing unit tests. Include linkvalidation in unit test classpath.
12885: Merged DEV/DAVEW_POST3D to V3.1
12881: Changes to allow monitoring of authentication configuration
12862: Merged DEV/3.1_ENTERPRISE_ONLY to DEV/DAVEW_POST3D
12797: Changes to allow persistence of changes made by JMX.
12852: Review comment from Derek: remove dependencies of descriptor service (serverDescriptorDAO, currentRepoDescriptorDAO and installedRepoDescriptorDAO) out of bootstrap-context.xml
12849: Correction to JAWS-221: dbscripts directory must be directly under config/alfresco in enterprise project.
12847: JAWS-221: Move proprietary DB create/upgrade scripts into Enterprise Only project
12845: Avoid NullPointerExceptions in status templates when no codeName or description exists for the status code
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13513 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
12719: Merged V2.2 to V3.0
12709: Merged V2.1 to V2.2
12708: Fix for ALFCOM-2305 (against 2.1E original - to be merged forward)
12711: Fix for ETHREEOH-1110 (applied to 2.2 where original code is present)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12720 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12200: Fix for ETHREEOH-974
- Large file uploads now correctly streamed through web-tier (replaced Sun HTTPClient impl with Apache impl that fully supports streaming of multi-part form content).
- Fix to repository WebScripts framework to not load multi-part form file content into memory (i.e. to fix repo side)
- Improvements to web-tier script execution performance as per CHK-5509 and some recent research into runtime compiling of Rhino scripts.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12553 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12513 Implementation of Asset.getProperties
12469 Implement paths relative to web app. And unit tests. Asset Test is now clean of TODOs.
12413 Implementation of WCM Asset. Still work remaining but this is 80% of the implementation.
12404 WCM Services
- asset service - fix rename/move folder issue (folders are not locked)
- sandbox service - fix delete sandbox test
12374 WCM Services - optimise get/is web project
12347 WCM Services - "asset service" - add/remove/has aspect, get aspects
12341 WCM Services - "asset service" checkpoint (locking fixes, bulk import, more tests added)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12236: Implementation of Sandbox Revert REST API
12305: WCM Services - "asset service" initial checkpoint (more tests to be added)
12334: placeholder for WCM Asset implementation
12338: Check in to get server working ...
12341: WCM Services - "asset service" checkpoint (locking fixes, bulk import, more tests added)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12544 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12297: Fix mysql config instructions for case sensitive user names - DOC-68
12298: Merged V2.2 to V3.0
12257: Fixed ETWOTWO-952: MLText properties not intercepted when calling addAspect and createNode
12270: Fixed RhinoScriptTest to propogate exceptions for full recording by Junit
12271: Fixed NPE in ML interceptor when null node properties are passed to createNode
12282: Merged V2.1 to V2.2
11616: Fix for ETWOONE-218: Common.js function needs to be changed to support root context
12287: Merged V2.1 to V2.2
12229: WCM - disable/hide link validation by defrault (ETWOONE-106, ETWOONE-392)
12301: Merged V2.2 to V3.0
12288: Merged V2.1 to V2.2
12233: Fixed ETWOONE-124: Add the property UUIDBinding to ImporterBootstrap
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12185: Fix 3.0 SP1 installation on non-Oracle databases. Removed creation of indexes in AlfrescoPostCreate-2.2-MappedFKIndexes.sql that were also in AlfrescoPostCreate-2.2-Extra.sql
12186: Performance improvements to HibernateNodeDaoServiceImpl
12188: Multi user tests: enable graceful web script recovery on optimistic locking failure (...)
12191: Improve Javascript execution performance in Web Scripts & Improve error presentation (...) thrown by JavaScript
12192: Share performance improvements: stop AbstractFeedGenerator from 'choking' the repository with too many web script requests
12193: Multi user testing: don't suppress all exceptions during Wiki Move.
12194: Multi user testing. Don't suppress all runtime exceptions in script site node object.
12195: Multi user testing. Convert User bean object to use a retrying transaction so that optimistic locking failures are handled.
12196: Multi user testing: Configuration changes to support concurrent access by 20 users
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12522 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12520: Move supporting heartbeat code into enterprise tree (public part)
12510: Move license and heartbeat into enterprise only code (public part)
12509: Move license and heartbeat into enterprise only code (public part)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12521 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12178: Authenticate now required since introduction of public service usage in 3.0 test and authentication util changes.
12180: Build fix for updating person properties - set all existing to keep quota properties.
12187: MT - fix missing merge and fallout post authentication util changes
12199: Usage Service - fix unit test fallout post authentication util changes
12204: Authenticate now required since introduction of public service usage in 3.0 test and authentication util changes
12206: Authenticate now required since authentication util changes
12210: Module fixes - to use new authentication util api changes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
