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

. Big and juicy application/WCM model refactoring

Browse Source 
- 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:
Kevin Roast
2006-11-27 15:03:12 +00:00
parent ef669bec2a
commit 4003f0e36f
26 changed files with 599 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/core-services-context.xml
View File

@@ -468,6 +468,7 @@
<value>alfresco/model/bpmModel.xml</value> <value>alfresco/model/bpmModel.xml</value>
<value>alfresco/model/wcmModel.xml</value> <value>alfresco/model/wcmModel.xml</value>
<value>alfresco/model/applicationModel.xml</value> <value>alfresco/model/applicationModel.xml</value>
<value>alfresco/model/wcmAppModel.xml</value>
<value>alfresco/model/forumModel.xml</value> <value>alfresco/model/forumModel.xml</value>
<!-- Implementation models --> <!-- Implementation models -->

152
config/alfresco/model/applicationModel.xml
View File

@@ -52,149 +52,6 @@
<parent>cm:link</parent> <parent>cm:link</parent>
</type> </type>
<type name="app:webfolder">
<title>AVM Website Folder</title>
<parent>wcm:avmfolder</parent>
<properties>
<!-- root name of the avm staging stores for this web folder -->
<property name="app:avmstore">
<title>AVM Store Root</title>
<type>d:text</type>
</property>
<property name="app:defaultwebapp">
<title>Default Webapp</title>
<type>d:text</type>
</property>
</properties>
<associations>
<child-association name="app:webuser">
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>app:webuser</class>
<mandatory>false</mandatory>
<many>true</many>
</target>
</child-association>
<child-association name="app:webform">
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>app:webform</class>
<mandatory>false</mandatory>
<many>true</many>
</target>
</child-association>
<child-association name="app:webworkflowdefaults">
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>app:webworkflowdefaults</class>
<mandatory>false</mandatory>
<many>true</many>
</target>
</child-association>
</associations>
</type>
<type name="app:webuser">
<title>Website User Information</title>
<parent>sys:base</parent>
<properties>
<property name="app:username">
<type>d:text</type>
<mandatory>true</mandatory>
</property>
<property name="app:role">
<type>d:text</type>
<mandatory>true</mandatory>
</property>
</properties>
</type>
<type name="app:webform">
<title>Website Web Form</title>
<parent>sys:base</parent>
<properties>
<property name="app:formname">
<type>d:text</type>
<mandatory>true</mandatory>
</property>
</properties>
<associations>
<child-association name="app:webformtemplate">
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>app:webformtemplate</class>
<mandatory>false</mandatory>
<many>true</many>
</target>
</child-association>
<child-association name="app:workflowdefaults">
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>app:workflowdefaults</class>
<mandatory>false</mandatory>
<many>false</many>
</target>
</child-association>
</associations>
<mandatory-aspects>
<aspect>cm:titled</aspect>
<aspect>app:filenamepattern</aspect>
</mandatory-aspects>
</type>
<type name="app:webformtemplate">
<title>Website Web Form Template</title>
<parent>sys:base</parent>
<properties>
<property name="app:engine">
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
</properties>
<mandatory-aspects>
<aspect>app:filenamepattern</aspect>
</mandatory-aspects>
</type>
<type name="app:workflowdefaults">
<title>Workflow Defaults</title>
<parent>sys:base</parent>
<properties>
<property name="app:workflowname">
<type>d:text</type>
<mandatory>true</mandatory>
</property>
<property name="app:defaults">
<type>d:content</type>
<mandatory>false</mandatory>
<index enabled="false" />
</property>
</properties>
</type>
<type name="app:webworkflowdefaults">
<title>Web Workflow Defaults</title>
<parent>app:workflowdefaults</parent>
<mandatory-aspects>
<aspect>app:filenamepattern</aspect>
</mandatory-aspects>
</type>
</types> </types>
<aspects> <aspects>
@@ -280,15 +137,6 @@
</properties> </properties>
</aspect> </aspect>
<aspect name="app:filenamepattern">
<title>Filename Pattern</title>
<properties>
<property name="app:filenamepattern">
<type>d:text</type>
</property>
</properties>
</aspect>
</aspects> </aspects>
</model> </model>

309
config/alfresco/model/wcmAppModel.xml Normal file
View File

@@ -0,0 +1,309 @@
<model name="wca:applicationmodel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
<description>Alfresco WCM Application Model</description>
<author>Alfresco</author>
<published>2006-11-27</published>
<version>1.0</version>
<imports>
<import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
<import uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
<import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
<import uri="http://www.alfresco.org/model/wcmmodel/1.0" prefix="wcm"/>
</imports>
<namespaces>
<namespace uri="http://www.alfresco.org/model/wcmappmodel/1.0" prefix="wca"/>
</namespaces>
<types>
<type name="wca:webfolder">
<title>AVM Website Folder</title>
<parent>wcm:avmfolder</parent>
<properties>
<!-- root name of the avm staging stores for this web folder -->
<property name="wca:avmstore">
<title>AVM Store Root</title>
<type>d:text</type>
</property>
<property name="wca:defaultwebapp">
<title>Default Webapp</title>
<type>d:text</type>
</property>
</properties>
<associations>
<child-association name="wca:webuser">
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>wca:webuser</class>
<mandatory>false</mandatory>
<many>true</many>
</target>
</child-association>
<child-association name="wca:webform">
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>wca:webform</class>
<mandatory>false</mandatory>
<many>true</many>
</target>
</child-association>
<child-association name="wca:webworkflowdefaults">
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>wca:webworkflowdefaults</class>
<mandatory>false</mandatory>
<many>true</many>
</target>
</child-association>
</associations>
</type>
<type name="wca:webuser">
<title>Website User Information</title>
<parent>sys:base</parent>
<properties>
<property name="wca:username">
<type>d:text</type>
<mandatory>true</mandatory>
</property>
<property name="wca:role">
<type>d:text</type>
<mandatory>true</mandatory>
</property>
</properties>
</type>
<type name="wca:webform">
<title>Website Web Form</title>
<parent>sys:base</parent>
<properties>
<property name="wca:formname">
<type>d:text</type>
<mandatory>true</mandatory>
</property>
</properties>
<associations>
<child-association name="wca:webformtemplate">
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>wca:webformtemplate</class>
<mandatory>false</mandatory>
<many>true</many>
</target>
</child-association>
<child-association name="wca:workflowdefaults">
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>wca:workflowdefaults</class>
<mandatory>false</mandatory>
<many>false</many>
</target>
</child-association>
</associations>
<mandatory-aspects>
<aspect>cm:titled</aspect>
<aspect>wca:filenamepattern</aspect>
</mandatory-aspects>
</type>
<type name="wca:webformtemplate">
<title>Website Web Form Template</title>
<parent>sys:base</parent>
<properties>
<property name="wca:engine">
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
</properties>
<mandatory-aspects>
<aspect>wca:filenamepattern</aspect>
</mandatory-aspects>
</type>
<type name="wca:workflowdefaults">
<title>Workflow Defaults</title>
<parent>sys:base</parent>
<properties>
<property name="wca:workflowname">
<type>d:text</type>
<mandatory>true</mandatory>
</property>
<property name="wca:defaults">
<type>d:content</type>
<mandatory>false</mandatory>
<index enabled="false" />
</property>
</properties>
</type>
<type name="wca:webworkflowdefaults">
<title>Web Workflow Defaults</title>
<parent>wca:workflowdefaults</parent>
<mandatory-aspects>
<aspect>wca:filenamepattern</aspect>
</mandatory-aspects>
</type>
<type name="wca:renditionproperties">
<title>Properties for renditions</title>
<parent>sys:base</parent>
<properties>
<property name="wca:outputpathpatternrendition">
<title>Type</title>
<type>d:text</type>
<mandatory>true</mandatory>
</property>
<property name="wca:mimetypeforrendition">
<title>Mimetype for generated assets</title>
<type>d:text</type>
<mandatory>true</mandatory>
</property>
</properties>
</type>
</types>
<aspects>
<aspect name="wca:filenamepattern">
<title>Filename Pattern</title>
<properties>
<property name="wca:filenamepattern">
<type>d:text</type>
</property>
</properties>
</aspect>
<!-- An XForms capture form aspect. -->
<aspect name="wca:form">
<title>XForms Form</title>
<properties>
<property name="wca:xmlschemarootelementname">
<title>Schema Root Element Name</title>
<type>d:text</type>
<mandatory>true</mandatory>
</property>
<property name="wca:xmlschema">
<title>Schema</title>
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
<property name="wca:outputpathpatternforminstancedata">
<title>Output path pattern for form instance data</title>
<type>d:text</type>
<mandatory>true</mandatory>
</property>
<property name="wca:defaultworkflowid">
<title>Default Workflow ID</title>
<type>d:text</type>
<mandatory>false</mandatory>
</property>
</properties>
<associations>
<association name="wca:renderingenginetemplates">
<title>Form Data Renderers</title>
<source>
<role>wca:capture</role>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>wca:renderingenginetemplate</class>
<role>wca:presentation</role>
<mandatory>false</mandatory>
<many>true</many>
</target>
</association>
</associations>
</aspect>
<!-- An XML to something else transformer. -->
<aspect name="wca:renderingenginetemplate">
<title>A Rendering Engine</title>
<properties>
<property name="wca:parentrendereringenginename">
<title>Type</title>
<type>d:text</type>
<mandatory>true</mandatory>
</property>
<property name="wca:formsource">
<title>Form Source</title>
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
</properties>
<associations>
<child-association name="wca:renditionproperties">
<title>Rendition Properties</title>
<source>
<role>wca:capture</role>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>wca:renditionproperties</class>
<mandatory>false</mandatory>
<many>true</many>
</target>
</child-association>
</associations>
</aspect>
<aspect name="wca:forminstancedata">
<title>XML file generated by a form</title>
<properties>
<property name="wca:parentform">
<title>Form that generated this asset</title>
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
<property name="wca:parentformname">
<title>Form that generated this asset</title>
<type>d:text</type>
<mandatory>true</mandatory>
</property>
</properties>
</aspect>
<aspect name="wca:rendition">
<title>XML file generated by a form</title>
<properties>
<property name="wca:parentrenderingenginetemplate">
<title>Form data renderer that generated this asset</title>
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
<property name="wca:parentrenditionproperties">
<title>Rendition properties used for this rendition</title>
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
<property name="wca:primaryforminstancedata">
<title>Primary XML Asset used to generate this asset</title>
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
</properties>
</aspect>
</aspects>
</model>

130
config/alfresco/model/wcmModel.xml
View File

@@ -62,136 +62,6 @@
</properties> </properties>
</type> </type>
<type name="wcm:renditionproperties">
<title>Properties for renditions</title>
<parent>sys:base</parent>
<properties>
<property name="wcm:outputpathpatternforrendition">
<title>Type</title>
<type>d:text</type>
<mandatory>true</mandatory>
</property>
<property name="wcm:mimetypeforrendition">
<title>Mimetype for generated assets</title>
<type>d:text</type>
<mandatory>true</mandatory>
</property>
</properties>
</type>
</types> </types>
<aspects>
<!-- An XForms capture form aspect. -->
<aspect name="wcm:form">
<title>XForms Form</title>
<properties>
<property name="wcm:xmlschemarootelementname">
<title>Schema Root Element Name</title>
<type>d:text</type>
<mandatory>true</mandatory>
</property>
<property name="wcm:xmlschema">
<title>Schema</title>
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
<property name="wcm:outputpathpatternforforminstancedata">
<title>Output path pattern for form instance data</title>
<type>d:text</type>
<mandatory>true</mandatory>
</property>
<property name="wcm:defaultworkflowid">
<title>Default Workflow ID</title>
<type>d:text</type>
<mandatory>false</mandatory>
</property>
</properties>
<associations>
<association name="wcm:renderingenginetemplates">
<title>Form Data Renderers</title>
<source>
<role>wcm:capture</role>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>wcm:renderingenginetemplate</class>
<role>wcm:presentation</role>
<mandatory>false</mandatory>
<many>true</many>
</target>
</association>
</associations>
</aspect>
<!-- An XML to something else transformer. -->
<aspect name="wcm:renderingenginetemplate">
<title>A Rendering Engine</title>
<properties>
<property name="wcm:parentrendereringenginename">
<title>Type</title>
<type>d:text</type>
<mandatory>true</mandatory>
</property>
<property name="wcm:formsource">
<title>Form Source</title>
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
</properties>
<associations>
<child-association name="wcm:renditionproperties">
<title>Rendition Properties</title>
<source>
<role>wcm:capture</role>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>wcm:renditionproperties</class>
<mandatory>false</mandatory>
<many>true</many>
</target>
</child-association>
</associations>
</aspect>
<aspect name="wcm:forminstancedata">
<title>XML file generated by a form</title>
<properties>
<property name="wcm:parentform">
<title>Form that generated this asset</title>
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
<property name="wcm:parentformname">
<title>Form that generated this asset</title>
<type>d:text</type>
<mandatory>true</mandatory>
</property>
</properties>
</aspect>
<aspect name="wcm:rendition">
<title>XML file generated by a form</title>
<properties>
<property name="wcm:parentrenderingenginetemplate">
<title>Form data renderer that generated this asset</title>
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
<property name="wcm:parentrenditionproperties">
<title>Rendition properties used for this rendition</title>
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
<property name="wcm:primaryforminstancedata">
<title>Primary XML Asset used to generate this asset</title>
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
</properties>
</aspect>
</aspects>
</model> </model>

56
source/java/org/alfresco/model/ApplicationModel.java Normal file
View File

@@ -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");
}

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

@@ -154,8 +154,6 @@ public interface ContentModel
static final QName PROP_HOME_FOLDER_PROVIDER = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "homeFolderProvider"); 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"); static final QName PROP_DEFAULT_HOME_FOLDER_PATH = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "defaultHomeFolderPath");
// Ownable aspect // Ownable aspect
static final QName ASPECT_OWNABLE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "ownable"); static final QName ASPECT_OWNABLE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "ownable");
static final QName PROP_OWNER = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "owner"); static final QName PROP_OWNER = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "owner");
@@ -165,107 +163,38 @@ public interface ContentModel
static final QName PROP_TEMPLATE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "template"); static final QName PROP_TEMPLATE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "template");
// Dictionary model // Dictionary model
public static final QName TYPE_DICTIONARY_MODEL = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "dictionaryModel"); 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"); 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"); 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"); 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"); 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"); 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 PROP_MODEL_ACTIVE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "modelActive");
// referencing aspect // referencing aspect
public static final QName ASPECT_REFERENCING = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "referencing"); 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 ASSOC_REFERENCES = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "references");
// link object // link object
public static final QName TYPE_LINK = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "link"); 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 PROP_LINK_DESTINATION = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "destination");
// email aspect // email aspect
public static final QName ASPECT_MAILED = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "emailed"); 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"); 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"); 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"); 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"); 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 PROP_SUBJECT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "subjectline");
// countable aspect // countable aspect
public static final QName ASPECT_COUNTABLE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "countable"); 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"); 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 PROP_COUNTER = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "counter");
// References Node Aspect. // References Node Aspect.
public static final QName ASPECT_REFERENCES_NODE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "referencesnode"); 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 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");
// //

18
source/java/org/alfresco/model/ForumModel.java
View File

@@ -16,11 +16,14 @@
*/ */
package org.alfresco.model; package org.alfresco.model;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
/** /**
* Forums Model Constants * Forums Model Constants
*
* @author gavinc
*/ */
public interface ForumModel public interface ForumModel
{ {
@@ -28,15 +31,12 @@ public interface ForumModel
// Forums Model Definitions // Forums Model Definitions
// //
static final String FORUMS_MODEL_URI = "http://www.alfresco.org/model/forum/1.0"; static final QName TYPE_FORUMS = QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "forums");
static final String FORUMS_MODEL_PREFIX = "fm"; 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 TYPE_FORUMS = QName.createQName(FORUMS_MODEL_URI, "forums"); static final QName ASPECT_DISCUSSABLE = QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "discussable");
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 ASPECT_DISCUSSABLE = QName.createQName(FORUMS_MODEL_URI, "discussable"); static final QName ASSOC_DISCUSSION = QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "discussion");
static final QName ASSOC_DISCUSSION = QName.createQName(FORUMS_MODEL_URI, "discussion");
} }

88
source/java/org/alfresco/model/WCMAppModel.java Normal file
View File

@@ -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");
}

43
source/java/org/alfresco/model/WCMModel.java
View File

@@ -26,41 +26,14 @@ import org.alfresco.service.namespace.QName;
public interface WCMModel public interface WCMModel
{ {
// content // content
public static final QName TYPE_AVM_CONTENT = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmcontent"); 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"); 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"); 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 PROP_AVM_FILE_INDIRECTION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmfileindirection");
// folders // folders
public static final QName TYPE_AVM_FOLDER = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmfolder"); 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"); 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"); 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"); 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");
} }

16
source/java/org/alfresco/repo/action/executer/SimpleWorkflowActionExecuter.java
View File

@@ -21,7 +21,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.alfresco.model.ContentModel; import org.alfresco.model.ApplicationModel;
import org.alfresco.repo.action.ParameterDefinitionImpl; import org.alfresco.repo.action.ParameterDefinitionImpl;
import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.action.ParameterDefinition; import org.alfresco.service.cmr.action.ParameterDefinition;
@@ -83,21 +83,21 @@ public class SimpleWorkflowActionExecuter extends ActionExecuterAbstractBase
// Set the property values // Set the property values
Map<QName, Serializable> propertyValues = new HashMap<QName, Serializable>(); Map<QName, Serializable> propertyValues = new HashMap<QName, Serializable>();
propertyValues.put(ContentModel.PROP_APPROVE_STEP, approveStep); propertyValues.put(ApplicationModel.PROP_APPROVE_STEP, approveStep);
propertyValues.put(ContentModel.PROP_APPROVE_FOLDER, approveFolder); propertyValues.put(ApplicationModel.PROP_APPROVE_FOLDER, approveFolder);
if (approveMove != null) 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(ApplicationModel.PROP_REJECT_STEP, rejectStep);
propertyValues.put(ContentModel.PROP_REJECT_FOLDER, rejectFolder); propertyValues.put(ApplicationModel.PROP_REJECT_FOLDER, rejectFolder);
if (rejectMove != null) 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 // 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);
} }
} }
} }

5
source/java/org/alfresco/repo/admin/patch/impl/EmailTemplatesFolderPatch.java
View File

@@ -23,6 +23,7 @@ import java.util.Map;
import java.util.Properties; import java.util.Properties;
import org.alfresco.i18n.I18NUtil; import org.alfresco.i18n.I18NUtil;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.importer.ImporterBootstrap; 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_NAME, emailTemplatesName);
properties.put(ContentModel.PROP_TITLE, emailTemplatesName); properties.put(ContentModel.PROP_TITLE, emailTemplatesName);
properties.put(ContentModel.PROP_DESCRIPTION, emailTemplatesDescription); properties.put(ContentModel.PROP_DESCRIPTION, emailTemplatesDescription);
properties.put(ContentModel.PROP_ICON, PROPERTY_ICON); properties.put(ApplicationModel.PROP_ICON, PROPERTY_ICON);
// create the node // create the node
ChildAssociationRef childAssocRef = nodeService.createNode( ChildAssociationRef childAssocRef = nodeService.createNode(
@@ -232,6 +233,6 @@ public class EmailTemplatesFolderPatch extends AbstractPatch
emailTemplatesFolderNodeRef = childAssocRef.getChildRef(); emailTemplatesFolderNodeRef = childAssocRef.getChildRef();
// add the required aspects // add the required aspects
nodeService.addAspect(emailTemplatesFolderNodeRef, ContentModel.ASPECT_UIFACETS, null); nodeService.addAspect(emailTemplatesFolderNodeRef, ApplicationModel.ASPECT_UIFACETS, null);
} }
} }

6
source/java/org/alfresco/repo/admin/patch/impl/ForumsIconsPatch.java
View File

@@ -3,7 +3,7 @@ package org.alfresco.repo.admin.patch.impl;
import java.io.Serializable; import java.io.Serializable;
import org.alfresco.i18n.I18NUtil; import org.alfresco.i18n.I18NUtil;
import org.alfresco.model.ContentModel; import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ForumModel; import org.alfresco.model.ForumModel;
import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.importer.ImporterBootstrap; import org.alfresco.repo.importer.ImporterBootstrap;
@@ -71,14 +71,14 @@ public class ForumsIconsPatch extends AbstractPatch
{ {
if (this.nodeService.exists(node)) 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) if (icon != null && icon.length() > 0)
{ {
int idx = icon.indexOf("_large"); int idx = icon.indexOf("_large");
if (idx != -1) if (idx != -1)
{ {
String newIcon = icon.substring(0, idx); 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++; changed++;
} }
} }

5
source/java/org/alfresco/repo/admin/patch/impl/GuestUserPatch.java
View File

@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Properties; import java.util.Properties;
import org.alfresco.i18n.I18NUtil; import org.alfresco.i18n.I18NUtil;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.importer.ImporterBootstrap; 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_NAME, guestHomeName);
properties.put(ContentModel.PROP_TITLE, guestHomeName); properties.put(ContentModel.PROP_TITLE, guestHomeName);
properties.put(ContentModel.PROP_DESCRIPTION, guestHomeDescription); 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, ChildAssociationRef childAssocRef = nodeService.createNode(companyHomeRef, ContentModel.ASSOC_CONTAINS,
QName.createQName(guestHomeChildName, namespaceService), ContentModel.TYPE_FOLDER, properties); QName.createQName(guestHomeChildName, namespaceService), ContentModel.TYPE_FOLDER, properties);
NodeRef nodeRef = childAssocRef.getChildRef(); NodeRef nodeRef = childAssocRef.getChildRef();
// add the required aspects // add the required aspects
nodeService.addAspect(nodeRef, ContentModel.ASPECT_UIFACETS, null); nodeService.addAspect(nodeRef, ApplicationModel.ASPECT_UIFACETS, null);
setGuestHomePermissions(nodeRef); setGuestHomePermissions(nodeRef);

5
source/java/org/alfresco/repo/admin/patch/impl/RSSTemplatesFolderPatch.java
View File

@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.Properties; import java.util.Properties;
import org.alfresco.i18n.I18NUtil; import org.alfresco.i18n.I18NUtil;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.importer.ACPImportPackageHandler; 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_NAME, folderName);
properties.put(ContentModel.PROP_TITLE, folderName); properties.put(ContentModel.PROP_TITLE, folderName);
properties.put(ContentModel.PROP_DESCRIPTION, folderDescription); properties.put(ContentModel.PROP_DESCRIPTION, folderDescription);
properties.put(ContentModel.PROP_ICON, PROPERTY_ICON); properties.put(ApplicationModel.PROP_ICON, PROPERTY_ICON);
// create the node // create the node
ChildAssociationRef childAssocRef = nodeService.createNode( ChildAssociationRef childAssocRef = nodeService.createNode(
@@ -292,7 +293,7 @@ public class RSSTemplatesFolderPatch extends AbstractPatch
this.rssFolderNodeRef = childAssocRef.getChildRef(); this.rssFolderNodeRef = childAssocRef.getChildRef();
// finally add the required aspects // finally add the required aspects
nodeService.addAspect(rssFolderNodeRef, ContentModel.ASPECT_UIFACETS, null); nodeService.addAspect(rssFolderNodeRef, ApplicationModel.ASPECT_UIFACETS, null);
} }
private void importContent() throws IOException private void importContent() throws IOException

5
source/java/org/alfresco/repo/admin/patch/impl/SavedSearchFolderPatch.java
View File

@@ -23,6 +23,7 @@ import java.util.Map;
import java.util.Properties; import java.util.Properties;
import org.alfresco.i18n.I18NUtil; import org.alfresco.i18n.I18NUtil;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.importer.ImporterBootstrap; 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_NAME, savedSearchesName);
properties.put(ContentModel.PROP_TITLE, savedSearchesName); properties.put(ContentModel.PROP_TITLE, savedSearchesName);
properties.put(ContentModel.PROP_DESCRIPTION, savedSearchesDescription); properties.put(ContentModel.PROP_DESCRIPTION, savedSearchesDescription);
properties.put(ContentModel.PROP_ICON, PROPERTY_ICON); properties.put(ApplicationModel.PROP_ICON, PROPERTY_ICON);
// create the node // create the node
ChildAssociationRef childAssocRef = nodeService.createNode( ChildAssociationRef childAssocRef = nodeService.createNode(
dictionaryNodeRef, dictionaryNodeRef,
@@ -244,7 +245,7 @@ public class SavedSearchFolderPatch extends AbstractPatch
properties); properties);
savedSearchesFolderNodeRef = childAssocRef.getChildRef(); savedSearchesFolderNodeRef = childAssocRef.getChildRef();
// add the required aspects // add the required aspects
nodeService.addAspect(savedSearchesFolderNodeRef, ContentModel.ASPECT_UIFACETS, null); nodeService.addAspect(savedSearchesFolderNodeRef, ApplicationModel.ASPECT_UIFACETS, null);
// done // done
} }

5
source/java/org/alfresco/repo/admin/patch/impl/ScriptsFolderPatch.java
View File

@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.Properties; import java.util.Properties;
import org.alfresco.i18n.I18NUtil; import org.alfresco.i18n.I18NUtil;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.importer.ACPImportPackageHandler; 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_NAME, folderName);
properties.put(ContentModel.PROP_TITLE, folderName); properties.put(ContentModel.PROP_TITLE, folderName);
properties.put(ContentModel.PROP_DESCRIPTION, folderDescription); properties.put(ContentModel.PROP_DESCRIPTION, folderDescription);
properties.put(ContentModel.PROP_ICON, PROPERTY_ICON); properties.put(ApplicationModel.PROP_ICON, PROPERTY_ICON);
// create the node // create the node
ChildAssociationRef childAssocRef = nodeService.createNode( ChildAssociationRef childAssocRef = nodeService.createNode(
@@ -278,7 +279,7 @@ public class ScriptsFolderPatch extends AbstractPatch
scriptsFolderNodeRef = childAssocRef.getChildRef(); scriptsFolderNodeRef = childAssocRef.getChildRef();
// finally add the required aspects // finally add the required aspects
nodeService.addAspect(scriptsFolderNodeRef, ContentModel.ASPECT_UIFACETS, null); nodeService.addAspect(scriptsFolderNodeRef, ApplicationModel.ASPECT_UIFACETS, null);
} }
private void importContent() throws IOException private void importContent() throws IOException

8
source/java/org/alfresco/repo/admin/patch/impl/UIFacetsAspectRemovalPatch.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Properties; import java.util.Properties;
import org.alfresco.i18n.I18NUtil; 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.admin.patch.AbstractPatch;
import org.alfresco.repo.importer.ACPImportPackageHandler; import org.alfresco.repo.importer.ACPImportPackageHandler;
import org.alfresco.repo.importer.ImporterBootstrap; import org.alfresco.repo.importer.ImporterBootstrap;
@@ -124,10 +124,10 @@ public class UIFacetsAspectRemovalPatch extends AbstractPatch
for (NodeRef ref : nodeRefs) for (NodeRef ref : nodeRefs)
{ {
// if the content has the uifacets aspect, then remove it and meaningless icon reference // 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.removeAspect(ref, ApplicationModel.ASPECT_UIFACETS);
nodeService.setProperty(ref, ContentModel.PROP_ICON, null); nodeService.setProperty(ref, ApplicationModel.PROP_ICON, null);
updated++; updated++;
} }
} }

14
source/java/org/alfresco/repo/configuration/ConfigurableServiceImpl.java
View File

@@ -18,7 +18,7 @@ package org.alfresco.repo.configuration;
import java.util.List; 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.ChildAssociationRef;
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;
@@ -38,7 +38,7 @@ public class ConfigurableServiceImpl implements ConfigurableService
public boolean isConfigurable(NodeRef nodeRef) 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) public void makeConfigurable(NodeRef nodeRef)
@@ -46,14 +46,14 @@ public class ConfigurableServiceImpl implements ConfigurableService
if (isConfigurable(nodeRef) == false) if (isConfigurable(nodeRef) == false)
{ {
// First apply the aspect // 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 // Next create and add the configurations folder
this.nodeService.createNode( this.nodeService.createNode(
nodeRef, nodeRef,
ContentModel.ASSOC_CONFIGURATIONS, ApplicationModel.ASSOC_CONFIGURATIONS,
ContentModel.ASSOC_CONFIGURATIONS, ApplicationModel.ASSOC_CONFIGURATIONS,
ContentModel.TYPE_CONFIGURATIONS); ApplicationModel.TYPE_CONFIGURATIONS);
} }
} }
@@ -65,7 +65,7 @@ public class ConfigurableServiceImpl implements ConfigurableService
List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs( List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs(
nodeRef, nodeRef,
RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL,
ContentModel.ASSOC_CONFIGURATIONS); ApplicationModel.ASSOC_CONFIGURATIONS);
if (assocs.size() != 0) if (assocs.size() != 0)
{ {
ChildAssociationRef assoc = assocs.get(0); ChildAssociationRef assoc = assocs.get(0);

5
source/java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java
View File

@@ -18,6 +18,7 @@ package org.alfresco.repo.configuration;
import java.util.List; import java.util.List;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.service.ServiceRegistry; import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -79,11 +80,11 @@ public class ConfigurableServiceImplTest extends BaseSpringTest
public void testMakeConfigurable() public void testMakeConfigurable()
{ {
this.configurableService.makeConfigurable(this.nodeRef); this.configurableService.makeConfigurable(this.nodeRef);
assertTrue(this.nodeService.hasAspect(this.nodeRef, ContentModel.ASPECT_CONFIGURABLE)); assertTrue(this.nodeService.hasAspect(this.nodeRef, ApplicationModel.ASPECT_CONFIGURABLE));
List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs( List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs(
this.nodeRef, this.nodeRef,
RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL,
ContentModel.ASSOC_CONFIGURATIONS); ApplicationModel.ASSOC_CONFIGURATIONS);
assertNotNull(assocs); assertNotNull(assocs);
assertEquals(1, assocs.size()); assertEquals(1, assocs.size());
} }

3
source/java/org/alfresco/repo/copy/CopyServiceImpl.java
View File

@@ -26,6 +26,7 @@ import java.util.Set;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.i18n.I18NUtil; import org.alfresco.i18n.I18NUtil;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.policy.ClassPolicyDelegate; import org.alfresco.repo.policy.ClassPolicyDelegate;
import org.alfresco.repo.policy.JavaBehaviour; import org.alfresco.repo.policy.JavaBehaviour;
@@ -826,7 +827,7 @@ public class CopyServiceImpl implements CopyService
QName childType = this.nodeService.getType(childRef); QName childType = this.nodeService.getType(childRef);
// TODO will need to remove this reference to the configurations association // 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) copyDetails.isChildAssociationRefAlwaysTraversed(classRef, childAssoc) == true)
{ {
if (copiedChildren.containsKey(childRef) == false) if (copiedChildren.containsKey(childRef) == false)

7
source/java/org/alfresco/repo/forum/DiscussableAspect.java
View File

@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.alfresco.i18n.I18NUtil; import org.alfresco.i18n.I18NUtil;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.model.ForumModel; import org.alfresco.model.ForumModel;
import org.alfresco.repo.policy.JavaBehaviour; import org.alfresco.repo.policy.JavaBehaviour;
@@ -240,15 +241,15 @@ public class DiscussableAspect
ChildAssociationRef childRef = this.nodeService.createNode(destNodeRef, ChildAssociationRef childRef = this.nodeService.createNode(destNodeRef,
ForumModel.ASSOC_DISCUSSION, ForumModel.ASSOC_DISCUSSION,
QName.createQName(ForumModel.FORUMS_MODEL_URI, "discussion"), QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "discussion"),
ForumModel.TYPE_FORUM, forumProps); ForumModel.TYPE_FORUM, forumProps);
destinationForum = childRef.getChildRef(); destinationForum = childRef.getChildRef();
// apply the uifacets aspect // apply the uifacets aspect
Map<QName, Serializable> uiFacetsProps = new HashMap<QName, Serializable>(5); Map<QName, Serializable> uiFacetsProps = new HashMap<QName, Serializable>(5);
uiFacetsProps.put(ContentModel.PROP_ICON, "forum"); uiFacetsProps.put(ApplicationModel.PROP_ICON, "forum");
this.nodeService.addAspect(destinationForum, ContentModel.ASPECT_UIFACETS, uiFacetsProps); this.nodeService.addAspect(destinationForum, ApplicationModel.ASPECT_UIFACETS, uiFacetsProps);
} }
return destinationForum; return destinationForum;

5
source/java/org/alfresco/repo/importer/FileImporterImpl.java
View File

@@ -25,6 +25,7 @@ import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.transaction.TransactionUtil; import org.alfresco.repo.transaction.TransactionUtil;
import org.alfresco.repo.transaction.TransactionUtil.TransactionWork; 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 // apply the uifacets aspect - icon, title and description props
Map<QName, Serializable> uiFacetsProps = new HashMap<QName, Serializable>(5); Map<QName, Serializable> uiFacetsProps = new HashMap<QName, Serializable>(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_TITLE, name);
uiFacetsProps.put(ContentModel.PROP_DESCRIPTION, path); 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()) if (logger.isDebugEnabled())
logger.debug("Added uifacets aspect with properties: " + uiFacetsProps); logger.debug("Added uifacets aspect with properties: " + uiFacetsProps);

35
source/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java
View File

@@ -27,6 +27,7 @@ import javax.transaction.UserTransaction;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.action.ActionServiceImplTest; import org.alfresco.repo.action.ActionServiceImplTest;
import org.alfresco.repo.action.ActionServiceImplTest.AsyncTest; import org.alfresco.repo.action.ActionServiceImplTest.AsyncTest;
@@ -318,9 +319,9 @@ public class RuleServiceCoverageTest extends TestCase
assertTrue(this.nodeService.hasAspect(newNodeRef, ContentModel.ASPECT_VERSIONABLE)); assertTrue(this.nodeService.hasAspect(newNodeRef, ContentModel.ASPECT_VERSIONABLE));
Map<String, Serializable> params2 = new HashMap<String, Serializable>(2); Map<String, Serializable> params2 = new HashMap<String, Serializable>(2);
params2.put(AddFeaturesActionExecuter.PARAM_ASPECT_NAME, ContentModel.ASPECT_SIMPLE_WORKFLOW); params2.put(AddFeaturesActionExecuter.PARAM_ASPECT_NAME, ApplicationModel.ASPECT_SIMPLE_WORKFLOW);
params2.put(ContentModel.PROP_APPROVE_STEP.toString(), "approveStep"); params2.put(ApplicationModel.PROP_APPROVE_STEP.toString(), "approveStep");
params2.put(ContentModel.PROP_APPROVE_MOVE.toString(), false); params2.put(ApplicationModel.PROP_APPROVE_MOVE.toString(), false);
// Test that rule can be updated and execute correctly // Test that rule can be updated and execute correctly
//rule.removeAllActions(); //rule.removeAllActions();
@@ -335,9 +336,9 @@ public class RuleServiceCoverageTest extends TestCase
ContentModel.TYPE_CONTENT, ContentModel.TYPE_CONTENT,
getContentProperties()).getChildRef(); getContentProperties()).getChildRef();
addContentToNode(newNodeRef2); addContentToNode(newNodeRef2);
assertTrue(this.nodeService.hasAspect(newNodeRef2, ContentModel.ASPECT_SIMPLE_WORKFLOW)); assertTrue(this.nodeService.hasAspect(newNodeRef2, ApplicationModel.ASPECT_SIMPLE_WORKFLOW));
assertEquals("approveStep", this.nodeService.getProperty(newNodeRef2, ContentModel.PROP_APPROVE_STEP)); assertEquals("approveStep", this.nodeService.getProperty(newNodeRef2, ApplicationModel.PROP_APPROVE_STEP));
assertEquals(false, this.nodeService.getProperty(newNodeRef2, ContentModel.PROP_APPROVE_MOVE)); assertEquals(false, this.nodeService.getProperty(newNodeRef2, ApplicationModel.PROP_APPROVE_MOVE));
// System.out.println(NodeStoreInspector.dumpNodeStore(this.nodeService, this.testStoreRef)); // System.out.println(NodeStoreInspector.dumpNodeStore(this.nodeService, this.testStoreRef));
} }
@@ -345,7 +346,7 @@ public class RuleServiceCoverageTest extends TestCase
public void testDisableIndividualRules() public void testDisableIndividualRules()
{ {
Map<String, Serializable> params = new HashMap<String, Serializable>(1); Map<String, Serializable> params = new HashMap<String, Serializable>(1);
params.put("aspect-name", ContentModel.ASPECT_CONFIGURABLE); params.put("aspect-name", ApplicationModel.ASPECT_CONFIGURABLE);
Rule rule = createRule( Rule rule = createRule(
RuleType.INBOUND, RuleType.INBOUND,
@@ -364,7 +365,7 @@ public class RuleServiceCoverageTest extends TestCase
ContentModel.TYPE_CONTENT, ContentModel.TYPE_CONTENT,
getContentProperties()).getChildRef(); getContentProperties()).getChildRef();
addContentToNode(newNodeRef); 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()); Rule rule2 = this.ruleService.getRule(rule.getNodeRef());
rule2.setRuleDisabled(false); rule2.setRuleDisabled(false);
@@ -378,7 +379,7 @@ public class RuleServiceCoverageTest extends TestCase
ContentModel.TYPE_CONTENT, ContentModel.TYPE_CONTENT,
getContentProperties()).getChildRef(); getContentProperties()).getChildRef();
addContentToNode(newNodeRef2); 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(); getContentProperties()).getChildRef();
addContentToNode(newNodeRef); addContentToNode(newNodeRef);
assertTrue(this.nodeService.hasAspect(newNodeRef, ContentModel.ASPECT_SIMPLE_WORKFLOW)); assertTrue(this.nodeService.hasAspect(newNodeRef, ApplicationModel.ASPECT_SIMPLE_WORKFLOW));
assertEquals("approveStep", this.nodeService.getProperty(newNodeRef, ContentModel.PROP_APPROVE_STEP)); assertEquals("approveStep", this.nodeService.getProperty(newNodeRef, ApplicationModel.PROP_APPROVE_STEP));
assertEquals(this.rootNodeRef, this.nodeService.getProperty(newNodeRef, ContentModel.PROP_APPROVE_FOLDER)); assertEquals(this.rootNodeRef, this.nodeService.getProperty(newNodeRef, ApplicationModel.PROP_APPROVE_FOLDER));
assertTrue(((Boolean)this.nodeService.getProperty(newNodeRef, ContentModel.PROP_APPROVE_MOVE)).booleanValue()); assertTrue(((Boolean)this.nodeService.getProperty(newNodeRef, ApplicationModel.PROP_APPROVE_MOVE)).booleanValue());
assertTrue(this.nodeService.hasAspect(newNodeRef, ContentModel.ASPECT_SIMPLE_WORKFLOW)); assertTrue(this.nodeService.hasAspect(newNodeRef, ApplicationModel.ASPECT_SIMPLE_WORKFLOW));
assertEquals("rejectStep", this.nodeService.getProperty(newNodeRef, ContentModel.PROP_REJECT_STEP)); assertEquals("rejectStep", this.nodeService.getProperty(newNodeRef, ApplicationModel.PROP_REJECT_STEP));
assertEquals(this.rootNodeRef, this.nodeService.getProperty(newNodeRef, ContentModel.PROP_REJECT_FOLDER)); assertEquals(this.rootNodeRef, this.nodeService.getProperty(newNodeRef, ApplicationModel.PROP_REJECT_FOLDER));
assertFalse(((Boolean)this.nodeService.getProperty(newNodeRef, ContentModel.PROP_REJECT_MOVE)).booleanValue()); assertFalse(((Boolean)this.nodeService.getProperty(newNodeRef, ApplicationModel.PROP_REJECT_MOVE)).booleanValue());
// System.out.println(NodeStoreInspector.dumpNodeStore(this.nodeService, this.testStoreRef)); // System.out.println(NodeStoreInspector.dumpNodeStore(this.nodeService, this.testStoreRef));
} }

3
source/java/org/alfresco/repo/version/NodeServiceImplTest.java
View File

@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.AssociationRef;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -241,7 +242,7 @@ public class NodeServiceImplTest extends BaseVersionStoreTest
boolean test1 = this.lightWeightVersionStoreNodeService.hasAspect( boolean test1 = this.lightWeightVersionStoreNodeService.hasAspect(
version.getFrozenStateNodeRef(), version.getFrozenStateNodeRef(),
ContentModel.ASPECT_UIFACETS); ApplicationModel.ASPECT_UIFACETS);
assertFalse(test1); assertFalse(test1);
boolean test2 = this.lightWeightVersionStoreNodeService.hasAspect( boolean test2 = this.lightWeightVersionStoreNodeService.hasAspect(

3
source/java/org/alfresco/repo/version/VersionServiceImplTest.java
View File

@@ -21,6 +21,7 @@ import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Set; import java.util.Set;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.transaction.TransactionUtil; import org.alfresco.repo.transaction.TransactionUtil;
import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentReader;
@@ -250,7 +251,7 @@ public class VersionServiceImplTest extends BaseVersionStoreTest
contentWriter.putContent(UPDATED_CONTENT_1); contentWriter.putContent(UPDATED_CONTENT_1);
// Change the aspects on the node // 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 // Store the node details for later
Set<QName> origAspects2 = this.dbNodeService.getAspects(versionableNode); Set<QName> origAspects2 = this.dbNodeService.getAspects(versionableNode);

56
source/java/org/alfresco/service/namespace/NamespaceService.java
View File

@@ -33,70 +33,82 @@ import org.alfresco.service.PublicService;
public interface NamespaceService extends NamespacePrefixResolver public interface NamespaceService extends NamespacePrefixResolver
{ {
/** Default Namespace URI */ /** Default Namespace URI */
public static final String DEFAULT_URI = ""; static final String DEFAULT_URI = "";
/** Default Namespace Prefix */ /** Default Namespace Prefix */
public static final String DEFAULT_PREFIX = ""; static final String DEFAULT_PREFIX = "";
/** Default Alfresco URI */ /** 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 */ /** Default Alfresco Prefix */
public static final String ALFRESCO_PREFIX = "alf"; static final String ALFRESCO_PREFIX = "alf";
/** Dictionary Model URI */ /** 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 */ /** Dictionary Model Prefix */
public static final String DICTIONARY_MODEL_PREFIX = "d"; static final String DICTIONARY_MODEL_PREFIX = "d";
/** System Model URI */ /** 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 */ /** System Model Prefix */
public static final String SYSTEM_MODEL_PREFIX = "sys"; static final String SYSTEM_MODEL_PREFIX = "sys";
/** Content Model URI */ /** 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 */ /** Content Model Prefix */
public static final String CONTENT_MODEL_PREFIX = "cm"; static final String CONTENT_MODEL_PREFIX = "cm";
/** Application Model URI */ /** 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 */ /** Application Model Prefix */
public static final String APP_MODEL_PREFIX = "app"; static final String APP_MODEL_PREFIX = "app";
/** Business Process Model URI */ /** 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 */ /** Business Process Model Prefix */
public static final String BPM_MODEL_PREFIX = "bpm"; static final String BPM_MODEL_PREFIX = "bpm";
/** Workflow Model URI */ /** 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 */ /** 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 */ /** 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 */ /** Alfresco View Namespace Prefix */
public static final String REPOSITORY_VIEW_PREFIX = "view"; static final String REPOSITORY_VIEW_PREFIX = "view";
/** Alfresco security URI */ /** 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 */ /** Alfresco security Prefix */
public static final String SECURITY_MODEL_PREFIX = "security"; static final String SECURITY_MODEL_PREFIX = "security";
/** Alfresco WCM URI */ /** 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 */ /** 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";
/** /**