mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
23 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Jan Vonka
|
4224441ffc |
Merged BRANCHES/DEV/V3.3-BUG-FIX to HEAD:
24001: Merged BRANCHES/DEV/BELARUS/V3.3-2010_11_10 to BRANCHES/DEV/V3.3-BUG-FIX:
23971: ALF-1948: Deleting a freshly created file doesn't remove it from a user sandbox
- also minor formatting & extra tests
24007: Merged BRANCHES/DEV/BELARUS/V3.3-2010_11_10 to BRANCHES/DEV/V3.3-BUG-FIX:
23971: ALF-1948: (commit mergeinfo !)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Jan Vonka
|
839d522808 |
Fix continuous build error (reverse part of r22938)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22946 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Jan Vonka
|
0ab098088d |
Enable logging for 2 unit tests (ALF-5096 / ALF-5097)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22938 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Jan Vonka
|
00ea243bc3 |
Merged BRANCHES/DEV/V3.3-BUG-FIX to HEAD:
22883: ALF-4800 - AVM - intermittent test failure (layered file delete) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22884 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
Dave Ward
|
890d3795ce |
Merged V3.3 to HEAD
20440: RM: CapabilitiesTest.testDestroyRecordsCapability (MS SQL Server build) - use non-public nodeService
20441: Include virtual tomcat in installers
20442: Change bitrock builder version to use.
20443: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: (Fixed tabs and removed 'svn:executable' and 'svn:eol-style')
20384: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
20271: ALF-803: Asset Service Improvements
20386: Merged V2.2 to V3.3-BUG-FIX
20385: Merged DEV/BELARUS/V2.2-2010_04_06 to V2.2
20379: V2.2-ALF-1888 AssociationQuery was corrected to filter ...
20387: Version Migrator (ALF-1000) - approx x3 boost (policies ignore version2 store)
20388: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
20372: ALF-897: It is impossible to create content when default value selected in ContentHeadlineBackground field for intranet_rssi_landing_template web-form (also fixes ALF-2798 & ALF-791)
20389: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
20374: ALF-2723: WCM - Http 500 creating content via webform
20394: Fix for ALF-2257 - It's impossible to find and add group at Records Manage Permissions page
20396: Fixed ALF-2956 "XSS attack is made when a rule is being deleted"
20397: Fix for ALF-922: Mysql does not support unique keys that contain nulls as one would expect
20402: ALF-2186 : Rules not being fired on datalist items - because it's a zero byte file?
20404: Fixed ALF-2109 "Rule doesn't apply to the files in sub-folders when 'Run rule for this folder and its subfolders' action was performed"
20406: Fix for ALF-2985 - Share document library throws error if document modifier or creator is deleted from Alfresco
20409: Improved FormServiceImplTest, added more content related tests and some edge case tests using the FDK model (this test needs to be manually enabled though as the FDK model is not available by default)
20414: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX
20401: ALF-2616: Serious Web Form layout performance issues on IE8. This fix contains:
20427: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX
20042: ALF-1523: Failed Kerberos SSO auth doesn't fail through, simply returns a blank page
20323: ALF-1523: Failed Kerberos SSO auth doesn't fail through, simply returns a blank page
20428: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX
20417: ALF-736: WebDAV Folder Renaming fails on Mac but works on Windows.
20430: Fix for ALF-2313 - Accessing a Doclib folder in Share which has a link to a deleted node fails
20431: Version Migrator (ALF-1000) - migrate 1st batch independently
20432: Fix for ALF-2327 - Can not have more than one Transfer Step in a disposal schedule
20438: ALF-479: Merged DEV/BELARUS/V3.2-2010_01_11 to DEV/V3.3-BUG-FIX
18448: ETHREEOH-4044: External Authentication Subsystem does not perform user mapping for WebDAV requests
20444: Fix for ConcurrentModificationException in file server quota manager. ALF-2970.
20445: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
20413: Added clean of quickr project
20446: Changed version to 3.3.1dev
20447: Merged V3.3-BUG-FIX to V3.3
20294: Fixes: ALF-1020 & ALF-1013 for all views except agenda.
20451: Merged V2.2 to V3.3
20450: Merged DEV/BELARUS/V2.2-2010_04_06 to V2.2
20412: ALF-1887: too easy to break alfresco - one can remove the guest user and recreate it but then access to RSS is broken
- PersonServiceImpl.beforeDeleteNode prohibits attempts to delete a guest user.
20452: Fix for transaction error from NFS server file expiry thread. ALF-3016.
20458: ALF-2729 - rationalise (and deprecate) VersionLabelComparator
20460: Fix for ALF-2430
- AVM nodes are not checked for exclusion - the default ACLEntryVoter will always vote for AVM
- avoids embedded AVM permission checks for getType/getAspect and anything else that may be added
- seems AVM read is not checked upon "lookup" for the last node in the PATH (getType should have failed too)
20466: Merged V2.2 to V3.3
20243: (RECORD ONLY) ALF-2814: Merged V3.2 to V2.2
17891: Merged DEV_TEMPORARY to V3.2
17873: ETHREEOH-3810: WCM - Recursion detector erroring
20467: Merged V3.1 to V3.3 (RECORD ONLY)
20276: Incremented version label
20275: ALF-2845: Merged V3.2 to V3.1
17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2
17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch - also causes subsequent patches to not be applied
19573: Merged V3.2 to V3.1
19539: Merged HEAD to V3.2
19538: Build fix - fix build speed
20468: Merged PATCHES/V3.2.r to V3.3 (RECORD ONLY)
20357: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r
20349: Merged V3.3 to PATCHES/V3.2.0
20346: ALF-2839: Node pre-loading generates needless resultset rows
- Added missing Criteria.list() call
20339: Incremented version label
20338: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r
20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows
- Split Criteria query to retrieve properties and aspects separately
20272: Backports to help fix ALF-2839: Node pre-loading generates needless resultset rows
Merged BRANCHES/V3.2 to PATCHES/V3.2.0:
18490: Added cache for alf_content_data
Merged BRANCHES/DEV/V3.3-BUG-FIX to PATCHES/V3.2.0:
20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows
20469: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY)
20393: Eclipse classpath fix to avoid problems in JBoss
20309: ALF-2777: PrimaryChildAssocCopyBehaviour from MOB-388 corrupts cm:name attributes of copied child nodes
- Folded example behaviours from previous AMP into repository
- Fixed PrimaryChildAssocCopyBehaviour to back-up and set the cm:name property on copied children
20470: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY)
20465: Incremented version label
20464: ALF-3060: Merged V3.2 to PATCHES/V3.2.0
19920: Merged HEAD to BRANCHES/V3.2:
19918: Fix ALF-2499 (Deleting a web project also deletes similarly named web projects - Potential Data Loss)
20448: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.2.0
20414: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX
20401: ALF-2616: Serious Web Form layout performance issues on IE8. This fix contains:
a) X-UA-Compatible head tag with IE=EmulateIE7 value
b) alfresco.ieVersion and alfresco.ieEngine in common.js
c) recurseOnChildren in _updateDisplay
d) Some performance modifications in xforms.js
20350: Increment version label
20349: Merged V3.3 to PATCHES/V3.2.0
20346: ALF-2839: Node pre-loading generates needless resultset rows
- Added missing Criteria.list() call
20471: Fix for offline sync losing metadata properties, due to rename/delete of original file. ALF-575.
20478: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
20477: Fix ALF-3086: CMIS checkin of a non-versionable document should make it versionable
20479: ALF-2110: Make it possible to determine which person properties are synced via LDAP and hence immutable
- Added Set<QName> UserRegistrySynchronizer.getPersonMappedProperties(String username)
- UI/Services Fix to follow
20481: Latest SpringSurf libs:
- Fix for ALF-1518 - Added support for HTTP and HTTPS proxies for Surf application remote api calls - via the standard JVM cmd line properties such as -Dhttp.proxyHost=...
20484: ALF-2886: LDAP sync defaults display names incorrectly and can't cope with DNs containing escaped trailing whitespace.
- Had to work around a JDK bug in LDAP RDN parsing
20486: Added case sensitive flag to the file state cache. Part of ALF-570.
20487: Fix for copy/rename of folders causing file exists errors in some cases. ALF-570.
20488: Fix ALF-680: Previously valid content models now fail with CMISAbstractDictionaryService$DictionaryRegistry exception
20489: Uploaded correct version of spring source jars and reunited them with 3rd-party/.classpath
20490: Fix for cannot delete folders via CIFS from Mac OSX, due to desktop actions. ALF-2553.
20491: Merged DEV/TEMPORARY to V3.3 (With corrections)
20485: ALF-2290: a HTTP GET request of a document redirects to the Home Location when using NTLM SSO
The logic related to ADB-61 in NTLMAuthenticationFilter clears previous location and redirects request to default home location. NTLMAuthenticationFilter was changed to process GET requests to documents correctly. Now, fix to ADB-61 processes only “/faces” requests and GET requests to documents are processed correctly.
The same fix was made to KerberosAuthenticationFilter
20492: Fix ALF-680: Previously valid content models now fail with CMISAbstractDictionaryService$DictionaryRegistry exception
- missing remove directory
20493: Fix ALF-2837: ClassCastException in getProperties()
20498: Fix for ALF-2818: Failure to close index writer under certain conditions.
- fix for index writer to close indexes when stopped by exceptions during FTS
- fix FTS job to handle exceptions better
- debug for FTS background operations
20499: ALF-3094: In ticket authenticate method in AuthenticationHelper, invalidate the current session if its cached ticket doesn't match
20500: Fix for ALF-2858 "Zero KB sized bin files will be created in the contentstore when new sites are created" (RECORD ONLY)
20503: AVMTestSuite: minor fixes to cleanup ctx usage (avoid re-loading)
20505: Merged BRANCHES/V2.2 to BRANCHES/V3.3 (record-only)
13859: (record-only) Removed dev from version label
14003: (record-only) Updated version to 2.2.5dev
14566: (record-only) ETWOTWO-1239 - remove workflow interpreter/console bootstrap
14572: (record-only) ETWOTWO-1239 - fix PersonTest to fix JBPMEngineTest (part-sourced from r13247)
14776: (record-only) Merged V3.1 to V2.2
14748: ETHREEOH-2225 - WCM upgrade (performance improvements for MySQL)
20506: NFS ReadDir/ReadDirPlus skips some folder entries. JLAN-98.
20507: Fixed issue with folder search resume id being reset to the wrong value during NFS folder search. Part of JLAN-98.
20508: Merged BRANCHES/V3.2 to BRANCHES/V3.3:
18319: Merged BRANCHES/DEV/BELARUS/V3.2-2010_01_11 to V3.2
18273: ETHREEOH-3834: WCM: An extral .xml.html file is created when editing newly created content
19182: Merged V3.1 to V3.2
18423: ETHREEOH-3850 - Content Manager unable to edit content items if there is a lock on a generated rendition
18432: (RECORD ONLY) Added FTP data port range configuration via <dataPorts>n:n</dataPorts> config value. ETHREEOH-4103.
18451: (RECORD ONLY) Fixed incorrect FTP debug level name.
18577: (RECORD ONLY) Fix for ETHREEOH-4117, based on CHK-11154
18792: Fix ETHREEOH-2729: Import of property with @ symbol in name fails with "start tag unexpected character @ "
19570: ALF-192 / ALF-1750: System Error if user trying submit web content based on web form which was deleted
19583: Merged DEV/BELARUS/V3.2-2010_03_17 to V3.2
19545: ALF-1954: Regression: same item can be submitted multiple times to workflow
19725: AVMStoreDescriptor - fix minor typo (for debugging)
19917: (RECORD ONLY) Merged HEAD to BRANCHES/V3.2:
19880: Fix ALF-898 - WCM: Deleting a file leads to error (only if RM/DOD installed)
19920: (RECORD ONLY) Merged HEAD to BRANCHES/V3.2:
19918: Fix ALF-2499 (Deleting a web project also deletes similarly named web projects - Potential Data Loss)
20509: Merged BRANCHES/V3.2 to BRANCHES/V3.3 (RECORD ONLY):
19825: (RECORD ONLY) Merged PATCHES/V3.2.r to BRANCHES/V3.2:
19804: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r
Merged HEAD to V3.2.0
...
20510: Merged BRANCHES/V3.1 to BRANCHES/V3.3 (RECORD ONLY)
17482: (RECORD ONLY) Merged V3.2 to V3.1
17478: Fix ETHREEOH-3340 - WCM - Revert to snapshot failure (fix AVM getListing -> AVMSync compare -> WCM revertSnapshot)
18783: (RECORD ONLY) MT: ensure group (EMAIL_CONTRIBUTORS) bootstraps tenant admin user (when creating tenant)
20513: Added port change example for remote Alfresco server to share-config-custom.xml.sample
20518: ALF-657 Created tests to check that the 'runas' functionality works in the AlfrescoJavaScript action handler. Also modified the handler to run as the System user if no Authentication is currently set, as may occur if the action handler is being executed asynchronously.
20519: ALF-657 Created tests to check that the 'runas' functionality works in the AlfrescoJavaScript action handler. Also modified the handler to run as the System user if no Authentication is currently set, as may occur if the action handler is being executed asynchronously.
20520: Removed dev version.label
20522: ALF-3129: Map cm:organization property in LDAP as well as cm:organizationId, since cm:organization is what shows up in JSF and Share. Needed by ALF-2110.
20523: First part of fix for ALF-2110:
- Appropriate Person and webframework metadata APIs now return information on immutability of Person properties (as some properties are immutable when synced to LDAP etc.)
- Share client now correctly disables profile fields in User Profile and Admin User Console as appropriate based on individual user property mutability
- Change Password button now correctly enabled/disabled based on account mutability
20524: VersionMigrator - option to run as scheduled job (ALF-1000)
20525: Fix for various IE6 CSS issues:
ALF-3047 - It's impossible to destinate any action with data list item (IE6 specific)
ALF-3049 - Incorrect layout of Manage aspects page
ALF-3050 - Incorrect layout of Assign Workflow form
20526: Fix for ALF-2915 - Select > None feature for Data Lists not working across multiple pages in IE
Closed ALF-2846 - DataList UI not fully I18Ned [Old prototype code]
20527: Fix for ALF-3082 - There is no Edit Offline action at Details page in Share site
20528: Fix various script errors due to typo:
ALF-3088 - Script error occurs on creating duplicated record seria
ALF-3012 - Incorrect behaviour on creating duplicating folders
ALF-3004 - Script error when submitting an item with long data in Prioprity field
20529: Fix for ALF-3006 - Selected Items > Copy to... and Move to actions not working in Document Library
20530: Dynamic Models - fix test(s)
- fix concurrency test for Oracle build (retry if txn lock cannot be acquired)
- when getting deployed models, skip if invalid (eg. cannot be parsed)
20536: Remove @Override (ALF-657)
20537: Activities - (minor) fix NPE for Oracle build/test
20543: Final part of ALF-2110 - Appropriate person properties disabled for editing in Explorer Client if external mapped sync such as LDAP is used.
Fixed issue with Change Password option being disabled incorrectly.
20544: Follow-up fix to r20528
20546: Fix for ALF-3151 - Freemarker causes NPE while deploying 3.3 enterprise onto WebSphere 7.0.0.7
- NOTE: will need to submit patch to freemarker.org
20552: Merged BRANCHES/V3.2 to BRANCHES/V3.3 (RECORD ONLY)
20551: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/V3.2:
20090: Dynamic models: minor improvements to DictionaryModelType
20553: Fix for escalated issue ALF-2856: Space returns to browse view after completing Add Content dialog; need a way to return to custom view (applied patch provided by customer).
20554: Improvement to model delete validation (investigating intermittent failure of RepoAdminServiceImplTest.testSimpleDynamicModelViaNodeService)
20558: Merged DEV/BELARUS/V3.3-2010_06_08 to V3.3
20550: ALF-922: Mysql does not support unique keys that contain nulls as one would expect ...... duplicates in the alf_access_control_entry table
20562: ALF-3177 - security fix.
20563: Merged BRANCHES/V3.2 to BRANCHES/V3.3:
19412: Fix for ALF-865 "WCM / Cluster: unexpected error when concurrently submitting content"
ALF-862 "WCM submit execution will require locking in a clustered WCM authoring env"
20564: Merged BRANCHES/V3.1 to BRANCHES/V3.3:
20542: Fixed ALF-3152: ImporterComponent transaction retry settings can cause IllegalArgumentException
20568: Follow-up on fix ALF-3152. Fix jobLockService's retryWaitIncrementMs
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Dave Ward
|
a5f31cd37e |
Merged V3.3 to HEAD
20167: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
20166: Fix ALF-2765: Renditions created via 3.3 RenditionService are not exposed via OpenCMIS rendition API
20232: Fix problem opening AVM web project folders via FTP. ALF-2738.
20234: ALF-2352: Cannot create folders in Share doclib without admin user in authentication chain
20235: Fix for unable to create folders in web project via CIFS. ALF-2736.
20258: Reverse-merged rev 20254: 'When dropping the mysql database ...'
20262: Merged V3.3-BUG-FIX to V3.3
20251: Fix for ALF-2804 - Unable to browse into folders in Share Site in certain situations.
- Browser history filter object in incorrect state after page refresh.
20264: Updated Oracle build support (to fix grants)
20282: Merged PATCHES/V3.2.0 to V3.3
20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows
20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows
20283: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20194: AVMTestSuite - scale down unit tests (slightly)
20247: AVMServiceTest.testVersionByDate - build (add delay)
20290: Fixed ALF-2851 "Drag n Drop issues in IE6 & IE7"
- Reordering rules-list with drag and drop didn't work at all because each rule was created using a template that had the "id"-attribute set, which made IE confused after using HTMLELement.clone() even though the id was resetted
- Both customise-dashlets & rules-list got an error when "throwing" away the dashlet or rule instead of releasing it "carefully", reason was becuuase IE didnt capture the x:y-position which made the animation fail. Now no animation is done if x:y isn't found.
20296: Merged PATCHES/V3.1.0 to V3.3 (RECORD ONLY)
20249: Merged V3.1 to PATCHES/V3.1.0
14565: Updated version to include revision number (x.y.z)
20246: Merged V3.1 to PATCHES/V3.1.0
13841: Build fix
20245: Merged V3.1 to PATCHES/V3.1.0
16185: AbstractLuceneIndexerAndSearcherFactory.getTransactionId() must return null when there is no transaction
20241: Merged V3.1 to PATCHES/V3.1.0
14187: Fix for ETHREEOH-2023: LDAP import must lower case the local name of the association to person.
16167: ETHREEOH-2475: Fixed nested transaction handling in AbstractLuceneIndexerAndSearcherFactory to allow duplicate user processing in PersonServiceImpl to actually work
16168: ETHREEOH-2797: Force patch.db-V2.2-Person to apply one more time to fix up corrupt users created by LDAP Import
- Problem due to ETHREEOH-2023, fixed in 3.1.1
- Also corrects ldap.synchronisation.defaultHomeFolderProvider to be userHomesHomeFolderProvider
- Also requires fix to ETHREEOH-2475 to fix up duplicate users
20221:Merged PATCHES/V3.1.2 to PATCHES/V3.1.0
20217: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2
19793: Merged HEAD to V3.2.0
19786: Refactor of previous test fix. I have pushed down the OOo-specific parts of the change from AbstractContentTransformerTest to OpenOfficeContentTransformerTest leaving an extension point in the base class should other transformations need to be excluded in the future.
19785: Fix for failing test OpenOfficeContentTransformerTest.testAllConversions.
Various OOo-related transformations are returned as available but fail on our test server with OOo on it.
Pending further work on these failings, I am disabling those transformations in test code whilst leaving them available in the product code. This is because in the wild a different OOo version may succeed with these transformations.
I had previously explicitly disabled 3 transformations in the product and I am moving that restriction from product to test code for the same reason.
19707: Return value from isTransformationBlocked was inverted. Fixed now.
19705: Refinement of previous check-in re OOo transformations.
I have pulled up the code that handles blocked transformations into a superclass so that the JodConverter-based transformer worker can inherit the same list of blocked transformations. To reiterate, blocked transformations are those that the OOo integration code believes should work but which are broken in practice. These are blocked by the transformers and will always be unavailable regardless of the OOo connection state.
19702: Fix for HEAD builds running on panda build server.
OOo was recently installed on panda which has activated various OOo-related transformations/extractions in the test code.
It appears that OOo does not support some transformations from Office 97 to Office 2007. Specifically doc to docx and xls to xlsx. These transformations have now been marked as unavailable.
20220: Created hotfix branch off TAGS/ENTERPRISE/V3.1.0
20297: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY)
20268: Increment version number
20267: ALF-550: Merged V3.2 to PATCHES/V3.1.2
17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2
17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch - also causes subsequent patches to not be applied
20217: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2
19793: Merged HEAD to V3.2.0
19786: Refactor of previous test fix. I have pushed down the OOo-specific parts of the change from AbstractContentTransformerTest to OpenOfficeContentTransformerTest leaving an extension point in the base class should other transformations need to be excluded in the future.
19785: Fix for failing test OpenOfficeContentTransformerTest.testAllConversions.
Various OOo-related transformations are returned as available but fail on our test server with OOo on it.
Pending further work on these failings, I am disabling those transformations in test code whilst leaving them available in the product code. This is because in the wild a different OOo version may succeed with these transformations.
I had previously explicitly disabled 3 transformations in the product and I am moving that restriction from product to test code for the same reason.
19707: Return value from isTransformationBlocked was inverted. Fixed now.
19705: Refinement of previous check-in re OOo transformations.
I have pulled up the code that handles blocked transformations into a superclass so that the JodConverter-based transformer worker can inherit the same list of blocked transformations. To reiterate, blocked transformations are those that the OOo integration code believes should work but which are broken in practice. These are blocked by the transformers and will always be unavailable regardless of the OOo connection state.
19702: Fix for HEAD builds running on panda build server.
OOo was recently installed on panda which has activated various OOo-related transformations/extractions in the test code.
It appears that OOo does not support some transformations from Office 97 to Office 2007. Specifically doc to docx and xls to xlsx. These transformations have now been marked as unavailable.
20204: Moved version label to '.6'
20298: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY)
20281: Incremented version number to '10'
20272: Backports to help fix ALF-2839: Node pre-loading generates needless resultset rows
Merged BRANCHES/V3.2 to PATCHES/V3.2.0:
18490: Added cache for alf_content_data
Merged BRANCHES/DEV/V3.3-BUG-FIX to PATCHES/V3.2.0:
20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
20299: Merged PATCHES/V3.2.1 to V3.3 (RECORD ONLY)
20279: Incremented version label
20211: Reinstated patch 'patch.convertContentUrls' (reversed rev 20205 ALF-2719)
20210: Incremented version label to '.3'
20206: Bumped version label to '.2'
20205: Workaround for ALF-2719 by disabling patch.convertContentUrls and ContentStoreCleaner
20149: Incremented version label
20101: Created hotfix branch off ENTERPRISE/V3.2.1
20300: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/V3.3:
20293: ALF-767: remove-AVM-issuer.sql upgrade does not account for column (mis-)order - fixed for MySQL, PostgreSQL and Oracle (DB2 & MS SQL Server already OK)
20301: Merged PATCHES/V3.2.1 to V3.3
20278: ALF-206: Make it possible to follow hyperlinks to document JSF client URLs from MS Office
- A request parameter rather than a (potentially forgotten) session attribute is used to propagate the URL to redirect to after successful login
20303: Fixed ALF-2855: FixAuthorityCrcValuesPatch reports NPE during upgrade from 2.1.7 to 3.3E
- Auto-unbox NPE on Long->long: Just used the Long directly for reporting
20319: Fixed ALF-2854: User Usage Queries use read-write methods on QNameDAO
20322: Fixed ALF-1998: contentStoreCleanerJob leads to foreign key exception
- Possible concurrent modification of alf_content_url.orphan_time led to false orphan detection
- Fixed queries to check for dereferencing AND use the indexed orphan_time column
- More robust use of EagerContentStoreCleaner: On eager cleanup, ensure that URLs are deleted
- Added optimistic lock checks on updates and deletes of alf_content_url
20335: Merged DEV/V3.3-BUG-FIX to V3.3
20334: ALF-2473: Changes for clean startup and shutdown of subsystems on Spring 3
- Removed previous SafeEventPublisher workaround for startup errors and associated changes
- Replaced with SafeApplicationEventMulticaster which queues up events while an application context isn't started
- Now all subsystems shut down cleanly
- Fixes problem with FileContentStore visibility in JMX too!
20341: ALF-2517 Quick fix which means rules which compare the creation/modification date of content should now correctly be applied when content is uploaded to a folder.
20346: ALF-2839: Node pre-loading generates needless resultset rows
- Added missing Criteria.list() call
20347: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
20356: Merged DEV/BELARUS/HEAD-2010_03_30 to V3.3 (with corrections)
19735: ALF-686: Alfresco cannot start if read/write mode in Sysadmin subsystem is configured
1. org.alfresco.repo.module.ModuleComponentHelper was modified to allow “System” user run write operations in read-only system.
2. Startup of “Synchronization” subsystem failed with the same error as was occurred in issue during modules start. org.alfresco.repo.security.sync.ChainingUserRegistrySynchronizer was also modified to allow “System” user run write operations in read-only mode.
20361: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
20345: Fix ALF-2319: CMIS 'current' version mapping is not compliant with spec
20354: Update test to reflect changes to CMIS version mapping.
20363: Merge from V3.2 to V3.2 (all record-only)
c. 19448 OOoJodConverter worker bean correctly handles isAvailable() when subsystem is disabled.
c. 19484 JodConverter-backed thumbnailing test now explicitly sets OOoDirect and OOoJodconverter enabled-ness back to default settings in tearDown
c. 20175 Fix for ALF-2773 JMX configuration of enterprise logging broken
20376: Altered URL of online help to point at http://www.alfresco.com/help/33/enterprise/webeditor/
20395: set google docs off
20398: Fixed ALF-2890: Upgrade removes content if transaction retries are triggered
- Setting ContentData that was derived outside of the current transaction opened up a window
for the post-rollback code to delete the underlying binary. The binaries are only registered
for writers fetched via the ContentService now; the low-level DAO no longer does management
because it can't assume that a new content URL indicates a new underlying binary.
- The contentUrlConverter was creating new URLs and thus the low-level DAO cleaned up
live content when retrying collisions took place. The cleanup is no longer on the stack
for the patch.
- Removes the ALF-558 changes around ContentData.reference()
20399: Remove googledocs aspect option
20400: PurgeTestP (AVM) - increase wait cycles
20422: Added ooo converter properties
20425: Merge V3.3-BUG-FIX to V3.3
20392 : ALF-2716 - imap mail metadata extraction fails when alfresco server locale is non English
20365 : Merge DEV to V3.3-BUG_FIX
18011 : ETHREEOH-3804 - IMAP message body doesn't appears in IMAP folder when message subject is equal to the attachment name
20332 : Build fix - rework to the ImapServiceUnit tests.
20325 : build fix
20318 : MERGE DEV TO V3.3-BUG-FIX
20287 : ALF-2754: Alfresco IMAP and Zimbra Desktop Client.
20317 : ALF-2716 - imap mail metadata extraction fails when alfresco server locale is non English This change reworks the received date metadata extraction.
20316 : ALF-1912 : Problem with IMAP Sites visibility Now only IMAP favouries are shown. Also major rework to the way that this service uses the FileFolderService.
20315 : ALF-1912 Updates to the FileFolderService to support the Imap Service - add listDeepFolders - remove "makeFolders" which moves to its own Utility class. - update to JavaDoc
20429: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20171: 3.3SP1 bug fix branch
20174: Fix for ALF-960 and ALFCOM-1980: WCM - File Picker Restriction relative to folder not web project
20179: ALF-2629 Now when a workflow timer signals a transition it also ends the associated task.
20433: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20184: ALF-2772: Added new test case to RepoTransferReceiverImplTest and fixed the fault in the primary manifest processor.
20196: Temporary fix to SandboxServiceImplTest, which reverses the fix to ALF-2529.
20434: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: (RECORD ONLY)
20213: (RECORD ONLY) Merge from V3.3 to V3.3-BUG-FIX
r20176 Merge from V3.2 to V3.3.
r20175. JMX configuration of enterprise logging broken (fix).
20215: (RECORD ONLY) Merge from V3.3 to V3.3-BUG-FIX
r20178 JodConverter loggers are now exposed in JMX.
20218: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
20195: Form fields for numbers are now rendered much smaller that ...
20248: (RECORD ONLY) Merging HEAD into V3.3
20284: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
20177: Add 'MaxPermSize' setting for DOD JUnit tests
20305: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
20236: Add Oracle support for creating/dropping "databases" (users) in continuous.xml
20264: Updated Oracle build support (to fix grants)
20435: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20233: Part fix for ALF-2811: DOD5015 module breaks CMIS tck
20239: Final part of fix for ALF-2811: DOD5015 module breaks CMIS tck
20250: Merge from DEV/BELARUS/HEAD-2010_04_28 to V3.3-BUG-FIX
20230 ALF-2450: latin/utf-8 HTML file cannot be text-extracted.
20253: ALF-2629 Now tasks should correctly be ended when an associated timer is triggered. Should no longer cause WCM workflows to fail.
20254: ALF-2579 Changed teh status code on incorrect password to '401' to reflect that it is an authorisation error.
20263: Fix for ALF-2500: query with a ! in contains search make it strange
20265: Fix for ALF-1495. Reindexing of OOo-transformed content after OOo crash.
20436: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20292: (RECORD ONLY) Latest SpringSurf libs:
20308: (RECORD ONLY) Latest SpringSurf libs:
20366: (RECORD ONLY) Latest SpringSurf libs:
20415: Latest SpringSurf libs:
20437: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20270: Build times: SearchTestSuite
20273: Fix for ALF-2125 - Accessing a deleted page in Share does not return an error page, instead the document-details page breaks
20274: Fix for ALF-2518: It's impossible to find user by user name in Add User or Group window at Manage permissions page (also allows users to be found by username in the Share Admin Console).
20277: Fix for ALF-2417: Create Web Content Wizard if cancelling/aborting Step Two - Author Web Content, any asset being uploaded gets locked
20291: Reduce build time: Added security test suite to cover 17 security tests
20439: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20302: Fixed ALF-727: Oracle iBatis fails on PropertyValueDAOTest Double.MAX_VALUE
20307: VersionStore - minor fixes if running deprecated V1
20310: Fixed a bug in UIContentSelector which was building lucene search queries incorrectly.
20314: Fix for ALF-2789 - DispatcherServlet not correctly retrieving Object ID from request parameters
20320: Merged DEV/TEMPORARY to V3.3-BUG-FIX
20313: ALF-2507: Not able to email space users even if the user owns the space
20324: Fixed ALF-2078 "Content doesn't make checked in after applying 'Check-in' rule in Share"
20327: Fix Quickr project to compile in Eclipse
20367: ALF-2829: Avoid reading entire result set into memory in FixNameCrcValuesPatch
20368: Work-around for ALF-2366: patch.updateDmPermissions takes too long to complete
20369: Part 1 of fix for ALF-2943: Update incorrect mimetypes (Excel and Powerpoint)
20370: Version Migrator (ALF-1000) - use common batch processor to enable multiple workers
20373: Version Migrator (ALF-1000) - resolve runtime conflict (w/ r20334)
20378: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
20312: ALF-2162: Error processing WCM form: XFormsBindingException: property 'constraint' already present at model item
20381: Fixed ALF-2943: Update incorrect mimetypes (Excel and Powerpoint)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Jan Vonka
|
0f0d7a2fe0 |
Merged V3.2 to HEAD
19246: ALF-1940 - case-insensitive AVM path lookups fail on a DB that is (configured by default to be) case-sensitive
19280: AVM - preserve case on child lookup, add unit tests
19316: AVM - fix rename (change in 'case') & add unit tests (ALF-1725 & ALF-1767)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19337 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
Mark Rogers
|
03d130e99c |
ALF-2031 - DR and VT can't start
- undeleted and reinstated use of org.alfresco.util.Pair - undeleted org.alfresco.util.PropertyCheck which is used in the deployment code. - undeleted other org.alfresco.util.* classes which probably should never have been moved to spring surf. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Jan Vonka
|
deb5fc9c08 |
Merged V3.2 to HEAD
18021: AVM - fix AVMNodeService.getChildByName
18065: (record-only)
18254: WCM/AVM - ETHREEOH-2057 (Submitting WCM Content through WF JSF Error - due to AVM Sync issue)
18442: ETHREEOH-4004 - rework test
18467: ETHTREEOH-4004 - test fix (avoid conversion, replace UTF-16 with UTF-8)
18835: (record-only) Merged V3.1 to V3.2 (record-only)
18783: (record-only) MT: ensure group (EMAIL_CONTRIBUTORS) bootstraps tenant admin user (when creating tenant) - fixed by r14588
19146: (record-only) Undo previous/unwanted commit (version.properties)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19288 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
Nick Burch
|
47837f9286 |
Fix the AVM test suite so that all AVM tests can be run from it, and enable that instead of individual tests in build.xml
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
Paul Holmes-Higgin
|
cefda8c965 |
Updated header to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Paul Holmes-Higgin
|
43e93f3c14 |
Updated header to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18926 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
Derek Hulley
|
add74c1a59 |
Merged V3.2 to HEAD
17332: ETHREEOH-2020: Original tag disappears after a new one has been added to a wiki page
17711: Fix ETHREEOH-3720 - blocker (upgrade from 2.x)
17712: Build/test fix (FeedCleanerTest.testConcurrentAccessAndRemoval)
17726: DownloadContentServlet wraps call in read-only RetryingTransactionHelper
17736: Fix ETHREEOH-2821 - deployment of layered file (fix for 3.2 deployment)
17745: Fixed broken PostgreSQL (AVM, audit, etc) and Oracle (audit)
17746: Merged V3.1 to V3.2
17290: Merged V2.2 to V3.1
17282: (record-only) Fix for ETWOTWO-1387: Node deletions transactions not properly detected ...
17381: (record-only) Putting explicit version name on PDFRenderer.jar
17413: (record-only) Removed dev from label
17749: Type handler fixes for PostgreSQL: Use LONGVARBINARY
17750: Fixed propval mappings for DB2
17754: Fixed "invalid character" in Oracle port of propval
17757: Re-added fix for ETHREEOH-2789 that got lost in a merge.
17762: Fix FeedCleanerTest (for Oracle 10g) + exposed feed cleaner issue (maxSize)
17765: Assorted minor build fixes for Oracle
17767: Empty String property values are persisted as '.empty'
17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2
17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch
17772: Fix build (JBPMEngineUnitTest) - fallout from r17765
17774: Fix JSONtoFmModelTest
17781: Build/test fix (AVMCrawlTestP)
17791: Fix for ETHREEOH-3793: Oracle unit test failure for JobLockServiceTest - Missing unique indexes for all DB ports
17795: ETHREEOH-3696: Attempt to navigate into any existent web-project or create new one after upgrade from Enterprise 2.1.7 ...
17799: ETHREEOH-3796: org.alfresco.repo.importer.ImporterComponentTest fails
17807: Fix ETHREEOH-3723 - MT blocker (can't restart)
17816: Merged DEV/BELARUS/V3.2-2009_12_15 to V3.2
17814: ETHREEOH-3808: Upgrade fails if content cm:name contains curly brackets ('{}')
17822: Fix for ETHREEOH-3828: Mistake porting AlfrescoPostCreate-3.2-PropertyValueTables.sql script to mssql dialect
17823: Fix for ETHREEOH-3829: SQLServer index limit reached for 'idx_alf_props_str'
17831: Fix ETHREEOH-3818 - upgrade from Community 3.2r2 to Enterprise 3.2
17862: Merged V3.1 to V3.2
17722: Fix ETHREEOH-3643 - WCM layered folders (flatten) - also add unit test
17835: ETHREEOH-3763 - fix for WCM layered folders - also add unit test
17871: Merged V3.1 to V3.2
17855: ACT 12915 - create web project performance (-> setPermission -> buildIndirections)
17863: ETHREEOH-3852 - perf tweak (WCM layered files)
-------------------------------------
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_24:r17758
Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_12_15:r17814
Merged /alfresco/BRANCHES/V2.2:r17282
Merged /alfresco/BRANCHES/V3.1:r17290,17381,17413,17722,17835,17855,17863
Merged /alfresco/BRANCHES/V3.2:r17332,17711-17712,17726,17736,17745-17746,17749-17750,17754,17757,17762,17765,17767-17768,17772,17774,17781,17791,17795,17799,17807,17816,17822-17823,17831,17862,17871
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Derek Hulley
|
c67a5c18d2 |
Merged V3.2 to HEAD
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
|
||
Kevin Roast
|
b726c4d6db |
Merged DEV/TEMPORARY to HEAD
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 |
||
|
Jan Vonka
|
e096d59076 |
Merged V3.2 to HEAD
16030: Merged V3.1 to V3.2
16001: Merged V2.2 to V3.1
15999: Temp build/test (AVM permissions - testSimpleInternalLayer)
16223: WCM UI - simple perf improvement when displaying modified list (lock icon)
16472: Merged V3.1 to V3.2
16180: ETHREEOH-2821 - fix deployment of WCM layered (ie. across web project) file
16188: WCM - minor: display (localisable) "File" text (follow-on fix for r15970)
16255: WCM - ETHREEOH-2836
16257: AVM - minor updates to unit tests
16275: WCM - ETHREEOH-2844
16277: WCM - ETHREEOH-2829 - added simple unit test
16341: AVM - minor update to reuse core (path) utils
16344: Merged V2.2 to V3.1
16323: Fix ETWOTWO-1266 (unexpected AVM conflict)
16457: Fix ETHREEOH-2836 (WCM layered files) - follow-on fix, with additional unit test
16649: Fix ETHREEOH-1878 - configure WCM locking for CIFS/FTP
16654: Merged V3.1 to V3.2
16507: Fix ETHREEOH-2604 - update unsecured-public-services-security-context.xml.sample (to allow server to start)
16527: Fix ETHREEOH-2868 - can't submit removal of WCM layered file (Older version prevents update)
16607: AVM - additional tests when deleting LD + fix to avoid cycle
16612: AVM - console improvement (lsver, rmvers) to enable admin/support to list & purge snapshots between dates
16638: Fix ETHREEOH-2893 - stale WCM/AVM layered dir
16643: AVM - console improvement (setopacity) -> eg. to set stale/modifed WCM layered folder as opaque
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Derek Hulley
|
2dd348a281 |
Merged V3.2 to HEAD
15897: Merged V3.1 to V3.2
14485: (RECORD ONLY) ETHREEOH-1937
14915: (RECORD ONLY) Fix for ETHREEOH-2011: chaining-authentication-context.xml.sample
14954: (RECORD ONLY) Fix merge error
14966: (RECORD ONLY) Merged V2.2 to V3.1
14131: *RECORD ONLY*
14605: Merged HEAD to V2.2 (workaround for ETWOTWO-1137)
14368: Fix for ETHREEOH-1936
14607: Fixed NPE in TextMiningContentTransformer: Lead-up to fix for ETWOTWO-1174
14992: (RECORD ONLY) Updated svn:mergeinfo for V2.1-A
15080: Applied suggested fix for ETHREEOH-2252: Emailed content created in wrong space
15131: Merged V2.1-A to V3.1 (ETHREEOH-2270)
13465: Fix for ADB-161 ACT 7870 - added 'xsd' to mimetype map.
15134: Merged V2.2 to V3.1
14332: (RECORD-ONLY)
14717: (RECORD-ONLY)
14745: (RECORD-ONLY)
14746: Fixed error relating to detection and clean-up of duplicate child associations
14759: Missed check-in: Set transactionService for post-transaction duplicate child assoc cleanup
14761: (RECORD-ONLY)
14885: (RECORD-ONLY)
14893: (RECORD-ONLY)
14903: (RECORD-ONLY)
15204: Fixed ETHREEOH-2303: FixNameCrcValuesPatch throws ConstraintViolationException during upgrade ...
15214: Fixed ETHREEOH-1861: Offline synchronization updates file content without any changes
15271: Applied patch fix: Imported users don't conform to case-sensitivity switch
15352: ETHREEOH-2322
15361: ETHREEOH-1112
15369: ETHREEOH-2448
15419: ETHREEOH-2479
15431: ETHREEOH-2520 and ETHREEOH-2521
15587: (RECORD ONLY) Moved Enterprise-only scripts to correct location
15616: Fix ETHREEOH-2581 - WCM layered folder - can't submit deleted file
15675: WCM fixes (ETHREEOH-2110 & ETHREEOH-2645)
15836: Check for null username in ContentUsage service getUserUsage() method
15840: (RECORD ONLY) Merged V3.2 to V3.1
14760: Fix for ALFCOM-586 - trims and ignores leading/trailing whitespace before validation in JSF client forms.
15841: Fixes for ETHREEOH-2702 and ETHREEOH-2687
15860: (RECORD ONLY) Added Oracle and MS SQL Server config
15891: Removed unused compiler directive
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/DEV/BELARUS/ETHREEOH-2221:r14753
Merged /alfresco/BRANCHES/V2.1-A: lots
Merged /alfresco/BRANCHES/V2.2:r14131,14332,14605,14607,14717,14745-14746,14759,14761,14885,14893,14903
Merged /alfresco/BRANCHES/V3.1:r14485,14915,14954,14966,14992,15080,15131,15134,15204,15214,15271,15352,15361,15369,15419,15431,15587,15616,15675,15818,15836,15840-15841,15860,15891
Merged /alfresco/BRANCHES/V3.2:r15897
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Jan Vonka
|
2eeefe0a72 |
Merged V3.2 to HEAD
15596: Merged V3.1 to V3.2
14017: Fix ETHREEOH-1880 - remove (double-)reverse of WCM staging snapshot order
14112: Fix ETHREEOH-1758 - apply contributed patch
14447: Merged V2.2 to V3.1
14276: ETWOTWO-1224 / WCM-948 - browsing staging area during (commit of) large submit can cause AVMNotFoundException: Path /www/avm_webapps not found.
14452: Add WCM services-based unit test for ETWOTWO-1224 / WCM-948
14589: ETHREEOH-1646 - User Sandboxes aren't visible for Content Publisher
15604: Merged V3.1 to V3.2
14734: Merged V2.2 to V3.1
14718: ETWOTWO-1244 - unable to revert some snapshots ("Does not exist: xxx")
14852: Merged V2.2 to V3.1
14720: ETWOTWO-1183 - "Show All Sandboxes" checkbox should only be visible for "Content Publisher" or "Content Manager"
15032: Fix ETHREEOH-2240 - delete WCM web project (does not clean-up workflow sandboxes and also appears in archive store)
15037: Fix ETHREEOH-2240 - follow-on for Alfresco Explorer's Manage (Review) Task Dialog
15056: Fix ETHREEOH-2297 - WCM layered folder - problem deleting file
15072: Minor - fix remote AVM test
15605: Merged V3.1 to V3.2
15082: Merged V2.2 to V3.1
15081: AVM - add tests only
15083: Fix ETHREEOH-2296 - user conflict when updating an AVM layered file
15118: Merged V2.2 to V3.1
15115: Fix ETWOTWO-1265 - WCM locking not working as expected (+ add WCM services test)
15137: Fix ETHREEOH-2309 and ETHREEOH-227 - including refactor (& clean-up) of WCM-related actions
15156: Fix ETHREEOH-2078 & ETHREEOH-2040 - WCM - deploy to localhost causes "Must have at least one store" errors
15175: Fix ETHREEOH-2309 and ETHREEOH-227 - further clean-up of WCM submit/undo actions (for consistency)
15190: Minor: message updates for WCM submit/undo actions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16858 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Jan Vonka
|
c2cca0311b |
AVM DAO refactor
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16138 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Derek Hulley
|
198ebe371e |
Merged V3.1 to HEAD
13256: Fix ETHREEOH-1221 Hard-coded use of "admin" username
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r13256
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Derek Hulley
|
5407e7ff37 |
Merged V2.2 to HEAD
10953: Merged V2.1 to V2.2
10904: AVM - add test suite wrapper, update existing tests to purge test stores (rather than all stores)
10909: AVM - unit test updates only (exposed further tests via test suite)
10947: AVM - unit test update only (extra checks)
10969: Merged V2.1 to V2.2 (cont)
10904: AVM - add test suite wrapper, update existing tests to purge test stores (rather than all stores)
11054: Fixed blind failures in AVM unit tests
11064: AVM - unit test error handling
11068: Temporarily remove AvmTestSuite from the build
11074: AVM - unit tests - added error stack on concurrency tests (to show failure in build output), removed 1 hour freeze, put back AVM test suite
11218: Merged V2.1 to V2.2
11217: AVM - unit test fix ("n must be positive")
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11224 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Jan Vonka
|
e438c81d27 |
Merged DEV/WCM-PERMISSIONS2 to HEAD
AVM folder diff (r9383-r9503) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9545 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Jan Vonka
|
10240e71f4 |
Merged V2.9 to HEAD
9543: Merged V2.2 to V2.9
9338: Restructure AVM tests
9348: AVM - add expected "compare" diffs to existing unit tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9544 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|