20440: RM: CapabilitiesTest.testDestroyRecordsCapability (MS SQL Server build) - use non-public nodeService
20441: Include virtual tomcat in installers
20442: Change bitrock builder version to use.
20443: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: (Fixed tabs and removed 'svn:executable' and 'svn:eol-style')
20384: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
20271: ALF-803: Asset Service Improvements
20386: Merged V2.2 to V3.3-BUG-FIX
20385: Merged DEV/BELARUS/V2.2-2010_04_06 to V2.2
20379: V2.2-ALF-1888 AssociationQuery was corrected to filter ...
20387: Version Migrator (ALF-1000) - approx x3 boost (policies ignore version2 store)
20388: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
20372: ALF-897: It is impossible to create content when default value selected in ContentHeadlineBackground field for intranet_rssi_landing_template web-form (also fixes ALF-2798 & ALF-791)
20389: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
20374: ALF-2723: WCM - Http 500 creating content via webform
20394: Fix for ALF-2257 - It's impossible to find and add group at Records Manage Permissions page
20396: Fixed ALF-2956 "XSS attack is made when a rule is being deleted"
20397: Fix for ALF-922: Mysql does not support unique keys that contain nulls as one would expect
20402: ALF-2186 : Rules not being fired on datalist items - because it's a zero byte file?
20404: Fixed ALF-2109 "Rule doesn't apply to the files in sub-folders when 'Run rule for this folder and its subfolders' action was performed"
20406: Fix for ALF-2985 - Share document library throws error if document modifier or creator is deleted from Alfresco
20409: Improved FormServiceImplTest, added more content related tests and some edge case tests using the FDK model (this test needs to be manually enabled though as the FDK model is not available by default)
20414: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX
20401: ALF-2616: Serious Web Form layout performance issues on IE8. This fix contains:
20427: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX
20042: ALF-1523: Failed Kerberos SSO auth doesn't fail through, simply returns a blank page
20323: ALF-1523: Failed Kerberos SSO auth doesn't fail through, simply returns a blank page
20428: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX
20417: ALF-736: WebDAV Folder Renaming fails on Mac but works on Windows.
20430: Fix for ALF-2313 - Accessing a Doclib folder in Share which has a link to a deleted node fails
20431: Version Migrator (ALF-1000) - migrate 1st batch independently
20432: Fix for ALF-2327 - Can not have more than one Transfer Step in a disposal schedule
20438: ALF-479: Merged DEV/BELARUS/V3.2-2010_01_11 to DEV/V3.3-BUG-FIX
18448: ETHREEOH-4044: External Authentication Subsystem does not perform user mapping for WebDAV requests
20444: Fix for ConcurrentModificationException in file server quota manager. ALF-2970.
20445: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
20413: Added clean of quickr project
20446: Changed version to 3.3.1dev
20447: Merged V3.3-BUG-FIX to V3.3
20294: Fixes: ALF-1020 & ALF-1013 for all views except agenda.
20451: Merged V2.2 to V3.3
20450: Merged DEV/BELARUS/V2.2-2010_04_06 to V2.2
20412: ALF-1887: too easy to break alfresco - one can remove the guest user and recreate it but then access to RSS is broken
- PersonServiceImpl.beforeDeleteNode prohibits attempts to delete a guest user.
20452: Fix for transaction error from NFS server file expiry thread. ALF-3016.
20458: ALF-2729 - rationalise (and deprecate) VersionLabelComparator
20460: Fix for ALF-2430
- AVM nodes are not checked for exclusion - the default ACLEntryVoter will always vote for AVM
- avoids embedded AVM permission checks for getType/getAspect and anything else that may be added
- seems AVM read is not checked upon "lookup" for the last node in the PATH (getType should have failed too)
20466: Merged V2.2 to V3.3
20243: (RECORD ONLY) ALF-2814: Merged V3.2 to V2.2
17891: Merged DEV_TEMPORARY to V3.2
17873: ETHREEOH-3810: WCM - Recursion detector erroring
20467: Merged V3.1 to V3.3 (RECORD ONLY)
20276: Incremented version label
20275: ALF-2845: Merged V3.2 to V3.1
17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2
17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch - also causes subsequent patches to not be applied
19573: Merged V3.2 to V3.1
19539: Merged HEAD to V3.2
19538: Build fix - fix build speed
20468: Merged PATCHES/V3.2.r to V3.3 (RECORD ONLY)
20357: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r
20349: Merged V3.3 to PATCHES/V3.2.0
20346: ALF-2839: Node pre-loading generates needless resultset rows
- Added missing Criteria.list() call
20339: Incremented version label
20338: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r
20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows
- Split Criteria query to retrieve properties and aspects separately
20272: Backports to help fix ALF-2839: Node pre-loading generates needless resultset rows
Merged BRANCHES/V3.2 to PATCHES/V3.2.0:
18490: Added cache for alf_content_data
Merged BRANCHES/DEV/V3.3-BUG-FIX to PATCHES/V3.2.0:
20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows
20469: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY)
20393: Eclipse classpath fix to avoid problems in JBoss
20309: ALF-2777: PrimaryChildAssocCopyBehaviour from MOB-388 corrupts cm:name attributes of copied child nodes
- Folded example behaviours from previous AMP into repository
- Fixed PrimaryChildAssocCopyBehaviour to back-up and set the cm:name property on copied children
20470: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY)
20465: Incremented version label
20464: ALF-3060: Merged V3.2 to PATCHES/V3.2.0
19920: Merged HEAD to BRANCHES/V3.2:
19918: Fix ALF-2499 (Deleting a web project also deletes similarly named web projects - Potential Data Loss)
20448: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.2.0
20414: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX
20401: ALF-2616: Serious Web Form layout performance issues on IE8. This fix contains:
a) X-UA-Compatible head tag with IE=EmulateIE7 value
b) alfresco.ieVersion and alfresco.ieEngine in common.js
c) recurseOnChildren in _updateDisplay
d) Some performance modifications in xforms.js
20350: Increment version label
20349: Merged V3.3 to PATCHES/V3.2.0
20346: ALF-2839: Node pre-loading generates needless resultset rows
- Added missing Criteria.list() call
20471: Fix for offline sync losing metadata properties, due to rename/delete of original file. ALF-575.
20478: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
20477: Fix ALF-3086: CMIS checkin of a non-versionable document should make it versionable
20479: ALF-2110: Make it possible to determine which person properties are synced via LDAP and hence immutable
- Added Set<QName> UserRegistrySynchronizer.getPersonMappedProperties(String username)
- UI/Services Fix to follow
20481: Latest SpringSurf libs:
- Fix for ALF-1518 - Added support for HTTP and HTTPS proxies for Surf application remote api calls - via the standard JVM cmd line properties such as -Dhttp.proxyHost=...
20484: ALF-2886: LDAP sync defaults display names incorrectly and can't cope with DNs containing escaped trailing whitespace.
- Had to work around a JDK bug in LDAP RDN parsing
20486: Added case sensitive flag to the file state cache. Part of ALF-570.
20487: Fix for copy/rename of folders causing file exists errors in some cases. ALF-570.
20488: Fix ALF-680: Previously valid content models now fail with CMISAbstractDictionaryService$DictionaryRegistry exception
20489: Uploaded correct version of spring source jars and reunited them with 3rd-party/.classpath
20490: Fix for cannot delete folders via CIFS from Mac OSX, due to desktop actions. ALF-2553.
20491: Merged DEV/TEMPORARY to V3.3 (With corrections)
20485: ALF-2290: a HTTP GET request of a document redirects to the Home Location when using NTLM SSO
The logic related to ADB-61 in NTLMAuthenticationFilter clears previous location and redirects request to default home location. NTLMAuthenticationFilter was changed to process GET requests to documents correctly. Now, fix to ADB-61 processes only “/faces” requests and GET requests to documents are processed correctly.
The same fix was made to KerberosAuthenticationFilter
20492: Fix ALF-680: Previously valid content models now fail with CMISAbstractDictionaryService$DictionaryRegistry exception
- missing remove directory
20493: Fix ALF-2837: ClassCastException in getProperties()
20498: Fix for ALF-2818: Failure to close index writer under certain conditions.
- fix for index writer to close indexes when stopped by exceptions during FTS
- fix FTS job to handle exceptions better
- debug for FTS background operations
20499: ALF-3094: In ticket authenticate method in AuthenticationHelper, invalidate the current session if its cached ticket doesn't match
20500: Fix for ALF-2858 "Zero KB sized bin files will be created in the contentstore when new sites are created" (RECORD ONLY)
20503: AVMTestSuite: minor fixes to cleanup ctx usage (avoid re-loading)
20505: Merged BRANCHES/V2.2 to BRANCHES/V3.3 (record-only)
13859: (record-only) Removed dev from version label
14003: (record-only) Updated version to 2.2.5dev
14566: (record-only) ETWOTWO-1239 - remove workflow interpreter/console bootstrap
14572: (record-only) ETWOTWO-1239 - fix PersonTest to fix JBPMEngineTest (part-sourced from r13247)
14776: (record-only) Merged V3.1 to V2.2
14748: ETHREEOH-2225 - WCM upgrade (performance improvements for MySQL)
20506: NFS ReadDir/ReadDirPlus skips some folder entries. JLAN-98.
20507: Fixed issue with folder search resume id being reset to the wrong value during NFS folder search. Part of JLAN-98.
20508: Merged BRANCHES/V3.2 to BRANCHES/V3.3:
18319: Merged BRANCHES/DEV/BELARUS/V3.2-2010_01_11 to V3.2
18273: ETHREEOH-3834: WCM: An extral .xml.html file is created when editing newly created content
19182: Merged V3.1 to V3.2
18423: ETHREEOH-3850 - Content Manager unable to edit content items if there is a lock on a generated rendition
18432: (RECORD ONLY) Added FTP data port range configuration via <dataPorts>n:n</dataPorts> config value. ETHREEOH-4103.
18451: (RECORD ONLY) Fixed incorrect FTP debug level name.
18577: (RECORD ONLY) Fix for ETHREEOH-4117, based on CHK-11154
18792: Fix ETHREEOH-2729: Import of property with @ symbol in name fails with "start tag unexpected character @ "
19570: ALF-192 / ALF-1750: System Error if user trying submit web content based on web form which was deleted
19583: Merged DEV/BELARUS/V3.2-2010_03_17 to V3.2
19545: ALF-1954: Regression: same item can be submitted multiple times to workflow
19725: AVMStoreDescriptor - fix minor typo (for debugging)
19917: (RECORD ONLY) Merged HEAD to BRANCHES/V3.2:
19880: Fix ALF-898 - WCM: Deleting a file leads to error (only if RM/DOD installed)
19920: (RECORD ONLY) Merged HEAD to BRANCHES/V3.2:
19918: Fix ALF-2499 (Deleting a web project also deletes similarly named web projects - Potential Data Loss)
20509: Merged BRANCHES/V3.2 to BRANCHES/V3.3 (RECORD ONLY):
19825: (RECORD ONLY) Merged PATCHES/V3.2.r to BRANCHES/V3.2:
19804: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r
Merged HEAD to V3.2.0
...
20510: Merged BRANCHES/V3.1 to BRANCHES/V3.3 (RECORD ONLY)
17482: (RECORD ONLY) Merged V3.2 to V3.1
17478: Fix ETHREEOH-3340 - WCM - Revert to snapshot failure (fix AVM getListing -> AVMSync compare -> WCM revertSnapshot)
18783: (RECORD ONLY) MT: ensure group (EMAIL_CONTRIBUTORS) bootstraps tenant admin user (when creating tenant)
20513: Added port change example for remote Alfresco server to share-config-custom.xml.sample
20518: ALF-657 Created tests to check that the 'runas' functionality works in the AlfrescoJavaScript action handler. Also modified the handler to run as the System user if no Authentication is currently set, as may occur if the action handler is being executed asynchronously.
20519: ALF-657 Created tests to check that the 'runas' functionality works in the AlfrescoJavaScript action handler. Also modified the handler to run as the System user if no Authentication is currently set, as may occur if the action handler is being executed asynchronously.
20520: Removed dev version.label
20522: ALF-3129: Map cm:organization property in LDAP as well as cm:organizationId, since cm:organization is what shows up in JSF and Share. Needed by ALF-2110.
20523: First part of fix for ALF-2110:
- Appropriate Person and webframework metadata APIs now return information on immutability of Person properties (as some properties are immutable when synced to LDAP etc.)
- Share client now correctly disables profile fields in User Profile and Admin User Console as appropriate based on individual user property mutability
- Change Password button now correctly enabled/disabled based on account mutability
20524: VersionMigrator - option to run as scheduled job (ALF-1000)
20525: Fix for various IE6 CSS issues:
ALF-3047 - It's impossible to destinate any action with data list item (IE6 specific)
ALF-3049 - Incorrect layout of Manage aspects page
ALF-3050 - Incorrect layout of Assign Workflow form
20526: Fix for ALF-2915 - Select > None feature for Data Lists not working across multiple pages in IE
Closed ALF-2846 - DataList UI not fully I18Ned [Old prototype code]
20527: Fix for ALF-3082 - There is no Edit Offline action at Details page in Share site
20528: Fix various script errors due to typo:
ALF-3088 - Script error occurs on creating duplicated record seria
ALF-3012 - Incorrect behaviour on creating duplicating folders
ALF-3004 - Script error when submitting an item with long data in Prioprity field
20529: Fix for ALF-3006 - Selected Items > Copy to... and Move to actions not working in Document Library
20530: Dynamic Models - fix test(s)
- fix concurrency test for Oracle build (retry if txn lock cannot be acquired)
- when getting deployed models, skip if invalid (eg. cannot be parsed)
20536: Remove @Override (ALF-657)
20537: Activities - (minor) fix NPE for Oracle build/test
20543: Final part of ALF-2110 - Appropriate person properties disabled for editing in Explorer Client if external mapped sync such as LDAP is used.
Fixed issue with Change Password option being disabled incorrectly.
20544: Follow-up fix to r20528
20546: Fix for ALF-3151 - Freemarker causes NPE while deploying 3.3 enterprise onto WebSphere 7.0.0.7
- NOTE: will need to submit patch to freemarker.org
20552: Merged BRANCHES/V3.2 to BRANCHES/V3.3 (RECORD ONLY)
20551: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/V3.2:
20090: Dynamic models: minor improvements to DictionaryModelType
20553: Fix for escalated issue ALF-2856: Space returns to browse view after completing Add Content dialog; need a way to return to custom view (applied patch provided by customer).
20554: Improvement to model delete validation (investigating intermittent failure of RepoAdminServiceImplTest.testSimpleDynamicModelViaNodeService)
20558: Merged DEV/BELARUS/V3.3-2010_06_08 to V3.3
20550: ALF-922: Mysql does not support unique keys that contain nulls as one would expect ...... duplicates in the alf_access_control_entry table
20562: ALF-3177 - security fix.
20563: Merged BRANCHES/V3.2 to BRANCHES/V3.3:
19412: Fix for ALF-865 "WCM / Cluster: unexpected error when concurrently submitting content"
ALF-862 "WCM submit execution will require locking in a clustered WCM authoring env"
20564: Merged BRANCHES/V3.1 to BRANCHES/V3.3:
20542: Fixed ALF-3152: ImporterComponent transaction retry settings can cause IllegalArgumentException
20568: Follow-up on fix ALF-3152. Fix jobLockService's retryWaitIncrementMs
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Cleanup and improvements to RequestContext related classes.
- Removal of obsolete Alfresco util classes.
Fixed up imports back to Alfresco versions of unused SpringSurf util classes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19322 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17332: ETHREEOH-2020: Original tag disappears after a new one has been added to a wiki page
17711: Fix ETHREEOH-3720 - blocker (upgrade from 2.x)
17712: Build/test fix (FeedCleanerTest.testConcurrentAccessAndRemoval)
17726: DownloadContentServlet wraps call in read-only RetryingTransactionHelper
17736: Fix ETHREEOH-2821 - deployment of layered file (fix for 3.2 deployment)
17745: Fixed broken PostgreSQL (AVM, audit, etc) and Oracle (audit)
17746: Merged V3.1 to V3.2
17290: Merged V2.2 to V3.1
17282: (record-only) Fix for ETWOTWO-1387: Node deletions transactions not properly detected ...
17381: (record-only) Putting explicit version name on PDFRenderer.jar
17413: (record-only) Removed dev from label
17749: Type handler fixes for PostgreSQL: Use LONGVARBINARY
17750: Fixed propval mappings for DB2
17754: Fixed "invalid character" in Oracle port of propval
17757: Re-added fix for ETHREEOH-2789 that got lost in a merge.
17762: Fix FeedCleanerTest (for Oracle 10g) + exposed feed cleaner issue (maxSize)
17765: Assorted minor build fixes for Oracle
17767: Empty String property values are persisted as '.empty'
17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2
17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch
17772: Fix build (JBPMEngineUnitTest) - fallout from r17765
17774: Fix JSONtoFmModelTest
17781: Build/test fix (AVMCrawlTestP)
17791: Fix for ETHREEOH-3793: Oracle unit test failure for JobLockServiceTest - Missing unique indexes for all DB ports
17795: ETHREEOH-3696: Attempt to navigate into any existent web-project or create new one after upgrade from Enterprise 2.1.7 ...
17799: ETHREEOH-3796: org.alfresco.repo.importer.ImporterComponentTest fails
17807: Fix ETHREEOH-3723 - MT blocker (can't restart)
17816: Merged DEV/BELARUS/V3.2-2009_12_15 to V3.2
17814: ETHREEOH-3808: Upgrade fails if content cm:name contains curly brackets ('{}')
17822: Fix for ETHREEOH-3828: Mistake porting AlfrescoPostCreate-3.2-PropertyValueTables.sql script to mssql dialect
17823: Fix for ETHREEOH-3829: SQLServer index limit reached for 'idx_alf_props_str'
17831: Fix ETHREEOH-3818 - upgrade from Community 3.2r2 to Enterprise 3.2
17862: Merged V3.1 to V3.2
17722: Fix ETHREEOH-3643 - WCM layered folders (flatten) - also add unit test
17835: ETHREEOH-3763 - fix for WCM layered folders - also add unit test
17871: Merged V3.1 to V3.2
17855: ACT 12915 - create web project performance (-> setPermission -> buildIndirections)
17863: ETHREEOH-3852 - perf tweak (WCM layered files)
-------------------------------------
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_24:r17758
Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_12_15:r17814
Merged /alfresco/BRANCHES/V2.2:r17282
Merged /alfresco/BRANCHES/V3.1:r17290,17381,17413,17722,17835,17855,17863
Merged /alfresco/BRANCHES/V3.2:r17332,17711-17712,17726,17736,17745-17746,17749-17750,17754,17757,17762,17765,17767-17768,17772,17774,17781,17791,17795,17799,17807,17816,17822-17823,17831,17862,17871
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17246: ETHREEOH-3208: User profiles for users authenticated by immutable subsystems are now read only
- Introduced MutableAuthenticationService interface, only implemented by Alfresco native authentication service
- Split out those methods from AuthenticationService that mutate the user store and added isAuthenticationMutable()
- Now both Alfresco Explorer and Share user profile / password edit link rendering is conditional on isAuthenticationMutable
- Works with authentication chain containing mixture of internally and externally authenticated users
17247: Fix failing unit tests
- rm-public-services-security-context.xml needed to be brought in line with public-services-security-context.xml (and will forever more!)
17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters
17253: *RECORD ONLY* ETHREEOH-2885: web.xml must conform to the schema to work on JBoss
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17667: Branch for SpringSurf integration - from HEAD r17665
17668: Fix to ensure included scripts files are not loaded from a cached classpath loader.
17670: Part 1 of SpringSurf integration - changes relating to spring-surf-core-1.0.0.CI-SNAPSHOT.jar
17674: Part 2 of SpringSurf integration - changes relating to spring-surf-core-configservice-1.0.0.CI-SNAPSHOT.jar
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
15471: MOB-279: Heartbeat now uses destination URL embedded in the license (if present) and also sends the following new parameters
- memFree
- memMax
- memTotal
- numUsers (this was there already)
- numGroups
- repoName
15349: Merged V3.1 to V3.2
15348: Fix ImportTest following fix to ETHREEOH-2219
15344: Merged V3.1 to V3.2
15339: ETHREEOH-2219: Give ImporterBootstrap its own retrying transaction helper with specific parameters tuned to its longer-running setup transaction. Should avoid startup errors on clustered installations.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16856 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
14955: Merged V2.2 to V3.1
14352: Fixed ETWOTWO-1113: Creation date / modification date reset to current date during import
14956: Fix for ETHREEOH-2198 and ALFCOM-2972
- Thumbnail Service now allows creation of system managed thumbnails nodes by Consumer users or on Locked items
- Explicit permission check to ensure user must at least be able to Read the original doc
- Now correctly ensures that the 'modifier' properties are not updated on the original doc due to thumbnail generation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14957 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
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
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
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
12145: Merged V2.2 to V3.0 (AuthenticationUtil)
12109: AuthenticationUtil and AuthenticationComponent refactor
12152: Removed Lucene usage from lookup of 'sites' root folder
12153: Fix InviteServiceTest by cleaning up leaking authentications
12159: Fix for broken usage pattern of the Threadlocal values in recent AuthenticationUtil refactor.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12123: Merged V2.2 to V3.0
11466: Fixed sql-query DELETE syntax
11614: Flush after putChild, fix for ETWOTWO-777
11641: Merged V2.1 to V2.2
11632: Improvements for AVM index FULL and AUTO rebuild.
11646: Upgrade scripts tweaks:
11650: Added unit test to confirm fix of ETWOTWO-740
11674: Added missing EHCache definitions for QName, Namespace and Locale caches
11825: Fixed Eclipse classpath addition of path for Oracle JDBC driver
12125: ETHREEOH-899: Image transformations do not follow Options
12127: Merged V2.2 to V3.0
11675: Node DAO optimizations
11680: Full Fix for ETWOTWO-777 + more protection for nested write transactions beneath read transactions.
11729: AVM creates and deletes no longer update the directory mod time - ETWOTWO-801
11738: Fix for ETWOTWO - fixed check for TX propagation mode
11748: Fixed ETWOTWO-578: RepositoryWebService fetchMore() does not fetch last node
11749: Incorporate feedback from ACT-5440: MySQL-specific tweaks to the upgrade scripts
11750: Moved t_qnames_dyn section to after t_qnames
11752: Fixed ETWOTWO-734: ImporterComponent uses Lucene queries
11785: Build Fix:Remove auto created person TX commit fro DB
11853: Fix for ETWOTWO-687 - missed a case when generating lists of actions for modified files list
11940: Stress test main method for ETWOTWO-744
11950: Fixed ETWOTWO-909 and ETWOTWO-911
11987: Dirty checking for attribute related DAOs
12008: Fixed test for transaction-requiring AttributeService
12128: Merged V2.2 to V3.0
11530: Merged V2.1 to V2.2
11499: Defensive clear of the security context to avoid any ticket sharing for a given user - ETWOTWO-326
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
11943: Fix for ETHREEOH-879 & ETHREEOH-783: Multi-valued properties not allowed in Alfresco 3.0 (due to java.lang.UnsupportedOperationException)
11944: Fix for ETHREEOH-865
11947: Build fix for site service unit test failures. This will be reviewed since it works round the issue rather than tackle why runAs is now failing.
11952: ETHREEOH-845, ETHREEOH-871, ETHREEOH-853, ETHREEOH-839
11953: ETHREEOH-483 Unable to upload files [with Flash 10 installed] Fixed to fit into yui 2.6.0
11954: Added missing 'protocolOrder' configuration value.
11956: Fix for ETHREEOH-895
11957: Fix for ETHREEOH-891.
11958: Readded generated source line for RemoteAPI project.
11959: ETHREEOH-483 Unable to upload files [with Flash 10 installed] Missed to add this image
11960: Removed JDK6 specific method.
11962: Fixed missing setup of the share mapper class name when the <class> config tag is used. ALFCOM-2060.
11964: fix for ETHREEOH-266 - restrict length of webapp to 150 chars.
11965: Merged 2.2 to 3.0
11926: Fox for ETHREEOH-725 User doesn't receive email to his box when rule 'Send an Email to specified users' is created
11966: ETHREEOH-872: Editing Email-notify-rules fails w/ ClassCastException
11967: MT - test fixes (post runAs merge)
11968: Changed Windows x64 NetBIOS warning message to be a debug message. ETHREEOH-897.
11971: ETHREEOH-829 Case issue when inserting Document Share links into a discussion using richtext editor
11973: Fix for ETHREEOH-890 - users with apostrophe in their login name can now login to Alfresco Explorer (and Share).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12490 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
11509: ETHREEOH-394: Incorrect message in activity feed when user accepts an invitation to a site
11510: Fix to set position
11511: Fix for ETHREEOH-533: Dialogs access via ExternalAccessServlet return to blank empty container.jsp page when Close button is clicked
11512: Fix DM ACL deletion after merge forward for shared and defining ACLs.
11513: Merged V2.2 to V3.0
11501: Expose if set permissions are inherited or not and fix relatd behaviour for import/copy
11514: Fix for ETHREEOH-476 (Impossible to create Site Invite Workflow) & ETHREEOH-254 (Default value at 'Start Advanced Workflow Wizard' page)
11515: Fix for ETHREEOH-446 and ETHREEOH-447
11517: Fix for ETHREEOH-225: Web Forms with repeating elements don't work
11518: Merged V2.2 to V3.0
11343: ACL upgrades may require a COW - it now warns when this happens.
11369: Always lock against staging - ETWOTWO-763
11519: Merged V2.2 to V3.0
11467: Fixed ETWOTWO-774: CreateVersionTxnListener.afterCommit() throws NPE
11468: More defensive coding on AVM txn listeners (avoid NPEs)
11475: More defensive checks to avoid NPE
11520: Merged V2.2 to V3.0
11478: Keep creator and owner as orihinally set in AVM - Fix for ETWOTWO-604
11521: RuntimeExec: Added optional directive SPLIT: to force argument tokenization
11522: Limited tests to just check the command format not execute it for "dir . .."
11523: Undid revision 11520 (Merged V2.2 11478)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12449 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
9848: Merged V2.2 to V2.9
9610: Fixed ETWOTWO-548
10232: Merged V2.2 to V2.9
10231: Merged V2.1 to V2.2
10229: Merged V2.1-A to V2.1
10227: https://issues.alfresco.com/jira/browse/ADB-106
10530: Merged V2.2 to V2.9
9847: Applied patch for ETWOTWO-542 (supplied by Peter Monks)
9897: Fix for ETWOTWO-302: Alphabetise advanced workflow names
9901: Fixed ETWOTWO-426: V2.2 upgrade problems with MySQL 5.0.51
9902: Fix for ETWOTWO-438: Versionable aspect and add-content permissions
9905: Fix ETWOTWO-560
9912: Increased test wait iterations from 10 (10s) to 100 (100s).
9919: Part fix for ACT-3574: Added close for schema bootstrap connection
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10612 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
9409: Fix ETWONINE-12
9459: Fix for ETWONINE-17 (error message appears instead of notification message when mananging deleted items
9468: User usages - add test, ensure multiple beforeDeletes are only handled once
9473: User usages - add tests + fixes (ETWONINE-43, ETWONINE-44, recalc missing usages)
9491: Remove noop://noop empty store (added during merge)
9662: User usages - minor fix (if "owner" qname not present)
9843: Merged V2.2 to V2.9
9486: Merged HEAD to V2.2
9482: New commands for AVM Console (AVMInterpreter). Version parameter is not longer mandatory for simple commands.
9727: Merged V2.1 to V2.2
9211: Workaround for extraneous ".ppt" extension when saving PowerPoint files over WebDAV
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10591 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
9018: MT: system-wide jobs should run across all stores/indexes
9204: Merged V2.2 to V2.9
8633: Merged V2.1 to V2.2
8629: Merged V2.1-A to V2.1
8493: Fixed ADB-51: ImporterBootstrap doesn't use transaction retrying
8494: EHCache and JGroup patches and upgrades
8546: ACT-1650: performance optimization
8550: Fixes to transactional cache handling
8553: Fixed tests: MLText is a Map, but will always have at least one entry, even that entry is null.
8583: ACT-954: IndexInfo files now reopen when they close (for whatever reason)
8640: Merged V2.1 to V2.2
8638: Used correct exception type for IO channel reopen logic
9102: Unit test to check that transactional cache size overrun is handled
9106: Merged V2.1 to V2.2
9043: Fixed AR-2291: SchemaBootstrap lock is only required before first SQL execution
9045: Fix AR-2291: SchemaBootstrap lock is only required before first SQL execution
9047: Fixed AR-2305: Index tracking in AUTO mode doesn't report anything on bootstrap
9048: Fixed AR-2300: Random-based GUID instead of time-based GUIDs
9049: Fix patches to only run once
9050 <Defered>: Changed getString() method to use the available buffer length rather than a hard coded value.
9060: Fixed ETWOONE-109 and ETWOONE-128: RetryingTransactionHelper fixes and improvements
9061: Fixed NodeRefPropertyMethodInterceptorTest
9075 <Defered>: Added delete permission check when marking a file for delete on close. ETWOONE-141/ACT-2416.
9080: Fixed EHCache source zip
9081: Fixed ETWOONE-118: Tomcat failed bootstrap doesn't clean up EHCache cluster structures
9085: Fixed ETWOONE-154: Added JSR107 Jar to WAR
9115: Fixed test: TransactionalCache uses LRU so repeatedly checking if a entry is there keeps it in the cache.
9206: Merged V2.2 to V2.9
8857: Improvements to ACL performance for large ACLs
8951: Always check permission entry changes are made at position 0
9219 <No change>: Made NTLMLogonDetails class Serializable, port of r8973.
9220: Added delete permission check when marking a file for delete on close. Port of r9075.
9222: Merged V2.1 to V2.9
8683: Early warning for nodes indexed in the wrong store (ACT-964)
8684: Enhanced tests
8685: Enhanced tests
8686: Additional tests
9223: Merged V2.2 to V2.9
9120: Merged V2.1 to V2.2
8740: Fix for AR-2173 - do no recheck case of the user name when validating tickets (it has been done)
9122: Additional unit test from support case.
9224: Merged V2.2 to V2.9
9076: Fixed ETWOTWO-426: Upgrading alfresco from 2.1.1 to 2.2 throws errors with Mysql 5.0.51
9104: Merged V2.1 to V2.2
9025: Fixed AR-2314, AR-2299: Optimizations after profiling
9105: Merged V2.1 to V2.2
8745: Fix AR-2233 (regression introduced by fix for AR-2221)
9121: Merged V2.1 to V2.2
9017: Fix index back up failing due to background index merge/deletions (inlcudes back port of CHK-2588)
9137: Incorporated additions from Will into AVM console (ETWOTWO-439)
9225: Merged V2.1 to V2.9
8641: Merged V2.1-A to V2.1
7729: Fix to Repository Web Service (queryAssociated) to allow reverse association lookup (ie. given target, get the source)
8673: Fix for AR-2098 - shorter URL form now has NTLM filter mapping example in web.xml
8682: Fix for AR-2005
8695: AR-2054.
8696: Improved sort test to include prefix form of field name
9226: Fix ALFCOM-994 (see also earlier change in r9223)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6636: Temporary hack to fix build.
6637: Better handling of binary string bufs, disable link validation when poll interval is <= 0
6638: Forgotten files for TXT to PDF transformer.
6639: Fix for AWC-1541
6641: Fix for WCM-792.
6642: A little extra PropertyValue support for createNode, too.
6643: Fix for WCM-791
6644: Closure of AR-1528: Check concurrency handling of DuplicateChildNodeNameException
6647: Fix WCM-794
6648: WCM-656
6650: Applied user supplied patch to fix AWC-1546 - Cannot mount AVM using CIFS on new alfresco installation.
6651: Index tidy ups
6654: Various minor updates for passthru authentication debugging and error handling.
6657: Fix for WCM-799 (Some items selected for submission were not present)
6659: Updated installers.
6660: Partial fix to AWC-1524
6661: Fix WCM-803
6664: Including hibernate-3.2.1.jar in $VIRTUAL_TOMCAT_HOME/server/lib/
6665: adding an automated unit test for output path patterns.
6668: Fixed to add shale-test-1.0.4.jar to Eclipse classpath (PHH oked)
6681: Fixes WCM-811 - Lookup.getIndirectionPath() had a bit of a howler in it.
6684: UncategorizedSQLException with the word 'deadlock' in the message is now cause for retrying a transaction.
6691: Fix for WCM-813 (lock not removed when expiration date set and no workflow on web project)
6696: Imporved SSO filters for SiteMinder etc + test filter
6697: Support for scheduled import
6699: Fix for the compliation target: compile-benchmarkframework
6701: Fix for 1.6 JVMs (1.5 gets by with lucky ordering)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6749 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
There might be a few SDK projects that still use TransactionUtil, but this checkin gets rid of
its use otherwise.
I took a glance over the areas of the code that use UserTransaction directly and didn't see any
transactionally wrapped code that desperately needed to be put into a retry loop (i.e. write
transactions in a concurrent scenario). If you spot any that you think might qualify, let me know.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6220 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
