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

Swift – SE.S21 Share - DM Remote Store - WIP

Browse Source 
- listpattern method now working for site and user dashboards
 - inherited permissions correctly block invalid users from modifying or removing dashboard and component config for sites and users, private sites automatically hide child surf-config folder also
 - added surf-config folder to sites bootstrap descriptor

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28382 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2011-06-14 11:22:04 +00:00
parent 19336abb53
commit c37a4ba527
1 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
source/java/org/alfresco/repo/web/scripts/bean/ADMRemoteStore.java
View File

@@ -461,7 +461,7 @@ public class ADMRemoteStore extends BaseRemoteStore
*
* @param store the store id
* @param path document path
* @param pattern file pattern to match - allows wildcards e.g. *.xml or site*.xml
* @param pattern file pattern to match - allows wildcards e.g. page.*.site.xml
*
* @throws IOException if an error occurs listing the documents
*/
@@ -476,25 +476,27 @@ public class ADMRemoteStore extends BaseRemoteStore
{
res.setContentType("text/plain;charset=UTF-8");
final FileInfo fileInfo = resolveNodePath(path, false, true);
if (fileInfo == null || !fileInfo.isFolder())
{
res.setStatus(Status.STATUS_NOT_FOUND);
return null;
}
String filePattern = pattern;
if (filePattern == null || filePattern.length() == 0)
{
filePattern = "*";
}
// ensure we pass in the file pattern as it is used as part of the folder match - i.e.
// for a site component set e.g. /alfresco/site-data/components/page.*.site~xyz~dashboard.xml
final FileInfo fileInfo = resolveNodePath(path, pattern, false, true);
if (fileInfo == null || !fileInfo.isFolder())
{
res.setStatus(Status.STATUS_NOT_FOUND);
return null;
}
if (logger.isDebugEnabled())
logger.debug("listDocuments() pattern: " + pattern);
try
{
outputFileNodes(res.getWriter(), fileInfo, aquireSurfConfigRef(path, false), pattern, false);
outputFileNodes(res.getWriter(), fileInfo, aquireSurfConfigRef(path + "/" + pattern, false), pattern, false);
}
catch (AccessDeniedException ae)
{
@@ -534,6 +536,25 @@ public class ADMRemoteStore extends BaseRemoteStore
* parameter above) or null if the supplied path does not exist in the store.
*/
private FileInfo resolveNodePath(final String path, final boolean create, final boolean isFolder)
{
return resolveNodePath(path, null, create, isFolder);
}
/**
* @param path cm:name based root relative path
* example: /alfresco/site-data/pages/customise-user-dashboard.xml
* /alfresco/site-data/components
* @param pattern optional pattern that is used as part of the match to aquire the surf-config
* folder under the appropriate sites or user location.
* @param create if true create the config and folder dirs for the given path returning
* the FileInfo for the last parent in the path, if false only attempt to
* resolve the folder path if it exists returning the last element.
* @param isFolder True if the path is for a folder, false if it ends in a filename
*
* @return FileInfo representing the file/folder at the specified path location (see create
* parameter above) or null if the supplied path does not exist in the store.
*/
private FileInfo resolveNodePath(final String path, final String pattern, final boolean create, final boolean isFolder)
{
if (logger.isDebugEnabled())
logger.debug("Resolving path: " + path);
@@ -554,7 +575,7 @@ public class ADMRemoteStore extends BaseRemoteStore
pathElements.add(t.nextToken());
}
NodeRef surfConfigRef = aquireSurfConfigRef(path, create);
NodeRef surfConfigRef = aquireSurfConfigRef(path + (pattern != null ? ("/" + pattern) : ""), create);
try
{
if (create)