23430: Merged V3.3 to V3.3-BUG-FIX
23429: Merged PATCHES/V3.2.0 to V3.3
23428: ALF-5141: Further refinement of transaction limiting behaviour
- Once accepted a transaction will be retried until it succeeds or the retry limit is exceeded. No limiting of retries by time as otherwise likelihood of any transaction succeeding under load is small
- Default web transaction threshold is now 20 seconds to avoid problems on non-loaded systems
- Record stack traces of tracked transactions to help debug slow transactions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23431 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
23257: Merged V3.3 to V3.3-BUG-FIX
23224: (RECORD ONLY) MERGE V3.3 BUG FIX to V3.3
23199 : imap message test
23247: Merged HEAD to V3.3
23246: Fix for ALF-5032: findAuthorities() getting slow when many groups are created.
- moved to PARENT driven queries where possible in preference to PATH
23255: Merged PATCHES/V3.2.0 to V3.3
23252: ALF-5141, ALF-5302, ALF-5281: Improved transaction limiting mechanism
- No ceiling. Just monitor transaction start times and reject new transactions when the oldest transaction is older than the threshold.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23258 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
23080: Fix for ALF-3815 - Error occur on creating user (Active Directory +LDAP authentication)
23084: MERGED DEV to V3.3-BUG-FIX
22839 : ALF-4920 - IMAP server UID failure
23102: Checked in file with my Hostname!
23141: Merged PATCHES/V3.2.0 to V3.3-BUG-FIX
22977: ALF-5057: Don't use lucene to locate tag nodes - unreliable in a cluster
- CategoryService extended with root category retrieval method using node service
23043: ALF-5057: Merged V3.2 to PATCHES/V3.2.0 (partial)
18052: Merged DEV/REPO-DOCLIB to V3.2
17653: Checkpoint Repo DocLib prototype work
23142: Merged PATCHES/V3.2.0 to V3.3-BUG-FIX
22981: ALF-5141: Need to limit webscript response times and reject traffic at high load
- server.web.transaction.max-duration-ms property now specifies a maximum time for repository webscript transaction execution. Default is 10 seconds.
- transaction retrying will not continue when the projected time is greater than this
- Once a transaction hits this execution time the number of concurrently executing transactions at the time it was started becomes the ‘ceiling’ for the number of concurrent transactions
- The ceiling will dynamically rise and fall, based on transaction execution times
- When a transaction is started ‘above’ the current ceiling a TooBusyException is thrown, which is mapped to an immediate status 503 response
- New unit test added for this
23006: ALF-5141: Reverting IndexInfo changes
- 'fairness' flag on ReentrantReadWriteLock appears to cause deadlock on JDK 1.5 in IndexInfoTest
- lucene.indexer.maxMergeWait property and associated throttling 'back off' behaviour abandoned as it has the risk of leaving indexes in incomplete uncommited state
- transaction limiter feature should be enough to avoid excessive wait times
23011: ALF-5141: Reintroduce fair locking to IndexInfo and fix RetryingTransactionHelperTest
- Bugs surrounding ReentrantReadWriteLock in old JVMs mean that it's not safe to make fair locking the default
- However, it would be useful in new JVMs as it should guarantee that we don't lock out waiting writers indefinitely under high load
- Now controlled by lucene.indexer.fairLocking property. Default value is false in V3.2.0 but true in V3.3.4 onwards.
- RetryingTransactionHelperTest now uses latches to ensure test threads start up in strict sequential order
23014: ALF-5141: Correct error that could allow transaction ceiling to be lowered to zero
23146: (RECORD ONLY) ALF-5028: Merged HEAD to V3.3-BUG-FIX
21471: SAIL-240 (SAIL-294) AuditDAO: AuditService enhancements
- Added isAuditEnabled and enableAudit for global case (system-wide)
- Some neatening up of Audit SQL (common WHERE and ORDER BY clauses)
- AuditService enforces 'admin' role for all methods
22109: ALF-4106: Added entry deletion count return value for clear()
22726: Coding standards
22857: Fix typo in javadoc
22980: Added AuditService.clearAudit(List<Long>)
22986: ALF-5028 - Tagging Service Update - Use the audit service as a persisted event log, so that tag scope updates can occur in batches and without contention issues. (Further tests and post-startup executor still needed)
This commit enables the Audit Service by default, but turns off all the audit applications except tagging by default, so there shouldn't be any noticable changes
22997: ALF-5028 - More tag scope updates and unit tests. Shortly after the system is started, check for un-applied tag scope updates, and apply them.
23015: ALF-5028: Tagging test mods
- Join onto first-level threads to be sure that first round of tagging has been done
- Double-checks for transaction leaks (found 1)
- Some formatting (new test only, but should be applied to file)
23148: Merged PATCHES/V3.2.0 to V3.3-BUG-FIX
23133: ALF-5221: Fixed file handle leaks in TaggingService
23149: Merged V3.2 to V3.3-BUG-FIX
23070: Part-fix ALF-5134: Performance of Alfresco cluster less than performance of single node
- Prevent cache being updated even when there are no changes
- Prevents some cache invalidation messages during read operations
23071: ALF-5134: Performance of Alfresco cluster less than performance of single node
- Removed null-equivalence check in TransactionalCache
- Avoids cache update messages when running against empty caches
23150: (RECORD ONLY) ALF-5235: Merged HEAD to V3.3-BUG-FIX
22695: ALF-3800 "File is uploaded to the Document Library when its size more than user quota": make sure the exception is thrown back up to the transaction machinery to perform a rollback
23156: Merged V3.3 to V3.3-BUG-FIX
22913: Add jars back into Tomcat bundles
23028: Merged DEV to V33:
23022: ALF-4760 : XAM post-retention cleanup job: XAMArchiveJob
1. Post-retention xam cleanup job was implemented according to requirements provided by Derek.
2. Unit tests was added for new functionality.
23125: Merged HEAD to V3.3
20752: BatchProcessor is fed work by a BatchProcessWorkProvider
22297: Fixed ALF-4676: WorkProviderIterator over BatchProcessWorkProvider does not fetch all results
23126: (RECORD ONLY) Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
22883: ALF-4800 - AVM - intermittent test failure (layered file delete)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23161 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
16737: Fix for ETHREEOH-2903: MSSQL bootstrap failed : "n must be positive"
16826: Missing merge metadata on root from previous check-in CHK-9689
16847: Merged V3.1 to V3.2
16835: Build fix after PDFBox lib change
16915: (RECORD ONLY) Removed deep svn:mergeinfo
16923: Lucene performance: avoid too many index deltas ...
16933: Fix ETHREEOH-1788 - Bootstrap fails due to disabled-avm-indexing-context.xml
16935: Merged V3.1 to V3.2
15894: Fix ETHREEOH-2416 and ALFCOM-3300: Duplicate name exceptions not being trapped correctly
16936: Merged V3.1 to V3.2
16672: Fixed ETHREEOH-2021: System error appears when trying to paste content
16686: Fixed ETHREEOH-2129: HibernateNodeDaoService implementation does not cater for a null condition
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r15894,16672,16686,16811,16816,16835
Merged /alfresco/BRANCHES/V3.2:r16737,16826,16847,16915,16923,16933,16935-16936
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
15341: Update svn:mergeinfo
15220: NestedSQLException containing causal exceptions with word "deadlock" will trigger a retry
Added "constraint" search as part of the merge
15565: Update svn:mergeinfo
15569: Merge 3.1 to 3.2:
15231: Fix for cut/paste file between folders on CIFS. ETHREEOH-2323, + ENH-515. (Record only)
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r14561-14562,14922,15155,15233-15234,15258,15326
Merged /alfresco/BRANCHES/V3.2:r15231,15341,15520,15565,15569
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16857 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13077: Abstracted ContentStore MBean operations
13099: Merge V3.0 to V3.1
13096 Merged V2.2 to V3.0
13071: Fix ETWOTWO-1058: Hibernate exception while concurrently submitting from and updating same user sandbox.
13079: Fix ETWOTWO-1117: Misleading exceptions reported during AVM flatten and update
13102: [no comment]
13112: Merged V3.0 to V3.1
13111: Merged V2.2 to V3.0
13110: Fix 2.1 -> 2.2 upgrade on Postgres
13114: Build/test fix (Enterprise Remote API project does not yet have any Java files to generate Javadoc)
13117: DM Index Check - unit test improvements
13123: *RECORD ONLY* Removed svn:mergeinfo fluff
13124: Used newer, more efficient NodeService.addProperties method instead of many NodeService.setProperty calls
13125: Added M2Binding for 'child-association': propagateTimestamps'
13126: WCM unit tests - reduce build/test time to check (async) submits
13127: Minor test fix - to allow it to run locally (on Mac OS X)
13130: Support for 'maxRetries' of zero or less
13131: Merged V3.0 to V3.1
13025 *RECORD-ONLY*: Removed unnecessary svn:mergeinfo
13026: Merged V2.2 to V3.0
12964: Fixed ETWOTWO-968: Space rules are not run when saving from MS Word
12993 *RECORD-ONLY*: added openoffice bootstrap context to sample-extensions
13009 *RECORD-ONLY*: Avoid default OOo config from causing problems on zip/gz installs
13132: Updated svn:mergeinfo
13134: ETHREEOH-1202 - initial fix and unit tests
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r13005,13025-13026,13030,13039,13042,13050,13053,13096,13098,13111
Merged /alfresco/BRANCHES/V2.2:r12964,12993,13009,13071,13079,13110
Merged /alfresco/BRANCHES/V3.1:r13077,13099,13102,13112,13114,13117,13123-13127,13130-13132,13134
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13564 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
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
10586: Merged V2.2 to V2.9
9883: Fix for https://issues.alfresco.com/jira/browse/ETWOTWO-561
9893: Gave some more time to wait for the threads to finish (QNameDAOTest)
9955: Added trace logging of calls that possibly cause failures during session flushing
9956: Part fix ETWOTWO570: RetryingTransactionAdvice needs to use RetryingTransactionHelper
9958: Fixed ETWOTWO-570: AVM transaction interceptors fail if methods are incorrectly declared
9973: More missing transaction declarations for AttributeService
9977: Fixed unit test to rollback properly after expected txn failure
9978: Fix for ETWOTWO-440: Error : 500: Failed to execute method NodeInfoBean.sendNodeInfo
9986: LinkValidationService missing txn declaration for onBootstrap
10588: Merged V2.2 to V2.9
9898: Fixed handling of cm:name on root nodes
9900: Empty property sets are allowed
10589: Merged V2.2 to V2.9
9965: Fixed unit test to inject 'nodeService' and not 'NodeService'.
10311: getWebProjectUserRole - change log level from info to debug
10329: Fix missing and mis-spelt transaction declarations
10343: Fix for ETWOTWO-32
10346: Build Fix
10358: Fix for ETWOTWO-621
10362: Fix for ETWOTWO-518
10371: QNameDAO cache doesn't blow up if cache entry is invalid
10538: Fix for minor XSS issue identified in ETWOTWO-657 item 3
10678: Merged V2.2 to V2.9
10205: Fix for ETWOTWO-48: Cancelled import of war into a Web project and Web Project became unusable
10206: Fix for ETWOTWO-181: Deletion of checked out document
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10710 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
9845: Merged V2.2 to V2.9
9733: Merged V2.1 to V2.2
9281: Improvements to index AUTO recovery
9316: Fixed ETWOONE-193: Transactional caches not being cleaned up after rollback (2.1.4 regression)
9317: Fixed ETWOONE-194: Faster void handling during index tracking
9365: Improved performance for finding which snapshots have been indexed
9413: Support to retrieve read/write state of the transaction and ensure Lucene commits are handled last
9414: ACT-3245: Updating node properties and aspects don't bump the alf_node.version value
9415: Code cleanup: Removed unnecessary empty methods
9416: Fixed creation of multiple thread pools
9417: Full index recovery absorbs indexing exceptions by default
9418: Added AUTO index recovery option to sample in line with Wiki docs
9419: ETWOONE-194: Index tracking is too slow
9420: Fixed ETWOONE-201: Better logging and configurability for RetryingTransactionHelper
9421: Fixed ETWOONE-202: SPlit person cleanup doesn't break read-only transactions
9422: Follow up on CHK-3317: Removed use of JDK 1.6 NavigableMap interface
9423: Fixed unit test after CHK-3317
9424: More test fixes after CHK-3317
9425: Ensure that index tracking tests don't run too long.
9426: Made concurrent reindexing optional. It is on by default.
9509: ACT-3539: Mid-transaction locking on Lucene resources
9547: Multithreaded index tracking startup: Handle previously lagging single-threaded rebuilds
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10592 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
8265: Added catch blocks for the permissions service access denied exception to various file/folder operations
8286: Merged V2.1 to V2.2
8256: Fix broken WCM workflow.
8257: Partial fix for AWC-1850
8283: Merged V2.1-A to V2.1
8264: Fine-grained debug logging for exceptions causing transaction retries.
8288: Should fix workflow problems. Hard to test since almost nothing works right now.
8291: Added Peter's fixes to improve deployment start scripts
8294: Update deploy script from Peter
8298: Fix for WCM-1058:
8300: Commented out admin dashlet (active_tasks)
8359: Fix AR-1735: Customer-requested POI upgrade
8367: Fix for AWC-1639
8368: Fix for WCM-1102
8389: Revert changes between r8072 and r8251 from Schema2XForms.java
8401: Fix for WCM-1105
8407: Minor typo fix
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7534: Merged V2.1 to HEAD
7398: XPath metadata extractor selector handles malformed and empty XML files
7401: Fix AR-1879: JBPM Timer never fires
7413: Contribution: Integrity checker ignores exceptions that would normally trigger transaction retries.
7416: AR-1884.Unicode wildcard processing.
7417: Added filtering of pseudo files when a partial wildcard search path is used, such as '*.csv'. AR-1889.
7436: AR-1863: major version's can now be created via the web service API;
7451: Fix for handling of UTF-8 application/x-www-form-urlencoded encoded form arguments as raised in support ticket 242
7458: Fix for AR-1900
7520: Fix to Template API where content was not retrievable from custom d:content properties on a node
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8413 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6975: Fix for WCM-883 - ZIP files with non-ascii characters, now gives the user an option for the encoding of the ZIP filenames
6978: Fixed test for 2.1 bean names.
6981: Fixes test failure.
6982: Integrity exception message carries full failure details.
6983: Added upgrade script for SQL Server.
6988: Replaced UserTransaction with RetryingTransactionHelper.
6989: Added org.hibernate.ObjectNotFoundException RetryingTransactionHelper.
6996: Added updated support for datetime tokens in the lucene index
7001: FIx for AR-1806
7015: Added missing post-create index script for QName columns on alf_child_assoc.
7022: Merged V2.0 to V2.1:
7013: Fixed primary child node status query
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7371 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6958: Fix for WCM-823
6959: Merged V1.4 to V2.1
6943: Upgrade scripts for transaction commit time and indexes for QName columns on alf_child_assoc
6960: Fixed script patch "applied on" date updates.
6961: Retry transactions on ConstraintViolationException.
6964: Added svn revision number to be substituted into build string if build number is not passed.
6965: Daylight savings for FTP. Fix for AR-1776.
6966: Added catch blocks for the AVMLockingException. WCM-877.
6967: Interim fix for WCM-866 (large link validation report causes SQL exception)
6968: Fixes for AWC-1309 "Broken preview image for Web Projects in MySpaces" and similar AWC-1635 "Broken/Missing images in MySpaces Web Script".
6970: Force DB write ordering of the NodeStatus vs Node object.
6971: More transaction demarcation fixes for special cases of non-executed script patches.
6972: Switch off session size management for the mass archive and restore test.
6973: Fixed AR-1801: Boolean isMultiValued() no longer returns null
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7370 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6944: More hibernate session cache taming.
6945: Times for commits are close to linear in the number of items submitted.
6946: Missing break statement. (Courtesy of Jan).
6948: Fixed session cache eviction problem triggered by resetLayer().
6956: Wrapped AVMService and AttributeService in TransactionResourceInterceptor.
Reverted log4j.properties
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7368 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
6418: Allow getLayeringInfo on deleted nodes.
6419: fixes for submitting of deleted directories and regenerate renditions related fixes.
6420: Added installs to build
6421: Build fix for sdk
6423: WCM-710 - Submit All feature reintroducted to WCM My Modified Files views
6424: OpenOffice connection is now tested on bootstrap.
6425: AWC-1446 - Space Selector would show spaces you do not have access to
6426: WCM-699 - Staging area user assets
6427: Rollback exceptions now explicitly handled by RetryingTransactionHelper to extract the cause of the exception.
6428: Fix for AWC-1340
6429: Fixed transaction boundaries for full index recovery components
6433: AR-1660 - SMB and SMB2 signature check
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6338: Some WCM-435.
6344: Fix for AWC-1452 (dialog close navigation issue)
6345: Fix for AR-1611 and other related CIFS and NFS fixes
6346: Minor javadoc fix for ReplicatingContentStore
6347: Handle exceptions arising from UserTransaction.begin().
6348: Many WCM fixes in one
Conflicts resolved on faces-config-beans.xml
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6722 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- A patch will assign initial version values to the entities
- Deprecated TransactionUtil in favour of the RetryingTransactionHelper
- Renamed RetryingTransactionHelper.Callback to RetryingTransactionHelper.RetryingTransactionCallback
The name Callback clashes with many other classes in the classpath
- Moved loads of components to be included in the retry behaviour
Duplicate name checks
- This is done using a query, but the entity update is not written to the database early
- Concurrent adds of the same-named child node will only fail at the end of the transaction
- TODO: Detect the duplicate violation during transaction retrying
Workaround for ADMLuceneTest
- Disable session size resource management during tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5823 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
executeInUserTransaction().
Changed the on close callback for write listeners to use a RetryingTransaction.
The point of this exercise is to make it possible for clients of the core server
to ignore transient resource contention failures. CIFS, for example, will be able
to take advantage of this, since a transient error condition currently results in a dead
share.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4597 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
