Changeset 30

Timestamp:

11/23/10 03:01:19 (15 years ago)

Author:

eparker

Message:

Updated XSD to latest version from newScaffolding branch

Files:

• trunk/website/schema/gesture/ModelGlue.xsd (modified) (4 diffs)

trunk/website/schema/gesture/ModelGlue.xsd

@@ -192 +192 @@
                         </xsd:attribute>
                         
-                        <xsd:attribute name="type" type="xsd:string" use="required">
-                                <xsd:annotation>
-                                        <xsd:documentation><![CDATA[The CFC to use for a controller in the same format that you'd use in a CreateObject() call, such as "myapplication.controller.MyController"]]></xsd:documentation>
+                        <xsd:attribute name="type" type="xsd:string" use="optional">
+                                <xsd:annotation>
+                                        <xsd:documentation><![CDATA[The CFC to use for a controller in the same format that you'd use in a CreateObject() call, such as "myapplication.controller.MyController". Required if not using the 'bean' attribute.]]></xsd:documentation>
                                 </xsd:annotation>
                         </xsd:attribute>
@@ -201 +201 @@
                                 <xsd:annotation>
                                         <xsd:documentation><![CDATA[A bean (or comma delimited list, if more than one) as defined in ColdSpring.xml, that will be accessible to any cffunction in the controller. Replaces the need for getModelGlue().getBean() within controller methods.]]></xsd:documentation>
+                                </xsd:annotation>
+                        </xsd:attribute>
+                        
+                        <xsd:attribute name="bean" type="xsd:string" use="optional">
+                                <xsd:annotation>
+                                        <xsd:documentation><![CDATA[If you wish to define the controller directly in your ColdSpring.xml you can tell ModelGlue the id of it here instead of providing a type.]]></xsd:documentation>
                                 </xsd:annotation>
                         </xsd:attribute>
@@ -415 +421 @@
                 
                 <xsd:complexType>
+                
                         <xsd:sequence>
                         <xsd:choice minOccurs="0" maxOccurs="unbounded">
@@ -421 +428 @@
                                 </xsd:choice>
                         </xsd:sequence>
+
+                        <xsd:attribute name="format" type="xsd:string" use="optional">
+                                <xsd:annotation>
+                                        <xsd:documentation><![CDATA[(Optional) - Specifies what requestFormat this group of views should be rendered for. Defaults to "html".]]></xsd:documentation>
+                                </xsd:annotation>
+                        </xsd:attribute>
                         
                 </xsd:complexType>