24662: 3.4.1 bug fix branch
24718: Merged V3.3 to V3.4-BUG-FIX
24717: Fix ALF-5555: It is impossible to edit review date from record's details page
24719: Fix for ALF-6106: Error on Check In operation with % symbol (SPP)
24733: Better fix for ALF-6106: Error on Check In operation with % symbol
24734: Fix for ALF-6089: Incorrect order of fields at 'Create Series', 'Create Category' and 'Create Folder' forms
The name, title and description fields are now placed in their own group on the server, all other non custom rm fields are put in an 'other' group, the client side config then declares a set for each group and orders them appropriately.
24752: Merged V3.4 to V3.4-BUG-FIX
24751: Merged V3.3-BUG-FIX to V3.4 (RECORD ONLY)
Restored V3.3-BUG-FIX mergeinfo, somehow truncated in revision 24274
24753: Merged V3.3-BUG-FIX to V3.4-BUG-FIX
23870: Merge Dev to V3.3_BUG_FIX
ALF-4243: F5 load-balancer sending regular HTTP requests to Alfresco server causing Faces Servlet to throw java.lang.NullPointerException (MyFaces upgrade to from 1.1.5 to 1.1.7)
23897: Additional fixes and tweaks since introduction of MyFaces 1.1.7 library.
23919: More JSF component id related fixes.
23945: More MyFaces1.1.7 JSF page fix ups
23959: Another MyFaces 1.1.7 dup id issue fixed.
24008: ALF-4243
- Upgraded MyFaces from 1.1.7 to 1.1.8 to fix a bug seen in 1.1.7
- Added handling for the fact that valuebound properties that result in null now cause an exception where-as they were perfectly valid in 1.1.5.
24419: Merge from V3.3 to V3.3-BUG-FIX
r.24418 Fix for ALF-6075. Running out of /tmp space on the server is causing uploads to fail.
24768: Fixes ALF-6295: Allows MySQL to not be installed via unattended installer invocation
24771: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
24767: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
24765: ALF-6547: fix intermittent test failure (AssetServiceImplTest renameFile/renameFolder) - fallout from ALF-1948
24779: Merge V3.3 to V3.4-BUG-FIX
24497 : ALF-3092 - deployment service - catch Throwable from Begin.
24684 : Merge DEV/BELARUS/V3.3-BUG-FIX-2010_10_04 to V3.3
23498 : ALF-5498 In Windows XP, placing a Folder with a Name that already Exists Removes all Content of the Existing Folder
24749 : ALF-6174 - Transfer Service fails with double peer assoc custom content type
24766 : ALF-5603 - It is impossible to assign workflow from workflow console to non-admin user
24802: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
24801: Fix for ALF-3055: "SecurityTestSuite hangs when run in DOD5015 context - failed authentication audit hangs on DB connection"
- do failed audits in a separate thread (from a thread pool)
24812: Fix ALF-6316: A new "spoof" multivalue text property (cm:tagScopeSummary) is now made available for TagScope nodes when accessed via the getProperty or getProperties operations on the standard node service. The values of this property take the form "<tagname>=<tagcount>". A new interceptor has been added to the node service to do this (TagScopePropertyMethodInterceptor). WQS has been tweaked to make use of this new property, and the now defunct behaviour has been removed.
24820: Work in progress refactoring transaction handling of transfer unit tests.
24822: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
24821: Fix for ALF-3055: "SecurityTestSuite hangs when run in DOD5015 context - failed authentication audit hangs on DB connection"
- fix up unit tests
24834: ALF-6468 - Update the scheduled actions folder bootstrap to use localisable names and descriptions, following the normal pattern
24836: Added system property 'system.cache.disableImmutableSharedCaches' (false by default)
- Equivalent to disabling Hibernate L2 cache for *immutable* entities
- Allows distinction between mutable and immutable cache entries
24850: Fix ALF-6562: Moved property that is used to label the WQS dashlet on the "configure site dashboard" page out of the Slingshot project and into the WQS Share Module project. Corrected its value to "Web Quick Start" rather than "WCM Quick Start".
24857: Merged V3.4 to V3.4-BUG-FIX
24853: Merged V3.3 to V3.4
24852: Fixed ALF-6573 "Incorrect name of subgroups on "Groups" page"
24870: Removed svn:mergeinfo from root
24873: Merged V3.3 to V3.4-BUG-FIX (RECORD ONLY)
21789: ALF-4333: Fix
- Updated RepoPrimaryManifestProcessorImpl so it can handle deletions that are reported by either pre-delete noderef or archived noderef (previously only handled the latter).
- Updated TransferManifestNodeFactory so that it handles the case where the status of the node to transfer is "deleted".
- Updated UnitTestTransferManifestNodeFactory so that it handles the change to TransferManifestNodeFactory above.
- Added new tests for deletion cases.
23259: Merged HEAD to V3.3
23256: Fix ALF-4573: Start Workflow action is absent for edited document and working copy in Share
23346: Brought WebQS module in (including build process but not installer elements yet)
23371: "Simply" added wcmqs to installer
23391: ALF-5367: Copy dlls into tomcat/bin as appropriate.
23485: Merged V3.4 to V3.3 (fix backported for V3.3.x lines)
23472: Fixed ALF-5408: SQL Server missing ON DELETE CASCADE declarations
23515: Merged PATCHES/V3.2.0 to V3.3
23514: ALF-5554: Merged HEAD to V3.2.0
23153: When updating tag scopes following system shutdown/restore, be smarter about quickly skipping tag scopes that another (new) thread is currently working on
23283: More debugging level logging for tagging updates, to help identify the problem with periodic multi-threaded test failures on bamboo
23535: Merged V3.4 to V3.3 (complements 23517: ALF-5552)
23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs
23564: ALF-5600: Merged V3.4 to V3.3
23424: Fixes: ALF-2989 - Incorrect sideId reference in URL for event in Site Calendar Dashlet
Adds support for displaying events that start in the past but finish in the future (previously only events that start in the future were shown)
23586: MERGED V3.4 to V3.3
22864: Fix for ALF-5005: "Create and edit functions on AWE become "confused""
23042: Fix ALF-5127: Impossible to create an article/blog (WCMQS) [Must clear panel hideEvent handler if manually hiding a YUI panel]
23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size.
Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call)
23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events.
23630: Backport of installer
23631: Added 64-bit & deployment installers
23664: Fixes ALF-5691: TransferService: Multi-byte characters are not encoded correctly
23681: Fixes ALF-5699: TransferService: Snapshot file from source repo never contains complete MLText properties
23695: Fixed bug exposed after fixing ALF-5699. Parsing of MLText properties out of the transfer snapshot file was incorrect, and that was causing multi-lingual property values to be duplicated
23709: ALF-5699: Fix NPE in ManifestIntegrationTest
23734: Merged V3.4 to V3.3
23731: Fixes for ALF-3098 and ALF-3097
- Share - Security check on Personal Dashboard - only the owning user can view a user dashboard page
- Share - Security issue on Customize Site Dashboard - private and moderated site dashboard pages no longer visible to non-members, customise site and dashboard pages only accessible to SiteManager
23747: ALF-5696: Merged V3.4 to V3.3
23585: Fixed ALF-5372 "JavaScript error on Groups management dialog with IE8 : document.getElementById is null"
23790: Fixed ALF-3823 "Share: RSS feed can't be read: http://cds-srv.sun.com:8700/rss/update/public/sunalert_update.xml - ok with other RSS client."
23883: Fixes ALF-5759: WQS: Attempt to copy a website section fails
23907: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_09_20 to V33
22750: ALF-4846: Update rules are firing on inbound actions
23931: Undid rev 23907 (Reverse-merged /alfresco/BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_09_20:r22750)
23961: Fixed ALF-5686 "Incorrect behaviour of "All" filter in "My Tasks" dashlet"
- Variables assigned in a <#macro> shall always be assigned using <#local> (using <#assign> makes them globally available which might cause naming collisions)
24132: Disable intermittent failing unit test
24148: ALF-6007: Merged HEAD to V3.3
23049: Fixed ALF-5099: Error when trying to go back in Create Web Content Wizard (only with certain XSDs)
24263: Merged from V3.3-BUG-FIX to V3.3
24264: V3.3-BUG-FIX to V3.3
24262: Stress test code for ALF-5025: Support background processing of archiving
24287: Added missing import
24336: Merged V3.4 to V3.3
23205: Fix for ALF-2111 - Download URLS are different on different pages, authentication fails when URL sent
24353: Merged V3.4 to V3.3
24352: Fix SQL fallout from ALF-6078
24510: Merged V3.4 to V3.3
21960: First round of date refactoring: Document Library pages now expect XML dates (ISO8601) from Share data webscripts
21961: Share client-side I18N utility now emulates sever-side handling of doubled-up single quotes.
24526: Merged V3.4 to V3.3
24402: Fix for performance degredation related to ALF-3823.
RSS feed processing in JavaScript relies on Rhino impl of regex - this is extreemly slow as Rhino regex is by far the slowest component of the library.
Switched code to use the Java Regex libraries to improve performance and reduce memory usage.
24587: Merged V3.4 to V3.3
24564: Fix for ALF-3727: Custom permissions aren't visible in Explorer UI
24604: Merged V3.4 to V3.3
24602: Build fix for RM permission model loading - collateral damage for R 24564
24774: Merged BRANCHES/V3.4 to BRANCHES/V3.3:
23492: Fixed ALF-5550: DB2: Unable to insert values into alf_string_value
24813: Merged BRANCHES/V3.4 to BRANCHES/V3.3:
24750: Limit installer builds to 2 threads
24874: Merged V3.4 to V3.4-BUG-FIX
24667: Resolve ALF-6202 - MT: fix offline edit (Share)
24672: Fixes from Gloria for: ALF-6339 and ALF-6337
24673: Merge V3.3 to V3.4
24668 : Upgrade of large repository to latest 3.3 fails on excession of mysql table lock size
24674: Fixes ALF-6294: Remove illegal CLI option
24675: Fix ALF-6099: CLONE - IE6: Sometimes errors occur on almost actions in Office Add-ins. Removed linebreaks from JSON response template & prevented "undefined" entries in URL.
24680: ALF-6120 : Version notes are lost for versioned items migrated from 2.2 to 3.4.0
24681: Merged BRANCHES/DEV/BELARUS/V3.4-2010_12_14 to BRANCHES/V3.4:
24609: MT - ALF-3563
24640: MT - ALF-3563
(merged w/ minor improvement)
24685: Fixes ALF-6403: Change installer window height on Linux
24688: Fix ALF-6029 (part II)
- MT: cannot "Show Folders" for "Data Dictionary" in Afresco Share
- part II adds patch and removes workaround
24689: Fixes: ALF-6219 - Incorrectly formatted variable in translation
24691: MT: ALF-3263
- Explorer login now fails with consistent error message ("Unable to login - unknown username/password.") if tenant does not exist or is disabled
24692: Fixes: ALF-6370 and ALF-6225 among others - sweep of FR and DE resource bundles for quote escaping.
24694: Fixes ALF-6424. Erased erroneous equals sign
24695: Fixes: ALF-6320 - removed the country specific portion of the language pack suffixes for French, German and Spanish. This enables speakers of those languages outside of those countries to benefit from the language packs.
24696: Fix for ALF-6299: XSS attack on editing blog post with XSS data in IE6&IE7
24700: Swaps _it_IT for _it to make Italian language pack available to Italian speakers outside of Italy.
24703: Avoid DB2 query failure if someone passes in a made-up UUID
- Test RunningActionRestApiTest was making up a long node UUID
- DB2 fails to set the parameter with SQLSTATE=22001
24706: Merged V3.4-BUG-FIX to V3.4
24705: Fix for ALF-6365, ALF-6335
24708: Fix ALF-6386: View Details and Edit Metadata icons are incorrect for folder
24709: Missing first/last name handling.
24711: Merged V3.3 to V3.4
24710: ALF-5535 - Fix to correctly format json number values (not as numeric human readable strings)
24713: Fix ALF-5404: It is now possible to configure who receives notifications of "Contact Us" requests by setting a configuration property on the WQS website node, such as "feedbackAssignee.Contact Request=brian"
Also added missing Spring MVC source to 3rd Party.
24715: Fix for ALF-6412. OOoDirect always tries to connect to port 8100.
Formerly the ooo.port property did not exist for the OOoDirect connector. It was added in r.23182 for the soffice process, but not for the connector bean. Now added for the connector too.
24721: Fix for ALF-6351 - Simple search breaks if override config is used and does not contain new 'repository-search' element
24728: Fixes: ALF-5685 - Incorrect encoding of Japanese Characters
24732: Fixes ALF-6381 and others - calendar strings appearing incorrectly. Problem was an unicode encoded comma preventing the property string being broken up into different days of the weeks or months.
24739: Fix ALF-6545: DB2: SQLCODE=-302, SQLSTATE=22001 (testCreateMultiLingualCategoryRoots)
- Shortened Japanese name to 14 characters
24740: Fixes: ALF-6413 (with some translations still pending).
24742: Update readmes.
24744: Merged HEAD to BRANCHES/V3.4:
24137: Fixes: ALF-5642, ALF-3892, ALF-5043 & Brings Add Event dialog in line with other forms in share by disabling the popup validation error box.
24746: Build/test fix: PostgreSQL -AssetServiceImplTest.renameFolder
24755: Merged V3.3 to V3.4 (RECORD ONLY)
21789: ALF-4333: Fix
- Updated RepoPrimaryManifestProcessorImpl so it can handle deletions that are reported by either pre-delete noderef or archived noderef (previously only handled the latter).
- Updated TransferManifestNodeFactory so that it handles the case where the status of the node to transfer is "deleted".
- Updated UnitTestTransferManifestNodeFactory so that it handles the change to TransferManifestNodeFactory above.
- Added new tests for deletion cases.
23259: Merged HEAD to V3.3
23256: Fix ALF-4573: Start Workflow action is absent for edited document and working copy in Share
23346: Brought WebQS module in (including build process but not installer elements yet)
23371: "Simply" added wcmqs to installer
23391: ALF-5367: Copy dlls into tomcat/bin as appropriate.
23485: Merged V3.4 to V3.3 (fix backported for V3.3.x lines)
23472: Fixed ALF-5408: SQL Server missing ON DELETE CASCADE declarations
23515: Merged PATCHES/V3.2.0 to V3.3
23514: ALF-5554: Merged HEAD to V3.2.0
23153: When updating tag scopes following system shutdown/restore, be smarter about quickly skipping tag scopes that another (new) thread is currently working on
23283: More debugging level logging for tagging updates, to help identify the problem with periodic multi-threaded test failures on bamboo
23535: Merged V3.4 to V3.3 (complements 23517: ALF-5552)
23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs
23564: ALF-5600: Merged V3.4 to V3.3
23424: Fixes: ALF-2989 - Incorrect sideId reference in URL for event in Site Calendar Dashlet
Adds support for displaying events that start in the past but finish in the future (previously only events that start in the future were shown)
23586: MERGED V3.4 to V3.3
22864: Fix for ALF-5005: "Create and edit functions on AWE become "confused""
23042: Fix ALF-5127: Impossible to create an article/blog (WCMQS) [Must clear panel hideEvent handler if manually hiding a YUI panel]
23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size.
Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call)
23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events.
23630: Backport of installer
23631: Added 64-bit & deployment installers
23664: Fixes ALF-5691: TransferService: Multi-byte characters are not encoded correctly
23681: Fixes ALF-5699: TransferService: Snapshot file from source repo never contains complete MLText properties
23695: Fixed bug exposed after fixing ALF-5699. Parsing of MLText properties out of the transfer snapshot file was incorrect, and that was causing multi-lingual property values to be duplicated
23709: ALF-5699: Fix NPE in ManifestIntegrationTest
23734: Merged V3.4 to V3.3
23731: Fixes for ALF-3098 and ALF-3097
- Share - Security check on Personal Dashboard - only the owning user can view a user dashboard page
- Share - Security issue on Customize Site Dashboard - private and moderated site dashboard pages no longer visible to non-members, customise site and dashboard pages only accessible to SiteManager
23747: ALF-5696: Merged V3.4 to V3.3
23585: Fixed ALF-5372 "JavaScript error on Groups management dialog with IE8 : document.getElementById is null"
23790: Fixed ALF-3823 "Share: RSS feed can't be read: http://cds-srv.sun.com:8700/rss/update/public/sunalert_update.xml - ok with other RSS client."
23883: Fixes ALF-5759: WQS: Attempt to copy a website section fails
23907: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_09_20 to V33
- 22750: ALF-4846: Update rules are firing on inbound actions
23931: Undid rev 23907 (Reverse-merged /alfresco/BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_09_20:r22750)
23961: Fixed ALF-5686 "Incorrect behaviour of "All" filter in "My Tasks" dashlet"
- Variables assigned in a <#macro> shall always be assigned using <#local> (using <#assign> makes them globally available which might cause naming collisions)
24132: Disable intermittent failing unit test
24148: ALF-6007: Merged HEAD to V3.3
23049: Fixed ALF-5099: Error when trying to go back in Create Web Content Wizard (only with certain XSDs)
24263: Merged from V3.3-BUG-FIX to V3.3
24264: Merged V3.3-BUG-FIX to V3.3
24262: Stress test code for ALF-5025: Support background processing of archiving
24287: Added missing import
24336: Merged V3.4 to V3.3
23205: Fix for ALF-2111 - Download URLS are different on different pages, authentication fails when URL sent
24353: Merged V3.4 to V3.3
24352: Fix SQL fallout from ALF-6078
24510: Merged V3.4 to V3.3
21960: First round of date refactoring: Document Library pages now expect XML dates (ISO8601) from Share data webscripts
21961: Share client-side I18N utility now emulates sever-side handling of doubled-up single quotes.
24526: Merged V3.4 to V3.3
24402: Fix for performance degredation related to ALF-3823.
RSS feed processing in JavaScript relies on Rhino impl of regex - this is extreemly slow as Rhino regex is by far the slowest component of the library.
Switched code to use the Java Regex libraries to improve performance and reduce memory usage.
24587: Merged V3.4 to V3.3
24564: Fix for ALF-3727: Custom permissions aren't visible in Explorer UI
24604: Merged V3.4 to V3.3
24602: Build fix for RM permission model loading - collateral damage for R 24564
24775: Merged BRANCHES/V3.3 to BRANCHES/V3.4: (RECORD-ONLY) - already in V3.4
24774: (RECORD-ONLY) Merged BRANCHES/V3.4 to BRANCHES/V3.3:
23492: Fixed ALF-5550: DB2: Unable to insert values into alf_string_value
24788: Add evaluation use message for OSX installer
24790: Removed svn:mergeinfo on root
24791: Fixed ALF-6560: MIME type not detected (set to application/octet-stream) when content written via FileFolderService
- First access of content on a new file (FileFolderService.getWriter) guesses a mimetype
- The initial mimetype guess *was* done during create, but that was expensive.
- Added unit test to cover regression
24803: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
24773: DE bug fixes received from translators 10th Jan.
24776: ES files received from translators 10th Jan
24793: FR files received from translators 10th Jan
24792: IT files received from translators 10th Jan
24804: Temporarily removing Japanese language bundle
24856: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
24848: Latest Language updates from Translators
24863: ALF-6029 (MT Share - repo' view after upg)
24880: Merged V3.3 to V3.4-BUG-FIX
24463: Fixed ALF-4398 "Path to rule set is not displayed" ($html alias was missing from a merge)
24465: Merge V3.3 to V3.4 (RECORD ONLY)
24463: Fixed ALF-4398 "Path to rule set is not displayed" ($html alias was missing from a merge)
24493: Fix for Mac OS X CIFS logon problem, change UID to start at one as zero has special meaning, plus other minor fixes. JLAN-112.
24569: Fix for ALF-5333: Webdav - Online editing of files in a folder with German umlauts does not report correct characters
24611: Fix broken build due to merge #fail (r24460 / ALF-4015)
24668: ALF-4557 - Upgrade of large repository to latest 3.3 fails on excession of mysql table lock size
24707: Fix for handling of null first/last name in wiki page list
24710: ALF-5535 - Fix to correctly format json number values (not as numeric human readable strings)
24794: Fix for ALF-4984 - Outdated custom-slingshot-application-context.xml.sample file for share
24798: Fix for ALF-5806: Lucene query does not return expected result.
- Alfresco FTS now supports the prefixes ~ and = for phrase queries
24814: Build fix after r24798: Fix for ALF-5806: Lucene query does not return expected result.
24823: Synchronization improvements to RemoteClient and http proxy hosts
24825: Fixed#3 of ALF-6308 "Share data issues"
- Share falls back to use "html uploader" (in all browsers except IE) when "JSESSIONID" cookie is unreachable from javascript (like when "HttpOnly cookies" is activated on the server.
24835: Fixed ALF-5484: Check-in does not update association
- Copy code when copying over an existing target node was NOT processing associations
- Fallout from refactor and subsequent fixes related to ALF-958 (Target associations aren't copied)
- Some commented-out unit tests reintroduced
24842: Fix for ALF-6308 item #4 - validate the redirect URL to ensure it is a relative url
24845: Merged DEV/DAVEW/SAP to V3.3
23874: ALF-5822: Correct Lucene throttling mechanism to prevent build up of excessive committed deltas
- Also correct BatchProcessor's mechanism for single-threading batches with cross dependencies
- Single-threaded batches must be sequenced in order
23876: ALF-5822: Default lucene.indexer.mergerTargetOverlaysBlockingFactor to 2 for better write performance under load
24022: ALF-5822: Refinement of fix
- Don't block a thread that has already entered the prepare phase with another indexer (e.g. a cross-store commit). Otherwise it could block indefinitely and never enter the commit phase
- Also added extra debug diagnostics and handle all Throwables on failure
24023: ALF-5822: Minor correction to debug log message
24421: ALF-6134: Do not export org.hibernate.jmx.StatisticsService through JMX to avoid excessive blocking under load
24422: ALF-6135: Remove lock contention from concurrent Lucene searches
- Added a RW Lock and Thread local-based solution to org.apache.lucene.store.FSDirectory.FSIndexInput.readInternal() to avoid contention during multiple parallel Lucene searches. This is already recognized as a bottleneck by the Lucene developers, who offer NIOFSDirectory as an alternative, which unfortunately doesn't work on Windows.
- Added RW lock to org.apache.lucene.index.TermInfosReader.ensureIndexIsRead()
- Threads no longer hanging in lucene searches during load tests. Woohoo!
24423: ALF-6136: Don't call through to org.apache.log4j.NDC unless debug is enabled as it's heavily synchronized. Also avoid dynamic method invocation by using a delegate.
24426: ALF-6138 (SURF - PARTIAL): 'Warm' the java.beans.Introspector cache for key Freemarker accessible bean classes on loading in static initializers
24428: ALF-6139 (SURF - PARTIAL): First log in to Share is expensive due to 'lazy' dashboard creation and excessive synchronization
- Added AVMRemoteStore.createDocuments() for creating multiple XML documents at once, all embedded within the same master XML document in the request body
- Added corresponding saveDocuments() methods to Store, RemoteStore, Model, ModelObjectManager and ModelObjectPersister on the Surf side
- Used this in PresetsManager
- Removed excessive synchronization from StoreModelObjectPersister
24429: ALF-6140 (SURF - PARTIAL): Surf tweaks to allow concurrent execution of web scripts
- Use StrongCacheStorage instead of MruCacheStorage in RepositoryTemplateProcessor to avoid use of a synchronized cache
- Tweak cache sizes in FreeMarkerProcessor
- Use thread local object wrapper delegates in QNameAwareObjectWrapper and PresentationTemplateProcessor to work around synchronization in DefaultObjectWrapper
- Swap in the same object wrapper to WrappingTemplateModel
- Use a concurrent HashMap in ModelObjectCache and ModelHelper and remove excessive synchronization
- Use RW locks rather than synchronized blocks in AbstractWebScript
24431: ALF-6141: Improvements to IBatis DAO performance under load
- Use lazyLoadingEnabled="false", enhancementEnabled="false" to avoid unnecessary blocking and generation of CGI proxies in IBATIS DAOs
- Use useTransactionAwareDataSource="false" to prevent Spring from agressively unwrapping DBCP connections and bypassing the prepared statement cache
24432: ALF-6142: Remove dependency between RepositoryAuthenticationDAO and Lucene
- Reworked RepositoryAuthenticationDAO to use a node service lookup by child association QName
- This required adding a patch to 'upgrade' the qnames of existing authentication nodes, which previously all had the same QName
24433: ALF-6143: Remove net.sf.ehcache.use.classic.lru setting from EhCacheManagerFactoryBean and InternalEhCacheManagerFactoryBean to prevent serialization of accesses to shared caches by multiple executing threads
24434: ALF-6144: DirtySessionMethodInterceptor was causing contention between multiple threads calling the same DAO.
- Unfortunately method.getAnnotation() is a synchronized call, and thus causes concurrent calls to the same method to contended with each other.
- Added a non-blocking cache so that DAOs can be accessed in multiple threads without contending.
24435: ALF-6145: Use RW Locks in Subsystem Framework
- The operations relied on by the dynamic proxies wrapping subsystems were synchronized and thus caused contention when multiple threads were calling in to the same subsystem
- Replaced synchronized blocks with use of read write locks, thus allowing multiple concurrent readers
24436: ALF-6146: Regulate PermissionModel accesses with RW locks, rather than synchronized blocks and an excessive number of concurrent hashmaps.
24438: ALF-6136: Fix build classpath
24439: ALF-6142: Fixed seeding of admin user password
24444: ALF-6142: Fix unit test fallout
- InviteServiceTest needs a transaction
- RepositoryAuthenticationDao must listen for Person username changes and update authentication node qname accordingly
- Correction to MT handling in RepositoryAuthenticationDao
- Repository Authentication Component must 'normalize' the username before passing it through the DAO
24445: ALF-6145: Correction to lock handling when propagating destroy() events
24446: ALF-6142: Add new dependencies to unit test
24448: ALF-6142: Further fix ups
24461: ALF-6142: Fix unit test
24664: ALF-6408: Prevent possible deadlock during reindexing
- waitForHeadOfQueue() now only called in beforeCommit() phase rather than afterCommit() to prevent deadlocking with Lucene throttler
- indexes are also flushed beforehand in beforeCommit() so that indexing work can still be parallelized
- also prevent potential deadlock caused by clearing of IndexInfo.thisThreadPreparing in a nested transaction
24810: ALF-6653: Use read write lock in Hibernate ReadWriteCache to avoid needless contention on L2 cache reads
24817: ALF-4725: Avoid excessive lock contention in dbcp by upgrading to 1.4
- also upgraded commons pool
24818: ALF-6658: Remove synchronization from LockService - transaction local collections used anyway
24844: ALF-6681: Don't let the PostLookup job stack up in multiple threads
- Now only executes in one thread at a time and skips scheduled slots where it is already running
24864: Fix for ALF-5904: Explorer - Space model rights not duplicated when creating a space based on a template
- copy service no longer uses hasPermission
- added tests for permission copy scenarios with assorted rights
- this fix assumed there is nothing special about templates - ie that they should always carry permissions and is the "default" copy behaviour to copy permissions if possible
24865: ALF-6145: Fix failing unit test
24878: ALF-6146: Correction to write lock around requiredPermissionsCache
24881: Increment version revision
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@26792 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
24073: Initial commit of localised strings for German, Spanish, Italian and Japanese.
24076: Language Pack corrections (two wrongly located files were missed & Spanish date formats were wrong)
24106: L10N/I18N file corrections
24133: Fixes: ALF-5890 (and others) - incorrect use of single quote in properties file.
24135: Fixes: ALF-5862 - ES file using '(0)' instead of '{0}' & ensuring IT and ES file use '' not \" consistently.
24324: Updated properties files received from Gloria.
24495: Latest language pack updates from translators & restructuring the translated properties files so they are in the same location as English version, rather than in an extensions directory.
24513: Correcting filename on a file in the IT language pack.
24645: Fixes ALF-6317: Spaces in properties file.
24650: Fixes: ALF-6318 - Internationalises Enterprise copyright statement and provides localised versions for supported languages. Also fixes error in Japanese translation (removes extra line break)
24651: Fix ALF-6131: Language packs need new messages following Explorer "has tag" bug fix. Replaced "\u0092" character with single quote.
24652: Fixes: ALF-5984 - incorrectly encoded single quote
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@26791 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
25933: Updated activiti jars to 5.3 release + temporarily disabled query-tests for activtiti
25932: Fixed failing FormServiceImplTest.
25930: Fixed ClassCastException and NullPointerException when using JBPM and Activiti tasks in Alfresco Explorer.
25898: Implemented testGetWorkflows() which tests the methods getWorkflows() getActiveWorkflows() and getCompletedWorkflows() for both workflow engines.
25888: Fixed failing testOutcome.
25884: Workflow console fully tested using activiti engine + small bugfixes
25854: Implemented testGetPathProperties on AbstractWorkflowServiceIntegrationTest. This tests getPathProperties for Activiti and JBPM workflow engines.
25827: Added lifecycle sample for activiti engine
25801: Added a new WorkflowRestApiTest testTaskInstancesForWorkflowGet. Also fixed issues with ActivitWorkflowEngine.queryTasks() relating to the start task being returned incorrectly.
25731: Added timer execution test to verify Authentication and Transactional behavior + added license headers to 2 files
25682: ALF-6902 delete identitylinks + added timer sample + adhoc notify me feature
25649: Redeploying of parallel activiti WF's turned of (remainder from development)
25645: Fixing getWorkflows test, using valid date to check "due before"
25642: Implemented getPathProperties() on ActivitiWorkflowEngine. Also refactored ActivitiTypeConverter to create ActivitiPropertyConverter which uses a WorkflowPropertyHandlerRegistry.
25636: Fixes for use of Activiti workflows in JSF client
25615: Added parallel review and approve process (regular + grouped)
25520: Added REST-test for review workflow and pooled review workflow for both engines
25471: Added queryTasks test for both engines
25397: Testing getTimers() on both engines
25368: Using authorityName instead of name for candidate-group + fixed priority WF vs. Task mixup in start-task
25335: F96: A form control for LIST constraint based decision properties in Activiti tasks exists
25324: Added correct sources for current 5.3-SNAPSHOT
25323: Implemented TaskQuery further and added extra test-coverage + delete/cancel WF now deletes History as well
25318: The signal() method on ActivitiWorkflowEngine now returns a WorkflowPath if the signal ended the WorkflowInstance.
25300: Fixed start workflow form for Activiti pooled review and approve process definition
25294: Implemented signal() method on ActivitiWorkflowEngine. Currently it returns null if the signal() ended the Workflowinstance.
25199: Implemented getTimers() + fixed some issues with the outcome prop name + upgraded to activiti 5.3
25179: Added support for wf:outcome property on Activiti tasks. Now ian arbitrary property can be set as the property from which outcomes are read.
25152: Refactored the WorkflowServiceImplTest to create an AbstractWorkflowServiceImplTest. Extended this base test with Jbpm and Activiti implementations.
25134: Fixed workflowPath node issue on start-task + Task variables are no longer flushed to process-instance variables
25131: ALF-6901 start task completion date + taskListeners using ScriptService instead of activiti's built-in JSR-223
25105: Implemented getWorkflows() and getCompletedWorkflows() methods on ActivitiWorkflowEngine.
25098: Mandatory properties are now checked in TaskCompleteListener to allow setting of mandatory properties in end-task listeners before the check is performed + review-pooled used person to set as bpm_assignee + removed duplicate messageService in ActivitiWE
25089: Merged ActivitiTaskComponent and ActivitiWorkflowComponent into a single class, ActivitiWorkflowEngine.
25048: Implemented getStartTask(String) method on WorkflowService interface. This gets the start task instance for a given workflow instance Id. Also, modified the start task returned by the ActivitiTaskComponent so that it has the correct title.
25028: Added WorkflowDefinitionGet webscript and test + tested WorkflowInstanceDelete and fixed WorkflowTaskDefinition bug
25003: Added getStartTask() method to WorkflowService. Implemented for JBPMEngine and ActivitiTaskComponent.
24996: Added activiti process-definition for pooled review/approve workflow + new version of activiti 5.2 to allow releasing task to pool agian
24972: Extended TaskInstanceGet REST-test + upgraded activiti lib due to bug in HistoricTaskInstance
24934: Refactored package assignment/creation so that it is now mainly performed by the WOrkflowPackageComponent rather than the WorkflowComponent or TaskComponent. Implemented correct package behaviour for Activiti workflow engine.
24926: Extended TaskInstancePut REST-test + added extra logic for ignoring tasks for deleted/canceled WF's
24895: Added new tests to FormServiceImplTest to check TaskFormProcessor correctly transitions tasks with both workflow engines.
24888: Updated WorkflowRestApiTest, enhanced testing of getTaskInstances
24861: Updated the FormServiceImplTest so that it includes tests for the TaskFormProcessor using both workflow engines.
24851: Made WorkflowRestApiTest abstract and created a subtype for activiti and jbpm
24832: Added integration test to FormServiceImplTest to check WorkflowFormProcessor works correctly with both Activiti and Jbpm engines.
24829: ALF-6195 Pooled actors are now available on completed tasks
24806: Added null check for parameters variable
24805: Cleaned up WorkflowRestAPITest to remove deprecated field access.
24797: ALF-6016 start-task now contains variables, upgraded to activiti 5.2-SNAPSHOT
24796: Removed accidentaly checked-in folder
24795: Share project "Catalina-virtual" into "https://svn.alfresco.com/repos/enterprise/alfresco/BRANCHES/DEV/ACTIVITI_INTEGRATION2/root"
24780: Created Activiti Review & Approve workflow.
24702: ALF-6201 cleaned up WOFactory.createInstance + removed candidate group from adhoc WF (pooled task)
24693: ALF-6438 implemented getWorkflowById for completed workflows + added unittest for getWorkflowById from running and complete processes
24686: ALF-6195 added formKey (typeDefinition name) to variables to make available in history + added test for getTaskById() for a completed task
24642: ALF-6003 + ALF-6195 Introduced mapping of WorkfloTask from HistoricTaskInstance and it's variables
24565: ALF-6016 tested getting start task by id + added initial test for taskQuery
24560: ALF-6217 implemented and tested pooled actors using activiti-candidate user/group
24520: ALF-6003 ALF-6014 tested + various minor improvements + TaskTypeEvaluator matchin pattern adjusted to be able to use workflow-detail form for activiti start-tasks
24417: ALF-6003, ALF-6014 Added tasklisteners to set default task props + flush variables when task ends + running script in tasklistener (to set task-variables in script based on wf-props)
24399: Merged BRANCHES/V3.4 to BRANCHES/DEV/ACTIVITI_INTEGRATION2:
24396: Fix for ALF-6126: TaskTypeEvaluator uses task-name instead of taskType-name for node-type matching
24396: Fix for ALF-6126: TaskTypeEvaluator uses task-name instead of taskType-name for node-type matching
24334: ALF-6015 ALF-6016: Completing a task implemented + using task-local variables
24125: ALF-5995 properties passed when starting workflow are stored
24111: ALF-5974, ALF-5972 Task-update implemented + capturing company-home, initiator and initiator home implemented and tested
23891: Fixing failing tests in ActivitiWorkflowComponentTest
23776: Upgraded activiti to 5.0-SNAPSHOT + Introduced error-handling using messages + initial support for HistoricActivity/ProcessInstances
23600: Removing unneeded folder that was introduced accidentally when reattaching SVN to eclipse
23599:
23298:
23250: Rolling back revisions 23212 to 23113 to fix issue with logging in.
23212: Trying to fix the problem with logging in.
23200: Added Form config for the Activiti Adhoc Process. Fixed failing tests in ActivitiWorkflowComponentTest.
23197: Fixed failing tests in WorkflowServiceeImplTest. Updated Activiti jars in 3rdParty.
23191: Adding Activiti Ahodc Workflow to Workflow Deployer to demonstrate Activiti Workflow/Task..Component integration with UI.
23129: Copy Activiti JAR files when building WAR and doing exploded deploy
23113: Implemented ActivitiTaskComponent.getTaskById()
23079: Created ActivitiTaskComponent and started to implement various task getter methods.
22890: Added testStartTask to WorkflowServiceImplTests to test that the start task functionality works as required by the Workflow UI.
22889: Added testStartTask to WorkflowServiceImplTests to test that the start task functionality works as required by the Workflow UI.
22888: Added testStartTask to WorkflowServiceImplTests to test that the start task functionality works as required by the Workflow UI.
22887: Added testStartTask to WorkflowServiceImplTests to test that the start task functionality works as required by the Workflow UI.
22769: Added more functionality to ActivitiWorkflowComponent.startWorkflow.
22759: Implemented more methods for getting WorkflowDefinitions on ActivitiWorkflowComponent. Also added more functionality to the startWorkflow method.
22758: Implemented more methods for getting WorkflowDefinitions on ActivitiWorkflowComponent. Also added more functionality to the startWorkflow method.
22672: Created ActivitiWorkflowComponent and implemented deployDefinition(), undeployDefinition() and isDefinitionDeployed() methods.
22659: Replacing Activiti Jars
22359: Added tests to check rollback of transactions in Activiti.
22358: Got some simple transaction tests working. These test transaction visibility is working properly and also check that rollbacks work correctly.
22342: Created a patch to add the Activiti tables in.
22333: Added some simple tests to check if Activiti works using a DataSource and TransactionManager.
22332: Updating Activiti to the beta release.
22286: Added Activiti and its dependencies to 3rd Party libraries. Updated JUnit jar to 4.8. Created package org/alfresco/repo/workflow/activiti and added some simple tests to check Activiti integration.
21879: Branch to develop support for Activiti workflow engine.
23264: Creating branch ACTIVITI_INTEGRATION2 to merge HEAD back into the existing ACTIVITI_INTEGGRATION branch.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@25984 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
24695: Fixes: ALF-6320 - removed the country specific portion of the language pack suffixes for French, German and Spanish. This enables speakers of those languages outside of those countries to benefit from the language packs.
24700: Swaps _it_IT for _it to make Italian language pack available to Italian speakers outside of Italy.
24803: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
24773: DE bug fixes received from translators 10th Jan.
24776: ES files received from translators 10th Jan
24793: FR files received from translators 10th Jan
24792: IT files received from translators 10th Jan
24804: Temporarily removing Japanese language bundle
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24831 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
24495: Latest language pack updates from translators & restructuring the translated properties files so they are in the same location as English version, rather than in an extensions directory.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24498 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
The pooled and parallel workflow definitions are now enabled by default, all corresponding form configuration for the start tasks and other task types are also defined, some tweaking may be need after review from Linton.
Fixed a potential NPE when transition id's are returned as null. Log warnings added to the task type config evaluator when the type can not be retrieved, which gives an indication as to why forms display all the default fields rather than the configured ones.
Changed process definitions to use a consistent ordering for the Approve and Reject transitions.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22336 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Added isEditable, isReassignable, isClaimable and isReleasable flags to task model in REST API
- Added outcome property to task model in REST API (label instead of raw value)
- Change "definitionTypeTitle" property to "type" and fixed up fallout
- Changed UI to use the isXXX flags above rather than copious amount of repeated checks
- Updated workflow details page to use outcome label, isEditable flag and some changes following discussion with Linton
- Added tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21890 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Added and changed localised labels for the invitation workflow to give a clearer description of the tasks (now they're exposed in the UI)
- "Save and Close" button gets hidden when displaying the invitation accepted/rejected task as it is redundant (there's nothing to save)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21847 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
20678: DAO5 branch: Preparation for merge back to HEAD
20689: Merged DAO4 to DAO5
- Removed all 'dbscripts/create/3.x/SomeDialect' and replaced with 'dbscripts/create/SomeDialect'
DB create scripts are taken from latest DAO4
- TODO: FixAuthoritiesCrcValuesPatch needs query implementation in PatchDAO
Merged DAO3 to DAO4
- Reapplied fixes for ALF-713 (race condition on Usages)
19350: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-2 to BRANCHES/DEV/V3.3-DAO-REFACTOR-3:
18939: SAIL-4 :2nd stage branch for DAO refactor off HEAD rev 18898
18948: Merged V3.3-DAO-REFACTOR to V3.3-DAO-REFACTOR-2
18202: Dev branch for DAO refactor
18252: SAIL-233: QName.hbm.xml
18295: Added missing CREATE TABLE statements for QName-related code
18324: SAIL-234: Node.hbm.xml: Node aspects initial integration
18355: Added 'setValue' method to manually update the cached value
18356: MV property stressing lowered to speed test up
18357: SAIL-234: Node.hbm.xml
18376: Pulled all Alfresco-related create SQL into script
18389: SAIL-234: Permissions DAO refactor - initial checkpoint
18390: Formatting only (line-endings)
18400: SAIL-234: Node.hbm.xml
18418: SAIL-234: Node.hbm.xml: 'alf_node_assoc' CRUD
18429: SAIL-234: Node.hbm.xml: Cleaned out all Hibernate references to NodeAssocImpl
18457: SAIL-234: Permissions DAO refactor
18959: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
18479: SAIL-234: Node.hbm.xml - fix updateNode (missing id when saving oldDummyNode)
18482: SAIL-235: remove Permissions.hbm.xml
18517: SAIL-235: Permissions DAO refactor
18523: SAIL-234: Node.hbm.xml
18524: SAIL-235: Permissions DAO refactor
18960: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
18533: Flipped back to Windows line endings
18535: Formatting-only (eol)
18540: Formatting-only (eol)
18541: SAIL-235: Permissions DAO refactor
18543: SAIL-234: Node.hbm.xml: Start alf_store changes
18567: SAIL-235: Permissions DAO refactor
18596: SAIL-305: Alfresco DDL - formatted/rationalized and added missing indexes & fk constraints
18603: SAIL-311: Minor cleanup for schema upgrade scripts (V3.3)
18604: SAIL-311: Remove empty dirs
18619: SAIL-274: Locale.hbm.xml
18621: Added method to create default ACL
18622: SAIL-234: Node.hbm.xml: Store, Transaction, Server and some node
18624: Formatting only (eol)
18631: SAIL-235: Permissions DAO refactor
18633: SAIL-235: Permissions DAO refactor - do not expose CRUD for AceContext (or AuthorityAlias) since currently unused
18639: getLocale(Locale) should return null if it doesn't exist
18640: SAIL-234 NodeDAO: More replacement of node queries and updates
18648: SAIL-310: Create SQL script for core repo tables (All DB ports)
18651: SAIL-234 NodeDAO: Moves across stores handle presence of target deleted nodes
18961: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
18658: SAIL-274 Locale DAO: Missing getValueKey() method
18662: SAIL-235: Permissions DAO refactor - further cleanup (of DbAccessControlList usage, including copyACLs)
18664: DB scripts porting for PostgreSQL finished.
18668: SAIL-234 Node DAO: Note in case Transaction Change ID is dropped from indexes
18669: SAIL-234 Node DAO: deleteNode and archive (store move) fixes
18672: DB scripts porting for Oracle finished.
18675: SAIL-235: Permissions DAO refactor
18677: DB scripts porting for DB2 finished.
18964: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
18687: Execute a callback with retries
18688: SAIL-234 Node DAO: Child association creation
18690: SAIL-234 Node DAO: Comment out raw creation of stores as it breaks subsequent bootstrap checks
18691: SAIL-234 Node DAO: More replacement of alf_child_assoc handling
18713: Commented about needing a more efficient removeChildAssociation method
18714: SAIL-234 Node DAO: Replaced queries on alf_child_assoc
18715: SAIL-234 Node DAO: More alf_child_assoc query replacement
18727: SAIL-234 Node DAO: alf_child_assoc queries complete
18737: SAIL-234 Node DAO: Tweaks to newNode and implemented prependPaths
18741: SAIL-234 and SAIL-334: Moved UsageDelta Hibernate code and queries over to UsageDeltaDAO
18748: SAIL-234 Node DAO: fix NPE (EditionServiceImplTest)
18769: SAIL-234 Node DAO: alf_node_properties ground work
18786: SAIL-234 Node DAO: alf_node_properties and cm:auditable properties
18810: Added EqualsHelper.getMapComparison
18813: TransactionalCache propagates cache clears and removals during rollback
18826: SAIL-234 Node DAO: Moved over sundry references to NodeDaoService to NodeDAO
18849: SAIL-237: UsageDelta.hbm.xml - eol formatting only (including removal of unwanted svn:eol-style=native property)
18869: SAIL-234 NodeDAO: Fixed more references to 'nodeDaoService'
18895: SAIL-234 NodeDAO: Queries for alf_transaction
18899: SAIL-234 Node DAO: Fixed bean fetching for 'nodeDAO'
18909: SAIL-234 NodeDAO: Fixes to getNodeRefStatus and various txn queries
18916: SAIL-234 NodeDAO: Fixed moveNode alf_child_assoc updates
18922: SAIL-235: DAO refactoring: Permission.hbm.xml
18930: SAIL-235: DAO refactoring: Permission.hbm.xml
18932: SAIL-234 NodeDAO: Fixing up gotchas, javadocs and some naming
18933: SAIL-234 NodeDAO: Minor neatening
18935: SAIL-234 Node DAO: Caches for ID to NodeRef and StoreRef
18936: EHCache config files line endings
18938: SAIL-237: Usage DAO refactor - initial checkpoint
18945: SAIL-235: DAO refactoring: Permission.hbm.xml. Move Node.
18975: Fix for move-node ACL jiggery-pokery
19067: SAIL-4: fix VersionHistoryImpl.getSuccessors (causing VersionServiceImplTest.testGetVersionHistorySameWorkspace failure)
19068: SAIL-234: fix VersionMigratorTest.testMigrateOneVersion
19074: SAIL-237: Usage DAO - update to common iBatis mapping pattern(s) to ease DB porting
19076: SAIL-231: Activities DAO - update to common iBatis mapping pattern(s)
19077: SAIL-232: AppliedPatch DAO - minor cleanup (comments & formatting only)
19092: Merging HEAD to DEV/V3.3-DAO-REFACTOR-2
18973: Temporarily comment out AVMTestSuite and run AVM tests individually
19056: AVM unit test improvements
19097: SAIL-235: DAO refactoring: Permission.hbm.xml: Additional index to support queries to find the id and acl id for the primary children of a node.
19185: SAIL-238: Permissions DAO - (minor) update to common iBatis mapping pattern
19289: SAIL-234 NodeDAO: Node cache replaces NodeRef cache
19302: SAIL-234 Node DAO: Added cache for node properties
19318: SAIL-4: AVM DAO - (minor) update to common iBatis mapping pattern
20690: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-4 to BRANCHES/DEV/V3.3-DAO-REFACTOR-5:
20063: (RECORD ONLY) DAO refactor branch V4
20146: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
19401: SAIL-234 Node DAO: Fix permission service tests (setPrimaryChildrenSharedAclId needs to invalidate nodesCache)
19428: Fixed TransactionalCache issue with null and NullValueMarker
19429: Took empty cm:content creation out of FileFolderService#createImpl
19430: SAIL-234 Node DAO: Tweaks around caching and cm:auditable
19431: SAIL-4 DAO Refactor: Exception thrown when attempting writes in read-only txn have changed
19436: SAIL-234 Node DAO: Fix NPE during cm:auditable update
19475: Allow debugging of code without stepping into trivial stuff
19476: Follow-up on 19429 by ensuring CIFS/FTP set a mimetype on the ContentWriter
19477: SAIL-234 Node DAO: Leverage DAO better for NodeService.addProperties
19478: SAIL-234 NodeDAO: Added toString() for ParentAssocsInfo (cache value for parent assocs)
19479: SAIL-234 Node DAO: Fixed for parent association and property caches
19480: Made TransactionAwareSingleton bind-key a GUID
19481: SAIL-234 Node DAO: Reinstated 100K collection property tests
19482: SAIL-234 Node DAO: Node and property cache fixes highlighted by unit tests
19483: SAIL-234 Node DAO: Start on NodeBulkLoader implementation
19595: SAIL-234 Node DAO: Fix moveNode to detect cyclic relationship prior to updating ACLs for moved tree FileFolderServiceImplTest.testETHREEOH_3088_MoveIntoSelf)
20147: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
19602: (RECORD ONLY) Reintegrated with HEAD up to rev 19433
19621: (RECORD ONLY) SAIL-347
19683: (RECORD ONLY) Reverse-merged 19621 for SAIL-347
19722: (RECORD ONLY) Merged /alfresco/HEAD:r19434-19721
20150: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
19741: Merged DEV\V3.3-DAO-REFACTOR-2 to DEV\V3.3-DAO-REFACTOR-3
19739: Extended "move" tests
19743: Fix AuditableAspectTest.testAddAspect (to allow for node modified date tolerance)
19748: Remaining part of merge from HEAD to V3.3-DAO-REFACTOR-3
19367: Merged BRANCHES/V3.2 to HEAD:
19286: Fix for ALF-626 "Using 'null' as an authority argument in clearPermissions() cause a java.lang.NullPointerException"
19755: SAIL-234 Node DAO: Fix RepoAdminServiceImplTest.testConcurrentDynamicModelDelete (handle InvalidNodeRefException after getChildAssocs)
20692: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-4 to BRANCHES/DEV/V3.3-DAO-REFACTOR-5:
- Retired all 1.3 and 1.4 upgrade scripts ... R.I.P.
- Fixed CRC patch for Authorities (only tested on MySQL)
- Fixed SQL patch revision numbers and bumped version schema number up
20158: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
19773: SQL mappings and scripts: SAIL-310, SAIL-304, SAIL-303 and SAIL-347
19774: Futher fix for SAIL-310: Sequence patch must take into account sequences created for 3.3
19851: SAIL-371 (SAIL-294) NodeDAO fallout: Fix QName and Namespace read/write handling and bean name in unit test
20183: Merged DAO3 to DAO4
19852: SAIL-370: Remove LinkValidation
19853: SAIL-239 (SAIL-294) Attributes.hbm.xml: Added ability to attach arbitrary property to unique context
19857: SAIL-373 Fallout from Permissions DAO refactor (SAIL-235)
19864: SAIL-239 (SAIL-294): Removed AttributeService RMI API
19865: More SAIL-239 (SAIL-294): Removed AttributeService RMI API
20208: DAO-refactor implementation of ALF-2712 query improvements
20209: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
20060: Removal of AttributeService for SAIL-239 (SAIL-294)
20348: SAIL-371 (SAIL-294): Protect collection properties during map insert and retrieval
20547: SAIL-371 (SAIL-294) Attributes.hbm.xml: implement getAttributes + fixes
20573: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests and other fallout
20597: SAIL-239 Attributes.hbm.xml: WCM/AVM locking test fixes (wip)
20598: SAIL-239 Attributes.hbm.xml: WCM/AVM locking test fixes (wip) - fix AssetServiceImplTest.testSimpleLockFile NPE
20600: Fix PropertyValueDAOTest.testPropertyValue_Enum (follow-on to r20060 for SAIL-239 - which introduces ENUM prop vals)
20601: Fix UsageDAOTest.testCreateAndDeleteUsageDeltas NPE (would also affect ContentStoreCleanerScalabilityRunner)
20603: Fix CMISPropertyServiceTest.* (fallout from r20146 <- r19429 <- Took empty cm:content creation out of FileFolderService#createImpl)
20604: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - TransferServiceImplTest.*
20618: SAIL-371 (SAIL-294): NodeDAO: AuditableAspectTest (fix testCreateNodeWithAuditableProperties_ALF_2565 + add remove aspect test)
20624: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - UserUsageTest.*
20626: Fixed random keys for RuleTrigger NodeRef tracking
20635: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - PersonTest.testSplitDuplicates
20642: SAIL-371 (SAIL-294) DAO: Fixed CacheTest
20643: Removed must of the 'distribute' target's dependencies. Not for HEAD
20645: Follow-on to r20643 (Removed most of the 'distribute' target's dependencies. Not for HEAD)
20654: SAIL-371 (SAIL-294): NodeDAO: DMDeploymentTargetTest.* (do not try to remove mandatory aspects)
20655: SAIL-371 (SAIL-294): NodeDAO: Initial fix for TaggingServiceImplTest.testTagScopeUpdateViaNodePolicies (+ minor test cleanup)
20657: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - VersionMigratorTest.testMigrateOneVersion (cm:accessed not returned if null)
20658: Merged (back merge only - no merge info) BRANCHES/V3.3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
20090: Dynamic models: minor improvements to DictionaryModelType
20554: Improvement to model delete validation (investigating intermittent failure of RepoAdminServiceImplTest.testSimpleDynamicModelViaNodeService)
20662: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - RecordsManagementAuditServiceImplTest.* (we now ignore attempt to update 'cm:modifier' prop so update 'cm:title' prop instead)
20666: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - ADMLuceneTest.*
20668: SAIL-239 (SAIL-294) - delete WCM locks + tests (follow-on to r20060)
20674: SAIL-371 (SAIL-294) NodeDAO fallout: Cleaner and additional checks for ContentStoreCleaner
20675: SAIL-371 (SAIL-294) NodeDAO fallout: Fixed handling of ContentData
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20693 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17905 : ETHREEOH-3809 - WCM - First test server deploy fails.
- added yet another transaction to read the previous snapshot transaction.
- added a new system test based upon the WCM services. The beginnings of testing against layered authored sandboxes.
18370 : ETHREEOH-4045 - Web Deployed space appears even when there is no Web Projects space
- moved the patch to the wcm bootstrap.
18373 : show storeNamePattern property on avm-target.xml
18434 : ETHREEOH-4032 - Warning "Type not found: {http://www.alfresco.org/model/workflow/1.0}inviteToSiteTask" appears during upgrade
18616 : ETHREEOH-4181 - Access denied exception when deploying via avm deployment receiver
18694 : change to comment in deployment.properties
18701 : Merge DEV_TEMPORARY to V3.2
18693 : ETHREEOH-4182: ASR deployer fails to set the contentUrl of documents on the target system
- Merged in fix related to closing output streams.
- Increased coverage of unit test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Merged in r17325.
Fixing ETHREEOH-3030 Moved some behaviour out of Javascript embedded in nomination-invitation-processdefinition.xml into a Java class SendInviteAction. Added tests to ensure whitespace and special characters are handled properly.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17635: Complete fix for ETHREEOH-2879 - user with missing first/last name able to use Discussions, Blogs, Links etc. in Share.
17637: Fix regression from r17601: Favourite sites in header menu.
17638: Fix ETHREEOH-3610 - upgrade Enterprise 2.x -> 3.2 (personUsagePatch)
17641: ETHREEOH-3612 Security Issue : DeploymentTarget uses String to represent passwords
17642: Fix for ETHREEOH-3482 - Impossible to delete content from its details page.
- regression due to the "AbortProcessingException" changes added a while back.
17660: Minor functional fixes for mobile app and cleanup
17663: Fixed ETHREEOH-3664 "'My Tasks' dashlet could not load task list if a user was invited to a private site"
- When webscript accessed a private site undefined was returned so the title and description couldn't be displayed, now the values are store on the invite task instead.
17665: Fix up compile errors from r17663 - also clean up old code to coding standards in related invite classes.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18162 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17363: Fix to DbNodeServiceImple to allow restored nodes.
17384: Minor comments
17451: Fix ETHREEOH-2751 / ETWOONE-340 - specialising a node through an action doesn't set default values from model
17459: ETHREEOH-2391 - Invite pending task now has lots of properties
17465: Repo side fix for ETHREEOH-3010: Inbound and outbound Mltext multiple property are not converted correctly
17478: Fix ETHREEOH-3340 - WCM - Revert to snapshot failure (fix AVM getListing -> AVNSync compare -> WCM revertSnapshot)
17483: (record only) Merged V3.1 to V3.2 (record-only)
17482: (record-only) due to earlier back-merge
17493: Fix for ETHREEOH-3342: index.recovery.mode example is incorrect
17494: Fix for ETHREEOH-3027: missingFullTextReindexTrigger (from index-recovery-context.xml) job does not work.
17510: Fix for ETHREEOH-1147: Indexing large indices can lead to Java Heap space.
17511: Fix for ETHREEOH-1271: It is possible to add one category more than one time to the same content or space
17513: ETHREEOH_3366: Altered DictionaryDAOImpl so that passing a null QName into getType and getAspect does not result in an NPE
17531: ETHREEOH-1186: Corrected rssfeed.get.js so a user can configure a RSS Feed dashlet that has been placed on their own dashboard
17550: ETHREEOH-2317: Rule not fired when document has no content
17556: Fixed ETHREEOH-1229: Can't delete space that contains "translation without content"
17558: Fix for ETHREEOH-3356: Forms fail to persist if property or association name has an _ (underscore) in it
17572: Changed caching of person NodeRefs so that duplicates are detected better
17573: Fixed UTF-8 for file with encoded chars
17576: LockAcquisitionException message specific to failed release of taken-over lock
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.2:r17363,17384,17451,17459,17465,17478,17483,17493-17494,17510-17511,17513,17531,17550,17556,17558,17572-17573,17576
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18140 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16713: ETHREEOH-2379 deployment missing crypto libraries.
16722: ETHREEOH-2798 - java.lang.NullPointerException while deleting a folder node with emptyTranslation
16752: ETHREEOH-2946 - Release a test server from inside an Approve/Reject task
16796: ETHREEOH-1841 - MBean error when running in a WebSphere cluster
16920: ETHREEOH-2796 - Word 97 To Text transformation fails
16955: Merge V3.1 to V3.2
14275: Invitation change for ETHREEOH-1456, Missed change from check in 14222.
14222: ETHREEOH-1456 - accepting a rejected invitation.
16963: ETHREEOH-3029 - Strange defaltOnLoadListsner in hibernate-context.xml
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
1. Appropriate changes have been made in parallelreview_group_processdefinition.xml and
parallelreview_processdefinition.xml files.
2. Redeploy flag is kept with false value by default in the workflow-context.xml.sample file.
3. A sorting of the list of workflow definitions by name has been already applied in all branches according to ETWOTWO-302 issue
fix.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- further simplification of CMISDictionaryService and fixup fallout
- added logging
- consolidate & fix property definition handling (only one definition per property)
- include support for aspect properties
- fix property.isInherited
- open up the door for types outside of CMIS doc, folder, rel & policy
Dictionary Service
- add isOverride() to PropertyDefinition
Invite Workflows
- ensure they create their own namespace for new types/props
- NOTE: the previous way uses a hole in the DictinaryService which has been there
unnoticed for over 4 years, till now. At some point, the hole will be filled in.
Tests pass for CMIS REST / Web Services and Query.
Tests pass for Invitation Service.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- incl. taking Hibernate libs from 3.1 and adding missing file from earlier merge
13321: Fix ETHREEOH-1407: System error occur during "Undo Selected" action if no items are selected
13322: ETHREEOH-1206: Throwing Alfresco Exception on OnUpdateProperties behaviour resets Encoding field to Big (first entry)
13326: (RECORD ONLY) Removed 'dev' from version label.
13330: Fix ETHREEOH-1408: Incorrect button name at "Manage Task: Submitted" page
13337: Fix for ETHREEOH-1409 and further fix for ETHREEOH-1408
13338: Removed svn:mergeinfo
13346: Make startup bat script check JAVA can be found.
13351: ETHREEOH-1386 validate ASR and FSR hostname.
13359: ETHREEOH-1435: Share doesn't extract document metadata correctly
13360: Fix ETHREEOH-821: SDK dependencies
13369: Fixed distribute-sdk target for when it's run locally
13382: ETHREEOH-1437: Container creation induces an unexpected permission allocation in Share
13391: Shutdown backstop continues if logging throws errors.
13394: Fix ETHREEOH-1457 - MT coci issue with bootstrap (eg. data dictionary) content
13400: Activate JAWS-223: Adobe LC Hibernate Dialect Loading
13401: Support for JAWS-215, mysql and oracle
13413: Fix ETHREEOH-1458 - MT delete->archive
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r
13321-13322,13326-13327,13330,13337-13339,13341-13347,13351,13354-13355,13358-13363,
13365,13367,13369,13382,13385-13392,13394,13400-13403,13405-13406,13413
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12984: Sharepoint: Build fix after recent change to SiteService and bumped module version to 1.1
12997: (RECORD ONLY - Already merged) Added home property to start scripts; updated readmes; updated installers
13140: Merged V3.0 to V3.1
13138 Merged V2.2 to V3.0
13133: Fix ETWOTWO-1078: wcm submit does not complete when using Oracle
13146: Merged V3.0 to V3.1
13052: CIFS throws a NullPointerException if a non-relative path is received for a folder search. JLAN-69
13147: Updated svn:mergeinfo
13151: (RECORD ONLY) Changed labs -> enterprise for distribution bundles
13157: Partial fix for ETHREEOH-1277 - fixes usage of Application.getMessage()
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r13052,13138
Merged /alfresco/BRANCHES/V2.2:r13133
Merged /alfresco/BRANCHES/V3.1:r12984,12997,13140,13146-13147,13151,13154,13157
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13356: Fix for ETHREEOH-1297.
Fixes the more general issue that content related FreeMarker APIs on AVM Template Nodes were broken since 3.0.
13357: Fix for ETHREEOH-1445 - missing I18N labels for Site Invite workflow.
13375: Another I18N missing label patch to workflow tasks from wabson.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13595 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Java Script API for invitations on Site object.
Implementation of REST API for Site / Invitations.
Rename of old invite workflow to invitation-nominated and renaming of properties for consistency. Old workflow is due for deprecation.
Rework to Nominated workflow to unscramble user creation.
Start Workflow UI bean now knows to avoid workflows managed by the InvitationService.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13523 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
11469: MT - fix ETHREEOH-227
11470: Added check for request method type so that GET requests are redirected to the web client and PROPFIND/OPTIONS requests are routed to the WebDAV servlet. Fix Vista WebDAV client as it walks the path when connecting using the WebDAV mini redirector. ETHREEOH-554.
11471: Merged V2.2 to V3.0
11317: Fix ETWOTWO-698 and ETWOTWO-743.
11472: Fix for ETHREEOH-505
11473: Added LMv2 support, fallback from NTLMv2 to NTLMv1 and NTLMv2 can be switched off by the implementation.
11474: Removed the Principal configuration parameter, no longer needed as it is picked up after the server side Kerberos logon.
11476: Missing URL encoding for site manager username in Site Profile dashlet.
11477: Fix to padding on User Welcome dashlet now it is scrollable.
11479: Fixed: ETHREEOH-150 Possible to add empty post or empty comment to a post at blog page
11480: Added calculation of the LMv2 HMAC.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12445 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7452: Fixes submit breakage.
7456: Patch to redeploy new submission workflow definition
7457: Added 'View Deployment' action to workflow sandbox so reviewers can examine the last attempted deployment
Added 'Allocated' field to server config, tooltip shows which store the test server is allocated to
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8363 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7422: Deployment UI changes
7424: Deployment UI changes
7426: Created 'More Actions' menu for user sandboxes and moved various actions into it
7428: Server config UI
7433: Added ability to deploy a workflow sandbox to a test server
7434: Fixed confusing comment
7442: Enabled users with contributor and reviewer roles to reserve a test server and deploy to it
7443: Preparation for auto deployment
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6467, 6468: Patch to remove submitted aspect data
Resolved conflicted state of 'root\projects\repository\config\alfresco\version.properties'
Resolved conflicted state of 'root\projects\repository\config\alfresco\patch\patch-services-context.xml'
Version number to 104
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6738 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6455: OpenOffice transformer and extractor register regardless of the initial connection state.
6456: Fix for WCM-636 (Clicking OK twice while deleting web project results in exception)
6457: Updated installers and associated config
6458: AR-1669 Add getQnamePath to Javascript
6459: Fix for AWC-1456 - Word and Excel documents were being stored as octet streams rather than their correct mimetype
6460: Reverse order of reject & approve transitions, so that approve appears first in list of ui actions.
6461: Removed Process.exe (often detected as a virus) and updated config wizard.
6462: Switch to synchronous indexing for AVM by default
6463: Better support to query the state of AVM indexes
6464: Added Office 2007 document mimetypes and icons
6465: Added Office 2007 icons without the typo this time
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6454: Remove edit & upload actions from WCM submit parallel review task.
Serial review task still allows edit & upload.
Schema version number up to 103 and changed patch accordingly
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6436: Support for virtualized cookie paths, aggressive cleanup of sockets when virt server is down.
6439: Fix for WCM-619 & WCM-571
6440: Encoding of text/html files created inline using the web-client now has sensible default. AWC-1324.
6442: Fix for WCM-621 (reviewer can not view or run links report)
6443: Fix for AWC-1488. Dashboard
6444: Fix for WCM-693 issue with submitting a deleted directory if no workflow associated with web project.
6445: Icons for use in fix for WCM-522
6446: Office Add-Ins: Fix for AWC-1481 - Login dialog can appear recursively
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6361: Word 2007 Add-In and Installer - First version, untested
6362: Adds a scaling test that a number of customers could [use]
6363: Build fix
6365: Submit workflow to always clean up virtualized workflow, etc
6367: Support for wild cards within queries AR-615
Conflicts with newer Tenant code
Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\search\impl\lucene\ADMLuceneSearcherImpl.java'
Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\search\impl\lucene\ADMLuceneTest.java'
Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\search\impl\lucene\LuceneQueryParser.java'
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6724 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
