mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
. Big and juicy application/WCM model refactoring
- WARNING: this change requires a new DB as the WCM model has changed significantly, yes I have probably broken a few WCM things :) Previously the following statements were true: - Most of the model constants were defined in the ContentModel class - including web-client Application specific model items - WCMModel class was a mix of WCM repository and WCM application model constants - The applicationModel.xml definition file contained both web-client Application and WCM application model definitions - The wcmModel.xml definition file contained both WCM repository and WCM application model definitions The following statements are now true: - All web-client application specific model constants have been moved from ContentModel to a new model constants class ApplicationModel - A new WCM application model has been defined with the prefix "wca" and URI: http://www.alfresco.org/model/wcmappmodel/1.0 - All WCM application specific model constants have been renamed/moved from ContentModel/WCMModel to a new model constants class WCMAppModel - The mix of WCM application specific model definitions in contentModel.xml and applicationModel.xml has been moved to a new definition file wcmAppModel.xml - A patch is not required for standard Alfresco as only WCM definitions have actually changed . Fix to issue created during workflow id/name refactor . Fix to allow forms in the Available Content Forms panel to have correct sandbox/username context for action dialog git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -33,6 +33,7 @@ import javax.transaction.UserTransaction;
|
||||
import org.alfresco.config.Config;
|
||||
import org.alfresco.config.ConfigElement;
|
||||
import org.alfresco.config.ConfigService;
|
||||
import org.alfresco.model.ApplicationModel;
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||||
import org.alfresco.service.cmr.dictionary.TypeDefinition;
|
||||
@@ -623,7 +624,7 @@ public class BrowseBean implements IContextListener
|
||||
this.contentNodes.add(node);
|
||||
}
|
||||
// look for File Link object node
|
||||
else if (ContentModel.TYPE_FILELINK.equals(type))
|
||||
else if (ApplicationModel.TYPE_FILELINK.equals(type))
|
||||
{
|
||||
// create our File Link Node representation
|
||||
node = new MapNode(nodeRef, this.nodeService, true);
|
||||
@@ -636,7 +637,7 @@ public class BrowseBean implements IContextListener
|
||||
|
||||
this.contentNodes.add(node);
|
||||
}
|
||||
else if (ContentModel.TYPE_FOLDERLINK.equals(type))
|
||||
else if (ApplicationModel.TYPE_FOLDERLINK.equals(type))
|
||||
{
|
||||
// create our Folder Link Node representation
|
||||
node = new MapNode(nodeRef, this.nodeService, true);
|
||||
@@ -787,7 +788,7 @@ public class BrowseBean implements IContextListener
|
||||
this.contentNodes.add(node);
|
||||
}
|
||||
// look for File Link object node
|
||||
else if (ContentModel.TYPE_FILELINK.equals(type))
|
||||
else if (ApplicationModel.TYPE_FILELINK.equals(type))
|
||||
{
|
||||
// create our File Link Node representation
|
||||
node = new MapNode(nodeRef, this.nodeService, false);
|
||||
@@ -802,7 +803,7 @@ public class BrowseBean implements IContextListener
|
||||
|
||||
this.contentNodes.add(node);
|
||||
}
|
||||
else if (ContentModel.TYPE_FOLDERLINK.equals(type))
|
||||
else if (ApplicationModel.TYPE_FOLDERLINK.equals(type))
|
||||
{
|
||||
// create our Folder Link Node representation
|
||||
node = new MapNode(nodeRef, this.nodeService, false);
|
||||
@@ -1109,7 +1110,7 @@ public class BrowseBean implements IContextListener
|
||||
NodeRef ref = new NodeRef(Repository.getStoreRef(), id);
|
||||
|
||||
// handle special folder link node case
|
||||
if (ContentModel.TYPE_FOLDERLINK.equals(this.nodeService.getType(ref)))
|
||||
if (ApplicationModel.TYPE_FOLDERLINK.equals(this.nodeService.getType(ref)))
|
||||
{
|
||||
ref = (NodeRef)this.nodeService.getProperty(ref, ContentModel.PROP_LINK_DESTINATION);
|
||||
}
|
||||
@@ -1320,7 +1321,7 @@ public class BrowseBean implements IContextListener
|
||||
Node node = new Node(ref);
|
||||
|
||||
// store the URL to for downloading the content
|
||||
if (ContentModel.TYPE_FILELINK.equals(node.getType()))
|
||||
if (ApplicationModel.TYPE_FILELINK.equals(node.getType()))
|
||||
{
|
||||
node.addPropertyResolver("url", this.resolverLinkDownload);
|
||||
}
|
||||
|
Reference in New Issue
Block a user