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
12991: Merged V3.0 to V3.1
12929: Merged V2.2 to V3.0
12579: Fix ETWOTWO-925: Adding users to a web project is slow due to permission setting
12583: Fix ETWOTWO-925: Added post fix snapshot (follow on from 12579)
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r12929
Merged /alfresco/BRANCHES/V2.2:r12579,12583
Merged /alfresco/BRANCHES/V3.1:r12991
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12943: Port of support for ADB-47 from V2.1-A to 3.1
12948: Port of tests from CHK-2235 for ADB-20 from V2.1-A to 3.1
12965: Activated index tracker Quartz job by default
12974: Port for lazy creation of home folders with configuration from V2.1-A to V3.1: original CHK-2619, CHK-2716
12976: Merged V2.1A to V3.1
8562: (record-only) Fix to lazily create home folders - DO NOT MERGE
8694: (record-only) Added configuration for lazy or eager creation of home folders
12978: Merged V3.0 to V3.1
12920: Merged V2.2 to V3.0
12456: Wire up AVM locking service by interface to allow for potential over-ride
12457: Make AVM ChildKey case insensitive
12470: Merged V2.2.1-NBC-FIXES to V2.2
12156: Optimizations to WCMWorkflowEvaluator and WCMWorkflowDeletedEvaluator
12605: Hide annoying "Virtualisation Server not started" warnings (by making them debug)
12707: AVM console - "snap" also allows tag and description to be specified
12979: Build/test fix
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/DEV/V2.2.1-NBC-FIXES:r12156
Merged /alfresco/BRANCHES/V2.1-A:r8562,8694
Merged /alfresco/BRANCHES/V3.0:r12920
Merged /alfresco/BRANCHES/V2.2:r12456-12457,12470,12605,12707
Merged /alfresco/BRANCHES/V3.1:r12943,12948,12965,12974,12976,12978-12979
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13544 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12898: Cleaned up svn:mergeinfo
12905: Added 'js' to svn:ignore
12916: Divorced repositories [sic] Log4J extension point from Log4J imports
12939: Build/test fix (follow on from r12899)
12945: Merged V2.1-A to V3.1
7720: (record-only) Customer-specific request to allow domains to be case-sensitive
12946: fix for ETHREEOH-1227 (bunch of FTL and JS files by Lawrence)
12949: Merged V2.1-A to V3.1
8123: (record-only) Allow authorities that are identical ignoring case (as we do in 2.2)
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1-A:r7720,8123
Merged /alfresco/BRANCHES/V3.1:r12898,12905,12916,12939,12945-12946,12949
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13536 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12911: Fix for Share calendar toolbar after regression from site membership refactoring
12940: Refactoring of the Repository ScriptService to support compilation of Rhino JavaScript (from iDay work).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13484: ETHREEOH-1547: Do not set requiresNew flag and propagate exceptions in BaseDialogBean
13383: ETHREEOH-1220: Update LDAP-authentication-context to include allowGetEnabled entry to support Share
13381: ETHREEOH-1181: NTLM authentication periodically fails over CIFS - "Read-Write transaction started within read-only transaction"
13376: ETHREEOH-279: Friendly error message when cm:filename regular expression constraint is violated
13364: ETHREEOH-814: Correct character encoding issues in LDAP synchronization
13353: ETHREEOH-1444: Ability to run Alfresco from unexploded .war file with embedded license
13328: ETHREEOH-1400: Prevent TLD warnings on Weblogic startup
13183: Follow up to 13177: Fixes for Weblogic compatibility
13177: Fixes for Weblogic compatibility
13109: Build/test fix (to avoid unintentional import via application-context.xml)
13100: Checkpoint for new DM index check (enterprise-only)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13525 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12896: Merged DEV/LIVECYCLE-3.1 to V3.1
12859: Merged V2.1-A to DEV/LIVECYCLE-3.1
9040: Fixed WebService client code to take dynamic webapp name
12865: Merged V2.1-A to DEV/LIVECYCLE-3.1
9040 integration: Added 'repository.webapp' (defaults to 'alfresco') for Webservice clients
12868: JAWS-142: Adobe LC JGroups Clustering
- JGroups communications and factories remain in 'repository' project
- JGroups EHCache integration moved to 'enterpriserepository' project
- Default factory for EHCache cluster config is aware of open-enterprise split
- Default EHCache config still works as normal
- JGroups EHCache config still enabled by setting 'alfresco.cluster.name' property
12887: Merged V2.1-A to DEV\LIVECYCLE-31
8619: Hard-coded "admin" usage in non-test classes only
12906: Re-deleted files after merge mix-up
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r12896,12906
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13524 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Java Script API for invitations on Site object.
Implementation of REST API for Site / Invitations.
Rename of old invite workflow to invitation-nominated and renaming of properties for consistency. Old workflow is due for deprecation.
Rework to Nominated workflow to unscramble user creation.
Start Workflow UI bean now knows to avoid workflows managed by the InvitationService.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13523 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13107: Remove accidentally added .project file.
13106: Correction to 13104 - remove accidentally included merge marks
13105: Correction to 13104 - remove accidentally included merge marks
13104: Update continuous build to include Hyperic plugin amongst distributables
13092: Fix ConnectionPoolMBean. Naming of boolean methods didn't match those on DBCP BasicDataSource
13088: Bring hyperic plugin in sync with Derek's recent JMX changes
13076: Extended properties available on ConnectionPoolMBean
13045: Merged V3.0 to v3.1 (record only)
13044: Merged V2.2 to V3.0
13041: Merged V3.1 to V2.2
13037: PostgreSQL upgrade scripts from 2.1.6, 2.2.0, and 2.2.1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13522 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
