From dfd6c10aafe493d5d908a40fec179f8ed22b194d Mon Sep 17 00:00:00 2001
From: Ariel Backenroth <bounce@alfresco.com>
Date: Sun, 31 Dec 2006 08:45:42 +0000
Subject: [PATCH] - moving generic xml parsing utilities out of FormsService
 and into their own class - refactoring to generate and regenerate methods to
 make it easier to use project level overridden properties, and to at some
 point (soon) make it possible to make error handling for rendering engines
 more robust - added a web project object to encapsulate web project
 properties and provide a central location for getting forms and rendering
 engines with web project level overridden properties - made select default
 workflow screen match wireframes - using the same workflowdefault type in the
 wcm model for web projects and forms. - using outputpathpattern aspect
 consistently - using commons.io to parse paths - using form name rather than
 noderef as parameter for selected form from content forms dashlet - fixed bug
 where rendition properties noderef wasn't being properly associated with
 renditions causing problems with regenerate - using multivalued properties to
 track renditions - remove weird registerRendition/registerFormInstanceData
 calls.  no longer necessary since generateRendition and regenerate are done
 within forminstancedata and rendition - adding default workflow parameters as
 property of Form - adding a unique name property to rendering engine
 templates to allow for looking one up by name

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/model/wcmAppModel.xml         | 616 +++++++++---------
 .../java/org/alfresco/model/WCMAppModel.java  |  16 +-
 2 files changed, 323 insertions(+), 309 deletions(-)

diff --git a/config/alfresco/model/wcmAppModel.xml b/config/alfresco/model/wcmAppModel.xml
index bc62ac90b5..39ba9fadde 100644
--- a/config/alfresco/model/wcmAppModel.xml
+++ b/config/alfresco/model/wcmAppModel.xml
@@ -1,312 +1,324 @@
 <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>
+  <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>
+  <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:outputpathpattern</aspect>
+      </mandatory-aspects>
+    </type>
+    
+    <type name="wca:webformtemplate">
+      <title>Website Web Form Template</title>
+      <parent>sys:base</parent>
+      <properties>
+        <property name="wca:baserenderingenginetemplatename">
+          <type>d:text</type>
+          <mandatory>true</mandatory>
+        </property>
+        <property name="wca:baserenderingenginetemplaterenditionproperties">
+          <type>d:noderef</type>
+          <mandatory>true</mandatory>
+        </property>
+      </properties>
+      <mandatory-aspects>
+	<aspect>wca:outputpathpattern</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:workflowdefaultproperties">
+          <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:mimetypeforrendition">
+          <title>Mimetype for generated assets</title>
+          <type>d:text</type>
+          <mandatory>true</mandatory>
+        </property>
+      </properties>
+      <mandatory-aspects>
+	<aspect>wca:outputpathpattern</aspect>
+      </mandatory-aspects>
+    </type>
 
-	</types>
+  </types>
 
-	<aspects>
+  <aspects>
 
-      <aspect name="wca:webapp">
-	<title>Webapp</title>
-      </aspect>
-   
-      <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:webapp">
+      <title>Webapp</title>
+    </aspect>
+    
+    <aspect name="wca:filenamepattern">
+      <title>Filename Pattern</title>
+      <properties>
+        <property name="wca:filenamepattern">
+          <type>d:text</type>
+        </property>
+      </properties>
+    </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:outputpathpattern">
+      <title>Output Path Pattern</title>
+      <properties>
+        <property name="wca:outputpathpattern">
+          <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>
+      </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>
+        <child-association name="wca:formworkflowdefaults">
+          <source>
+            <mandatory>false</mandatory>
+            <many>false</many>
+          </source>
+          <target>
+            <class>wca:workflowdefaults</class>
+            <mandatory>false</mandatory>
+            <many>false</many>
+          </target>
+        </child-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:rendition">
-         <title>Output file generated by a rendering engine template</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:text</type>
-               <mandatory>true</mandatory>
-            </property>
-         </properties>
-      </aspect>
-   </aspects>
+    <aspect name="wca:forminstancedata">
+      <title>XML file generated by a form</title>
+      <properties>
+        <property name="wca:parentformname">
+          <title>Form that generated this asset</title>
+          <type>d:text</type>
+          <mandatory>true</mandatory>
+        </property>
+	<property name="wca:renditions">
+	  <title>Renditions of this form instance data</title>
+	  <type>d:text</type>
+	  <multiple>true</multiple>
+	</property>
+      </properties>
+    </aspect>
+
+    <aspect name="wca:rendition">
+      <title>Output file generated by a rendering engine template</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:text</type>
+          <mandatory>true</mandatory>
+        </property>
+      </properties>
+    </aspect>
+  </aspects>
 
 </model>
diff --git a/source/java/org/alfresco/model/WCMAppModel.java b/source/java/org/alfresco/model/WCMAppModel.java
index a9fcf271df..58f8ad9533 100644
--- a/source/java/org/alfresco/model/WCMAppModel.java
+++ b/source/java/org/alfresco/model/WCMAppModel.java
@@ -45,12 +45,12 @@ public interface WCMAppModel
     
     // 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");
+    static final QName PROP_BASE_RENDERING_ENGINE_TEMPLATE_NAME = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "baserenderingenginetemplatename");
     
     // AVM workflow defaults
-    static final QName TYPE_WORKFLOWDEFAULTS = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "workflowdefaults");
+    static final QName TYPE_WORKFLOW_DEFAULTS = 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");
+    static final QName PROP_WORKFLOW_DEFAULT_PROPERTIES = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "workflowdefaultproperties");
     
     // AVM web workflow defaults
     static final QName TYPE_WEBWORKFLOWDEFAULTS = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "webworkflowdefaults");
@@ -61,14 +61,17 @@ public interface WCMAppModel
     // 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");
+
+    // AVM output path pattern aspect
+    static final QName ASPECT_OUTPUT_PATH_PATTERN = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "outputpathpattern");
+    static final QName PROP_OUTPUT_PATH_PATTERN = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "outputpathpattern");
     
     // 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");
+    static final QName ASSOC_FORM_WORKFLOW_DEFAULTS = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "formworkflowdefaults");
     
     // An XML to something else tranformer aspect.
     static final QName ASPECT_RENDERING_ENGINE_TEMPLATE = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "renderingenginetemplate");
@@ -77,8 +80,8 @@ public interface WCMAppModel
     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 PROP_RENDITIONS = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "renditions");
     
     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");
@@ -86,6 +89,5 @@ public interface WCMAppModel
     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");
 }