diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml index 6fde55ef49..68807b45b0 100644 --- a/config/alfresco/core-services-context.xml +++ b/config/alfresco/core-services-context.xml @@ -468,8 +468,9 @@ alfresco/model/bpmModel.xml alfresco/model/wcmModel.xml alfresco/model/applicationModel.xml + alfresco/model/wcmAppModel.xml alfresco/model/forumModel.xml - + org/alfresco/repo/security/authentication/userModel.xml org/alfresco/repo/action/actionModel.xml diff --git a/config/alfresco/model/applicationModel.xml b/config/alfresco/model/applicationModel.xml index f11523fff5..5bd3bc616f 100644 --- a/config/alfresco/model/applicationModel.xml +++ b/config/alfresco/model/applicationModel.xml @@ -52,149 +52,6 @@ cm:link - - AVM Website Folder - wcm:avmfolder - - - - AVM Store Root - d:text - - - Default Webapp - d:text - - - - - - false - false - - - app:webuser - false - true - - - - - false - false - - - app:webform - false - true - - - - - false - false - - - app:webworkflowdefaults - false - true - - - - - - - Website User Information - sys:base - - - d:text - true - - - d:text - true - - - - - - Website Web Form - sys:base - - - d:text - true - - - - - - false - false - - - app:webformtemplate - false - true - - - - - false - false - - - app:workflowdefaults - false - false - - - - - cm:titled - app:filenamepattern - - - - - Website Web Form Template - sys:base - - - d:noderef - true - - - - app:filenamepattern - - - - - Workflow Defaults - sys:base - - - d:text - true - - - d:content - false - - - - - - - Web Workflow Defaults - app:workflowdefaults - - app:filenamepattern - - - @@ -280,15 +137,6 @@ - - Filename Pattern - - - d:text - - - - \ No newline at end of file diff --git a/config/alfresco/model/wcmAppModel.xml b/config/alfresco/model/wcmAppModel.xml new file mode 100644 index 0000000000..34ae39e3d3 --- /dev/null +++ b/config/alfresco/model/wcmAppModel.xml @@ -0,0 +1,309 @@ + + + Alfresco WCM Application Model + Alfresco + 2006-11-27 + 1.0 + + + + + + + + + + + + + + + + + AVM Website Folder + wcm:avmfolder + + + + AVM Store Root + d:text + + + Default Webapp + d:text + + + + + + false + false + + + wca:webuser + false + true + + + + + false + false + + + wca:webform + false + true + + + + + false + false + + + wca:webworkflowdefaults + false + true + + + + + + + Website User Information + sys:base + + + d:text + true + + + d:text + true + + + + + + Website Web Form + sys:base + + + d:text + true + + + + + + false + false + + + wca:webformtemplate + false + true + + + + + false + false + + + wca:workflowdefaults + false + false + + + + + cm:titled + wca:filenamepattern + + + + + Website Web Form Template + sys:base + + + d:noderef + true + + + + wca:filenamepattern + + + + + Workflow Defaults + sys:base + + + d:text + true + + + d:content + false + + + + + + + Web Workflow Defaults + wca:workflowdefaults + + wca:filenamepattern + + + + + Properties for renditions + sys:base + + + Type + d:text + true + + + Mimetype for generated assets + d:text + true + + + + + + + + + + Filename Pattern + + + d:text + + + + + + + XForms Form + + + Schema Root Element Name + d:text + true + + + Schema + d:noderef + true + + + Output path pattern for form instance data + d:text + true + + + Default Workflow ID + d:text + false + + + + + Form Data Renderers + + wca:capture + false + false + + + wca:renderingenginetemplate + wca:presentation + false + true + + + + + + + + A Rendering Engine + + + Type + d:text + true + + + Form Source + d:noderef + true + + + + + Rendition Properties + + wca:capture + false + false + + + wca:renditionproperties + false + true + + + + + + + XML file generated by a form + + + Form that generated this asset + d:noderef + true + + + Form that generated this asset + d:text + true + + + + + + XML file generated by a form + + + Form data renderer that generated this asset + d:noderef + true + + + Rendition properties used for this rendition + d:noderef + true + + + Primary XML Asset used to generate this asset + d:noderef + true + + + + + + + \ No newline at end of file diff --git a/config/alfresco/model/wcmModel.xml b/config/alfresco/model/wcmModel.xml index cb0d9cac53..4cc90da7fa 100644 --- a/config/alfresco/model/wcmModel.xml +++ b/config/alfresco/model/wcmModel.xml @@ -62,136 +62,6 @@ - - Properties for renditions - sys:base - - - Type - d:text - true - - - Mimetype for generated assets - d:text - true - - - - - - - - XForms Form - - - Schema Root Element Name - d:text - true - - - Schema - d:noderef - true - - - Output path pattern for form instance data - d:text - true - - - Default Workflow ID - d:text - false - - - - - Form Data Renderers - - wcm:capture - false - false - - - wcm:renderingenginetemplate - wcm:presentation - false - true - - - - - - - - A Rendering Engine - - - Type - d:text - true - - - Form Source - d:noderef - true - - - - - Rendition Properties - - wcm:capture - false - false - - - wcm:renditionproperties - false - true - - - - - - - XML file generated by a form - - - Form that generated this asset - d:noderef - true - - - Form that generated this asset - d:text - true - - - - - - XML file generated by a form - - - Form data renderer that generated this asset - d:noderef - true - - - Rendition properties used for this rendition - d:noderef - true - - - Primary XML Asset used to generate this asset - d:noderef - true - - - - diff --git a/source/java/org/alfresco/model/ApplicationModel.java b/source/java/org/alfresco/model/ApplicationModel.java new file mode 100644 index 0000000000..b7cc9e1bfa --- /dev/null +++ b/source/java/org/alfresco/model/ApplicationModel.java @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2005 Alfresco, Inc. + * + * Licensed under the Mozilla Public License version 1.1 + * with a permitted attribution clause. You may obtain a + * copy of the License at + * + * http://www.alfresco.org/legal/license.txt + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the + * License. + */ +package org.alfresco.model; + +import org.alfresco.service.namespace.NamespaceService; +import org.alfresco.service.namespace.QName; + +/** + * @author Kevin Roast + */ +public interface ApplicationModel +{ + // workflow + static final QName ASPECT_SIMPLE_WORKFLOW = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "simpleworkflow"); + static final QName PROP_APPROVE_STEP = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "approveStep"); + static final QName PROP_APPROVE_FOLDER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "approveFolder"); + static final QName PROP_APPROVE_MOVE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "approveMove"); + static final QName PROP_REJECT_STEP = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "rejectStep"); + static final QName PROP_REJECT_FOLDER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "rejectFolder"); + static final QName PROP_REJECT_MOVE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "rejectMove"); + + // ui facets aspect + static final QName ASPECT_UIFACETS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "uifacets"); + static final QName PROP_ICON = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "icon"); + + // inlineeditable aspect + static final QName ASPECT_INLINEEDITABLE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "inlineeditable"); + static final QName PROP_EDITINLINE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "editInline"); + + // configurable aspect + static final QName ASPECT_CONFIGURABLE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "configurable"); + static final QName TYPE_CONFIGURATIONS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "configurations"); + static final QName ASSOC_CONFIGURATIONS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "configurations"); + + // object links + static final QName TYPE_FILELINK = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "filelink"); + static final QName TYPE_FOLDERLINK = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "folderlink"); + + // feed source aspect + static final QName ASPECT_FEEDSOURCE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "feedsource"); + static final QName PROP_FEEDTEMPLATE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "template"); +} diff --git a/source/java/org/alfresco/model/ContentModel.java b/source/java/org/alfresco/model/ContentModel.java index 0fb7f09ea9..2a83956dee 100644 --- a/source/java/org/alfresco/model/ContentModel.java +++ b/source/java/org/alfresco/model/ContentModel.java @@ -153,8 +153,6 @@ public interface ContentModel static final QName PROP_ORGID = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "organizationId"); static final QName PROP_HOME_FOLDER_PROVIDER = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "homeFolderProvider"); static final QName PROP_DEFAULT_HOME_FOLDER_PATH = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "defaultHomeFolderPath"); - - // Ownable aspect static final QName ASPECT_OWNABLE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "ownable"); @@ -165,109 +163,40 @@ public interface ContentModel static final QName PROP_TEMPLATE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "template"); // Dictionary model - public static final QName TYPE_DICTIONARY_MODEL = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "dictionaryModel"); - public static final QName PROP_MODEL_NAME = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "modelName"); - public static final QName PROP_MODEL_DESCRIPTION = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "modelDescription"); - public static final QName PROP_MODEL_AUTHOR = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "modelAuthor"); - public static final QName PROP_MODEL_PUBLISHED_DATE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "modelPublishedDate"); - public static final QName PROP_MODEL_VERSION = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "modelVersion"); - public static final QName PROP_MODEL_ACTIVE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "modelActive"); + static final QName TYPE_DICTIONARY_MODEL = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "dictionaryModel"); + static final QName PROP_MODEL_NAME = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "modelName"); + static final QName PROP_MODEL_DESCRIPTION = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "modelDescription"); + static final QName PROP_MODEL_AUTHOR = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "modelAuthor"); + static final QName PROP_MODEL_PUBLISHED_DATE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "modelPublishedDate"); + static final QName PROP_MODEL_VERSION = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "modelVersion"); + static final QName PROP_MODEL_ACTIVE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "modelActive"); // referencing aspect - public static final QName ASPECT_REFERENCING = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "referencing"); - public static final QName ASSOC_REFERENCES = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "references"); + static final QName ASPECT_REFERENCING = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "referencing"); + static final QName ASSOC_REFERENCES = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "references"); // link object - public static final QName TYPE_LINK = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "link"); - public static final QName PROP_LINK_DESTINATION = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "destination"); + static final QName TYPE_LINK = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "link"); + static final QName PROP_LINK_DESTINATION = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "destination"); // email aspect - public static final QName ASPECT_MAILED = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "emailed"); - public static final QName PROP_SENTDATE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "sentdate"); - public static final QName PROP_ORIGINATOR = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "originator"); - public static final QName PROP_ADDRESSEE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "addressee"); - public static final QName PROP_ADDRESSEES = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "addressees"); - public static final QName PROP_SUBJECT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "subjectline"); + static final QName ASPECT_MAILED = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "emailed"); + static final QName PROP_SENTDATE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "sentdate"); + static final QName PROP_ORIGINATOR = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "originator"); + static final QName PROP_ADDRESSEE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "addressee"); + static final QName PROP_ADDRESSEES = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "addressees"); + static final QName PROP_SUBJECT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "subjectline"); // countable aspect - public static final QName ASPECT_COUNTABLE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "countable"); - public static final QName PROP_HITS = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "hits"); - public static final QName PROP_COUNTER = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "counter"); + static final QName ASPECT_COUNTABLE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "countable"); + static final QName PROP_HITS = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "hits"); + static final QName PROP_COUNTER = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "counter"); // References Node Aspect. - public static final QName ASPECT_REFERENCES_NODE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "referencesnode"); - public static final QName PROP_NODE_REF = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "noderef"); + static final QName ASPECT_REFERENCES_NODE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "referencesnode"); + static final QName PROP_NODE_REF = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "noderef"); - // - // Application Model Definitions - // - - // workflow - static final QName ASPECT_SIMPLE_WORKFLOW = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "simpleworkflow"); - static final QName PROP_APPROVE_STEP = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "approveStep"); - static final QName PROP_APPROVE_FOLDER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "approveFolder"); - static final QName PROP_APPROVE_MOVE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "approveMove"); - static final QName PROP_REJECT_STEP = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "rejectStep"); - static final QName PROP_REJECT_FOLDER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "rejectFolder"); - static final QName PROP_REJECT_MOVE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "rejectMove"); - - // ui facets aspect - static final QName ASPECT_UIFACETS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "uifacets"); - static final QName PROP_ICON = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "icon"); - // inlineeditable aspect - static final QName ASPECT_INLINEEDITABLE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "inlineeditable"); - static final QName PROP_EDITINLINE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "editInline"); - - // configurable aspect - static final QName ASPECT_CONFIGURABLE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "configurable"); - static final QName TYPE_CONFIGURATIONS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "configurations"); - static final QName ASSOC_CONFIGURATIONS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "configurations"); - - // object links - static final QName TYPE_FILELINK = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "filelink"); - static final QName TYPE_FOLDERLINK = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "folderlink"); - - // feed source aspect - static final QName ASPECT_FEEDSOURCE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "feedsource"); - static final QName PROP_FEEDTEMPLATE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "template"); - - // AVM web folder - static final QName TYPE_AVMWEBFOLDER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webfolder"); - static final QName PROP_AVMSTORE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "avmstore"); - static final QName PROP_DEFAULTWEBAPP = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "defaultwebapp"); - static final QName ASSOC_WEBUSER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webuser"); - static final QName ASSOC_WEBFORM = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webform"); - static final QName ASSOC_WEBWORKFLOWDEFAULTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webworkflowdefaults"); - - // AVM web user reference - static final QName TYPE_WEBUSER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webuser"); - static final QName PROP_WEBUSERNAME = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "username"); - static final QName PROP_WEBUSERROLE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "role"); - - // AVM web form - static final QName TYPE_WEBFORM = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webform"); - static final QName PROP_FORMNAME = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "formname"); - static final QName ASSOC_WEBFORMTEMPLATE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webformtemplate"); - static final QName ASSOC_WORKFLOWDEFAULTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "workflowdefaults"); - - // AVM web form template - static final QName TYPE_WEBFORMTEMPLATE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webformtemplate"); - static final QName PROP_ENGINE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "engine"); - - // AVM workflow defaults - static final QName TYPE_WORKFLOWDEFAULTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "workflowdefaults"); - static final QName PROP_WORKFLOW_NAME = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "workflowname"); - static final QName PROP_WORKFLOWDEFAULTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "defaults"); - - // AVM web workflow defaults - static final QName TYPE_WEBWORKFLOWDEFAULTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webworkflowdefaults"); - - // AVM filename pattern aspect - static final QName ASPECT_FILENAMEPATTERN = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "filenamepattern"); - static final QName PROP_FILENAMEPATTERN = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "filenamepattern"); - - // // User Model Definitions // diff --git a/source/java/org/alfresco/model/ForumModel.java b/source/java/org/alfresco/model/ForumModel.java index 9aa6db3e8a..4ceba5eac7 100644 --- a/source/java/org/alfresco/model/ForumModel.java +++ b/source/java/org/alfresco/model/ForumModel.java @@ -16,11 +16,14 @@ */ package org.alfresco.model; +import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; /** * Forums Model Constants + * + * @author gavinc */ public interface ForumModel { @@ -28,15 +31,12 @@ public interface ForumModel // Forums Model Definitions // - static final String FORUMS_MODEL_URI = "http://www.alfresco.org/model/forum/1.0"; - static final String FORUMS_MODEL_PREFIX = "fm"; - - static final QName TYPE_FORUMS = QName.createQName(FORUMS_MODEL_URI, "forums"); - static final QName TYPE_FORUM = QName.createQName(FORUMS_MODEL_URI, "forum"); - static final QName TYPE_TOPIC = QName.createQName(FORUMS_MODEL_URI, "topic"); - static final QName TYPE_POST = QName.createQName(FORUMS_MODEL_URI, "post"); + static final QName TYPE_FORUMS = QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "forums"); + static final QName TYPE_FORUM = QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "forum"); + static final QName TYPE_TOPIC = QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "topic"); + static final QName TYPE_POST = QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "post"); - static final QName ASPECT_DISCUSSABLE = QName.createQName(FORUMS_MODEL_URI, "discussable"); + static final QName ASPECT_DISCUSSABLE = QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "discussable"); - static final QName ASSOC_DISCUSSION = QName.createQName(FORUMS_MODEL_URI, "discussion"); + static final QName ASSOC_DISCUSSION = QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "discussion"); } diff --git a/source/java/org/alfresco/model/WCMAppModel.java b/source/java/org/alfresco/model/WCMAppModel.java new file mode 100644 index 0000000000..a6ff158a9e --- /dev/null +++ b/source/java/org/alfresco/model/WCMAppModel.java @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2005 Alfresco, Inc. + * + * Licensed under the Mozilla Public License version 1.1 + * with a permitted attribution clause. You may obtain a + * copy of the License at + * + * http://www.alfresco.org/legal/license.txt + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the + * License. + */ +package org.alfresco.model; + +import org.alfresco.service.namespace.NamespaceService; +import org.alfresco.service.namespace.QName; + +/** + * @author Kevin Roast + */ +public interface WCMAppModel +{ + // AVM web folder + static final QName TYPE_AVMWEBFOLDER = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "webfolder"); + static final QName PROP_AVMSTORE = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "avmstore"); + static final QName PROP_DEFAULTWEBAPP = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "defaultwebapp"); + static final QName ASSOC_WEBUSER = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "webuser"); + static final QName ASSOC_WEBFORM = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "webform"); + static final QName ASSOC_WEBWORKFLOWDEFAULTS = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "webworkflowdefaults"); + + // AVM web user reference + static final QName TYPE_WEBUSER = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "webuser"); + static final QName PROP_WEBUSERNAME = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "username"); + static final QName PROP_WEBUSERROLE = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "role"); + + // AVM web form + static final QName TYPE_WEBFORM = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "webform"); + static final QName PROP_FORMNAME = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "formname"); + static final QName ASSOC_WEBFORMTEMPLATE = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "webformtemplate"); + static final QName ASSOC_WORKFLOWDEFAULTS = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "workflowdefaults"); + + // AVM web form template + static final QName TYPE_WEBFORMTEMPLATE = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "webformtemplate"); + static final QName PROP_ENGINE = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "engine"); + + // AVM workflow defaults + static final QName TYPE_WORKFLOWDEFAULTS = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "workflowdefaults"); + static final QName PROP_WORKFLOW_NAME = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "workflowname"); + static final QName PROP_WORKFLOWDEFAULTS = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "defaults"); + + // AVM web workflow defaults + static final QName TYPE_WEBWORKFLOWDEFAULTS = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "webworkflowdefaults"); + + // AVM filename pattern aspect + static final QName ASPECT_FILENAMEPATTERN = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "filenamepattern"); + static final QName PROP_FILENAMEPATTERN = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "filenamepattern"); + + // The XForms data capture form aspect. + static final QName ASPECT_FORM = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "form"); + static final QName PROP_XML_SCHEMA = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "schema"); + static final QName PROP_XML_SCHEMA_ROOT_ELEMENT_NAME = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "xmlschemarootelementname"); + static final QName PROP_OUTPUT_PATH_PATTERN_FORM_INSTANCE_DATA = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "outputpathpatternforminstancedata"); + static final QName PROP_DEFAULT_WORKFLOW_NAME = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "defaultworkflowname"); + static final QName ASSOC_RENDERING_ENGINE_TEMPLATES = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "renderingenginetemplates"); + + // An XML to something else tranformer aspect. + static final QName ASPECT_RENDERING_ENGINE_TEMPLATE = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "renderingenginetemplate"); + static final QName PROP_PARENT_RENDERING_ENGINE_NAME = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "parentrenderingenginename"); + static final QName PROP_FORM_SOURCE = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "formsource"); + static final QName ASSOC_RENDITION_PROPERTIES = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "renditionproperties"); + + static final QName ASPECT_FORM_INSTANCE_DATA = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "forminstancedata"); + static final QName PROP_PARENT_FORM = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "parentform"); + static final QName PROP_PARENT_FORM_NAME = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "parentformname"); + + static final QName ASPECT_RENDITION = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "rendition"); + static final QName PROP_PARENT_RENDERING_ENGINE_TEMPLATE = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "parentrenderingenginetemplate"); + static final QName PROP_PARENT_RENDITION_PROPERTIES = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "parentrenditionproperties"); + static final QName PROP_PRIMARY_FORM_INSTANCE_DATA = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "primaryforminstancedata"); + + static final QName TYPE_RENDITION_PROPERTIES = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "renditionproperties"); + static final QName PROP_OUTPUT_PATH_PATTERN_RENDITION = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "outputpathpatternrendition"); + static final QName PROP_MIMETYPE_FOR_RENDITION = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "mimetypeforrendition"); +} diff --git a/source/java/org/alfresco/model/WCMModel.java b/source/java/org/alfresco/model/WCMModel.java index 242a57fb84..057b3d7e5a 100644 --- a/source/java/org/alfresco/model/WCMModel.java +++ b/source/java/org/alfresco/model/WCMModel.java @@ -26,41 +26,14 @@ import org.alfresco.service.namespace.QName; public interface WCMModel { // content - public static final QName TYPE_AVM_CONTENT = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmcontent"); - public static final QName TYPE_AVM_PLAIN_CONTENT = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmplaincontent"); - public static final QName TYPE_AVM_LAYERED_CONTENT = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmlayeredcontent"); - public static final QName PROP_AVM_FILE_INDIRECTION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmfileindirection"); + static final QName TYPE_AVM_CONTENT = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmcontent"); + static final QName TYPE_AVM_PLAIN_CONTENT = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmplaincontent"); + static final QName TYPE_AVM_LAYERED_CONTENT = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmlayeredcontent"); + static final QName PROP_AVM_FILE_INDIRECTION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmfileindirection"); // folders - public static final QName TYPE_AVM_FOLDER = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmfolder"); - public static final QName TYPE_AVM_PLAIN_FOLDER = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmplainfolder"); - public static final QName TYPE_AVM_LAYERED_FOLDER = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmlayeredfolder"); - public static final QName PROP_AVM_DIR_INDIRECTION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmdirindirection"); - - // The XForms data capture form aspect. - public static final QName ASPECT_FORM = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "form"); - public static final QName PROP_XML_SCHEMA = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "schema"); - public static final QName PROP_XML_SCHEMA_ROOT_ELEMENT_NAME = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "xmlschemarootelementname"); - public static final QName PROP_OUTPUT_PATH_PATTERN_FOR_FORM_INSTANCE_DATA = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "outputpathpatternforforminstancedata"); - public static final QName PROP_DEFAULT_WORKFLOW_NAME = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "defaultworkflowname"); - public static final QName ASSOC_RENDERING_ENGINE_TEMPLATES = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "renderingenginetemplates"); - - // An XML to something else tranformer aspect. - public static final QName ASPECT_RENDERING_ENGINE_TEMPLATE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "renderingenginetemplate"); - public static final QName PROP_PARENT_RENDERING_ENGINE_NAME = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "parentrenderingenginename"); - public static final QName PROP_FORM_SOURCE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "formsource"); - public static final QName ASSOC_RENDITION_PROPERTIES = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "renditionproperties"); - - public static final QName ASPECT_FORM_INSTANCE_DATA = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "forminstancedata"); - public static final QName PROP_PARENT_FORM = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "parentform"); - public static final QName PROP_PARENT_FORM_NAME = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "parentformname"); - - public static final QName ASPECT_RENDITION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "rendition"); - public static final QName PROP_PARENT_RENDERING_ENGINE_TEMPLATE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "parentrenderingenginetemplate"); - public static final QName PROP_PARENT_RENDITION_PROPERTIES = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "parentrenditionproperties"); - public static final QName PROP_PRIMARY_FORM_INSTANCE_DATA = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "primaryforminstancedata"); - - public static final QName TYPE_RENDITION_PROPERTIES = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "renditionproperties"); - public static final QName PROP_OUTPUT_PATH_PATTERN_FOR_RENDITION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "outputpathpatternforrendition"); - public static final QName PROP_MIMETYPE_FOR_RENDITION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "mimetypeforrendition"); + static final QName TYPE_AVM_FOLDER = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmfolder"); + static final QName TYPE_AVM_PLAIN_FOLDER = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmplainfolder"); + static final QName TYPE_AVM_LAYERED_FOLDER = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmlayeredfolder"); + static final QName PROP_AVM_DIR_INDIRECTION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmdirindirection"); } diff --git a/source/java/org/alfresco/repo/action/executer/SimpleWorkflowActionExecuter.java b/source/java/org/alfresco/repo/action/executer/SimpleWorkflowActionExecuter.java index 1e7309e846..1f4fc907ea 100644 --- a/source/java/org/alfresco/repo/action/executer/SimpleWorkflowActionExecuter.java +++ b/source/java/org/alfresco/repo/action/executer/SimpleWorkflowActionExecuter.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.alfresco.model.ContentModel; +import org.alfresco.model.ApplicationModel; import org.alfresco.repo.action.ParameterDefinitionImpl; import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.ParameterDefinition; @@ -83,21 +83,21 @@ public class SimpleWorkflowActionExecuter extends ActionExecuterAbstractBase // Set the property values Map propertyValues = new HashMap(); - propertyValues.put(ContentModel.PROP_APPROVE_STEP, approveStep); - propertyValues.put(ContentModel.PROP_APPROVE_FOLDER, approveFolder); + propertyValues.put(ApplicationModel.PROP_APPROVE_STEP, approveStep); + propertyValues.put(ApplicationModel.PROP_APPROVE_FOLDER, approveFolder); if (approveMove != null) { - propertyValues.put(ContentModel.PROP_APPROVE_MOVE, approveMove.booleanValue()); + propertyValues.put(ApplicationModel.PROP_APPROVE_MOVE, approveMove.booleanValue()); } - propertyValues.put(ContentModel.PROP_REJECT_STEP, rejectStep); - propertyValues.put(ContentModel.PROP_REJECT_FOLDER, rejectFolder); + propertyValues.put(ApplicationModel.PROP_REJECT_STEP, rejectStep); + propertyValues.put(ApplicationModel.PROP_REJECT_FOLDER, rejectFolder); if (rejectMove != null) { - propertyValues.put(ContentModel.PROP_REJECT_MOVE, rejectMove.booleanValue()); + propertyValues.put(ApplicationModel.PROP_REJECT_MOVE, rejectMove.booleanValue()); } // Apply the simple workflow aspect to the node - this.nodeService.addAspect(actionedUponNodeRef, ContentModel.ASPECT_SIMPLE_WORKFLOW, propertyValues); + this.nodeService.addAspect(actionedUponNodeRef, ApplicationModel.ASPECT_SIMPLE_WORKFLOW, propertyValues); } } } diff --git a/source/java/org/alfresco/repo/admin/patch/impl/EmailTemplatesFolderPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/EmailTemplatesFolderPatch.java index c071fde627..94b4b44133 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/EmailTemplatesFolderPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/EmailTemplatesFolderPatch.java @@ -23,6 +23,7 @@ import java.util.Map; import java.util.Properties; import org.alfresco.i18n.I18NUtil; +import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ImporterBootstrap; @@ -220,7 +221,7 @@ public class EmailTemplatesFolderPatch extends AbstractPatch properties.put(ContentModel.PROP_NAME, emailTemplatesName); properties.put(ContentModel.PROP_TITLE, emailTemplatesName); properties.put(ContentModel.PROP_DESCRIPTION, emailTemplatesDescription); - properties.put(ContentModel.PROP_ICON, PROPERTY_ICON); + properties.put(ApplicationModel.PROP_ICON, PROPERTY_ICON); // create the node ChildAssociationRef childAssocRef = nodeService.createNode( @@ -232,6 +233,6 @@ public class EmailTemplatesFolderPatch extends AbstractPatch emailTemplatesFolderNodeRef = childAssocRef.getChildRef(); // add the required aspects - nodeService.addAspect(emailTemplatesFolderNodeRef, ContentModel.ASPECT_UIFACETS, null); + nodeService.addAspect(emailTemplatesFolderNodeRef, ApplicationModel.ASPECT_UIFACETS, null); } } diff --git a/source/java/org/alfresco/repo/admin/patch/impl/ForumsIconsPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/ForumsIconsPatch.java index d96493f347..5d650a6dc6 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/ForumsIconsPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/ForumsIconsPatch.java @@ -3,7 +3,7 @@ package org.alfresco.repo.admin.patch.impl; import java.io.Serializable; import org.alfresco.i18n.I18NUtil; -import org.alfresco.model.ContentModel; +import org.alfresco.model.ApplicationModel; import org.alfresco.model.ForumModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ImporterBootstrap; @@ -71,14 +71,14 @@ public class ForumsIconsPatch extends AbstractPatch { if (this.nodeService.exists(node)) { - String icon = (String)this.nodeService.getProperty(node, ContentModel.PROP_ICON); + String icon = (String)this.nodeService.getProperty(node, ApplicationModel.PROP_ICON); if (icon != null && icon.length() > 0) { int idx = icon.indexOf("_large"); if (idx != -1) { String newIcon = icon.substring(0, idx); - this.nodeService.setProperty(node, ContentModel.PROP_ICON, (Serializable)newIcon); + this.nodeService.setProperty(node, ApplicationModel.PROP_ICON, (Serializable)newIcon); changed++; } } diff --git a/source/java/org/alfresco/repo/admin/patch/impl/GuestUserPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/GuestUserPatch.java index 6786b2e5cd..07a7c41564 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/GuestUserPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/GuestUserPatch.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Properties; import org.alfresco.i18n.I18NUtil; +import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ImporterBootstrap; @@ -206,14 +207,14 @@ public class GuestUserPatch extends AbstractPatch properties.put(ContentModel.PROP_NAME, guestHomeName); properties.put(ContentModel.PROP_TITLE, guestHomeName); properties.put(ContentModel.PROP_DESCRIPTION, guestHomeDescription); - properties.put(ContentModel.PROP_ICON, "space-icon-default"); + properties.put(ApplicationModel.PROP_ICON, "space-icon-default"); ChildAssociationRef childAssocRef = nodeService.createNode(companyHomeRef, ContentModel.ASSOC_CONTAINS, QName.createQName(guestHomeChildName, namespaceService), ContentModel.TYPE_FOLDER, properties); NodeRef nodeRef = childAssocRef.getChildRef(); // add the required aspects - nodeService.addAspect(nodeRef, ContentModel.ASPECT_UIFACETS, null); + nodeService.addAspect(nodeRef, ApplicationModel.ASPECT_UIFACETS, null); setGuestHomePermissions(nodeRef); diff --git a/source/java/org/alfresco/repo/admin/patch/impl/RSSTemplatesFolderPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/RSSTemplatesFolderPatch.java index e952e74bb5..e8399a9476 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/RSSTemplatesFolderPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/RSSTemplatesFolderPatch.java @@ -24,6 +24,7 @@ import java.util.Map; import java.util.Properties; import org.alfresco.i18n.I18NUtil; +import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ACPImportPackageHandler; @@ -280,7 +281,7 @@ public class RSSTemplatesFolderPatch extends AbstractPatch properties.put(ContentModel.PROP_NAME, folderName); properties.put(ContentModel.PROP_TITLE, folderName); properties.put(ContentModel.PROP_DESCRIPTION, folderDescription); - properties.put(ContentModel.PROP_ICON, PROPERTY_ICON); + properties.put(ApplicationModel.PROP_ICON, PROPERTY_ICON); // create the node ChildAssociationRef childAssocRef = nodeService.createNode( @@ -292,7 +293,7 @@ public class RSSTemplatesFolderPatch extends AbstractPatch this.rssFolderNodeRef = childAssocRef.getChildRef(); // finally add the required aspects - nodeService.addAspect(rssFolderNodeRef, ContentModel.ASPECT_UIFACETS, null); + nodeService.addAspect(rssFolderNodeRef, ApplicationModel.ASPECT_UIFACETS, null); } private void importContent() throws IOException diff --git a/source/java/org/alfresco/repo/admin/patch/impl/SavedSearchFolderPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/SavedSearchFolderPatch.java index 69acc47578..8e812b506a 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/SavedSearchFolderPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/SavedSearchFolderPatch.java @@ -23,6 +23,7 @@ import java.util.Map; import java.util.Properties; import org.alfresco.i18n.I18NUtil; +import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ImporterBootstrap; @@ -234,7 +235,7 @@ public class SavedSearchFolderPatch extends AbstractPatch properties.put(ContentModel.PROP_NAME, savedSearchesName); properties.put(ContentModel.PROP_TITLE, savedSearchesName); properties.put(ContentModel.PROP_DESCRIPTION, savedSearchesDescription); - properties.put(ContentModel.PROP_ICON, PROPERTY_ICON); + properties.put(ApplicationModel.PROP_ICON, PROPERTY_ICON); // create the node ChildAssociationRef childAssocRef = nodeService.createNode( dictionaryNodeRef, @@ -244,7 +245,7 @@ public class SavedSearchFolderPatch extends AbstractPatch properties); savedSearchesFolderNodeRef = childAssocRef.getChildRef(); // add the required aspects - nodeService.addAspect(savedSearchesFolderNodeRef, ContentModel.ASPECT_UIFACETS, null); + nodeService.addAspect(savedSearchesFolderNodeRef, ApplicationModel.ASPECT_UIFACETS, null); // done } diff --git a/source/java/org/alfresco/repo/admin/patch/impl/ScriptsFolderPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/ScriptsFolderPatch.java index 73b409ac96..7a6ce71d42 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/ScriptsFolderPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/ScriptsFolderPatch.java @@ -24,6 +24,7 @@ import java.util.Map; import java.util.Properties; import org.alfresco.i18n.I18NUtil; +import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ACPImportPackageHandler; @@ -266,7 +267,7 @@ public class ScriptsFolderPatch extends AbstractPatch properties.put(ContentModel.PROP_NAME, folderName); properties.put(ContentModel.PROP_TITLE, folderName); properties.put(ContentModel.PROP_DESCRIPTION, folderDescription); - properties.put(ContentModel.PROP_ICON, PROPERTY_ICON); + properties.put(ApplicationModel.PROP_ICON, PROPERTY_ICON); // create the node ChildAssociationRef childAssocRef = nodeService.createNode( @@ -278,7 +279,7 @@ public class ScriptsFolderPatch extends AbstractPatch scriptsFolderNodeRef = childAssocRef.getChildRef(); // finally add the required aspects - nodeService.addAspect(scriptsFolderNodeRef, ContentModel.ASPECT_UIFACETS, null); + nodeService.addAspect(scriptsFolderNodeRef, ApplicationModel.ASPECT_UIFACETS, null); } private void importContent() throws IOException diff --git a/source/java/org/alfresco/repo/admin/patch/impl/UIFacetsAspectRemovalPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/UIFacetsAspectRemovalPatch.java index 6aba06c231..640b0ac95a 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/UIFacetsAspectRemovalPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/UIFacetsAspectRemovalPatch.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Properties; import org.alfresco.i18n.I18NUtil; -import org.alfresco.model.ContentModel; +import org.alfresco.model.ApplicationModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ACPImportPackageHandler; import org.alfresco.repo.importer.ImporterBootstrap; @@ -124,10 +124,10 @@ public class UIFacetsAspectRemovalPatch extends AbstractPatch for (NodeRef ref : nodeRefs) { // if the content has the uifacets aspect, then remove it and meaningless icon reference - if (nodeService.hasAspect(ref, ContentModel.ASPECT_UIFACETS)) + if (nodeService.hasAspect(ref, ApplicationModel.ASPECT_UIFACETS)) { - nodeService.removeAspect(ref, ContentModel.ASPECT_UIFACETS); - nodeService.setProperty(ref, ContentModel.PROP_ICON, null); + nodeService.removeAspect(ref, ApplicationModel.ASPECT_UIFACETS); + nodeService.setProperty(ref, ApplicationModel.PROP_ICON, null); updated++; } } diff --git a/source/java/org/alfresco/repo/configuration/ConfigurableServiceImpl.java b/source/java/org/alfresco/repo/configuration/ConfigurableServiceImpl.java index 9096928ab6..40dca96ec5 100644 --- a/source/java/org/alfresco/repo/configuration/ConfigurableServiceImpl.java +++ b/source/java/org/alfresco/repo/configuration/ConfigurableServiceImpl.java @@ -18,7 +18,7 @@ package org.alfresco.repo.configuration; import java.util.List; -import org.alfresco.model.ContentModel; +import org.alfresco.model.ApplicationModel; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; @@ -38,7 +38,7 @@ public class ConfigurableServiceImpl implements ConfigurableService public boolean isConfigurable(NodeRef nodeRef) { - return this.nodeService.hasAspect(nodeRef, ContentModel.ASPECT_CONFIGURABLE); + return this.nodeService.hasAspect(nodeRef, ApplicationModel.ASPECT_CONFIGURABLE); } public void makeConfigurable(NodeRef nodeRef) @@ -46,14 +46,14 @@ public class ConfigurableServiceImpl implements ConfigurableService if (isConfigurable(nodeRef) == false) { // First apply the aspect - this.nodeService.addAspect(nodeRef, ContentModel.ASPECT_CONFIGURABLE, null); + this.nodeService.addAspect(nodeRef, ApplicationModel.ASPECT_CONFIGURABLE, null); // Next create and add the configurations folder this.nodeService.createNode( nodeRef, - ContentModel.ASSOC_CONFIGURATIONS, - ContentModel.ASSOC_CONFIGURATIONS, - ContentModel.TYPE_CONFIGURATIONS); + ApplicationModel.ASSOC_CONFIGURATIONS, + ApplicationModel.ASSOC_CONFIGURATIONS, + ApplicationModel.TYPE_CONFIGURATIONS); } } @@ -65,7 +65,7 @@ public class ConfigurableServiceImpl implements ConfigurableService List assocs = this.nodeService.getChildAssocs( nodeRef, RegexQNamePattern.MATCH_ALL, - ContentModel.ASSOC_CONFIGURATIONS); + ApplicationModel.ASSOC_CONFIGURATIONS); if (assocs.size() != 0) { ChildAssociationRef assoc = assocs.get(0); diff --git a/source/java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java b/source/java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java index b9c275b3c7..b0cab40660 100644 --- a/source/java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java +++ b/source/java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java @@ -18,6 +18,7 @@ package org.alfresco.repo.configuration; import java.util.List; +import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.ChildAssociationRef; @@ -79,11 +80,11 @@ public class ConfigurableServiceImplTest extends BaseSpringTest public void testMakeConfigurable() { this.configurableService.makeConfigurable(this.nodeRef); - assertTrue(this.nodeService.hasAspect(this.nodeRef, ContentModel.ASPECT_CONFIGURABLE)); + assertTrue(this.nodeService.hasAspect(this.nodeRef, ApplicationModel.ASPECT_CONFIGURABLE)); List assocs = this.nodeService.getChildAssocs( this.nodeRef, RegexQNamePattern.MATCH_ALL, - ContentModel.ASSOC_CONFIGURATIONS); + ApplicationModel.ASSOC_CONFIGURATIONS); assertNotNull(assocs); assertEquals(1, assocs.size()); } diff --git a/source/java/org/alfresco/repo/copy/CopyServiceImpl.java b/source/java/org/alfresco/repo/copy/CopyServiceImpl.java index 34e5436456..ea726a8941 100644 --- a/source/java/org/alfresco/repo/copy/CopyServiceImpl.java +++ b/source/java/org/alfresco/repo/copy/CopyServiceImpl.java @@ -26,6 +26,7 @@ import java.util.Set; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.i18n.I18NUtil; +import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.repo.policy.ClassPolicyDelegate; import org.alfresco.repo.policy.JavaBehaviour; @@ -826,7 +827,7 @@ public class CopyServiceImpl implements CopyService QName childType = this.nodeService.getType(childRef); // TODO will need to remove this reference to the configurations association - if (this.dictionaryService.isSubClass(childType, ContentModel.TYPE_CONFIGURATIONS) == true || + if (this.dictionaryService.isSubClass(childType, ApplicationModel.TYPE_CONFIGURATIONS) == true || copyDetails.isChildAssociationRefAlwaysTraversed(classRef, childAssoc) == true) { if (copiedChildren.containsKey(childRef) == false) diff --git a/source/java/org/alfresco/repo/forum/DiscussableAspect.java b/source/java/org/alfresco/repo/forum/DiscussableAspect.java index d7c3d9f3ef..6161a911aa 100644 --- a/source/java/org/alfresco/repo/forum/DiscussableAspect.java +++ b/source/java/org/alfresco/repo/forum/DiscussableAspect.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Map; import org.alfresco.i18n.I18NUtil; +import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.model.ForumModel; import org.alfresco.repo.policy.JavaBehaviour; @@ -240,15 +241,15 @@ public class DiscussableAspect ChildAssociationRef childRef = this.nodeService.createNode(destNodeRef, ForumModel.ASSOC_DISCUSSION, - QName.createQName(ForumModel.FORUMS_MODEL_URI, "discussion"), + QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "discussion"), ForumModel.TYPE_FORUM, forumProps); destinationForum = childRef.getChildRef(); // apply the uifacets aspect Map uiFacetsProps = new HashMap(5); - uiFacetsProps.put(ContentModel.PROP_ICON, "forum"); - this.nodeService.addAspect(destinationForum, ContentModel.ASPECT_UIFACETS, uiFacetsProps); + uiFacetsProps.put(ApplicationModel.PROP_ICON, "forum"); + this.nodeService.addAspect(destinationForum, ApplicationModel.ASPECT_UIFACETS, uiFacetsProps); } return destinationForum; diff --git a/source/java/org/alfresco/repo/importer/FileImporterImpl.java b/source/java/org/alfresco/repo/importer/FileImporterImpl.java index aef5fe5ea4..51c91ab210 100644 --- a/source/java/org/alfresco/repo/importer/FileImporterImpl.java +++ b/source/java/org/alfresco/repo/importer/FileImporterImpl.java @@ -25,6 +25,7 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; +import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.repo.transaction.TransactionUtil; import org.alfresco.repo.transaction.TransactionUtil.TransactionWork; @@ -354,10 +355,10 @@ public class FileImporterImpl implements FileImporter // apply the uifacets aspect - icon, title and description props Map uiFacetsProps = new HashMap(5); - uiFacetsProps.put(ContentModel.PROP_ICON, "space-icon-default"); + uiFacetsProps.put(ApplicationModel.PROP_ICON, "space-icon-default"); uiFacetsProps.put(ContentModel.PROP_TITLE, name); uiFacetsProps.put(ContentModel.PROP_DESCRIPTION, path); - this.nodeService.addAspect(nodeRef, ContentModel.ASPECT_UIFACETS, uiFacetsProps); + this.nodeService.addAspect(nodeRef, ApplicationModel.ASPECT_UIFACETS, uiFacetsProps); if (logger.isDebugEnabled()) logger.debug("Added uifacets aspect with properties: " + uiFacetsProps); diff --git a/source/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java b/source/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java index 0374d8092e..0c4c98fac5 100644 --- a/source/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java +++ b/source/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java @@ -27,6 +27,7 @@ import javax.transaction.UserTransaction; import junit.framework.TestCase; +import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.repo.action.ActionServiceImplTest; import org.alfresco.repo.action.ActionServiceImplTest.AsyncTest; @@ -318,9 +319,9 @@ public class RuleServiceCoverageTest extends TestCase assertTrue(this.nodeService.hasAspect(newNodeRef, ContentModel.ASPECT_VERSIONABLE)); Map params2 = new HashMap(2); - params2.put(AddFeaturesActionExecuter.PARAM_ASPECT_NAME, ContentModel.ASPECT_SIMPLE_WORKFLOW); - params2.put(ContentModel.PROP_APPROVE_STEP.toString(), "approveStep"); - params2.put(ContentModel.PROP_APPROVE_MOVE.toString(), false); + params2.put(AddFeaturesActionExecuter.PARAM_ASPECT_NAME, ApplicationModel.ASPECT_SIMPLE_WORKFLOW); + params2.put(ApplicationModel.PROP_APPROVE_STEP.toString(), "approveStep"); + params2.put(ApplicationModel.PROP_APPROVE_MOVE.toString(), false); // Test that rule can be updated and execute correctly //rule.removeAllActions(); @@ -335,9 +336,9 @@ public class RuleServiceCoverageTest extends TestCase ContentModel.TYPE_CONTENT, getContentProperties()).getChildRef(); addContentToNode(newNodeRef2); - assertTrue(this.nodeService.hasAspect(newNodeRef2, ContentModel.ASPECT_SIMPLE_WORKFLOW)); - assertEquals("approveStep", this.nodeService.getProperty(newNodeRef2, ContentModel.PROP_APPROVE_STEP)); - assertEquals(false, this.nodeService.getProperty(newNodeRef2, ContentModel.PROP_APPROVE_MOVE)); + assertTrue(this.nodeService.hasAspect(newNodeRef2, ApplicationModel.ASPECT_SIMPLE_WORKFLOW)); + assertEquals("approveStep", this.nodeService.getProperty(newNodeRef2, ApplicationModel.PROP_APPROVE_STEP)); + assertEquals(false, this.nodeService.getProperty(newNodeRef2, ApplicationModel.PROP_APPROVE_MOVE)); // System.out.println(NodeStoreInspector.dumpNodeStore(this.nodeService, this.testStoreRef)); } @@ -345,7 +346,7 @@ public class RuleServiceCoverageTest extends TestCase public void testDisableIndividualRules() { Map params = new HashMap(1); - params.put("aspect-name", ContentModel.ASPECT_CONFIGURABLE); + params.put("aspect-name", ApplicationModel.ASPECT_CONFIGURABLE); Rule rule = createRule( RuleType.INBOUND, @@ -364,7 +365,7 @@ public class RuleServiceCoverageTest extends TestCase ContentModel.TYPE_CONTENT, getContentProperties()).getChildRef(); addContentToNode(newNodeRef); - assertFalse(this.nodeService.hasAspect(newNodeRef, ContentModel.ASPECT_CONFIGURABLE)); + assertFalse(this.nodeService.hasAspect(newNodeRef, ApplicationModel.ASPECT_CONFIGURABLE)); Rule rule2 = this.ruleService.getRule(rule.getNodeRef()); rule2.setRuleDisabled(false); @@ -378,7 +379,7 @@ public class RuleServiceCoverageTest extends TestCase ContentModel.TYPE_CONTENT, getContentProperties()).getChildRef(); addContentToNode(newNodeRef2); - assertTrue(this.nodeService.hasAspect(newNodeRef2, ContentModel.ASPECT_CONFIGURABLE)); + assertTrue(this.nodeService.hasAspect(newNodeRef2, ApplicationModel.ASPECT_CONFIGURABLE)); } @@ -535,14 +536,14 @@ public class RuleServiceCoverageTest extends TestCase getContentProperties()).getChildRef(); addContentToNode(newNodeRef); - assertTrue(this.nodeService.hasAspect(newNodeRef, ContentModel.ASPECT_SIMPLE_WORKFLOW)); - assertEquals("approveStep", this.nodeService.getProperty(newNodeRef, ContentModel.PROP_APPROVE_STEP)); - assertEquals(this.rootNodeRef, this.nodeService.getProperty(newNodeRef, ContentModel.PROP_APPROVE_FOLDER)); - assertTrue(((Boolean)this.nodeService.getProperty(newNodeRef, ContentModel.PROP_APPROVE_MOVE)).booleanValue()); - assertTrue(this.nodeService.hasAspect(newNodeRef, ContentModel.ASPECT_SIMPLE_WORKFLOW)); - assertEquals("rejectStep", this.nodeService.getProperty(newNodeRef, ContentModel.PROP_REJECT_STEP)); - assertEquals(this.rootNodeRef, this.nodeService.getProperty(newNodeRef, ContentModel.PROP_REJECT_FOLDER)); - assertFalse(((Boolean)this.nodeService.getProperty(newNodeRef, ContentModel.PROP_REJECT_MOVE)).booleanValue()); + assertTrue(this.nodeService.hasAspect(newNodeRef, ApplicationModel.ASPECT_SIMPLE_WORKFLOW)); + assertEquals("approveStep", this.nodeService.getProperty(newNodeRef, ApplicationModel.PROP_APPROVE_STEP)); + assertEquals(this.rootNodeRef, this.nodeService.getProperty(newNodeRef, ApplicationModel.PROP_APPROVE_FOLDER)); + assertTrue(((Boolean)this.nodeService.getProperty(newNodeRef, ApplicationModel.PROP_APPROVE_MOVE)).booleanValue()); + assertTrue(this.nodeService.hasAspect(newNodeRef, ApplicationModel.ASPECT_SIMPLE_WORKFLOW)); + assertEquals("rejectStep", this.nodeService.getProperty(newNodeRef, ApplicationModel.PROP_REJECT_STEP)); + assertEquals(this.rootNodeRef, this.nodeService.getProperty(newNodeRef, ApplicationModel.PROP_REJECT_FOLDER)); + assertFalse(((Boolean)this.nodeService.getProperty(newNodeRef, ApplicationModel.PROP_REJECT_MOVE)).booleanValue()); // System.out.println(NodeStoreInspector.dumpNodeStore(this.nodeService, this.testStoreRef)); } diff --git a/source/java/org/alfresco/repo/version/NodeServiceImplTest.java b/source/java/org/alfresco/repo/version/NodeServiceImplTest.java index e519177248..a1fe4a1773 100644 --- a/source/java/org/alfresco/repo/version/NodeServiceImplTest.java +++ b/source/java/org/alfresco/repo/version/NodeServiceImplTest.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef; @@ -241,7 +242,7 @@ public class NodeServiceImplTest extends BaseVersionStoreTest boolean test1 = this.lightWeightVersionStoreNodeService.hasAspect( version.getFrozenStateNodeRef(), - ContentModel.ASPECT_UIFACETS); + ApplicationModel.ASPECT_UIFACETS); assertFalse(test1); boolean test2 = this.lightWeightVersionStoreNodeService.hasAspect( diff --git a/source/java/org/alfresco/repo/version/VersionServiceImplTest.java b/source/java/org/alfresco/repo/version/VersionServiceImplTest.java index ddc677d3db..e99db11f69 100644 --- a/source/java/org/alfresco/repo/version/VersionServiceImplTest.java +++ b/source/java/org/alfresco/repo/version/VersionServiceImplTest.java @@ -21,6 +21,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Set; +import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.repo.transaction.TransactionUtil; import org.alfresco.service.cmr.repository.ContentReader; @@ -250,7 +251,7 @@ public class VersionServiceImplTest extends BaseVersionStoreTest contentWriter.putContent(UPDATED_CONTENT_1); // Change the aspects on the node - this.dbNodeService.addAspect(versionableNode, ContentModel.ASPECT_SIMPLE_WORKFLOW, null); + this.dbNodeService.addAspect(versionableNode, ApplicationModel.ASPECT_SIMPLE_WORKFLOW, null); // Store the node details for later Set origAspects2 = this.dbNodeService.getAspects(versionableNode); diff --git a/source/java/org/alfresco/service/namespace/NamespaceService.java b/source/java/org/alfresco/service/namespace/NamespaceService.java index 3c360fdb04..ece3221db6 100644 --- a/source/java/org/alfresco/service/namespace/NamespaceService.java +++ b/source/java/org/alfresco/service/namespace/NamespaceService.java @@ -33,70 +33,82 @@ import org.alfresco.service.PublicService; public interface NamespaceService extends NamespacePrefixResolver { /** Default Namespace URI */ - public static final String DEFAULT_URI = ""; + static final String DEFAULT_URI = ""; /** Default Namespace Prefix */ - public static final String DEFAULT_PREFIX = ""; + static final String DEFAULT_PREFIX = ""; /** Default Alfresco URI */ - public static final String ALFRESCO_URI = "http://www.alfresco.org"; + static final String ALFRESCO_URI = "http://www.alfresco.org"; /** Default Alfresco Prefix */ - public static final String ALFRESCO_PREFIX = "alf"; + static final String ALFRESCO_PREFIX = "alf"; /** Dictionary Model URI */ - public static final String DICTIONARY_MODEL_1_0_URI = "http://www.alfresco.org/model/dictionary/1.0"; + static final String DICTIONARY_MODEL_1_0_URI = "http://www.alfresco.org/model/dictionary/1.0"; /** Dictionary Model Prefix */ - public static final String DICTIONARY_MODEL_PREFIX = "d"; + static final String DICTIONARY_MODEL_PREFIX = "d"; /** System Model URI */ - public static final String SYSTEM_MODEL_1_0_URI = "http://www.alfresco.org/model/system/1.0"; + static final String SYSTEM_MODEL_1_0_URI = "http://www.alfresco.org/model/system/1.0"; /** System Model Prefix */ - public static final String SYSTEM_MODEL_PREFIX = "sys"; + static final String SYSTEM_MODEL_PREFIX = "sys"; /** Content Model URI */ - public static final String CONTENT_MODEL_1_0_URI = "http://www.alfresco.org/model/content/1.0"; + static final String CONTENT_MODEL_1_0_URI = "http://www.alfresco.org/model/content/1.0"; /** Content Model Prefix */ - public static final String CONTENT_MODEL_PREFIX = "cm"; + static final String CONTENT_MODEL_PREFIX = "cm"; /** Application Model URI */ - public static final String APP_MODEL_1_0_URI = "http://www.alfresco.org/model/application/1.0"; + static final String APP_MODEL_1_0_URI = "http://www.alfresco.org/model/application/1.0"; /** Application Model Prefix */ - public static final String APP_MODEL_PREFIX = "app"; + static final String APP_MODEL_PREFIX = "app"; /** Business Process Model URI */ - public static final String BPM_MODEL_1_0_URI = "http://www.alfresco.org/model/bpm/1.0"; + static final String BPM_MODEL_1_0_URI = "http://www.alfresco.org/model/bpm/1.0"; /** Business Process Model Prefix */ - public static final String BPM_MODEL_PREFIX = "bpm"; + static final String BPM_MODEL_PREFIX = "bpm"; /** Workflow Model URI */ - public static final String WORKFLOW_MODEL_1_0_URI = "http://www.alfresco.org/model/workflow/1.0"; + static final String WORKFLOW_MODEL_1_0_URI = "http://www.alfresco.org/model/workflow/1.0"; /** Workflow Model Prefix */ - public static final String WORKFLOW_MODEL_PREFIX = "wf"; + static final String WORKFLOW_MODEL_PREFIX = "wf"; + + /** Alfresco Forums URI */ + static final String FORUMS_MODEL_1_0_URI = "http://www.alfresco.org/model/forum/1.0"; + /** Alfresco Forums Prefix */ + static final String FORUMS_MODEL_PREFIX = "fm"; + /** Alfresco View Namespace URI */ - public static final String REPOSITORY_VIEW_1_0_URI = "http://www.alfresco.org/view/repository/1.0"; + static final String REPOSITORY_VIEW_1_0_URI = "http://www.alfresco.org/view/repository/1.0"; /** Alfresco View Namespace Prefix */ - public static final String REPOSITORY_VIEW_PREFIX = "view"; + static final String REPOSITORY_VIEW_PREFIX = "view"; /** Alfresco security URI */ - public static final String SECURITY_MODEL_1_0_URI = "http://www.alfresco.org/model/security/1.0"; + static final String SECURITY_MODEL_1_0_URI = "http://www.alfresco.org/model/security/1.0"; /** Alfresco security Prefix */ - public static final String SECURITY_MODEL_PREFIX = "security"; + static final String SECURITY_MODEL_PREFIX = "security"; /** Alfresco WCM URI */ - public static final String WCM_MODEL_1_0_URI = "http://www.alfresco.org/model/wcmmodel/1.0"; + static final String WCM_MODEL_1_0_URI = "http://www.alfresco.org/model/wcmmodel/1.0"; /** Alfresco WCM Prefix */ - public static final String WCM_MODEL_PREFIX = "wcm"; + static final String WCM_MODEL_PREFIX = "wcm"; + + /** WCM Application Model URI */ + static final String WCMAPP_MODEL_1_0_URI = "http://www.alfresco.org/model/wcmappmodel/1.0"; + + /** WCM Application Model Prefix */ + static final String WCMAPP_MODEL_PREFIX = "wca"; /**