inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged DEV/SWIFT to HEAD

Browse Source 
27908: ALF-8706: RSOLR 023: Locale is persisted for all nodes
          - Part of ALF-7991: RSOLR 023: Locale support for query: Repository
          - Added alf_node.locale_id mandatory column
          - sys:localizable is now spoofed and mandatory on sys:base
          - sys:locale property is always available
          - The locale set is the I18NUtil.getLocale() (thread then server)
          - TODO: Upgrade scripts, so drop database to take this change
   27909: ALF-8706: RSOLR 023: Locale is persisted for all nodes
          - Part of ALF-7991: RSOLR 023: Locale support for query: Repository
          - Extended locale test to ensure that sys:locale can be set using properties during create
   27910: ALF-8707: RSOLR 023: Upgrade to give nodes their default locales
          - Part of ALF-7991:RSOLR 023: Locale support for query: Repository
          - Upgrade scripts for PostgreSQL and MySQL: patch.db-V4.0-Node-Locale
   27912: WCM QS ML Support for creating missing intermediate directories when adding an "orphan" translation, plus tests
   27913: Fixed failing JbpmEngineUnitTest.
   27914: Build fix. Fixes failing test DiscussionServiceTest.testDeleteTopLevelPost
   27916: WCM QS ML forms config for overrideable name, and passing the initially orphaned flag through to the behaviour
   27917: Enable the WCM QS ML Manage Translations action in the folder details page, as well as the document details page as before
   27919: Quick build fix. Introduction of new property sys:locale on all nodes means that FormService is seeing some off-by-one errors.
   27921: WCM QS ML - Support copying parts of the section collections to the new folder when translating a section, plus tests
   27925: ALF-8707: RSOLR 023: Upgrade to give nodes their default locales
          - Part of ALF-7991: RSOLR 023: Locale support for query: Repository
          - Upgrade scripts for DB2, Oracle and SQLServer
   27927: Update FileFolderService list/paging (RINF 09) & CQ permission checking (RINF 11)
          - also added additional unit tests and update FileFolderPerformanceTester utility (for read / list testing)
   27930: Corrected bean reference: "ServiceRegistry"
   27931: Partially implemented EnvironmentImpl.getPublishingEvents(). This currently only supports searching on publishing event ids.
   27933: Implemented PublishService.getPublishingEvent(String) method.
   27934: WCM QS ML Pull over the locale resolver from Ian, and delegate much of the work to the main class
   27941: ALF-7874 - Mime Type entries for detection and display for some Apple and Adobe formats
   27947: ALF-2707 - Largely fix custom site properties that have multiple values, and custom site properties without a full definition, plus tests.
   27964: ALF-7339:RSOLR 009: Index track and build from SOLR
          - complete
          ALF-7475: RSOLR 010: Index integrity check
          - check ACL info
   27966: RINF 09: FileFolderService list - if skipCount > number of items then return empty list
          - related to ALF-7884 when using CMIS getChildren (via OpenCMIS - eg. http://localhost:8080/alfresco/cmisatom/...)
   27968: ALF-7884 - getChildren() returns an error if skipCount > number of children
   27970: WCM QS Fix issue in the webapp for sites where no port has been given yet
   27972: WPUB: F150: Foundation API: Request that a node be removed from the live environment
          - Initial support for "unpublish"
   27975: ALF-8790:RSOLR 033: Automated build produces SOLR artifacts
          - add configuration per core based on properties files
   27976: ALF-8790: RSOLR 033: Automated build produces SOLR artifacts
          - restructure, added properties files for config, track archived store
   27977: ALF-8790: RSOLR 033: Automated build produces SOLR artifacts
          - Solr zip included in continuous build
   27978: Fixed missing policy event when sys:locale is changed.
   27979: Fixed tests and checks after sys:locale became a mandatory property.
   27982: ALF-8547: WPUB: F163: Foundation API: Create/update/remove a delivery channel
          - Code and tests for channel update and delete
   28007: Implemented starting publishing workflow on schedulePublishingEvent method. Added tests for PublishingEventHelper.
   28008: Updated web-publishing-context.xml to include WorkflowService and workflowEngineId for PublishingEventHelper.
   28009: Added more PublishingEventHelper tests.
   28012: Support for ALF-8792: RSOLR 036: SOLR APIs to support index integrity checking
   28013: Fix failing Web Publishing tests.
   28015: Adding a DoNotCopy CopyBehaviourCallback for the fm:commentsRollup aspect. Part of ALF-8498.
   28016: Bring over the WCM QS ML RootNavInterceptor from Ian, and productise it
   28019: CMIS browser: close invalid connections
   28025: Update the WCM QS ML behaviour, webscript and test to handle more things having locales by default
   28026: ML-WQS:
          - Wired up the RootNavInterceptor to detect locale based on path
          - Wired up the replacement locale resolver to respect the locale determined by the RootNavInterceptor
          - Adjusted "Manage Translations" page to render the data table correctly
          - Adjusted site search box to restrict search to selected site localisation
          - Adjusted top nav component to select menu items only from appropriate site localisation
   28029: Added more tests for PublishingEventHelper and PublishingQueueImpl. Also added WebPublishingTestSuite.
   28034: Support for ALF-8792: RSOLR 036: SOLR APIs to support index integrity checking
          - ACL and ACLTX support
   28036: WCM QS ML UI tweaks for marking something as the initial translation
   28038: ALF-8548: WPUB: F165: Foundation API: Cancel a scheduled publishing event
           - Code and initial test cases
   28043: Added missing JCR mapping for property type d:locale
           - This property type is not new, btw.
   28312: RepoBM: minor cleanup
          - remove hardcoded JMeter install dir
          - add configurable user.dir (for default import of test data) - check that default zip exists
          - update readme
          - default threadfolder should be null (in case of absolute folder paths)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28320 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-06-09 22:40:27 +00:00
parent f0f74b86f1
commit afe709ae54
78 changed files with 2831 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
View File

@@ -37,6 +37,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.query.CannedQueryFactory;
import org.alfresco.query.CannedQueryResults;
import org.alfresco.repo.search.QueryParameterDefImpl;
import org.alfresco.repo.security.permissions.impl.acegi.WrappedList;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.model.FileExistsException;
@@ -128,7 +129,7 @@ public class FileFolderServiceImpl implements FileFolderService
// TODO: Replace this with a more formal means of identifying "system" folders (i.e. aspect or UUID)
private List<String> systemPaths;
// applies to list "all" methods - note: final result count also depends on "system.acl.maxPermissionCheckTimeMillis"
// default cutoff - applies to list "all" methods
private int defaultListMaxResults = 5000;
/**
@@ -213,7 +214,7 @@ public class FileFolderServiceImpl implements FileFolderService
public void init()
{
}
/**
* Helper method to convert node reference instances to file info
*
@@ -331,7 +332,16 @@ public class FileFolderServiceImpl implements FileFolderService
public List<FileInfo> list(NodeRef contextNodeRef)
{
return list(contextNodeRef, true, true);
// execute the query
List<FileInfo> results = listSimple(contextNodeRef, true, true);
// done
if (logger.isDebugEnabled())
{
logger.debug("Shallow search for files and folders: \n" +
" context: " + contextNodeRef + "\n" +
" results: " + results);
}
return results;
}
/* (non-Javadoc)
@@ -342,10 +352,20 @@ public class FileFolderServiceImpl implements FileFolderService
ParameterCheck.mandatory("contextNodeRef", contextNodeRef);
ParameterCheck.mandatory("pagingRequest", pagingRequest);
// execute query
CannedQueryResults<NodeRef> results = listImpl(contextNodeRef, files, folders, ignoreQNameTypes, pagingRequest);
Set<QName> searchTypeQNames = buildTypes(files, folders, ignoreQNameTypes);
List<NodeRef> nodeRefs = results.getPages().get(0);
// execute query
CannedQueryResults<NodeRef> results = listImpl(contextNodeRef, searchTypeQNames, pagingRequest);
List<NodeRef> nodeRefs = null;
if (results.getPageCount() > 0)
{
nodeRefs = results.getPages().get(0);
}
else
{
nodeRefs = Collections.emptyList();
}
// set total count
Pair<Integer, Integer> totalCount = null;
@@ -365,12 +385,22 @@ public class FileFolderServiceImpl implements FileFolderService
return new PagingFileInfoResultsImpl(nodeInfos, hasMoreItems, totalCount, results.getQueryExecutionId(), true);
}
private CannedQueryResults<NodeRef> listImpl(NodeRef contextNodeRef, boolean files, boolean folders, Set<QName> ignoreQNameTypes, PagingFileInfoRequest pagingRequest)
private CannedQueryResults<NodeRef> listImpl(NodeRef contextNodeRef, boolean files, boolean folders)
{
Set<QName> searchTypeQNames = buildTypes(files, folders, null);
return listImpl(contextNodeRef, searchTypeQNames);
}
private CannedQueryResults<NodeRef> listImpl(NodeRef contextNodeRef, Set<QName> searchTypeQNames)
{
return listImpl(contextNodeRef, searchTypeQNames, new PagingFileInfoRequest(defaultListMaxResults, null));
}
// note: similar to getChildAssocs(contextNodeRef, searchTypeQNames) but enables paging features, including max items, sorting etc (with permissions per-applied)
private CannedQueryResults<NodeRef> listImpl(NodeRef contextNodeRef, Set<QName> searchTypeQNames, PagingFileInfoRequest pagingRequest)
{
long start = System.currentTimeMillis();
Set<QName> searchTypeQNames = buildTypes(files, folders, ignoreQNameTypes);
// get canned query
GetChildrenCannedQueryFactory getChildrenCannedQueryFactory = (GetChildrenCannedQueryFactory)cannedQueryRegistry.getNamedObject("getChildrenCannedQueryFactory");
@@ -394,28 +424,10 @@ public class FileFolderServiceImpl implements FileFolderService
return results;
}
private List<FileInfo> list(NodeRef contextNodeRef, boolean files, boolean folders)
{
// execute the query
List<NodeRef> nodeRefs = listSimple(contextNodeRef, files, folders);
// convert the noderefs
List<FileInfo> results = toFileInfo(nodeRefs);
// done
if (logger.isDebugEnabled())
{
logger.debug("Shallow search for files and folders: \n" +
" context: " + contextNodeRef + "\n" +
" results: " + results);
}
return results;
}
public List<FileInfo> listFiles(NodeRef contextNodeRef)
{
// execute the query
List<NodeRef> nodeRefs = listSimple(contextNodeRef, true, false);
// convert the noderefs
List<FileInfo> results = toFileInfo(nodeRefs);
List<FileInfo> results = listSimple(contextNodeRef, true, false);
// done
if (logger.isDebugEnabled())
{
@@ -429,9 +441,7 @@ public class FileFolderServiceImpl implements FileFolderService
public List<FileInfo> listFolders(NodeRef contextNodeRef)
{
// execute the query
List<NodeRef> nodeRefs = listSimple(contextNodeRef, false, true);
// convert the noderefs
List<FileInfo> results = toFileInfo(nodeRefs);
List<FileInfo> results = listSimple(contextNodeRef, false, true);
// done
if (logger.isDebugEnabled())
{
@@ -529,6 +539,7 @@ public class FileFolderServiceImpl implements FileFolderService
List<NodeRef> nodeRefs = searchInternal(contextNodeRef, namePattern, fileSearch, folderSearch, includeSubFolders);
List<FileInfo> results = toFileInfo(nodeRefs);
// eliminate unwanted files/folders
Iterator<FileInfo> iterator = results.iterator();
while (iterator.hasNext())
@@ -592,10 +603,10 @@ public class FileFolderServiceImpl implements FileFolderService
}
else
{
nodeRefs = listSimple(contextNodeRef, fileSearch, folderSearch);
nodeRefs = listImpl(contextNodeRef, fileSearch, folderSearch).getPage();
}
}
else
else
{
// TODO - we need to get rid of this xpath stuff
// if the name pattern is null, then we use the ANY pattern
@@ -652,10 +663,15 @@ public class FileFolderServiceImpl implements FileFolderService
return nodeRefs;
}
private List<NodeRef> listSimple(NodeRef contextNodeRef, boolean files, boolean folders)
private List<FileInfo> listSimple(NodeRef contextNodeRef, boolean files, boolean folders) throws InvalidTypeException
{
PagingFileInfoRequest pagingRequest = new PagingFileInfoRequest(0, defaultListMaxResults, null, null);
return listImpl(contextNodeRef, files, folders, null, pagingRequest).getPage();
CannedQueryResults<NodeRef> cq = listImpl(contextNodeRef, files, folders);
List<NodeRef> nodeRefs = cq.getPage();
List<FileInfo> results = toFileInfo(nodeRefs);
// avoid re-applying permissions (for "list" canned queries)
return new WrappedList<FileInfo>(results, cq.permissionsApplied(), cq.hasMoreItems());
}
private Set<QName> buildTypes(boolean files, boolean folders, Set<QName> ignoreQNameTypes)
@@ -665,23 +681,12 @@ public class FileFolderServiceImpl implements FileFolderService
// Build a list of file and folder types
if (folders)
{
Collection<QName> qnames = dictionaryService.getSubTypes(ContentModel.TYPE_FOLDER, true);
searchTypeQNames.addAll(qnames);
searchTypeQNames.add(ContentModel.TYPE_FOLDER);
searchTypeQNames.addAll(buildFolderTypes());
}
if (files)
{
Collection<QName> qnames = dictionaryService.getSubTypes(ContentModel.TYPE_CONTENT, true);
searchTypeQNames.addAll(qnames);
searchTypeQNames.add(ContentModel.TYPE_CONTENT);
qnames = dictionaryService.getSubTypes(ContentModel.TYPE_LINK, true);
searchTypeQNames.addAll(qnames);
searchTypeQNames.add(ContentModel.TYPE_LINK);
searchTypeQNames.addAll(buildFileTypes());
}
// Remove 'system' folders
Collection<QName> qnames = dictionaryService.getSubTypes(ContentModel.TYPE_SYSTEM_FOLDER, true);
searchTypeQNames.removeAll(qnames);
searchTypeQNames.remove(ContentModel.TYPE_SYSTEM_FOLDER);
if (ignoreQNameTypes != null)
{
@@ -691,6 +696,38 @@ public class FileFolderServiceImpl implements FileFolderService
return searchTypeQNames;
}
private Set<QName> buildFolderTypes()
{
Set<QName> folderTypeQNames = new HashSet<QName>(50);
// Build a list of folder types
Collection<QName> qnames = dictionaryService.getSubTypes(ContentModel.TYPE_FOLDER, true);
folderTypeQNames.addAll(qnames);
folderTypeQNames.add(ContentModel.TYPE_FOLDER);
// Remove 'system' folders
qnames = dictionaryService.getSubTypes(ContentModel.TYPE_SYSTEM_FOLDER, true);
folderTypeQNames.removeAll(qnames);
folderTypeQNames.remove(ContentModel.TYPE_SYSTEM_FOLDER);
return folderTypeQNames;
}
private Set<QName> buildFileTypes()
{
Set<QName> fileTypeQNames = new HashSet<QName>(50);
// Build a list of file types
Collection<QName> qnames = dictionaryService.getSubTypes(ContentModel.TYPE_CONTENT, true);
fileTypeQNames.addAll(qnames);
fileTypeQNames.add(ContentModel.TYPE_CONTENT);
qnames = dictionaryService.getSubTypes(ContentModel.TYPE_LINK, true);
fileTypeQNames.addAll(qnames);
fileTypeQNames.add(ContentModel.TYPE_LINK);
return fileTypeQNames;
}
/**
* A deep version of listSimple. Which recursively walks down the tree from a given starting point, returning
* the node refs of files or folders found along the way.
@@ -717,31 +754,12 @@ public class FileFolderServiceImpl implements FileFolderService
logger.debug("searchSimpleDeep contextNodeRef:" + contextNodeRef);
}
Set<QName> folderTypeQNames = new HashSet<QName>(10);
Set<QName> fileTypeQNames = new HashSet<QName>(10);
// To hold the results.
List<NodeRef> result = new ArrayList<NodeRef>();
// Build a list of folder types
Collection<QName> qnames = dictionaryService.getSubTypes(ContentModel.TYPE_FOLDER, true);
folderTypeQNames.addAll(qnames);
folderTypeQNames.add(ContentModel.TYPE_FOLDER);
// Remove 'system' folders and all descendants
Collection<QName> systemFolderQNames = dictionaryService.getSubTypes(ContentModel.TYPE_SYSTEM_FOLDER, true);
folderTypeQNames.removeAll(systemFolderQNames);
folderTypeQNames.remove(ContentModel.TYPE_SYSTEM_FOLDER);
if (files)
{
Collection<QName> fileQNames = dictionaryService.getSubTypes(ContentModel.TYPE_CONTENT, true);
fileTypeQNames.addAll(fileQNames);
fileTypeQNames.add(ContentModel.TYPE_CONTENT);
Collection<QName> linkQNames = dictionaryService.getSubTypes(ContentModel.TYPE_LINK, true);
fileTypeQNames.addAll(linkQNames);
fileTypeQNames.add(ContentModel.TYPE_LINK);
}
Set<QName> folderTypeQNames = buildFolderTypes();
Set<QName> fileTypeQNames = (files ? buildFileTypes() : new HashSet<QName>(0));
if(!folders && !files)
{
@@ -1091,7 +1109,7 @@ public class FileFolderServiceImpl implements FileFolderService
public FileInfo create(NodeRef parentNodeRef, String name, QName typeQName) throws FileExistsException
{
return createImpl(parentNodeRef, name, typeQName, null);
}
}
public FileInfo create(NodeRef parentNodeRef, String name, QName typeQName, QName assocQName) throws FileExistsException
{