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

Fix for AR-1413 and AR-1532 (handling of missing nodes in FileFolderService, affecting CIFS, WebDav, FTP and web-client)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6060 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-06-21 19:53:52 +00:00
parent 8172e5b73f
commit 228f72296c
2 changed files with 81 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
source/java/org/alfresco/web/bean/BrowseBean.java
View File

@@ -625,77 +625,74 @@ public class BrowseBean implements IContextListener
// create our Node representation from the NodeRef // create our Node representation from the NodeRef
NodeRef nodeRef = fileInfo.getNodeRef(); NodeRef nodeRef = fileInfo.getNodeRef();
if (this.nodeService.exists(nodeRef)) // find it's type so we can see if it's a node we are interested in
QName type = this.nodeService.getType(nodeRef);
// make sure the type is defined in the data dictionary
TypeDefinition typeDef = this.dictionaryService.getType(type);
if (typeDef != null)
{ {
// find it's type so we can see if it's a node we are interested in MapNode node = null;
QName type = this.nodeService.getType(nodeRef);
// make sure the type is defined in the data dictionary // look for File content node
TypeDefinition typeDef = this.dictionaryService.getType(type); if (this.dictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT))
if (typeDef != null)
{ {
MapNode node = null; // create our Node representation
node = new MapNode(nodeRef, this.nodeService, fileInfo.getProperties());
setupCommonBindingProperties(node);
// look for Space folder node this.contentNodes.add(node);
if (this.dictionaryService.isSubClass(type, ContentModel.TYPE_FOLDER) == true && }
this.dictionaryService.isSubClass(type, ContentModel.TYPE_SYSTEM_FOLDER) == false) // look for Space folder node
{ else if (this.dictionaryService.isSubClass(type, ContentModel.TYPE_FOLDER) == true &&
// create our Node representation this.dictionaryService.isSubClass(type, ContentModel.TYPE_SYSTEM_FOLDER) == false)
node = new MapNode(nodeRef, this.nodeService, true); {
node.addPropertyResolver("icon", this.resolverSpaceIcon); // create our Node representation
node.addPropertyResolver("smallIcon", this.resolverSmallIcon); node = new MapNode(nodeRef, this.nodeService, fileInfo.getProperties());
node.addPropertyResolver("icon", this.resolverSpaceIcon);
this.containerNodes.add(node); node.addPropertyResolver("smallIcon", this.resolverSmallIcon);
}
// look for File content node
else if (this.dictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT))
{
// create our Node representation
node = new MapNode(nodeRef, this.nodeService, true);
setupCommonBindingProperties(node);
this.contentNodes.add(node);
}
// look for File Link object node
else if (ApplicationModel.TYPE_FILELINK.equals(type))
{
// create our File Link Node representation
node = new MapNode(nodeRef, this.nodeService, true);
node.addPropertyResolver("url", this.resolverLinkUrl);
node.addPropertyResolver("webdavUrl", this.resolverLinkWebdavUrl);
node.addPropertyResolver("cifsPath", this.resolverLinkCifsPath);
node.addPropertyResolver("fileType16", this.resolverFileType16);
node.addPropertyResolver("fileType32", this.resolverFileType32);
node.addPropertyResolver("size", this.resolverSize);
node.addPropertyResolver("lang", this.resolverLang);
this.contentNodes.add(node);
}
else if (ApplicationModel.TYPE_FOLDERLINK.equals(type))
{
// create our Folder Link Node representation
node = new MapNode(nodeRef, this.nodeService, true);
node.addPropertyResolver("icon", this.resolverSpaceIcon);
node.addPropertyResolver("smallIcon", this.resolverSmallIcon);
this.containerNodes.add(node);
}
// inform any listeners that a Node wrapper has been created this.containerNodes.add(node);
if (node != null) }
// look for File Link object node
else if (ApplicationModel.TYPE_FILELINK.equals(type))
{
// create our File Link Node representation
node = new MapNode(nodeRef, this.nodeService, fileInfo.getProperties());
node.addPropertyResolver("url", this.resolverLinkUrl);
node.addPropertyResolver("webdavUrl", this.resolverLinkWebdavUrl);
node.addPropertyResolver("cifsPath", this.resolverLinkCifsPath);
node.addPropertyResolver("fileType16", this.resolverFileType16);
node.addPropertyResolver("fileType32", this.resolverFileType32);
node.addPropertyResolver("size", this.resolverSize);
node.addPropertyResolver("lang", this.resolverLang);
this.contentNodes.add(node);
}
else if (ApplicationModel.TYPE_FOLDERLINK.equals(type))
{
// create our Folder Link Node representation
node = new MapNode(nodeRef, this.nodeService, fileInfo.getProperties());
node.addPropertyResolver("icon", this.resolverSpaceIcon);
node.addPropertyResolver("smallIcon", this.resolverSmallIcon);
this.containerNodes.add(node);
}
// inform any listeners that a Node wrapper has been created
if (node != null)
{
for (NodeEventListener listener : getNodeEventListeners())
{ {
for (NodeEventListener listener : getNodeEventListeners()) listener.created(node, type);
{
listener.created(node, type);
}
} }
} }
else }
{ else
if (logger.isEnabledFor(Priority.WARN)) {
logger.warn("Found invalid object in database: id = " + nodeRef + ", type = " + type); if (logger.isEnabledFor(Priority.WARN))
} logger.warn("Found invalid object in database: id = " + nodeRef + ", type = " + type);
} }
} }

21
source/java/org/alfresco/web/bean/repository/MapNode.java
View File

@@ -24,12 +24,14 @@
*/ */
package org.alfresco.web.bean.repository; package org.alfresco.web.bean.repository;
import java.io.Serializable;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.QName;
/** /**
* Lighweight client side representation of a node held in the repository, which * Lighweight client side representation of a node held in the repository, which
@@ -70,6 +72,25 @@ public class MapNode extends Node implements Map<String, Object>
} }
} }
/**
* Constructor
*
* @param nodeRef The NodeRef this Node wrapper represents
* @param nodeService The node service to use to retrieve data for this node
* @param props The properties of the node, already retrieved from NodeService
*/
public MapNode(NodeRef nodeRef, NodeService nodeService, Map<QName, Serializable> props)
{
super(nodeRef);
for (QName qname: props.keySet())
{
Serializable propValue = props.get(qname);
this.properties.put(qname.toString(), propValue);
}
this.propsRetrieved = true;
}
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// Map implementation - allows the Node bean to be accessed using JSF expression syntax // Map implementation - allows the Node bean to be accessed using JSF expression syntax