You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by am...@apache.org on 2010/01/17 05:49:48 UTC

svn commit: r900052 [9/22] - in /cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/schema/3.0: ./ images/

Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/schema/3.0/modelMap17.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/schema/3.0/modelMap17.html?rev=900052&r1=900051&r2=900052&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/schema/3.0/modelMap17.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/schema/3.0/modelMap17.html Sun Jan 17 04:49:44 2010
@@ -3,41 +3,43 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:procedure</title>
+      <title>Schema documentation for component cay:query</title>
       <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
          <!--
-        var propertiesBoxes= new Array('properties_id11', 
-				'properties_id12', 
-				'properties_id13', 
-				'properties_id14', 
-				'properties_id15', 
-				'properties_id16', 
-				'properties_id17');
+        var propertiesBoxes= new Array('properties_id101', 
+				'properties_id105', 
+				'properties_id109', 
+				'properties_id110', 
+				'properties_id111', 
+				'properties_id112', 
+				'properties_id113', 
+				'properties_id114');
 
         
-        var usedByBoxes= new Array('usedBy_id11', 
-				'usedBy_id13', 
-				'usedBy_id14', 
-				'usedBy_id15', 
-				'usedBy_id16', 
-				'usedBy_id17');
+        var usedByBoxes= new Array('usedBy_id101', 
+				'usedBy_id110', 
+				'usedBy_id111', 
+				'usedBy_id112', 
+				'usedBy_id113', 
+				'usedBy_id114');
 
-        var sourceBoxes= new Array('source_id11', 
-				'source_id12', 
-				'source_id13', 
-				'source_id14', 
-				'source_id15', 
-				'source_id16', 
-				'source_id17');
+        var sourceBoxes= new Array('source_id101', 
+				'source_id105', 
+				'source_id109', 
+				'source_id110', 
+				'source_id111', 
+				'source_id112', 
+				'source_id113', 
+				'source_id114');
 
-        var instanceBoxes= new Array('instance_id11');
+        var instanceBoxes= new Array('instance_id101');
 
-        var diagramBoxes= new Array('diagram_id11', 
-				'diagram_id12');
+        var diagramBoxes= new Array('diagram_id101', 
+				'diagram_id105', 
+				'diagram_id109');
 
         
-        var attributesBoxes= new Array('attributes_id11', 
-				'attributes_id12');
+        var attributesBoxes= new Array('attributes_id101');
 
         
         var button_prefix = 'button_';
@@ -314,7 +316,7 @@
                <td class="rt_cornerBottomRight"></td>
             </tr>
          </table>
-      </div><a id="id11"></a><div class="componentTitle">Element <span class="qname">cay:procedure</span></div>
+      </div><a id="id101"></a><div class="componentTitle">Element <span class="qname">cay:query</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -333,27 +335,44 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id11" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id11');"
+                           <div class="floatRight"><input id="button_diagram_id101" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id101');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id11" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html27.jpeg"
-                                   usemap="#modelMap_46_html27" /><map name="modelMap_46_html27" id="modelMap_46_html27">
-                                 <area alt="modelMap17.tmp#id17" href="modelMap17.html#id17" coords="129,43,242,85" />
-                                 <area alt="modelMap17.tmp#id12" href="modelMap17.html#id12" coords="195,109,343,133" /></map></div>
+                           <div id="diagram_id101" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html18.png"
+                                   usemap="#modelMap_46_html18" /><map name="modelMap_46_html18" id="modelMap_46_html18">
+                                 <area alt="modelMap17.tmp#id110" href="modelMap17.html#id110" coords="104,40,179,64" />
+                                 <area alt="modelMap17.tmp#id111" href="modelMap17.html#id111" coords="104,74,217,116" />
+                                 <area alt="modelMap17.tmp#id112" href="modelMap17.html#id112"
+                                       coords="104,126,217,168" />
+                                 <area alt="modelMap17.tmp#id113" href="modelMap17.html#id113"
+                                       coords="104,178,217,220" />
+                                 <area alt="modelMap17.tmp#id114" href="modelMap17.html#id114"
+                                       coords="104,230,219,272" />
+                                 <area alt="modelMap10.tmp#id2" href="modelMap10.html#id2" coords="182,289,281,313" />
+                                 <area alt="modelMap23.tmp#id102" href="modelMap23.html#id102"
+                                       coords="182,323,371,365" />
+                                 <area alt="modelMap24.tmp#id104" href="modelMap24.html#id104"
+                                       coords="182,375,295,417" />
+                                 <area alt="modelMap17.tmp#id105" href="modelMap17.html#id105"
+                                       coords="182,427,295,469" />
+                                 <area alt="modelMap20.tmp#id106" href="modelMap20.html#id106"
+                                       coords="182,479,371,521" />
+                                 <area alt="modelMap17.tmp#id109" href="modelMap17.html#id109"
+                                       coords="182,531,295,573" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id11" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id101" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id11');"
+                                     onclick="switchState('properties_id101');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id11" style="display:block">
+                           <div id="properties_id101" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -368,16 +387,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id11" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id11');"
+                           <div class="floatRight"><input id="button_usedBy_id101" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id101');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id11" style="display:block">
+                           <div id="usedBy_id101" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap27.html#id1" target="mainFrame"
+                                    <td><b><a href="modelMap9.html#id1" target="mainFrame"
                                              title="http://cayenne.apache.org/schema/3.0/modelMap"
                                              onclick="updatePageTitle('Schema documentation for component cay:data-map')">cay:data-map</a></b></td>
                                  </tr>
@@ -387,31 +406,56 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="modelMap17.html#id12" target="mainFrame"
+                        <td><b><a href="modelMap10.html#id2" target="mainFrame"
                                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:procedure-parameter*')">cay:procedure-parameter*</a></b></td>
+                                 onclick="updatePageTitle('Schema documentation for component cay:property*')">cay:property*</a></b> , <b><a href="modelMap23.html#id102" target="mainFrame"
+                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
+                                 onclick="updatePageTitle('Schema documentation for component cay:sql*')">cay:sql*</a></b> , <b><a href="modelMap24.html#id104" target="mainFrame"
+                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
+                                 onclick="updatePageTitle('Schema documentation for component cay:ejbql*')">cay:ejbql*</a></b> , <b><a href="modelMap17.html#id105" target="mainFrame"
+                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
+                                 onclick="updatePageTitle('Schema documentation for component cay:qualifier*')">cay:qualifier*</a></b> , <b><a href="modelMap20.html#id106" target="mainFrame"
+                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
+                                 onclick="updatePageTitle('Schema documentation for component cay:ordering*')">cay:ordering*</a></b> , <b><a href="modelMap17.html#id109" target="mainFrame"
+                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
+                                 onclick="updatePageTitle('Schema documentation for component cay:prefetch*')">cay:prefetch*</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="modelMap17.html#id12" target="mainFrame"
+                        <td><b><a href="modelMap24.html#id104" target="mainFrame"
+                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
+                                 onclick="updatePageTitle('Schema documentation for component cay:ejbql')">cay:ejbql</a></b>, <b><a href="modelMap20.html#id106" target="mainFrame"
                                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:procedure-parameter')">cay:procedure-parameter</a></b></td>
+                                 onclick="updatePageTitle('Schema documentation for component cay:ordering')">cay:ordering</a></b>, <b><a href="modelMap17.html#id109" target="mainFrame"
+                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
+                                 onclick="updatePageTitle('Schema documentation for component cay:prefetch')">cay:prefetch</a></b>, <b><a href="modelMap10.html#id2" target="mainFrame"
+                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
+                                 onclick="updatePageTitle('Schema documentation for component cay:property')">cay:property</a></b>, <b><a href="modelMap17.html#id105" target="mainFrame"
+                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
+                                 onclick="updatePageTitle('Schema documentation for component cay:qualifier')">cay:qualifier</a></b>, <b><a href="modelMap23.html#id102" target="mainFrame"
+                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
+                                 onclick="updatePageTitle('Schema documentation for component cay:sql')">cay:sql</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id11" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id11');"
+                           <div class="floatRight"><input id="button_instance_id101" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id101');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id11" style="display:block">
+                           <div id="instance_id101" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;cay:procedure</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:procedure-parameter</span><span class="tokenText"> </span><span class="tokenAttrName">direction=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">length=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">type=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:procedure-parameter&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/cay:procedure&gt;</span></pre></td>
+                                    <td width="100%"><pre><span class="tokenElement">&lt;cay:query</span><span class="tokenText"> </span><span class="tokenAttrName">factory=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">result-entity=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">root=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">root-name=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
+  </span><span class="tokenElement">&lt;cay:property</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">value=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:property&gt;</span><span class="tokenIndent">
+  </span><span class="tokenElement">&lt;cay:sql</span><span class="tokenText"> </span><span class="tokenAttrName">adapter-class=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:sql&gt;</span><span class="tokenIndent">
+  </span><span class="tokenElement">&lt;cay:ejbql</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:ejbql&gt;</span><span class="tokenIndent">
+  </span><span class="tokenElement">&lt;cay:qualifier</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:qualifier&gt;</span><span class="tokenIndent">
+  </span><span class="tokenElement">&lt;cay:ordering</span><span class="tokenText"> </span><span class="tokenAttrName">descending=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">ignore-case=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:ordering&gt;</span><span class="tokenIndent">
+  </span><span class="tokenElement">&lt;cay:prefetch</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:prefetch&gt;</span><span class="tokenIndent">
+</span><span class="tokenElement">&lt;/cay:query&gt;</span></pre></td>
                                  </tr>
                               </table>
                            </div>
@@ -420,13 +464,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id11" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id101" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id11');"
+                                     onclick="switchState('attributes_id101');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id11" style="display:block">
+                           <div id="attributes_id101" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -439,7 +483,18 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="modelMap17.html#id17" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="modelMap17.html#id110" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for component factory')">factory</a></b></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td>required</td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td class="firstColumn"><b><a href="modelMap17.html#id111" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for component name')">name</a></b></td>
                                     <td><b>xs:string</b></td>
                                     <td></td>
@@ -449,6 +504,39 @@
                                        <div class="annotation"></div>
                                     </td>
                                  </tr>
+                                 <tr>
+                                    <td class="firstColumn"><b><a href="modelMap17.html#id114" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for component result-entity')">result-entity</a></b></td>
+                                    <td><b>xs:string</b></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td>optional</td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td class="firstColumn"><b><a href="modelMap17.html#id112" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for component root')">root</a></b></td>
+                                    <td><b>xs:string</b></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td>optional</td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td class="firstColumn"><b><a href="modelMap17.html#id113" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for component root-name')">root-name</a></b></td>
+                                    <td><b>xs:string</b></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td>optional</td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
+                                 </tr>
                               </table>
                            </div>
                         </td>
@@ -456,28 +544,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id11" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id11');"
+                           <div class="floatRight"><input id="button_source_id101" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id101');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id11" style="display:block">
+                           <div id="source_id101" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"procedure"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"query"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
   </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
     </span><span class="tokenElement">&lt;xs:sequence</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"procedure-parameter"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-          </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-          </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-          </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"length"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-          </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"direction"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;/xs:element&gt;</span><span class="tokenIndent">
+      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:property"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
+      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:sql"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
+      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:ejbql"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
+      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"qualifier"</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
+      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:ordering"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
+      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"prefetch"</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
     </span><span class="tokenElement">&lt;/xs:sequence&gt;</span><span class="tokenIndent">
+    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"factory"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
     </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
+    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"root"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
+    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"root-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
+    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"result-entity"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
   </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
 </span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
                                  </tr>
@@ -487,7 +577,7 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
+                        <td>file:/Users/ari/svn/cayenne30/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
                      </tr>
                   </tbody>
                </table>
@@ -499,9 +589,9 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id12"></a><div class="componentTitle">Element <span class="qname"><b><a href="modelMap17.html#id11" target="mainFrame"
+      </table><a id="id105"></a><div class="componentTitle">Element <span class="qname"><b><a href="modelMap17.html#id101" target="mainFrame"
                   title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b>/cay:procedure-parameter</span></div>
+                  onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b> / cay:qualifier</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -520,35 +610,34 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id12" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id12');"
+                           <div class="floatRight"><input id="button_diagram_id105" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id105');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id12" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html7.jpeg"
-                                   usemap="#modelMap_46_html7" /><map name="modelMap_46_html7" id="modelMap_46_html7">
-                                 <area alt="modelMap17.tmp#id13" href="modelMap17.html#id13" coords="190,43,303,85" />
-                                 <area alt="modelMap17.tmp#id14" href="modelMap17.html#id14" coords="190,95,303,137" />
-                                 <area alt="modelMap17.tmp#id15" href="modelMap17.html#id15" coords="190,147,309,189" />
-                                 <area alt="modelMap17.tmp#id16" href="modelMap17.html#id16" coords="190,199,303,241" /></map></div>
+                           <div id="diagram_id105" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html4.png" /></div>
                         </td>
                      </tr>
                      <tr>
+                        <td class="firstColumn"><b>Type</b></td>
+                        <td><b>xs:string</b></td>
+                     </tr>
+                     <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id12" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id105" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id12');"
+                                     onclick="switchState('properties_id105');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id12" style="display:block">
+                           <div id="properties_id105" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
                                        
                                     </td>
-                                    <td><b>complex</b></td>
+                                    <td><b>simple</b></td>
                                  </tr>
                                  <tr>
                                     <td class="firstColumn">minOccurs:
@@ -568,68 +657,97 @@
                      </tr>
                      <tr>
                         <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id12" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id12');"
+                           <div class="floatLeft"><b>Source</b></div>
+                           <div class="floatRight"><input id="button_source_id105" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id105');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id12" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
+                           <div id="source_id105" style="display:block">
+                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                     class="preWrapContainer">
                                  <tr>
-                                    <td class="firstColumn"><b><a href="modelMap17.html#id16" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component direction')">direction</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
+                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"qualifier"</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
                                  </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn"><b>Schema location</b></td>
+                        <td>file:/Users/ari/svn/cayenne30/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
+                     </tr>
+                  </tbody>
+               </table>
+            </td>
+            <td class="rt_lineRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_cornerBottomLeft"></td>
+            <td class="rt_lineBottom"></td>
+            <td class="rt_cornerBottomRight"></td>
+         </tr>
+      </table><a id="id109"></a><div class="componentTitle">Element <span class="qname"><b><a href="modelMap17.html#id101" target="mainFrame"
+                  title="http://cayenne.apache.org/schema/3.0/modelMap"
+                  onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b> / cay:prefetch</span></div>
+      <table class="rt">
+         <tr>
+            <td class="rt_cornerTopLeft"></td>
+            <td class="rt_lineTop"></td>
+            <td class="rt_cornerTopRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_lineLeft"></td>
+            <td class="rt_content">
+               <table class="component">
+                  <tbody>
+                     <tr>
+                        <td class="firstColumn"><b>Namespace</b></td>
+                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Diagram</b></div>
+                           <div class="floatRight"><input id="button_diagram_id109" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id109');"
+                                     class="control" /></div>
+                        </td>
+                        <td class="diagram">
+                           <div id="diagram_id109" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html6.png" /></div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn"><b>Type</b></td>
+                        <td><b>xs:string</b></td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Properties</b></div>
+                           <div class="floatRight"><input id="button_properties_id109" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('properties_id109');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="properties_id109" style="display:block">
+                              <table class="propertiesTable">
                                  <tr>
-                                    <td class="firstColumn"><b><a href="modelMap17.html#id15" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component length')">length</a></b></td>
-                                    <td><b>xs:integer</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
+                                    <td class="firstColumn">content:
+                                       
                                     </td>
+                                    <td><b>simple</b></td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="modelMap17.html#id13" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component name')">name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
+                                    <td class="firstColumn">minOccurs:
+                                       
                                     </td>
+                                    <td><b>0</b></td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="modelMap17.html#id14" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component type')">type</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
+                                    <td class="firstColumn">maxOccurs:
+                                       
                                     </td>
+                                    <td><b>unbounded</b></td>
                                  </tr>
                               </table>
                            </div>
@@ -638,23 +756,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id12" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id12');"
+                           <div class="floatRight"><input id="button_source_id109" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id109');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id12" style="display:block">
+                           <div id="source_id109" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"procedure-parameter"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"length"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"direction"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
+                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"prefetch"</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
                                  </tr>
                               </table>
                            </div>
@@ -662,7 +773,7 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
+                        <td>file:/Users/ari/svn/cayenne30/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
                      </tr>
                   </tbody>
                </table>
@@ -674,11 +785,9 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id13"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap17.html#id12" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure-parameter')">cay:procedure-parameter</a></b>/<b><a href="modelMap17.html#id11" target="mainFrame"
+      </table><a id="id110"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap17.html#id101" target="mainFrame"
                   title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b>/@name</span></div>
+                  onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b> / @factory</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -695,19 +804,15 @@
                         <td>No namespace</td>
                      </tr>
                      <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id13" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id110" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id13');"
+                                     onclick="switchState('properties_id110');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id13" style="display:block">
+                           <div id="properties_id110" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -722,18 +827,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id13" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id13');"
+                           <div class="floatRight"><input id="button_usedBy_id110" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id110');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id13" style="display:block">
+                           <div id="usedBy_id110" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap17.html#id12" target="mainFrame"
+                                    <td><b><a href="modelMap17.html#id101" target="mainFrame"
                                              title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:procedure/cay:procedure-parameter')">cay:procedure/cay:procedure-parameter</a></b></td>
+                                             onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -742,16 +847,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id13" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id13');"
+                           <div class="floatRight"><input id="button_source_id110" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id110');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id13" style="display:block">
+                           <div id="source_id110" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
+                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"factory"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">/&gt;</span></pre></td>
                                  </tr>
                               </table>
                            </div>
@@ -759,7 +864,7 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
+                        <td>file:/Users/ari/svn/cayenne30/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
                      </tr>
                   </tbody>
                </table>
@@ -771,11 +876,9 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id14"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap17.html#id12" target="mainFrame"
+      </table><a id="id111"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap17.html#id101" target="mainFrame"
                   title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure-parameter')">cay:procedure-parameter</a></b>/<b><a href="modelMap17.html#id11" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b>/@type</span></div>
+                  onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b> / @name</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -798,13 +901,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id14" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id111" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id14');"
+                                     onclick="switchState('properties_id111');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id14" style="display:block">
+                           <div id="properties_id111" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -819,18 +922,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id14" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id14');"
+                           <div class="floatRight"><input id="button_usedBy_id111" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id111');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id14" style="display:block">
+                           <div id="usedBy_id111" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap17.html#id12" target="mainFrame"
+                                    <td><b><a href="modelMap17.html#id101" target="mainFrame"
                                              title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:procedure/cay:procedure-parameter')">cay:procedure/cay:procedure-parameter</a></b></td>
+                                             onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -839,16 +942,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id14" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id14');"
+                           <div class="floatRight"><input id="button_source_id111" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id111');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id14" style="display:block">
+                           <div id="source_id111" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
+                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
                                  </tr>
                               </table>
                            </div>
@@ -856,7 +959,7 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
+                        <td>file:/Users/ari/svn/cayenne30/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
                      </tr>
                   </tbody>
                </table>
@@ -868,11 +971,9 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id15"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap17.html#id12" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure-parameter')">cay:procedure-parameter</a></b>/<b><a href="modelMap17.html#id11" target="mainFrame"
+      </table><a id="id112"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap17.html#id101" target="mainFrame"
                   title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b>/@length</span></div>
+                  onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b> / @root</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -890,18 +991,18 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:integer</b></td>
+                        <td><b>xs:string</b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id15" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id112" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id15');"
+                                     onclick="switchState('properties_id112');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id15" style="display:block">
+                           <div id="properties_id112" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -916,18 +1017,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id15" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id15');"
+                           <div class="floatRight"><input id="button_usedBy_id112" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id112');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id15" style="display:block">
+                           <div id="usedBy_id112" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap17.html#id12" target="mainFrame"
+                                    <td><b><a href="modelMap17.html#id101" target="mainFrame"
                                              title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:procedure/cay:procedure-parameter')">cay:procedure/cay:procedure-parameter</a></b></td>
+                                             onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -936,16 +1037,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id15" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id15');"
+                           <div class="floatRight"><input id="button_source_id112" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id112');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id15" style="display:block">
+                           <div id="source_id112" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"length"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">/&gt;</span></pre></td>
+                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"root"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
                                  </tr>
                               </table>
                            </div>
@@ -953,7 +1054,7 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
+                        <td>file:/Users/ari/svn/cayenne30/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
                      </tr>
                   </tbody>
                </table>
@@ -965,11 +1066,9 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id16"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap17.html#id12" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure-parameter')">cay:procedure-parameter</a></b>/<b><a href="modelMap17.html#id11" target="mainFrame"
+      </table><a id="id113"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap17.html#id101" target="mainFrame"
                   title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b>/@direction</span></div>
+                  onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b> / @root-name</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -992,19 +1091,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id16" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id113" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id16');"
+                                     onclick="switchState('properties_id113');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id16" style="display:block">
+                           <div id="properties_id113" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
                                        
                                     </td>
-                                    <td><b>required</b></td>
+                                    <td><b>optional</b></td>
                                  </tr>
                               </table>
                            </div>
@@ -1013,18 +1112,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id16" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id16');"
+                           <div class="floatRight"><input id="button_usedBy_id113" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id113');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id16" style="display:block">
+                           <div id="usedBy_id113" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap17.html#id12" target="mainFrame"
+                                    <td><b><a href="modelMap17.html#id101" target="mainFrame"
                                              title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:procedure/cay:procedure-parameter')">cay:procedure/cay:procedure-parameter</a></b></td>
+                                             onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -1033,16 +1132,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id16" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id16');"
+                           <div class="floatRight"><input id="button_source_id113" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id113');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id16" style="display:block">
+                           <div id="source_id113" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"direction"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
+                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"root-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
                                  </tr>
                               </table>
                            </div>
@@ -1050,7 +1149,7 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
+                        <td>file:/Users/ari/svn/cayenne30/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
                      </tr>
                   </tbody>
                </table>
@@ -1062,9 +1161,9 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id17"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap17.html#id11" target="mainFrame"
+      </table><a id="id114"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap17.html#id101" target="mainFrame"
                   title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b>/@name</span></div>
+                  onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b> / @result-entity</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -1087,19 +1186,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id17" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id114" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id17');"
+                                     onclick="switchState('properties_id114');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id17" style="display:block">
+                           <div id="properties_id114" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
                                        
                                     </td>
-                                    <td><b>required</b></td>
+                                    <td><b>optional</b></td>
                                  </tr>
                               </table>
                            </div>
@@ -1108,18 +1207,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id17" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id17');"
+                           <div class="floatRight"><input id="button_usedBy_id114" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id114');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id17" style="display:block">
+                           <div id="usedBy_id114" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap17.html#id11" target="mainFrame"
+                                    <td><b><a href="modelMap17.html#id101" target="mainFrame"
                                              title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b></td>
+                                             onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -1128,16 +1227,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id17" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id17');"
+                           <div class="floatRight"><input id="button_source_id114" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id114');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id17" style="display:block">
+                           <div id="source_id114" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
+                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"result-entity"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
                                  </tr>
                               </table>
                            </div>
@@ -1145,7 +1244,7 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
+                        <td>file:/Users/ari/svn/cayenne30/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
                      </tr>
                   </tbody>
                </table>