29057: ALF-9491: Bitrock 7.2.2
29063: ALF-8766 Concatenated strings in EN webclient file
29066: Merge DEV/DEV/BELARUS/V3.4-BUG-FIX-2011_07_13 to DEV/V3.4-BUG-FIX
29010: ALF-7396: Japanese- Untranslated
29072: HomeFolderProvider work - Changes as a result of Dave Ward's comments
(HomeFolderManager not fully done as there is a spring issue with using NodeService, FileFolderService, fileFolderService, SearchService or searchService)
29074: ALF-7637 - Share displays incorrect folder contents after copy-on-outbound rule against working copy
29075: ALF-8406 - Configuring the datalist display for sub-types does not work
29082: ALF-6847 translation: "Collega" should be reverted to English: "Link" as per term list.
29087: ALF-5717 property names for wcm quickstart website-model had an invalid format or did not end in .description or .title
29093: Merge V3.3 to DEV/V3.4-BUG-FIX (28596)
28596: Remove dependency between subsystems and all the object factories in the parent context!
- Do not allow eager initialization when looking up parent post processors
- Removes circular dependencies from sysAdmin subsystem
29094: Merge HEAD to DEV/V3.4-BUG-FIX ()
28892: Broke circular references between NodeService beans, NodeIndexer, Lucene and back to NodeService.
- NodeIndexer is now bootstrapped to pull out reference to the Lucene beans
29100: Revert Merge V3.3 to DEV/V3.4-BUG-FIX (28596) Caused RepositoryStartupTest to fail
28596: Remove dependency between subsystems and all the object factories in the parent context!
- Do not allow eager initialization when looking up parent post processors
- Removes circular dependencies from sysAdmin subsystem
29102: ALF-9048: Make apply_amps.bat work from its installed location
29103: ALF-8746: Restored Japanese choice format translations
29104: Merged V3.3 to V3.4-BUG-FIX (Reinstated this revision as it is required)
28596: Remove dependency between subsystems and all the object factories in the parent context!
- Do not allow eager initialization when looking up parent post processors
- Removes circular dependencies from sysAdmin subsystem
29105: Use org.springframework.aop.target.LazyInitTargetSource in the NodeService public proxy to break a circular dependency
29106: Make PersonService interact with HomeFolderManager via a lazy proxy to prevent another circular dependency
- Simple HomeFolderManager interface created
- Implementation class renamed to PortableHomeFolderManager
- Removed TODOs from authentication-services-context.xml
29107: Forgot to remove the serviceRegistry dependency from homeFolderManager
29108: ALF-9529: Installer memory consumption and startup time improvements
- Bitrock discover the for loop!
29109: ALF-9530: Postgres installed as Windows service should run as a postgres user, not System
- Fix from Bitrock
29118: Fix for ALF-6737 - It's impossible to view any version of the wiki page if it was renamed with native characters
29119: Fix for ALF-5787 - strings extracted for L10N in Web form creation help text
29124: ALF-9530: Follow up fix from Bitrock
29126: Fix for ALF-8344 - Incorrect message is displayed while recover deleted file
29127: Fix for ALF-9445 - French - Share, translation on Transfer Target configuration
29129: ALF-9476: Make FTPS work on IBM JDK
29133: Fix failing DictionaryRestApiTest
29136: Fix build issues from 29104:
- run as system when creating home folders (PortableHomeFolderManager)
- re-factored onCreateNode out of PortableHomeFolderManager into PersonServiceImpl
- re-factored property PortableHomeFolderManager.enableHomeFolderCreationAsPeopleAreCreated to PersonServiceImpl.homeFolderCreationEager
29137: Fix for ALF-8831 - Internal error occurs in My Tasks Webscripts component
29138: Fix for ALF-8765 - Layout is displaced if translated string occupies more than 1 line
29140: Fix for ALF-8668 - Deleting author account causes Failed to load the forum posts
29142: - PortableHomeFolderManager: Moved code to run as System into PersonServiceImpl so that one must have a valid authority to call the publick makeHomeFolder method. The authority should already be valid if called via PersonServiceImpl.
- Removed unused policyBehaviourFilter property from PersonServiceImpl
29146: ALF-8701: partially translated string in html-upload.get_fr
29147: ALF-8727: DE - changes to Root Category
29149: ALF-8731: DE - Wiki changes (space before full stop)
29152: ALF-9503: Add space after colon in strings in file wdr-messages.properties
29153: Fixed ALF-7899: association.ftl does not render when showTargetLink=true in workflow
29165: ALF-8749: on submit action properties in wcn-workflow-messages.properties
29166: Fix for ALF-6220 - Language pack - .ftl localization
29167: ALF-9550 - Typos in new section of webclient.properties
29169: Fix for ALF-7844 - W3C: Impossible to activate 'Choose from popular tags in this site' link by Enter/Space keys
29170: Merge V3.4-TEAM to V3.4-BUG-FIX (3.4.4)
27471: Fix for ALF-8150 - check for visibility before applying focus to element for IE.
29171: Fixes: ALF-8922, removes date formatting from API (now returns ISO8601) and instead formats it on the client, using L10N strings.
29172: Fix for ALF-2023 - Repository Action - Copy item to specific space doesn not include content. The option to 'deep copy' is now exposed in the UI for Run Action and Rules in Explorer.
29173: Fix for ALF-1446 - Sorting of inline descendants is not observed
29175: ALF-241 - The item is not coppied via 'Paste All' in Shelf when 'Details' page is opened
29177: Fix for ALF-9520 - confusing sample config. Reordered sample config file as suggested.
29178: Fixed ALF-6400: GERMAN: Explorer mouse over hints for TinyMCE are not localized
Fixed ALF-5766: ALL translations errors in Explorer - Calendars are not localizable for content based on webforms
29202: Merge DEV/BELARUS/V3.4-BUG-FIX-2011_04_12 to V3.4-BUG-FIX (3.4.4)
27836: ALF-8524: CLONE - Sharepoint doesn't work with HTTPS
Changes in url links required for HTTPS support.
29203: Restored removal of postgresCreateSymLinksLinuxBuildingFromWindows tag (32 bit Linux) from revision 26582
29211: Fix for ALF-1051 - It is impossible to find link by tag from link details page
29212: Fix for ALF-5301 - TinyMCE is replacing carriage return with white spaces
29250: Latest L10N update for all languages (DE, ES, FR, IT, JA) from Gloria (based on r29172)
29253: L10N Update from Gloria
29270: Fixed ALF-516: Unable to add content/delete tables in webform content when using FireFox
29271: Update from Gloria
29272: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_07_13 to BRANCHES/DEV/V3.4-BUG-FIX: (with minor modification)
29223: ALF-7619: When document A has an association with a document B editing A's properties fails if user has no permission to edit B
29274: ALF-9517 Incorrect behaviour of versions on Copy action. Version is 0.1 rather than 1.0
29283: Resolve ALF-8273: Valid datetime value cannot be parsed by CMIS AtomPub interface
29284: Update from Gloria
29286: ALF-9596: Merged PATCHES/V3.4.1 to V3.4-BUG-FIX
28150: ALF-8607: Detailed debug logging when out of sync transaction detected by index checker / tracker
28177: ALF-8607: Corrections to debug logging in AbstractReindexComponent
28213: ALF-8607: Further corrections to debug logging in AbstractReindexComponent
- Log attributes from indexes, rather than nodeService properties
28341: ALF-8607: Stop index checker from 'lying'
- isTxnPresentInIndex() call must be made in a new transaction in order to get a database view in sync with the current indexes
28352: ALF-8607: Revisit transaction delineation. Nested transaction only required in checkTxnsImpl()
28403: ALF-8607: Merged PATCHES/V3.3.4 to PATCHES/V3.4.1
27823: ALF-7237: Index tracker needs to perform a cascade reindex on updated nodes in order to cope with node moves
28406: ALF-8607: Improvement to FTS fix. Prevent FTS from restoring documents that have been deleted!
28412: ALF-8607: Invalidate properties and aspects as well as parent assocs when stale cache entry dected during transaction tracking
28427: ALF-8607: Prevent NPE with bad NodeRef in ADMLuceneIndexerImpl.createDocumentsImpl()
28705: ALF-8607: Validate transaction IDs when fetching parent associations
- Compare the cached child node transaction ID against one fetched from the DB
- Stops us from pairing up the cached node for an older or newer transaction with the wrong parent associations
28707: ALF-8607: Merged PATCHES/V3.3.4 to PATCHES/V3.4.1
28588: ALF-7237: Prevent FTS from ever wiping out a document that still exists and ignore duplicates
28708: ALF-8607: Make FTS capable of recovering from cache concurrency issues by using a RetryingTransactionHelper and better exception handling.
- Also avoids skipping the entire batch when the reindexing of a particular document fails.
28710: ALF-8607: Corrected transaction delineation
28753: ALF-8607: Prevent errors caused by AbstractReindexComponent diagnostics trying to parse FTSREF document IDs as NodeRefs (which they aren't!)
28755: ALF-8607: When 'failing over' during FTS indexing, don't bother adding a FTS status document so we don't get stuck in a loop with a problematic document
28815: ALF-8607: Do two way validation of cached / fetched nodes and their parent associations to avoid skew
- Should resolve problem of tracking moves to the archive store and moves in general
28862: ALF-8607: Lucene indexers now support 'read through' behaviour for FTS and Index tracking batches
- Small discrete read only transactions used to read each reindexed node from the database / cache
- Avoids cache 'drift' and 'skew' after long running indexing transactions
28863: ALF-8607: Missing file
28869: ALF-8607: isTxnPresentInIndex() needs to 'read through' so index tracker and checker don't pollute the cache
28872: ALF-8607: Optimization to prevent constant writing to AVM indexes whilst 'ticking over'.
28950: ALF-8607: Improved logic in AbstractReindexComponent.isTxnPresentInIndex() so that we can reliably cope with multi-store transactions (e.g. archive store + spaces store)
- Due to FTS, the txn ID may have 'drifted in' to one store but not the other so we must validate all stores in the txn
29098: ALF-8607: Use getNodeRefStatus as a cache validation point for reindexing 'read through' transactions
- Guarantees that FTS reindexed node will see correct state (well if we had consistent read behaviour it would!)
- Removes stale nodeRef -> ID mappings (e.g. when original node moved to archive store and substituted with deleted node)
- Inexplicably seems to produce a ~30x speedup in performance tests on MySQL! Appears to remove a contention point. More investigation required to find out what!
29287: ALF-9598: Merged PATCHES/V3.4.1 to V3.4-BUG-FIX
28653: ALF-9189: More efficient usage of IndexReaders to avoid huge memory churn with large indexes
- A single reading thread could block out all other reading threads because a write lock is obtained whilst constructing a set of FilterIndexReaderByStringId readers and all deletions across all indexes have to be evaluated. We now cache a FilterIndexReaderByStringId for each 'layer' of the index so that we get some reuse. We also defer evaluation of deletions to AFTER the write lock is returned and in some cases never have to evaluate the deletions at all.
- When merging deletions we now make use of a cached index reader for locating the documents, and only resort to a new reader if deletions have to be performed. Hopefully this will mean that the reader for the largest indexes, containing the least recently used stuff, will get left alone most of the time.
28690: ALF-9189: Corrections to previous fix
- Forgot to remove non-lazy reader initialization
- Fixed NPE
- Reinstated correct looping behaviour - each processed delta must be considered as one of the indexes to search for the next processed delta
29099: ALF-9189: Avoid having to allocate a byte array full of number ones for all occurrences of a term to 'fake' norms.
- Severe Lucene memory hog during FTS
29262: ALF-9189: Fixed memory leak during index tracking / reindexing and further memory leak regression
- Fixed up Lucene refcounting again - remember to propagate through decrefs on ReferenceCounting readers
- Refined ALF-9189 fix to guarantee mainreader clean up
- Remember to flush the delta during reindexing / tracking
- Some extra trace diagnostics to help
29288: ALF-9600: Merged PATCHES/V3.4.1 to V3.4-BUG_FIX
28876: ALF-9041: Merged HEAD to PATCHES/V3.4.1
28850: Latest SpringSurf libs
- Fix to SSO connector passing empty username
29289: ALF-8241: assemble-tomcat populates endorsed directory with xalan.jar and serializer.jar and Bitrock installer installs these too
29291: Merged DEV/SWIFT to V3.4-BUG-FIX (3.4.4) - already merged to HEAD as part of a larger merge
26104: RM: Remove incomplete and unnecessary unit test
29302: Fix for ALF-8885 - Unable to paste item due to system error:null
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29325 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
28993: HomeFolderProviderSynchronizer: Provider used for LDAP to continue to use username as home folder name directly under .../app:company_home/app:user_homes
Property spaces.user_homes.regex.pattern now set to "" rather than "^(..)" which would have given a single level hash structure.
28970: Merge DEV/ALAN/HOME_FOLDER to DEV/V3.4-BUG-FIX
28947: - Introduction of version 2 HomeFolderProvider2 and re-factor of version 1
so that the code used to create the folders is now in the HomeFolderManager.
- Re-factor homeFolderProviderSynchronizer to handle HomeFolderProvider2.
- Addition of AbstractHomeFolderProvider.V2Adaptor to allow external providers
that extend AbstractHomeFolderPathProvider to be handled by
homeFolderProviderSynchronizer.
28860: Minor change to class comment and removed unused imports
28858: ALF-4727 Hashed home folder provider added and used by default for LDAP sync users - based on Romain Guinot work.
ALF-7797 HomeFolderProviderSynchronizer added to move existing users (normally those added by LDAP sync) into location preferred by home folder provider.
- HomeFolderProviderSynchronizer bug fixes
- tenant accounts supported for first time
- addition of a phase to create parent folders before moving home folder to avoid a race condition
- check for conditions that would result in FileExistExceptions as we don't want a the transaction to be discarded as this results in retries.
- HomeFolderProviderSynchronizerTest integration test including tenant services
- HomeFolderManager now sets the HOME_FOLDER_PROVIDER if it uses a default when HOME_FOLDER_PROVIDER is not set.
- AbstractHomeFolderProvider clears cache when path reset as it will be invalid.
- UIDBasedHomeFolderProvider.createNewParent creates its own mutable List as the one passed in may not be mutable.
28580: Save code changes - added comments to do with LDAP syn overriding the HFP value and related to this added a global property to keep empty parent folders.
28347: HomeFolderProviderSynchronizer
- issue to do with new run of sync having created a user via UI that has a home folder as one of the parent folders.
- issue to do with catching exception when creating temporary folder - transaction is gone
- give up if error in any phase
28298: Addition of HomeFolderPathProvider (based on Romain's work) and addition of HomeFolderProviderSynchronizer.
28956: Merged DEV to V3.4-BUG-FIX
ALF-9428: Multitenancy users not preserved after upgrade from 3.2.2.7 to 3.4.2
- Provide correct RunAs context in FixUserQNamesPatch batching.
28941: ALF-9361 : CLONE -sync Flat IMAP client with Alfresco is slow and inaccurate
28916: ALF-9421 The AlfrescoJavaScript action now includes company home in the JavaScript scope.
28879: Fixed ALF-9296: Alfresco Dashboard: Impossible to approve/reject task from My Tasks dashlet on My Alfresco
28875: Fixed ALF-6329: SPANISH - Share, translation on Transfer Target configuration
28864: Message:
ALF-9430: RuntimeExec waitForCompletion logic is obscure
- Only a single flag 'isCompleted'
- Set flag in try-finally
- Added notify()
However, the wait() code doesn't, in practice, get called because the waitForCompletion is synchronized with the run()
and is called a while after the reading thread is triggered. So the logic is less obscure and safer for the finally.
28800: File for rev 28799: ALF-9240
28799: Merged DEV to V3.4-BUG-FIX
28797: ALF-9240: Issue with adding an aspect with large multivalued list
Added unit test to stress, but could not reproduce
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28995 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
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
13171: Fix for ETHREEOH-1239: User needs to have owner on their person
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r13171
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13609 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
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
