mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
31682: Fix for ALF-9504 - Upload non-flash fallback fails Merged HEAD to V3.4-BUG-FIX 31065: Fixed ALF-10407 "Share HTML uploader broken in Swift" 31738: merged DEV to V3.4_BUG_FIX 31681 : ALF-7859 - Deployment fails for *.xml content with wcm-xml-metadata-extracter-context.xml enabled 31755: Fix for ALF-9257: merged in and optimised Belarus fix. 31775: Fixed ALF-10667: WCM - Validation issue with xf:switch web forms 31817: Spanish: Updates translations (based on: r31738) & adds new WCM translations. 31840: Fix for ALF-10282 - Web Browser freezes with large xml files Web form transformation 31843: ALF-9208 Performance issue, during load tests /share/page/user/user-sites is showing to be the most expensive. Modification to AuthorityDAOImpl.findAuthorities(...) to use childAuthorityCache when possible Big improvement to 'My Sites' 31850: Italian: Translation updates, inc. fix for: ALF-11293. 31867: Merged DEV/TEMPORARY to V3.4-BUG-FIX 31400: ALF-10764: PDF vs 1.5 cause crash jvm - PDFRenderer library has been updated from 2009-09-27 to 0.9.1 version to support PDF documents of 1.5 version 31906: ALF-9545: Adjust date picker for IE 31911: Merge PATCHES/V3.3.3 to V3.4-BUG-FIX (3.4.7) 31905: ALF-10309 CLONE -WebDAV - Cancelling "save as" upload will create 0 byte content - Run Timer as the original user - Run timer if there is a LOCK timeout (not run if not so not to break standard. MS Office uses a 3 minute timeout) - PUT method clears aspect BEFORE it starts processing the content, so that the Timer does not remove the node if the content is very large - Delete node faster (than the Timer) if the client issues an UNLOCK, having locked the node but not issued a PUT. - Lots of debug 31708: ALF-10309 CLONE -WebDAV - Cancelling "save as" upload will create 0 byte content 'runAsSystem' the 5 minute timer to remove LOCKED but not PUT WebDAV files 31698: ALF-10309 CLONE -WebDAV - Cancelling "save as" upload will create 0 byte content Added 5 minute timer to remove LOCKED but not PUT WebDAV files 31687: ALF-10309 CLONE -WebDAV - Cancelling "save as" upload will create 0 byte content Added missing sys:webdavNoContent aspect to system model. 31913: Merge PATCHES/V3.4.1 (3.4.1.22) to V3.4-BUG-FIX (3.4.7) 31876: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode Use a retrying non-propagating (new) transaction to get the licence key in order to avoid intermittent issues. 31929: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_11_09 to BRANCHES/DEV/V3.4-BUG-FIX 31903: ALF-9971: RM search doesn't work with NAME:any_text: Check for dublicate template of properties was added. Throws an exception if there is already an entry in the map entry. 31931: ALF_9678 Fixed null pointer issues in WorkflowManager methods 31938: Merged DEV to V3.4-BUG-FIX 31932: ALF-9566: hasMoreItems always false in CMIS query (Web Service binding) 1. PropertyFilter was fixed to be able to handle OpenCMIS Workbench. Unit test was updated. 2. hasMoreItems was adopted to indicate whether more itemsa are avliable in the repo based on maxItems and skipCount. Unit test was added. 3. CMISFolderTypeDefinition was fixed to be fileable according to 2.1.5.1 File-able Objects. 31965: German: Translation updates and additions based on EN r31738 31967: French: Translation updates and additions based on EN r31738 31969: Spanish: : Translation updates and additions based on EN r31738 31971: Italian: Translation updates and additions based on EN r31738 31972: Fix for patch 'alternatives': Alternative patch must have executed and not just been marked as successful 31973: Fixed ALF-11489: 'patch.sitesSpacePermissions' failed on upgrade 2.2.8 -> 3.4.6 - 'patch.sitesFolder' is an alternative to 'patch.sitesSpacePermissions' - Note: Requires rev 31972 for fix to PatchService use of alternatives 31994: ALF-11495 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode - Replaced DescriptorDAORetryingInterceptor (add in the hotfix) with a RetryingTransactionInterceptor 31999: Change the low level CIFS packet reading code to read/process up to 4 requests per thread run. ALF-9540 Reduces thread blocking when the CIFS client uses overlapped I/O, and also keeps writes in their original sequence. 32037: Japanese: Translation update, new and modified strings based on EN r31738 32061: ALF-11376 Requesting PDFBox 1.6 be included in future service pack release. Upgrading pdfbox,fontbox,jempbox from 1.5.0 to 1.6.0 32074: ALF-11522 IMAP: Generic AlfrescoImapFolderException error is a bit misleading "Can't create folder - Permission denied" --> "Cannot perform action - permission denied" 32086: ALF-9971 RM search doesn't work with NAME:any_text - fix to test failure to do with upper case defaultFieldName finding nothing 32093: Merged BELARUS/V3.4-BUG-FIX-2011_10_13 to V3.4-BUG-FIX (3.4.7) Plus a little bit of refactoring to remove duplicate code 31490: ALF-9817: IE strips exe extension on download file when using download url with ticket parameter in code The "filename" part for "Content-Disposition" header in case of "attachment" for IE 32115: ALF-11569: Merged V3.3 to V3.4-BUG-FIX 32108: ALF-11571: Fix new deadlock in NIO CIFSRequestHandler - Needed to be able to get a thread safe estimate of the number of registered sessions without synchronizing on m_selector.keys() because a lock is held by the selector whilst waiting - Now the session count is maintained by the main thread, which is woken by anything wanting a session count. 32136: ALF-10412 Nonreducing 100% CPU Uploading Large Files to Share Site Document Library Reducing the priority of the async thread pool that is used to perform the transformations so that normal activity (and even garbage collection) is not interrupted by transformations. 32143: MERGED 2011_11_09 to V3.4-BUG-FIX 32133 - ALF-11193 Consumer role cannot Unscribe/subscribe the IMAP folders. 32137 32152: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_10_13 to BRANCHES/DEV/V3.4-BUG-FIX: 31731: ALF-6275: Discrepancy detected on archived pivot language with EditionService 32171: ALF-9638: Version2ServiceImpl now freezes aspect specific associations, in line with VersionServiceImpl 32191: Merged DEV to V3.4-BUG-FIX 32187: ALF-10884: A file renamed using the web UI still appears in a NFS mount but with NULL stats - Timestamp propogation in case of move - getPaths() call removed from the NodeMonitor 32192: Reversed out rev 32143: ALF-11193: Consumer role cannot Unscribe/subscribe the IMAP folders. - Patch is using SearchService - Patch doesn't transfer IMAP 'unsubscriptions' - Patch will not scale 32211: Merged V3.4 to V3.4-BUG-FIX 31914: ALF-10619: Not all container deletions were being honoured during indexing due to deletionsSinceFlushed processing - If container B is under container A with a secondary association, and A then B were deleted, then not all of Bs containers were getting masked out - only those in a subtree of A! - Now that delete events are fired on every affected node in a cascading delete, we can handle the nodes and containers on an individual basis 31915: ALF-10619: Prevent possible InvalidNodeRefException during reindexing - Handle in childRelationshipEvent() when comparing with 'path generation factor' 32322: Possible fix for: (ALF-11344) SORT clause in CMIS query (ORDER BY) drastically affects performance of search. - English based locales will sort as Java String comparison. 32327: ALF-11495: Merge V3.4.1 (3.4.1.23) to V3.4-BUG-FIX (3.4.8) 32326: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode MaxUserLicenseException class was not added to SVN in previous commit 32325: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode Remove RetryingTransactionInterceptor from around RepositoryDescriptorDAOImpl - not needed any more and caused extra exception if repo was r/o on boot 32324: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode Addition of message to say temporary problem has gone away 32323: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode Think I have found the reason for the vanishing licenses. License Descriptor can be accessed but the file in the content store cannot be read. Tidy up of code to remove TODO messages Addition of MaxUserLicenseException Additional code to handle possible temporary license outages and recovery Addition of more specific exception of invalid content store issue 32326: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode MaxUserLicenseException class was not added to SVN in previous commit 32288: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode Fix tests by still failing if we have not loaded a license yet 32259: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode Ignore exceptions from debug after RepositoryDescriptorDAOImpl Throwable 32252: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode Addition of logging and keep license live after error 32343: FIXED - issue ALF-11617: wma file type is mapped to 'video/x-ms-wma' mimetype instead of audio/x-ms-wma' Changed the type audio/x-ms-wma 32346: Fixed query use-case lookup of assoc namespace entity (i.e. should not lazily create) - Does not need merging to 4.0, which contains the fixes already 32349: Merged V3.3 to V3.4-BUG-FIX 32347: Prevent possible deadlock during subsystem syncing in a cluster 32352: ALF-11495: Merge V3.4.1 (3.4.1.23) to V3.4-BUG-FIX (3.4.8) PLEASE NOTE that ALF-11381 was also merged into V3.4-BUG-FIX in r32327 32350: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode Patched version of true license to log RunTimeExceptions and Errors from both ftp and non-ftp LicenseManager verify methods 32332: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode Cannot throw specific Exception for the file reader issue as returning null is required for FTL 32356: ALF-11495: Merge V3.4.1 (3.4.1.23) to V3.4-BUG-FIX (3.4.8) 32355: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode TrueLicense missing from classpath.unit.test.extension 32387: ALF-11617 Correct mimetype for WMA audio (with patch) 32395: ALF-11004 Workflow Interpreter can now handle transitions with spaces in the name when 'signal' is called. 32398: ALF-11078: Reinstate maxPermissionChecks logging from ALF-7237 32411: Fix for ALF-11344 SORT clause in CMIS query (ORDER BY) drastically affects performance of search. - use in memory sort rather than relying on the lucene field cache for result sets up to 1000 by default - this is configurable across all query languages (and per query via SearchParameters and QueryOptions) lucene.indexer.useInMemorySort=true lucene.indexer.maxRawResultSetSizeForInMemorySort=1000 32425: Fix for ALF-11344 SORT clause in CMIS query (ORDER BY) drastically affects performance of search. - fix for score sorting 32433: Merged V3.4 to V3.4-BUG-FIX 32432: ALF-11743: When RM is installed, admin does not have the appropriate permissions to perform any operations in Alfresco Explorer git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32477 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
168 lines
6.7 KiB
Java
168 lines
6.7 KiB
Java
/*
|
|
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
|
*
|
|
* This file is part of Alfresco
|
|
*
|
|
* Alfresco is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Alfresco is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
package org.alfresco.cmis;
|
|
|
|
import java.util.Locale;
|
|
|
|
import org.springframework.extensions.surf.util.I18NUtil;
|
|
import org.alfresco.repo.search.impl.querymodel.QueryOptions;
|
|
import org.alfresco.repo.search.impl.querymodel.QueryOptions.Connective;
|
|
import org.alfresco.service.cmr.repository.StoreRef;
|
|
import org.alfresco.service.cmr.search.LimitBy;
|
|
import org.alfresco.service.cmr.search.QueryParameterDefinition;
|
|
import org.alfresco.service.cmr.search.SearchParameters;
|
|
import org.alfresco.service.cmr.search.SearchService;
|
|
|
|
/**
|
|
* The options for a CMIS query
|
|
*
|
|
* @author andyh
|
|
*/
|
|
public class CMISQueryOptions extends QueryOptions
|
|
{
|
|
public enum CMISQueryMode
|
|
{
|
|
CMS_STRICT, CMS_WITH_ALFRESCO_EXTENSIONS ;
|
|
}
|
|
|
|
|
|
private CMISQueryMode queryMode = CMISQueryMode.CMS_STRICT;
|
|
|
|
|
|
public static CMISQueryOptions create(SearchParameters searchParameters)
|
|
{
|
|
String sql = searchParameters.getQuery();
|
|
|
|
CMISQueryOptions options = new CMISQueryOptions(sql, searchParameters.getStores().get(0));
|
|
options.setIncludeInTransactionData(!searchParameters.excludeDataInTheCurrentTransaction());
|
|
options.setDefaultFTSConnective(searchParameters.getDefaultOperator() == SearchParameters.Operator.OR ? Connective.OR : Connective.AND);
|
|
options.setDefaultFTSFieldConnective(searchParameters.getDefaultOperator() == SearchParameters.Operator.OR ? Connective.OR : Connective.AND);
|
|
options.setSkipCount(searchParameters.getSkipCount());
|
|
options.setMaxPermissionChecks(searchParameters.getMaxPermissionChecks());
|
|
options.setMaxPermissionCheckTimeMillis(searchParameters.getMaxPermissionCheckTimeMillis());
|
|
if (searchParameters.getLimitBy() == LimitBy.FINAL_SIZE)
|
|
{
|
|
options.setMaxItems(searchParameters.getLimit());
|
|
}
|
|
else
|
|
{
|
|
options.setMaxItems(searchParameters.getMaxItems());
|
|
}
|
|
options.setMlAnalaysisMode(searchParameters.getMlAnalaysisMode());
|
|
options.setLocales(searchParameters.getLocales());
|
|
options.setStores(searchParameters.getStores());
|
|
options.setUseInMemorySort(searchParameters.getUseInMemorySort());
|
|
options.setMaxRawResultSetSizeForInMemorySort(searchParameters.getMaxRawResultSetSizeForInMemorySort());
|
|
//options.setQuery(); Done on conbstruction
|
|
//options.setQueryMode(); Should set afterwards
|
|
options.setQueryParameterDefinitions(searchParameters.getQueryParameterDefinitions());
|
|
options.setDefaultFieldName(searchParameters.getDefaultFieldName());
|
|
return options;
|
|
}
|
|
/**
|
|
* Create a CMISQueryOptions instance with the default options other than the query and store ref.
|
|
* The query will be run using the locale returned by I18NUtil.getLocale()
|
|
*
|
|
* @param query - the query to run
|
|
* @param storeRef - the store against which to run the query
|
|
*/
|
|
public CMISQueryOptions(String query, StoreRef storeRef)
|
|
{
|
|
this(query, storeRef, I18NUtil.getLocale());
|
|
}
|
|
|
|
/**
|
|
* Create a CMISQueryOptions instance with the default options other than the query, store ref and locale.
|
|
*
|
|
* @param query - the query to run
|
|
* @param storeRef - the store against which to run the query
|
|
*/
|
|
public CMISQueryOptions(String query, StoreRef storeRef, Locale locale)
|
|
{
|
|
super(query, storeRef, locale);
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
* Get the query mode.
|
|
*
|
|
* @return the queryMode
|
|
*/
|
|
public CMISQueryMode getQueryMode()
|
|
{
|
|
return queryMode;
|
|
}
|
|
|
|
/**
|
|
* Set the query mode.
|
|
*
|
|
* @param queryMode the queryMode to set
|
|
*/
|
|
public void setQueryMode(CMISQueryMode queryMode)
|
|
{
|
|
this.queryMode = queryMode;
|
|
}
|
|
/**
|
|
* @return
|
|
*/
|
|
public SearchParameters getAsSearchParmeters()
|
|
{
|
|
SearchParameters searchParameters = new SearchParameters();
|
|
searchParameters.setDefaultFieldName(this.getDefaultFieldName());
|
|
searchParameters.setDefaultFTSFieldConnective(this.getDefaultFTSFieldConnective() == Connective.OR ? SearchParameters.Operator.OR : SearchParameters.Operator.AND);
|
|
searchParameters.setDefaultFTSOperator(this.getDefaultFTSConnective() == Connective.OR ? SearchParameters.Operator.OR : SearchParameters.Operator.AND);
|
|
searchParameters.setDefaultOperator(this.getDefaultFTSConnective() == Connective.OR ? SearchParameters.Operator.OR : SearchParameters.Operator.AND);
|
|
searchParameters.setLanguage(SearchService.LANGUAGE_CMIS_ALFRESCO);
|
|
if(this.getMaxItems() > 0)
|
|
{
|
|
searchParameters.setLimit(this.getMaxItems());
|
|
searchParameters.setLimitBy(LimitBy.FINAL_SIZE);
|
|
searchParameters.setMaxItems(this.getMaxItems());
|
|
}
|
|
searchParameters.setMaxPermissionChecks(this.getMaxPermissionChecks());
|
|
searchParameters.setMaxPermissionCheckTimeMillis(this.getMaxPermissionCheckTimeMillis());
|
|
searchParameters.setMlAnalaysisMode(this.getMlAnalaysisMode());
|
|
//searchParameters.setNamespace() TODO: Fix
|
|
//searchParameters.setPermissionEvaluation()
|
|
searchParameters.setQuery(this.getQuery());
|
|
searchParameters.setSkipCount(this.getSkipCount());
|
|
//searchParameters.addAllAttribute()
|
|
for(Locale locale : this.getLocales())
|
|
{
|
|
searchParameters.addLocale(locale);
|
|
}
|
|
for(QueryParameterDefinition queryParameterDefinition: this.getQueryParameterDefinitions())
|
|
{
|
|
searchParameters.addQueryParameterDefinition(queryParameterDefinition);
|
|
}
|
|
//searchParameters.addQueryTemplate(name, template)
|
|
//searchParameters.addSort()
|
|
for(StoreRef storeRef : this.getStores())
|
|
{
|
|
searchParameters.addStore(storeRef);
|
|
}
|
|
//searchParameters.addTextAttribute()
|
|
return searchParameters;
|
|
}
|
|
}
|
|
|
|
|