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

Added types cm:avmcontent (derived from cm:content) TYPE_AVM_CONTENT and

Browse Source 
cm:avmfolder (derived from cm:folder) TYPE_AVM_FOLDER as handles for UI.
Fixed configuration goofs I introduced recently that caused Node Browsing
to barf on content nodes. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-09-08 04:47:21 +00:00
parent 9c8ae2b7c4
commit 08ecce31b6
6 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/model/ContentModel.java
View File

@@ -97,7 +97,7 @@ public interface ContentModel
// content type and aspect constants
static final QName TYPE_CONTENT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "content");
static final QName PROP_CONTENT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "content");
static final QName PROP_READONLY = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "readonly");
static final QName TYPE_AVM_CONTENT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "avmcontent");
// title aspect
static final QName ASPECT_TITLED = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "titled");
@@ -115,7 +115,7 @@ public interface ContentModel
// author aspect
static final QName ASPECT_AUTHOR = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "author");
static final QName PROP_AUTHOR = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "author");
// categories
static final QName TYPE_CATEGORYROOT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "category_root");
static final QName ASPECT_CLASSIFIABLE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "classifiable");
@@ -143,6 +143,7 @@ public interface ContentModel
static final QName TYPE_FOLDER = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "folder");
/** child association type supported by {@link #TYPE_FOLDER} */
static final QName ASSOC_CONTAINS = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "contains");
static final QName TYPE_AVM_FOLDER = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "avmfolder");
// person
static final QName TYPE_PERSON = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "person");

2
source/java/org/alfresco/repo/avm/AVMContext.java
View File

@@ -280,7 +280,7 @@ public class AVMContext implements ApplicationContextAware
{
if (fNodeService == null)
{
fNodeService = (NodeService)fAppContext.getBean("NodeService");
fNodeService = (NodeService)fAppContext.getBean("nodeService");
}
return fNodeService;
}

9
source/java/org/alfresco/repo/avm/AVMNodeService.java
View File

@@ -268,11 +268,11 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
// Do the creates for supported types, or error out.
try
{
if (nodeTypeQName.equals(ContentModel.TYPE_FOLDER))
if (nodeTypeQName.equals(ContentModel.TYPE_AVM_FOLDER))
{
fAVMService.createDirectory(avmPath, nodeName);
}
else if (nodeTypeQName.equals(ContentModel.TYPE_CONTENT))
else if (nodeTypeQName.equals(ContentModel.TYPE_AVM_CONTENT))
{
fAVMService.createFile(avmPath, nodeName);
}
@@ -450,11 +450,11 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
(String)avmVersionPath[1]);
if (desc.isDirectory())
{
return ContentModel.TYPE_FOLDER;
return ContentModel.TYPE_AVM_FOLDER;
}
else
{
return ContentModel.TYPE_CONTENT;
return ContentModel.TYPE_AVM_CONTENT;
}
}
catch (AVMNotFoundException e)
@@ -1153,6 +1153,7 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
*/
public List<ChildAssociationRef> getChildAssocs(NodeRef nodeRef) throws InvalidNodeRefException
{
Object [] avmVersionPath = AVMNodeConverter.ToAVMVersionPath(nodeRef);
int version = (Integer)avmVersionPath[0];
String path = (String)avmVersionPath[1];

2
source/java/org/alfresco/repo/avm/AVMServiceTest.java
View File

@@ -2300,7 +2300,7 @@ public class AVMServiceTest extends AVMServiceTestBase
setupBasicTree();
FileFolderService ffs = (FileFolderService)fContext.getBean("FileFolderService");
assertTrue(ffs.create(AVMNodeConverter.ToNodeRef(-1, "main:/a/b/c"),
"banana", ContentModel.TYPE_CONTENT) != null);
"banana", ContentModel.TYPE_AVM_CONTENT) != null);
fService.createSnapshot("main");
System.out.println(recursiveList("main", -1, true));
}