. Moved avm specific types from ContentModel (cm) into WCMModel (wcm)

. Updated appropriate AVM and client classes to use new types
. Updated application types to derive from wcm types
NOTE: You will need a new database - this is NOT backward compatible with current websites!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4022 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-10-04 16:39:26 +00:00
parent edea95ec65
commit d03bc33acb
9 changed files with 128 additions and 122 deletions

View File

@@ -417,13 +417,13 @@
<value>alfresco/model/dictionaryModel.xml</value>
<value>alfresco/model/systemModel.xml</value>
<value>alfresco/model/contentModel.xml</value>
<value>alfresco/model/wcmModel.xml</value>
<value>alfresco/model/applicationModel.xml</value>
<value>alfresco/model/forumModel.xml</value>
<value>alfresco/model/recordsModel.xml</value>
<value>alfresco/model/bpmModel.xml</value>
<value>alfresco/model/workflowModel.xml</value>
<value>alfresco/model/wcmModel.xml</value>
<!-- Implementation models -->
<value>org/alfresco/repo/security/authentication/userModel.xml</value>
<value>org/alfresco/repo/action/actionModel.xml</value>

View File

@@ -9,6 +9,7 @@
<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>
@@ -53,7 +54,7 @@
<type name="app:webfolder">
<title>AVM Website Folder</title>
<parent>cm:avmfolder</parent>
<parent>wcm:avmfolder</parent>
<properties>
<!-- root name of the avm staging stores for this web folder -->
<property name="app:avmstore">

View File

@@ -79,29 +79,6 @@
</properties>
</type>
<!-- Consider this an abstract type for most purposes. -->
<type name="cm:avmcontent">
<title>AVM Content</title>
<parent>cm:content</parent>
</type>
<type name="cm:avmplaincontent">
<title>AVM Plain content</title>
<parent>cm:avmcontent</parent>
</type>
<type name="cm:avmlayeredcontent">
<title>AVM Layered Content</title>
<parent>cm:content</parent>
<properties>
<property name="cm:avmfileindirection">
<title>File Layer Indirection</title>
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
</properties>
</type>
<type name="cm:dictionaryModel">
<title>Dictionary Model</title>
<parent>cm:content</parent>
@@ -161,29 +138,6 @@
<parent>cm:folder</parent>
</type>
<!-- Consider this abstract for most purposes. -->
<type name="cm:avmfolder">
<title>AVM Folder</title>
<parent>cm:folder</parent>
</type>
<type name="cm:avmplainfolder">
<title>AVM Plain Folder</title>
<parent>cm:avmfolder</parent>
</type>
<type name="cm:avmlayeredfolder">
<title>AVM Layered Folder</title>
<parent>cm:avmfolder</parent>
<properties>
<property name="cm:avmdirindirection">
<title>Directory Layer Indirection</title>
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
</properties>
</type>
<type name="cm:person">
<title>Person</title>
<parent>sys:base</parent>

View File

@@ -7,6 +7,7 @@
<imports>
<import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
<import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
</imports>
<namespaces>
@@ -14,41 +15,84 @@
</namespaces>
<types>
<!-- Consider this an abstract type for most purposes. -->
<type name="wcm:avmcontent">
<title>AVM Content</title>
<parent>cm:content</parent>
</type>
<type name="wcm:avmplaincontent">
<title>AVM Plain content</title>
<parent>wcm:avmcontent</parent>
</type>
<type name="wcm:avmlayeredcontent">
<title>AVM Layered Content</title>
<parent>cm:content</parent>
<properties>
<property name="wcm:avmfileindirection">
<title>File Layer Indirection</title>
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
</properties>
</type>
<!-- Consider this abstract for most purposes. -->
<type name="wcm:avmfolder">
<title>AVM Folder</title>
<parent>cm:folder</parent>
</type>
<type name="wcm:avmplainfolder">
<title>AVM Plain Folder</title>
<parent>wcm:avmfolder</parent>
</type>
<type name="wcm:avmlayeredfolder">
<title>AVM Layered Folder</title>
<parent>wcm:avmfolder</parent>
<properties>
<property name="wcm:avmdirindirection">
<title>Directory Layer Indirection</title>
<type>d:noderef</type>
<mandatory>true</mandatory>
</property>
</properties>
</type>
</types>
<aspects>
<!-- An XForms capture template aspect. -->
<!-- An XForms capture template aspect. -->
<aspect name="wcm:template">
<title>XForms Template</title>
<properties>
<property name="wcm:schemaroottagname">
<title>Schema Root Tag Name</title>
<type>d:text</type>
<mandatory>true</mandatory>
</property>
</properties>
<associations>
<association name="wcm:templateoutputmethods">
<title>Template Output Methods</title>
<source>
<role>wcm:capture</role>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>wcm:templateoutputmethod</class>
<role>wcm:presentation</role>
<mandatory>false</mandatory>
<many>true</many>
</target>
</association>
</associations>
<title>XForms Template</title>
<properties>
<property name="wcm:schemaroottagname">
<title>Schema Root Tag Name</title>
<type>d:text</type>
<mandatory>true</mandatory>
</property>
</properties>
<associations>
<association name="wcm:templateoutputmethods">
<title>Template Output Methods</title>
<source>
<role>wcm:capture</role>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>wcm:templateoutputmethod</class>
<role>wcm:presentation</role>
<mandatory>false</mandatory>
<many>true</many>
</target>
</association>
</associations>
</aspect>
<!-- An XML to something else transformer. -->
<aspect name="wcm:templateoutputmethod">
<title>XML Transformer</title>
<properties>