mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
c69ebe9c75d12f1dde522f010038beda30e4acab
325 Commits
Author | SHA1 | Message | Date | |
---|---|---|---|---|
|
b4ffc16746 |
Merged BRANCHES/V3.4 to HEAD:
24209: Fixes for screenshot 5 in ALF-5590: Translation errors in Explorer git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24211 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
40f2200d14 |
Merged V3.4 to HEAD
24126 Fixes: ALF-4775: UI Spelling mistake corrections git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
e0e04abccd |
Merged V3.3-BUG-FIX to HEAD
22215: Fix compilation error 22240: ALF-4207: Download servlets show error page with permissions error rather than login page when non-guest user has insufficient permissions 22241: ALF-4469: External Access Servlet should also show status 403 errors to non-guest users, as in ALF-4207 22244: ALF-4599: CIFS access to alfresco with Kerberos authentication creates wrong users with domain suffix ALF-4395: recognize Kerberos machine accounts with lower case names 22247: ALF-4397: Properly handle null values in SortableSelectItem.compareTo() 22248: Merged DEV/TEMPORARY to V3.3-BUG-FIX 21963: ALF-4390: ModuleManagementTool is not returning error code in case of failure Error code constants and appropriate System.exit(code) invokations were added. 22260: ALF-4597: InviteContentUsersWizard was caching permissions in a non-type-specific cache - removed the cache - didn't allow for dynamic model updates either 22269: Merged V3.3 to V3.3-BUG-FIX (RECORD ONLY) 22268: Merged V3.3-BUG-FIX to V3.3 - Merged across all differences from V3.3-BUG-FIX 22270: Incremented revision number 22467: Merge from V3.3 to V3.3BUG-FIX. Fix for ALF-4741. V3.3: 22466 Merge from V3.2 to V3.3. Fix for ALF-4741. V3.2: 22465 Fix for ALF-4741. Repository Web Scripts can produce a corrupted response after a transaction collision/retry. 22667: Merged DEV/TEMPORARY to V3.3-BUG-FIX 22665: ALF-4825: Unlocking checked out content cause both original & working copy un-usable. Do not include unlock in the actions list when a node has a working copy. 22691: Add missing "logAbandoned" (= false) prop to config - follow on to r15133 (related to ALF-4020 / ETWOTWO-562) 22710: ALF-3948 - from time to time we have exception "Failed to init dictionaryRegistry" 22718: Merge from V3.3 to V3.3-BUG-FIX r 22715 Merge from V3.2 to V3.3 r 22713 Fix for ALF-4946 Possible NullPointerException during creation of thumbnails whose names are null-valued. 22722: Merged V3.3 to V3.3-BUG-FIX 22271: ALF-3712: Merged HEAD to V3.3 22249: Bin contents were not being packaged. 22272: Merged DEV/TEMPORARY to V3.3 22067: ALF-4479: when using webdav inline edit on webdav + MS Word 2003 +IE6, one gets: Unable to check in Content Node due to system error. Access Denied. You do not have the appropriate permissions to perform this operation. - Do not unlock a working copy. 22273: Merged DEV/TEMPORARY to V3.3 21729: ALF-3112: Property parameterTemplates not resolved correctly for SimpleTemplateActionDefinition The temporary fix for unconfigurable valueSeparator property. https://jira.springframework.org/browse/SPR-7429 22274: Merged DEV/TEMPORARY to V3.3 21993: ALF-4396: webdav "supportedlock" propfind request returns malformed response WebDAV supported lock elements were wrapped by “lockentry” elements according to the WebDAV specification. 22276: ALF-3890: FTP Change Working Directory (CWD) command works with root-relative paths with more than one component 22277: Merged DEV/TEMPORARY to V3.3 22076: ALF-3579: Open the Details Page URL removes the header, navigation bar etc The identifiers for modify action tag and details' actions tag should be different in the details pages. For documents: in the filelink-details.jsp and document-details.jsp. For spaces: in the space-details.jsp and spacelink-details.jsp. 22285: Merged HEAD to V3.3 22284: Fix for ALF-3063 "Incorrect behaviour on filtering by tag in Repository". Labels updated to more accurately reflect behaviour. 22299: Fix for ALF-3893: lucene.indexer.mergerTargetIndexCount is redundant - this property is now used to control the merging of indexes as was intended 22309: Merged DEV/TEMPORARY to V3.3 (Approved by Roy) 21035: ALF-2588: RM: Export and import of file plan causes disposition errors When content is imported from acp the actionId that points to the action NodeRef is old in the imported content and NullPointerExcepption appears. To avoid this we changed DispositionScheduleImpl. Now it stores the action that has different name and ID (when action is create it name equals id) in a separate map. And when getDispositionActionDefinition(String id) method is called it tries to retrieve the action from this map, if it hasn’t been found earlier. 22325: Fix for ALF-4428: Incorrect behaviour of Consumer and Contributor permissions with Quickr - unit test pass 22334: Merged HEAD to V3.3 22331: Fixes: ALF-3558: Input and variable encoding issues in Share Calendar & API JSON data. 22355: ALF-4489: Special Characters Create Stack Overflow Exception in the Group Admin Console for Share in Internet Explorer. Fixed missing encoding and also added guard code to prevent stack overflow problem in case of future error. 22356: Fix for ALF-4384 - missing JSP page directive 22360: Fix for ALF-4428: Incorrect behaviour of Consumer and Contributor permissions with Quickr - unit test pass - no abstain allowed 22365: Merged DEV/TEMPORARY to V3.3 21874: ALF-2641: WebDav Permission Issues - MAC OSX Finder The createExclusive field was introduced instead of m_scope. New algorithm of lockscope determination was added. Also ALF-4008 compliant fix provided with this. 21812: ALF-4008: save a MS Word change over webdav after a 2-3 minutes delay causes the error 'XXX.doc is currently in use. Please try again later.' Modified LOCK method, it gets a scope from NodeRef property if m_scope field is not defined. 22367: Merged DEV/TEMPORARY to V3.3 21442: ALF-2587: WEBDAV error in Windows 7 - variant generateLockDiscoveryXML methods were factored into a single one capable of generating a namespaced LOCK response compatible with Windows 7 when its user agent header is detected. 22368: Merged DEV/TEMPORARY to V3.3 20919: ALF-2834: All day events created in Outlook not appearing in Meeting Workspace Different date format is used by Outlook when creating all day meeting request and meeting request specifying date and time. The code was changed to handle both situations accordingly. 22369: Merged DEV/TEMPORARY to V3.3 (With simplifications) 21470: ALF-3796: Locale is not always set/reset on every request thread - A GlobalLocalizationFilter sits in front of ALL requests and sets a default fallback locale on I18NUtil - Moved BaseServlet.setLanguageFromRequestHeader into this filter and made sure it always falls back to a default locale - Subsequent filters / servlets in faces chain may override this with user preferred locale after authentication 22370: ALF-3868: Fix for compatibility with Sun Directory Server 22371: Merged DEV/TEMPORARY to V3.3 21811: ALF-4067: Display Value for Action Constraint breaking a java eval in Share When a node doesn't have a ContentModel.PROP_TITLE property it is added to AllowableValues with PROP_NAME value. 21795: ALF-4067: Display Value for Action Constraint breaking a java eval in Share The fix introduces the code which doesn't add a node to AllowableValues if it doesn't have a ContentModel.PROP_TITLE property. 22378: ALF-3796: Fixed compilation error - BaseServlet.setLanguageFromRequestHeader replaced by global filter 22380: ALF-3761: War bundles + extension samples now include alfresco-global.properties in correct position in hierarchy 22386: ALF-3887: Two versions of geronimo-activation are shipped - Removed the older version 22402: WCM - add more debug logging only 22405: Change notification handler not enabled by the server configuration bean. ALF-4715. 22407: Merged DEV/TEMPORARY to V3.3 22231: ALF-4096: Share point module is causing file descriptor leaks. The following changes were added to VtiIfHeaderAction and GetDocumentMethod: - code that copies data between streams was replaced by org.apache.commons.io.IOUtils.copy() - correct stream closing was added for all cases including exceptions while copying 22411: Merged DEV/TEMPORARY to V3.3 21864: ALF-4371: Error occurs if user try to find event from meeting place Replaced incorrect NamespaceService.CONTENT_MODEL_PREFIX with NamespaceService.CONTENT_MODEL_1_0_URI in QName creation. 22412: Merged DEV/TEMPORARY to V3.3 22018: ALF-4403: Search on users in JSF client and SHARE do not specify "cm:person" type clause in the query leading to incorrect results in user searching. People searches in Alfresco and share are restricted by “cm:person” type. 21988: ALF-4403: Search on users in JSF client and SHARE do not specify "cm:person" type clause in the query leading to incorrect results in user searching. People searches in Alfresco and share are restricted by “cm:person” type. 22418: ALF-4578: Avoid ConcurrentModificationException in AVMDeploymentTarget 22420: Fixed ALF-958: Target associations aren't copied - Added CopyBehaviourCallback. getAssociationCopyAction - Default behaviour: - Remove existing associations of same type when copying OVER an existing node (e.g. check-in) - Copy the association using a new target if the target is copied in the same call - Copy the association to the original target if the target is not copied in the same call - Abstract behaviour (for those that have implemented a CopyBehaviourCallback): - Remove existing associations of same type when copying OVER an existing node (e.g. check-in) - Only copy the association to a new target if the original target is copied 22421: ALF-4641: Strip ticket parameter on login page redirect to avoid endless redirect loop 22422: Merged DEV/TEMPORARY to V3.3 21201: ALF-1804: Passthru server check gets confused when a server goes offline 22423: Merged DEV/TEMPORARY to V3.3 21891: ALF-3356: Error changing own user role from coordinator to consumer When a user changes the Roles, all Permissions are immediately deleted and new selected permissions are created. If all permissions are deleted then the user doesn't have access for permissions creation. If the user currently has permission change permission the currently set of permissions is cleared and new permissions are added from a System User authority. 22424: Merged DEV/TEMPORARY to V3.3 21182: ALF-1786: Remote Opensearch request mimetype missing SearchProxy was changed to provide original User-Agent header. HTTPProxy was extended to set request headers. New overridable method setRequestHeaders was added to provide ability of setting headers. 22425: Merged DEV/TEMPORARY to V3.3 22165: ALF-197: When returning to the first step of Advanced Workflow creation from second or third steps it's always Adhoc Task chosen there The selectedWorkflow variable was reseting every time on "Choose Workflow" step 22426:Merged DEV/TEMPORARY to V3.3 21323: ALF-687: Error when invoking webservices via SSL repository location url. Add a new overload of ContentUtils.putContent() method with the isSSL argument at the end. If this parameter value is true then SSLSocket is used and Socket otherwise. 22428: ALF-3490: Unfriendly error messages from WebDAV when content doesn't exist - Generalized ALF-4207 solution so that the error page instead displays a status 404 message 22429: Merged DEV/TEMPORARY to V3.3 21325: ALF-3502: Logging in FacesHelper.getManagedBean on failure to create bean Detailed logging of the EvaluationException for ValueBinding was added. 22430: Merged DEV/TEMPORARY to V3.3 20974: ALF-2695: mimetypes-extension-context.xml.sample does not use the correct classes Changed the type of the bean id="mimetypeConfigService" from “"org.alfresco.config.xml.XMLConfigService” to “org.springframework.extensions.config.xml.XMLConfigService” Renamed mimetypes-extension-context.xml.sample file to file mimetypes-extension.xml.sample. The file mimetypes-extension-context.xml.sample was interpreted like spring context file. It wasn’t correct. 22431: Merged DEV/TEMPORARY to V3.3 21099: ALF-3046: UI - Import feature not available to contributor user The fix also covers related bug ALF-2802. Permission ‘Write’ was replaced by ‘CreateChildren’ for import action because contributor has ‘AddChildren’ (not ‘Write’) permission. 22432: Merged DEV/TEMPORARY to V3.3 20973: ALF-3244: alfresco-sample-website.war does not deploy to bundled Tomcat The cause of the corrupted alfresco-sample-website.war deployment is the usage of the SSIFilter in the application. Only Contexts which are marked as privileged may use SSI features. For this reason, the context has been marked as privileged in META-INF/context.xml 22433: Merged DEV/TEMPORARY to V3.3 21190: ALF-3751: Unintentional copy/remove of 'Web Forms' space removes form associations in Web Projects Parent validation before deleting was added. Now deleted web form is removed from Web Project only if this form is located in original Web Form folder. 22434: Merged DEV/TEMPORARY to V3.3 21490: ALF-4099: Customer concern about String comparison operators == vs equals Comparison operator was replaced by equals/EqualsHelper.nullSafeEquals in the ContentFilterLanguagesMap DocumentNavigator UIAjaxTagPicker Presence classes. DocumentNavigator.getAttributeName() method was changed because the previous method's logic always returned escapedLocalName in any case. 22436: Merged DEV/TEMPORARY to V3.3 22063: ALF-4494 : Share show error if versionable document has no version history. 1. evaluator.lib.js was modified to prevent NPE if no version history exists for document. 2. Result was manually tested. 22437: ALF-2796: java.naming.referral is set to "follow" in the LDAP contexts to avoid PartialResultExceptions on LDAP sync 22466: Merge from V3.2 to V3.3. Fix for ALF-4741. V3.2: 22465 Fix for ALF-4741. Repository Web Scripts can produce a corrupted response after a transaction collision/retry. 22469: Fix for CIFS long directory path results in duplicate folder displays. ALF-3938. Removed (hopefully) last of the hardcoded buffer length limits. 22472: Fixed ALF-4670: XAM retainUntil value does not propagate down the space hierarchy 22473: Fixed ALF-4656: Deleted Content Backup should ignore unrecognised URLs - Also fixes ALF-4657: Content stored on XAM is not cleaned up correctly - Errors in the listeners are logged only - ContentStoreCleanerListener checks and warns if the URL is unsupported 22474: Fix to web.xml to correctly validate and therefore deploy on JBoss5.1.0 22485: Fix for NFS losing contents during edit or copy. ALF-4737. 22492: ALF-4652 XAM bug fixes and improvements: Respect 0 'retentionPeriodDays' 22501: Fixed ALF-4763 XAM-enabled nodes must not go to the archive://SpacesStore 22504: Fix for MS Word mimetype is changed when editing via CIFS. ALF-3772. 22520: ALF-4768: WCM (w/ virt svr) - submit (no need to virtualize direct submit workflows) 22526: Externalised setting of BINARIES, plus added bin with jars and dlls 22561: ALF-4792: WCM virt svr - add experimental option for lazy deployment (defer startup of dependent webapps until accessed) 22611: Fixed ALF-1893: Windows 7 SSP Read-only. Note: Relies on the patched Excel and PowerPoint mimetypes, but also falls back to file exension. 22612: Merged HEAD to BRANCHES/V3.3: 22609: Resolve ALF4822, ALF4818 22628: ALF-3239: Added encoding elements to mysql db url 22656: Fix for Solaris/Gedit problem, keep a mapping for the original file handle to the new path after a rename. ALF-4843. 22673: ALF-4845: Person and Group member deletion performance fix - Don't batch load all a group's members when trying to delete one of them! - Can result in infeasibly large hibernate sessions when trying to delete a person / LDAP sync in a repository with very large groups - Switched off batch loading in NodeService.removeChild() - Avoided unnecessary use of removeAuthority in PersonService.deletePerson() 22674: Merged DEV/TEMPORARY to V3.3 22653: ALF-661: There is no way to determine the protocol, hostname and port from a javascript kicked off by JBPM These variables are now available for use in workflow and action javascript and they are wired to the corresponding parameters that already exist in the sysAdmin subsystem. urls.alfresco.protocol urls.alfresco.host urls.alfresco.port urls.alfresco.context urls.share.protocol urls.share.host urls.share.port urls.share.context See bug for example usage 22676: Merged HEAD to V3.3: 20306: Google Doc integration fixes: - Fixed up inconsistancies in powerpoint and excel mimetypes set throughout the code - Unit tests failures for excel sheets fixed - Able to now create and checkout docs, sheets and presentations successfullly - Docs, sheets and presentations downloadable and viewable - Fixed ALF-2700 (See ALF-4827) 22715: Merge from V3.2 to V3.3. r. 22713. Fix for ALF-4946 Possible NullPointerException during creation of thumbnails whose names are null-valued. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
fc5e0760de |
Fixes for ALF-4775 - Spelling Defects in UI (en)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22556 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
c9c8497290 |
Fixes ALF-4382: Typos in UI properties strings.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22009 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
ff982c4cd2 |
ALF-4128 : transfer service.
alien nodes : restore and move implementation and unit test git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21744 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
596ee7e831 |
Changed the name of the web client to "Explorer" to reflect the fact that thats what we call it now we have more than one "web client".
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20943 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
5f9d3cb6b1 |
Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-5 to HEAD:
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 |
||
|
7c7f733f64 |
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 |
||
|
1cafe11ec8 |
Merged V3.2 to HEAD
19251:Merged V3.2.0 to V3.2 19224: ALF-1999: Alfresco Explorer Group searches by display name now make correct use of AuthorityService 19111: Final part of fix for ALF-1934 - show group 'display name' rather than group 'identifier' 19088: Merged DEV/TEMPORARY to HEAD 19005: Group Admin Scalability (SAP) implementation 19078: ALF-1934: change the behaviour of 'Manage User Groups' similar to 'Manage System Users' git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
f22698147b |
Merge DM-DM_deployment to HEAD
18665 : Switch over to using new surf <formdata multipart-processing="false" /> configuration option. - now the PostContentCommandProcessor and PostSnapshotCommandProcessor handle their own MimePart processing. 18683 : SAIL-288 Implementation of TransferService client side cancelAsync. 18716 : Adding TransferEventBegin missed from asyncCancel work. 18734 : Transfer format : implementation of null properties and Serialized base64 Java objects for type d:any 18749 : SAIL-290: Added features that provide asynchronous commit on the receiver end and the ability to query commit status, as well as code that writes a progress report on the server side (currently only plain text) and the functionality to allow a transfer to be cancelled 18750 : New files that should have been checked in with previous commit but weren't... 18770 : Various transfer service work. - correction to transfer report name. - use surf Base64 Encoder - implementation of async commit to the TransferServiceImpl - implementation of the statusCommand through the HttpClientTransmitter. 18773 : transferId was null. 18780 : Changed the server-side commit to occur asynchronously. Added two test actions to transfer a single node or a tree of nodes. Tweaked TransferDefinition to provide varargs version of setNodes. 18793 : SAIL-290: Added a couple of test actions. Added varargs versions of transfer and transferAsync on TransferService. 18794 : SAIL-290: Added "targetExists" operation to the TransferService interface. 18804 : SAIL-36: Fixed an issue where transfer could fail if numerous nodes with the same cm:name value are transferred. 18805 : SAIL-36: Added model file that should have been with last commit. 18808 Continuing work on transfer report. 18825 TransferServiceImplTest green line. 18836 : Added a little more output to the server-side transfer report. 18848 : More work on transfer report. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18865 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
2cd5047075 |
Merged V3.2E to HEAD
17533: Fix for unreported issue for events with multiple days (secondary elements) aren't filtered correctly when view is filtered by tags 17535: ETHREEOH-3411 - Alert appears when loading My Dashboard when Documents I'm editing dashlet is aded and site name was edited with XSS text 17536: Fixes for various forms issues (ETHREEOH-3398, ETHREEOH-3273, ETHREEOH-3339 & ALFCOM-3587) and reverted accidentally checked in log4j.properties file - Folders can now have tags applied in edit form - Working copy nodes have their cm:name property set to protected - Removed mandatory marker from checkbox control (if you have a boolean there is always a value so no need to mark as mandatory) - Potential security issue 17537: ETHREEOH-1908 - .docx word documents are not displayed in 'Word Documents' category in 'Document List' component. Also fixed some i18n strings. 17538: Fix for ETHREEOH-3085 and ETHREEOH-3341. - NTLM/Kerberos, Tomcat/JBoss5 and JSF client now play nicely on session timeout and display the correct configured page on first login. - Tested Share NTLM works correctly with above changes. 17539: Fix for ETHREEOH-3368: UI does not show multi-valued MLText propertis as localisable 17543: Merged DEV_TEMPORARY to V3.2 17529: Fix for ETHREEOH-3186 & ETHREEOH-3187 17544: Fix for ETHREEOH-1509 - Manage action is not applied for task resources part from My Tasks tab in Office Addins if user already opens another task. 17547: Fix for ETHREEOH-1709 - AccessDeniedException - Download Servlet not re-directing user to login page. - WebDav path now resolved to a noderef as system user - then the permission test for READ_CONTENT is performed directly on the resulting noderef. 17548: Fix for ETHREEOH-3137 - Tags created for All day event are not displayed in Tags pane. 17551: Final part of fix for ETHREEOH-2161 includes solution for ETHREEOH-3270. - An admin user can now optionally disable the execute of Rules and the Archive of nodes during a folder delete operation. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18128 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
d89c2164d0 |
MERGE V3.2 To HEAD
- Merged DEV_TEMPORARY to 3.2 17321 - ETHREEOH-962: User able to add some FSR or ASR with the same name git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
3bd4252a04 |
Merged V3.2 to HEAD
17262: Fix for ETHREEOH-2898: Share Login - using return with auto-complete clears login screen details 17264: Fix for ETHREEOH-2368 Added category is not visible in "Categories" in Side Bar even after the page is refreshed. 17266: Merged V3.1 to V3.2 17265: ETHREEOH-3213 - Error occurs if you try to Configure of Site Wiki dashlet if wiki page name contains russian letters 17279: Fix for ETHREEOH-3110 - Error page if Add broken number by create(edit) ASR or FSR. 17281: Fix to unreported error where the NodeBrowser would not display nodes that ... 17283: ETHREEOH-3037 and ETHREEOH-2158 17286: Fix for ETHREEOH-3075 Encoding field is displayed as empty on Versioned details page. 17289: Merged V3.1 to V3.2 17288: Fix for ETHREEOH-3164 Link Destination (with modify properties of a space link) does ... 17291: Fix for ETHREEOH-2403 It's possible to create a content with spaces. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
d5fa19de9f |
Merged V3.2 to HEAD
17075: Merged DEV-TEMPORARY to V3.2 16768: ETHREEOH-2359: System Error message appears while clicking "View Completed Task" icon for the task, if the user, whom the Adhoc task was assigned to, has been deleted 16792: *RECORD ONLY* ETHREEOH-1429: Unfriendly error occurs when two content managers create identical content items in appropriate user sandboxes 17078: Merged DEV-TEMPORARY to V3.2 16962: ETHREEOH-1289: It is possible to add one Web Form to Web Project twice and more times 17080: Merged DEV-TEMPORARY to V3.2 16960: ETHREEOH-1894: Unfriendly notifications appear when trying to edit unlocked content git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
c350b0140a |
Merged V3.2 to HEAD
16841: Fix for ETHREEOH-3046 - discussion post replies and further post content now all set to UTF-8 encoding format. 16853: Merged V3.1 to V3.2 13681: Disable CMIS Web Services. 13958: ETHREEOH-1625 - Incorrect save file process via Office Addin 14026: ETHREEOH-1805 - update GET login web script description to recommend use of POST login web script instead. 16861: Merged V3.1 to V3.2 14162: ETHREEOH-1733 - multiday events display correctly 14273: fix for ETHREEOH-2031 14274: fix for event not adjusted by height issue in week view, after adding 16867: Merged V3.1 to V3.2 15429: The solution is to remove 'label' and 'description attributes' and add appropriate 'label-id' and 'description-id' attributes in web-client\config\alfresco\web-client-config.xml for dashlets. Appropriate ids were added into webclient.properties. 16677: ETHREEOH-1208 - Upload/recall documents with apostrophe/accent via Alfresco Office plugin 16869: Merged V3.1 to V3.2 16848: Merged V2.2 to V3.1 15217: Fix for ETWOTWO-1268. Check for existence of desired control on first step of the dialog. 15218: Fix for ETWOTWO-1269. Remove node.hasPermission(PermissionService.CREATE_CHILDREN) from CheckoutDocEvaluator#evaluate method (like 3.2 version). 16849: Merged V2.2 to V3.1 15424: ETWOTWO-1349 16851: Merged V2.2 to V3.1 15432: **RECORD ONLY** Input characters validation script was modified to disallow !@#$%^&*(). 15433: This check-in fixes ETWOTWO-1351, ETWOTWO-1352, ETWOTWO-1353 because their behaviour is similar. 16874: Merged DEV/TEMPORARY to V3.2 16789: ETHREEOH-1895: Incorrect working of Link Destination Details 16790: ETHREEOH-2372: Incorrect working of Link Destination Details 16791: ETHREEOH-2342: Error message appear when "Coordinator" try to remove himself from the space 16793: ETHREEOH-1364 & ETHREEOH-1367 16794: ETHREEOH-2358: Letters and special symbols can be typed in Date value of property while creation of Content Rule and it leads to error 16837: ETHREEOH-2631: two jsp:root elements cause compilation error in Weblogic 10.3.1 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16956 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
051b54a53c |
Merged V3.2 to HEAD
15504: ETHREOH-2447: My Content page localisation failing - Localization is provided for all the ftl and xml files in WEB-INF\classes\alfresco\templates\webscripts\org\alfresco\portlets. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16907 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
e2fa0967aa |
Merged V3.2 to HEAD
16681: Fixed ETHREEOH-2454 "It's possible to create a group with less than 3 symbols in JSF client, but it's impossible to find it in Share client" - Group name can now only be between 3-100 characters in webclient git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16901 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
fb35a5cf49 |
Merged V3.2 to HEAD
16673: Merged V3.1 to V3.2 16307: ETHREEOH-2814-2815 16393: ETHREEOH-2840: Failed to send email to group EVERYONE 16395: Just forget to add this file during previous (16393) CHECK-IN. 16430: Added license header to new Java file - applied coding standards and code comments. 16669: Merged V2.2 to V3.1 16650: ETWOTWO-1288 - Create Web project Wizard-Step3 :XSS attack can be made when configuring ASR or FSR 16668: Fix for ETWOTWO-1289 - My Web Files (Forms) dashlets XSS attack can be made when web project's details has been edited 16676: Merged V3.1 to V3.2 16675: Fix for ETHREEOH-2773 - Manage System users: system error happens when search is performed by a query that contains a space 16699: Fixes to SURF samples Login page - as per ALFCOM-3447 and ALFCOM-3448 contributions git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
f03cabea25 |
Merged V3.2 to HEAD
15908: Merged V3.1 to V3.2 (record only) 15907: Merged V3.2 to V3.1 15683: Fixed potential concurrency issues in HeartBeat and LicenseComponent 15972: Merged V3.1 to V3.2 15429: **Record only** I18N message IDs for JSF dashlets 15947: ETHREEOH-2565: The content size shown in the preview popup is incorrect 15952: Part of fix for ETHREEOH-2493 - missing html encoding on webscript 404 html status page. 15953: Fix for ETHREEOH-2364 - LDAP sync missing last name displayed as null. 15956: Fix for ETHREEOH-2714 - html encoding in Create New User summary page. 15957: Merged DEV-TEMPORARY to V3.1 15865: Fix for ETHREEOH-2673 15958: Merged DEV-TEMPORARY to V3.1 15885: ETHREEOH-2615: Localization Issue - Japanese UI 15959: Merged DEV-TEMPORARY to V3.1 15882: ETHREEOH-2644: Sending Email using Template throws exception 15962: Fix for ETHREEOH-2390 15963: Fix ETHREEOH-1962: Hibernate flush ordering incorrect for alf_qname 15965: Merged DEV/BELARUS/V3.1 15949: ETHREEOH-2689: When upgrading from 2.1.7e to 3.1.0e/3.1.1e user roles are mapped incorrectly 15966: Merged V2.2 to V3.1 15948: (RECORD ONLY) Backport of the fix provided for ETHREEOH-1719. 15969: Prep for ETHREEOH-2295 fixes and associated merges. 15970: Merged DEV-TEMPORARY to V3.1 14360: ETHREEOH-1571, ETHREEOH-1656, ETHREEOH-1404, ETHREEOH-953, ALFCOM-2650, ETHREEOH-1572, ETHREEOH-1574 15331: ETHREEOH-2295 - LayeredFile: Layer file/folder is present when original file/folder is removed 15824: ETHREEOH-2295 - higlight stale object ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/DEV/BELARUS/V3.1:r15865,15882,15885,15949 Merged /alfresco/BRANCHES/DEV/3.1SP2:r14360,15331,15824 Merged /alfresco/BRANCHES/V2.2:r15948 Merged /alfresco/BRANCHES/V3.1:r15907,15947-15962,15964-15970 Merged /alfresco/BRANCHES/V3.2:r15908,15972 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
6c3b7b8cd6 |
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 |
||
|
d67b53b7cc |
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 |
||
|
44e72700aa |
Merged V3.2 to HEAD
15828: ETHREEOH-2601: Users dialog won't delete users who have no authentication information - Moved the AuthenticationService.deleteAuthentication() call inside PersonService.deletePerson() and protected with try - catch so that if there is no authentication information (for an upgraded/moved user) the person can still be deleted - Removed a bunch of redundant deleteAuthentication() calls git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
cb4ce6b652 |
Merged V3.2 to HEAD
15506: Fix for ALFCOM-3274 - removed double-encoding of webview dashlet title when set from Configure dialog. 15543: Fixes for ETHREEOH-2596 and ETHREEOH-2392. Any Admin user now forced to enter old password when editing themselves in the Share User Admin console. 15620:Merged V3.1 to V3.2 15595: Merged DEV-TEMPORARY to V3.1 15446: Appropriate JSP page was modified to align radio buttons. 15597: Fix for ETHREEOH-2575 - all PNG files now appear in IE6, note that PNG transparency is not supported in IE6. 15598: Merged DEV-TEMPORARY to V3.1 15593: ETHREEOH-2445: Localization Issues [Email Templates and RSS Templates ACPs I18N] 15599: Merged DEV-TEMPORARY to V3.1 15491: ETHREEOH-2460: Localization Issues - Email template 15601: *RECORD ONLY* Merged V3.2 to V3.1 15504: ETHREEOH-2447: My Content page localisation failing. [backport from V3.2] 15613: *RECORD ONLY* Removed reference to portlets message bundle - as per CHK-8518 15784: Minor performance improvements to data dictionary classes relating to Permission evaluations. 15791: Merged V3.1 to V3.2 15693: Merged DEV-TEMPORARY to V3.1 15648: ETHREEOH-2549: Templates in 3.1 will need localising 15743: ETHREEOH-2586: JP:Layout error, the word "....." (cancel) should be in the same line 15745: ETHREEOH-2493 - HTML and XML encoding fixes to Alfresco OpenSearch keyword and person search HTML/ATOM/RSS feed templates. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
c31f491b71 |
Merged V3.2 to HEAD
15297: Merged V3.1 to V3.2 15093: Merged V2.1-A to V3.1 12428: Fix for ADB-150 13461: Fix for ADB-163 - Generic picker now resizes but has minimum width 13462: Fix for ADB-164 ACT 7788 - Search button label now configurable as component attribute. 13757: Fix for ADB-155 14113: Fix for ABD-143 14115: Fix for ADB-144 14493: Fixes for ADB-155 (correction) and ADB-161, ADB-184, ADB-185, ADB-186, ADB-188, ADB-189. 15162: Fix for ETHREEOH-2278 - missed during merge of ABD-143 15278: Fix for ETHREEOH-2474 - search regression git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15298 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
48f0e3a615 |
Merge IMAP in
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14947 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
1e70503048 |
Reverse-merged /alfresco/BRANCHES/DEV/IMAP3:r14500,14521,14560,14563,14632
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
738ddb59e9 |
Merged DEV/IMAP3 to HEAD
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14654 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
1f961e31f7 |
MOB-690 - WCM PreviewURIService - checkpoint
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14642 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
3914f58767 |
Merge WCM_WDR_MER TO HEAD
MOB-399 Implementation of Deploymemnt Engine MOB-669 MOB-630 Revisions 14181 - 14539 merged,, git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
94de11a162 |
Fix for ALFCOM-1311 - message now shown on the Explorer login page when user does not have enough permissions to view an item.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14512 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
8b53e5f3df |
MOB-687 - WCM Deployment - Select multiple test servers
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14337 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
cdfd0e7993 |
Merged DAVEW_V3.2 to HEAD
13659: Fix NTLMAuthenticationFilter to call super.afterPropertiesSet() 13658: MOB-424: Utility to Dump JMX Data - new enterprise distributable jmx-dumper.jar - command line invocation via "java -jar jmx-dumper.jar" - admin web access via http://localhost:8080/alfresco/faces/jsp/admin/jmx-dumper.jsp 13575: Preconfigured authentication stacks for alfresco, LDAP, Kerberos and NTLM. TODO: file server config. 13493: Initial work to enable selection, configuration, testing and hot-swapping of different authentication subsystems via JMX or admin UI. 13309: Changes to allow datasource and property configuration via JNDI - Move AVM catalina .jars into 3rd-party/lib/virtual-tomcat so that they don't get automatically included in the .war file and hence stop JNDI lookups from working - Allow JNDI lookup of datasource – use standard app server mechanisms for managing it but still fall back to 'normal' one - Allow properties to be overridden by JNDI env-entries as well as system properties. Including hibernate dialect ones. Web.xml can then declare required env-entries and these can be defined on deployment. - Rewire iBatis so that no config file edits are necessary when dialect is changed - Use proxy around datasource so that auto-commit is always activated for iBatis git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13668 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
ba836f778c |
Merged V3.1 to HEAD
- 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 |
||
|
c172eba346 |
Merged V3.1 to HEAD
13371: Fix for ETHREEOH-1371, ETHREEOH-1373, ETHREEOH-1374. Rule comparator now correctly deals with MLTEXT datatype fields such as name/title/description. 13372: Fix for ETHREEOH-1291. Fixes the general issue that "decodeURI()" should not be used to decode javascript encoded strings -unless- you specifically want to ignore certain characters, "unescape()" should be used instead. 13373: Fix for ETHREEOH-1284. Clean up of generated javascript for UIDataPager component - also moved to include file for performance and ease of modification. 13384: Fix for ETHREEOH-1459. Sweep through and clean up of the Edit Online/Offline editing and Checkin/Checkout process as per latest wireframes. A number of minor fixes to JSF action evaluators and related JSPs also. Icons updated as per wires. 13396: Fix for ETHREEOH-1424. Web-framework script connector now generates an Accept-Language header based on current user locale by default for remote calls. 13404: Missing paging controls added to task and workflow dialogs (part of ETHREEOH-1410). git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13596 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
b906c50cdf |
Merged V3.1 to HEAD
13304: Final part of I18N fixes for Share. TinyMCE editor lang packs: fr, de, jp, es. Added Spanish (es) to web-client TinyMCE integration also which was missing it. 13316: Liferay Portal 4.3.X fixes for JSF Client portlet: - Tested deployment instructions for Alfresco and Liferay 4.3.X - still work as per wiki page http://wiki.alfresco.com/wiki/Deploying_2.1WAR_Liferay4.3 - Upload is working (tested from Add Content, Upload New Version and Update) - Fixed bug raised in ETHREEOH-1170 NOTE: there are still issues with the other Ajax Mootools powered portlets... 13333: Fix for ETHREEOH-1410, ETHREEOH-1402, ETHREEOH-1396, ETHREEOH-1393, ETHREEOH-1380, ETHREEOH-1274, ETHREEOH-1266, ETHREEOH-1257 - Paging control submit box now correctly handles enter key press without submitting parent form. 13348: Fix for ETHREEOH-980 - a user home space can no longer be set directly to User Homes. So they are not accidently given full permissions to that folder or the ability to rename it later. 13349: Fix for ETHREEOH-980 - a user home space can no longer be set directly to User Homes [missed files] 13350: Fix for ETHREEOH-971. CIFS and WebDav online edit modes fixed to work in IE as best as possible in FF. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
a94f5f0bff |
Merged V3.1 to HEAD
13249: Fix for ETHREEOH-1064 and ETHREEOH-1286 and fix for issue where New Page action not activated in Share Wiki page list. 13251: Final part of fix for ETHREEOH-1270 - Group pickers in JSF client now use new findAuthorities() API to find groups for user searches - over 10x quicker for installations with many groups. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
1aa1ef1f13 |
Merged V3.1 to HEAD
13173: Merged V2.1-A to V3.1 10964: Fix for ADB-81: String 'Template' in Japanese is not good format 10971: Fix for ADB-85: Configure dashboard wizard: long items description get truncated 10972: Fix for ADB-95: All templates should be parameterized using a such that they pickup the server name and port number of the current installation 10973: Fix for ADB-117: Configure Dashboard Wizard. Layout word (Step 3) not localized for japanese and french 13174: Merged V2.1-A to V3.1 10975: Fix for ADB-118: Content attributes not localized [client templates] 13182: Merged V2.1-A to V3.1 11058: Fix for ADB-121: Next & Finish button remain disabled in 'Create Content in your home space' wizard even after entering name when locale is set to French 11059: Fix for ADB-128: Date format is different for 'Manage Content Rules' in Japanese Locale 13190: Merged V2.1-A to V3.1 11070: Fix for ADB-120 ACT 4773 13192: Merged V2.1-A to V3.1 11195: Fix for ADB-130: The 'Finish' button doesn't work after editing the content 13193: Merged V2.1-A to V3.1 8395: Remove user and group admin actions from Admin console [added config switch - off by default] 8584: Removed option for user to change password [added config switch - off by default] 10203: Fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default] 10374: Further fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default] 13194: Merged V2.1-A to V3.1 12095: Fix for ADB-131 13195: Merged V2.1-A to V3.1 12097: Fix for ADB-133, ADB-134 12102: Fix for ADB-139 13196: Merged V2.1-A to V3.1 12350: Fix for ADB-142 13197: Merged V2.1-A to V3.1 12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards 12878: Merged record-only for V2.1-A to HEAD 12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards 13198: Merged V2.1-A to V3.1 12977: Fix for ADB-158: Intermittent error while accessing the login page 13142: Another fix for ADB-158: Intermittent error while accessing the login page 13199: Merged V2.1-A to V3.1 11589: Fix for ADB-95: All templates should be parameterized git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
a07c125fd3 |
Merged V3.1 to HEAD
13023: ISO date fix for ETHREEOH-1215 13153: Merged V2.1-A to V3.1 9026: - Added "My Content" link to error page - Manual merge of Safari fixes - Fixed exploded build target after recent removals 13155: Restored line removed in merge 13156: Merged V2.1-A to V3.1 9027: *RECORD-ONLY* Further Safari rendering fix 9028: Removed use of generics from JSP so it compiles in JBoss 13161: Merged V2.1-A to V3.1 9051: *RECORD-ONLY* Fix for ACT 2806 (linked content was returning 404 error) 13162: Merged V2.1-A to V3.1 8680: *RECORD-ONLY* Added back "too_many_users" message as it got removed 13164: Merged V2.1-A to V3.1 8699: Added DOCTYPE line 8994: Added Copyright for Sun due to Rhino debugger use. 9388: *RECORD-ONLY* ACT-3263 - Localization of "username" and "password" in login.jsp 13166: Merged V2.1-A to V3.1 9748: *RECORD-ONLY* Fix for ACT 3455 (ADB-90) - Editor role can not check out documents 10199: Fix for ADB-86: Clicking 'Cancel' while adding a composite condition for a Rule on a space in CS ES has no effect 13167: Merged V2.1-A to V3.1 10673: Fix for ADB-110/ACT-4247: Review/Change Records Management URLs and make it compatible to Adobe's build 10674: Fix for ADB-109: setting log4j.rootLogger to WARN thows unexpected warn when accessing My Home 13168: Merged V2.1-A to V3.1 10883: *RECORD-ONLY* Fix for ADB-124: Change Search field length to 1 10905: Fix for ADB-114 ACT 4425. Also will fix ALFCOM-1895 when merged to HEAD. 10961: Fix for ADB-44: Create menu link should not be visible if the menu is empty 10962: Fix for ADB-61: Alfresco breadcrumbs + Navigator become inconsistent.... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
6519945977 |
Merged V3.1 to HEAD
12999: Fixed read-only bootstrap of SiteAVMBootstrap and removed incorrect use of 'assert' 13000: Added log4j to Eclipse classpath (unexported) 13001: Merged V2.1-A to V3.1 9127: Performance improvement to folder copy 9151: *RECORD-ONLY* Fix index back up failing with missing files 13002: Merged V2.1-A to V3.1 9174: Further fixes for ACT-2588 (Lucene backup read-write locks) 9279: Fix ADB-84. PHP module is not restricted by the upper version 10191: Fix for ADB-77: Need to have as the sender's email address the email address of the user triggering the rule 13006: Merged V2.1-A to V3.1 10893: Fixes for ADB-78 & ADB-98 - Fixed service getter/setter pattern as well 10903: Fix for ADB-115 ACT-4355 13010: Made AVMLockingBootstrap resilient to read-only mode 13011: Better message for InvalidStoreRefException 13013: Merged V2.1-A to V3.1 9189: Composite Conditions Support Part 1 of 2 (repo) 9190: Composite Conditions Support Part 1a of 2 ( missed file from repo) 13015: Port of Adobe CIFS/FTP configuration changes 13017: Convert avoids folders given by '--svn-status' option 13018: Merge V2.1A to V3.1 7746: (record-only) Added ability to specify a custom CIFS authenticator class 8533: (record-only) Added the <disableNativeCode/> configuration tag, disable use of JNI code on Windows 8700: (record-only) Update to prevent any native calls via configuration code 8705: (record-only) Filer out the '0.0.0.0' bind address 8864: (record-only) Added the getBean() method for custom authenticators to get access to beans 9054: (record-only) Added the 'AIX' platform type for use in the platforms="..." attribute 8863: (record-only) Fix passthru socket connection timeout, added 'protocolOrder' and 'offlineCheckInterval' config values 12144: (record-only) CIFS virtual circuit fixes 13020: Merged V2.1-A to V3.1 (Composite Actions) 9191: Composite Conditions Support Part 2 of 2 (client) 9243: Composite Conditions Support Part 1 of 2 (client) 9245: Composite Conditions Support Part 2 of 2 (repo) 13021: Merged V3.0 to V3.1 13008: Merged V2.2 to V3.0 12824: (record only) Change admin access to the web project staging store to be read-only in the virtualization view - ETWOTWO-933 13024: Ported CIFS configuration changes from Adobe V2.1A, missed checkin. ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V2.1-A:r9127,9151,9174,9189-9191,9243,9245,9279,10191,10893,10903 Merged /alfresco/BRANCHES/V3.1:r12999-13002,13006,13010-13011,13013,13015,13017-13018,13020-13021,13024 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
e98e71fb6f |
Merged V3.1 to HEAD
12994: Merged V3.0 to V3.1 12931: Merged V2.2 to V3.0 12635: Fix for ETWOTWO-995: Diff performance degrades on large data sets 12742: Fix for ETWOTWO-981: WCM - regression - revert fails (eg. for content publisher) 12743: AVM - add missing tests to test suite & fix existing tests (including base setup) 12759: AVM - build/test fix - follow-on to r12742 12781: Fix PersonDAO - fixes AuthorityServiceTest which failed after adding AVMServicePermissionsTest 12932: Merged V2.2 to V3.0 12763: Support for ETWOTWO-975: AVMDifference now implements Comparable<AVMDifference> 12782: Fix for ETWOTWO-939: Content Contributor cannot edit their own items 12809: Test fixes after r 12782 12818: ETWOTWO-977 (Orphan Reaper) - removal of comment questioning cache interaction. 12933: Merged V2.2 to V3.0 12306: (record-only) Final set of XSS and HTML encoding fixes for ETWOONE-90 - already merged (see r12310) 12934: Merged V2.2 to V3.0 12311: (record-only) Fix for ETWOONE-389 - Current page number not always visible on the browse screen - already merged (see r12312) 12935: Merged V2.2 to V3.0 12320: (record-only) Fix for ETWOONE-87: Behavior of delete cascade - already merged (see r12324) 12322: (record-only) Fix merge issue (marked as Do Not Merge - see CHK-5607) 12936: Merged V2.2 to V3.0 12775: (record-only) ETHREEOH-872: Editing Email-notify-rules fails w/ ClassCastException (back-port of r11966) 12937: Merged V2.2 to V3.0 12780: Fixed ETWOTWO-1003: DuplicateChildNameException not generated correctly (on Oracle) 12820: Update to ETWOTWO-926 (WCM Form Inline callouts to Web Scripts) 12825: Further ETWOTWO-926 update: provide compatibility with old token scheme as the original patch has already made its way into 3.0.1 12850: ETWOTWO-975 - Show Conflicts in Modified Items List 12938: Fix merge typo (follow on from r12931) 12941: Fix merge typo (follow on from r12931) 12998: Cleaned up svn:mergeinfo entries ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.0:r12931-12938,12941 Merged /alfresco/BRANCHES/V2.2:r12306,12311,12320,12322,12635,12742-12743,12759,12763,12775,12780-12782,12809,12818,12820,12825,12850 Merged /alfresco/BRANCHES/V3.1:r12994,12998 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
d5f42006f8 |
Merged V3.0 to HEAD
12310: Merged V2.2 to V3.0 12306: Merged V2.1 to V2.2 12212: Final set of XSS and HTML encoding fixes for ETWOONE-90 12312: Merged V2.2 to V3.0 12311: Merged V2.1 to V2.2 11667: Fix for ETWOONE-389 - Current page number not always visible on the browse screen. 12316: Fix for merge issue 12317: Merged 2.1 to 3.0 12313: Fix for regression introduced when fixing ETWOONE-91. Also fixes ETHREEOH-1043 12319: Final set of XSS fixes specific to 3.0 codeline see ETWOONE-90 12321: Missing file from previous checkin 12324: Merged 2.2 to 3.0 12320: Merged 2.1 to 2.2 11682: Fix for ETWOONE-87: Behavior of delete cascade 12326: Merge 2.1 to 3.0 11615: Fix for ETWOONE-188: After session has timed out, expanding a space in the Navigator results in unfriendly error git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
4c44ffd0f4 |
Merged V3.0 to HEAD
11357: Added site preset for Document Workspace. 11358: Minor fix to labels for new Edit Online and Edit Offline actions. 11359: Added missing servlet to NTLM auth examples section in web.xml git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12429 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
12be7dc6f2 |
Merged V2.1 to HEAD
10345: Fix for ETWOONE-89: Unfriendly error notification appears git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11220 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
09c1c23776 |
Merged V2.2 to HEAD
10982: Merged V2.1 to V2.2 10273: Fix for ETWOONE-317: Error from regenerate renditions wizard when templates are updated 10985: Merged V2.1 to V2.2 10717: Fix for ETWOONE-14: System Error message appears while clicking 'Manage Task' icon in ... 10742: Fix for ETWOONE-119: A user created with space characters at the begin and at the end can't login 10758: Fix for ETWOONE-183: URL addressability of forum spaces and topics 10760: Fix for ETWOONE-339: URL Addressability to discussions causes display issue 10761: Fix for ETWOONE-196: Attempt to post to the same forum by two or more users simultaneously leads to error appearance and impossibility to post for some of them 10772: Fix for ETWOONE-225: Validation.js does not properly handle trailing whitespace 10986: Added Hibernate src to Eclipse project 11004: Remove annoying exceptions on shutdown 11005: Minor javadoc fix 11012: Fixed ETWOTWO-423: Optionally inject the Open Office document converter instance to the transformer git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11202 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
c9afa4a3c8 |
SLNG-764: Add warning to JSF client when browsing into Share managed folders.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11076 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
e5e448fc9b |
Merged V2.2 to HEAD
10992: Merged V2.1 to V2.2 10318: Several WCM UI performance enhancements and UI improvements to enable faster interface refresh. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11036 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
4bf32304f1 |
Enhancements to FSR.
1) Performance imporvements (client and server are now multi-threaded + other performance work) 2) Pluggable transport protocols (ENH-145) 3) Changes to initialisation (ALFCOM-135) 4) Changes to the action service to enable multiple async event queues. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11022 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
997e6537aa |
Merged V2.2 to HEAD
10931: Merged V2.1 to V2.2 9931: Fix for https://issues.alfresco.com/jira/browse/ETWOONE-295 10094: Further fix for ETWOONE-241: SAXException - XML parser apparently is not thread safe 10101: Resolve ACT 1282: wcm workflow falling over on Oracle while hitting in clause limit of 1000 expressions. 10188: https://issues.alfresco.com/jira/browse/ETWOONE-74 (Part 1) 10447: ETWOONE-328: performance improvement added to rule trigger code 10455: Fix for ETWOONE-306. 10292: Fix for ETWOONE-92: If two users update the same contents at the same time, you get InvalidNodeRefException 10293: Fix for ETWOONE-116: Send email action does not handle invalid email address 10294: Fix for ETWOONE-164: when a powerpoint 2007 pptx is stored in alfresco ... 10341: Action Evaluator request level cache git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
1f74c0282c |
Missing SiteContributor label for JSF client roles.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10856 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |