- 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

@@ -120,7 +120,7 @@
       </associations>
       <mandatory-aspects>
 	<aspect>cm:titled</aspect>
-				<aspect>wca:filenamepattern</aspect>
+	<aspect>wca:outputpathpattern</aspect>
       </mandatory-aspects>
     </type>
     
@@ -128,13 +128,17 @@
       <title>Website Web Form Template</title>
       <parent>sys:base</parent>
       <properties>
-            <property name="wca:engine">
+        <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:filenamepattern</aspect>
+	<aspect>wca:outputpathpattern</aspect>
       </mandatory-aspects>
     </type>
     
@@ -146,7 +150,7 @@
           <type>d:text</type>
           <mandatory>true</mandatory>
         </property>
-            <property name="wca:defaults">
+        <property name="wca:workflowdefaultproperties">
           <type>d:content</type>
           <mandatory>false</mandatory>
           <index enabled="false" />
@@ -166,17 +170,15 @@
       <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>
+      <mandatory-aspects>
+	<aspect>wca:outputpathpattern</aspect>
+      </mandatory-aspects>
     </type>
 
   </types>
@@ -196,6 +198,15 @@
       </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>
@@ -210,16 +221,6 @@
           <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">
@@ -236,6 +237,17 @@
             <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>
     
@@ -274,16 +286,16 @@
     <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>
+	<property name="wca:renditions">
+	  <title>Renditions of this form instance data</title>
+	  <type>d:text</type>
+	  <multiple>true</multiple>
+	</property>
       </properties>
     </aspect>
 

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");
@@ -62,13 +62,16 @@ public interface WCMAppModel
     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");
 }