Author: steve.ebersole(a)jboss.com Date: 2007-11-02 10:27:41 -0400 (Fri, 02 Nov 2007) New Revision: 14177 Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml core/trunk/documentation/manual/src/main/docbook/en-US/content/persistent_classes.xml core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml Log: corrected DTD incongruities Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml =================================================================== --- core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml 2007-11-02 04:31:34 UTC (rev 14176) +++ core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml 2007-11-02 14:27:41 UTC (rev 14177) @@ -1821,13 +1821,13 @@ <literal>entity-name</literal> (optional): The entity name of the associated class. </para> </callout> - </calloutlist> <callout arearefs="manytoone16"> <para> <literal>formula</literal> (optional): an SQL expression that defines the value for a <emphasis>computed</emphasis> foreign key. </para> </callout> + </calloutlist> </programlistingco> <para> Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml =================================================================== --- core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml 2007-11-02 04:31:34 UTC (rev 14176) +++ core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml 2007-11-02 14:27:41 UTC (rev 14177) @@ -80,6 +80,14 @@ <sect1 id="collections-mapping" revision="4"> <title>Collection mappings</title> + <tip> + <para> + There are quite a range of mappings that can be generated for collections, covering + many common relational models. We suggest you experiment with the schema generation tool + to get a feeling for how various mapping declarations translate to database tables. + </para> + </tip> + <para> The Hibernate mapping element used for mapping a collection depends upon the type of the interface. For example, a <literal>&lt;set&gt;</literal> @@ -409,12 +417,6 @@ </sect2> - <para> - There are quite a range of mappings that can be generated for collections, covering - many common relational models. We suggest you experiment with the schema generation tool - to get a feeling for how various mapping declarations translate to database tables. - </para> - <sect2 id="collections-ofvalues" revision="2"> <title>Collections of values and many-to-many associations</title> Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml =================================================================== --- core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml 2007-11-02 04:31:34 UTC (rev 14176) +++ core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml 2007-11-02 14:27:41 UTC (rev 14177) @@ -829,69 +829,79 @@ </para> </sect2> - - <para> - None of the cache providers support all of the cache concurrency strategies. The following table shows - which providers are compatible with which concurrency strategies. - </para> - <table frame="topbot"> - <title>Cache Concurrency Strategy Support</title> - <tgroup cols='5' align='left' colsep='1' rowsep='1'> - <colspec colname='c1' colwidth="1*"/> - <colspec colname='c2' colwidth="1*"/> - <colspec colname='c3' colwidth="1*"/> - <colspec colname='c4' colwidth="1*"/> - <colspec colname='c5' colwidth="1*"/> - <thead> - <row> - <entry>Cache</entry> - <entry>read-only</entry> - <entry>nonstrict-read-write</entry> - <entry>read-write</entry> - <entry>transactional</entry> - </row> - </thead> - <tbody> - <row> - <entry>Hashtable (not intended for production use)</entry> - <entry>yes</entry> - <entry>yes</entry> - <entry>yes</entry> - <entry></entry> - </row> - <row> - <entry>EHCache</entry> - <entry>yes</entry> - <entry>yes</entry> - <entry>yes</entry> - <entry></entry> - </row> - <row> - <entry>OSCache</entry> - <entry>yes</entry> - <entry>yes</entry> - <entry>yes</entry> - <entry></entry> - </row> - <row> - <entry>SwarmCache</entry> - <entry>yes</entry> - <entry>yes</entry> - <entry></entry> - <entry></entry> - </row> - <row> - <entry>JBoss TreeCache</entry> - <entry>yes</entry> - <entry></entry> - <entry></entry> - <entry>yes</entry> - </row> - </tbody> - </tgroup> - </table> + <sect2 id="performance-cache-compat-matrix"> + <title>Cache-provider/concurrency-strategy compatibility</title> + <important> + <para> + None of the cache providers support all of the cache concurrency strategies. + </para> + </important> + + <para> + The following table shows which providers are compatible with which concurrency strategies. + </para> + + <table frame="topbot"> + <title>Cache Concurrency Strategy Support</title> + <tgroup cols='5' align='left' colsep='1' rowsep='1'> + <colspec colname='c1' colwidth="1*"/> + <colspec colname='c2' colwidth="1*"/> + <colspec colname='c3' colwidth="1*"/> + <colspec colname='c4' colwidth="1*"/> + <colspec colname='c5' colwidth="1*"/> + <thead> + <row> + <entry>Cache</entry> + <entry>read-only</entry> + <entry>nonstrict-read-write</entry> + <entry>read-write</entry> + <entry>transactional</entry> + </row> + </thead> + <tbody> + <row> + <entry>Hashtable (not intended for production use)</entry> + <entry>yes</entry> + <entry>yes</entry> + <entry>yes</entry> + <entry></entry> + </row> + <row> + <entry>EHCache</entry> + <entry>yes</entry> + <entry>yes</entry> + <entry>yes</entry> + <entry></entry> + </row> + <row> + <entry>OSCache</entry> + <entry>yes</entry> + <entry>yes</entry> + <entry>yes</entry> + <entry></entry> + </row> + <row> + <entry>SwarmCache</entry> + <entry>yes</entry> + <entry>yes</entry> + <entry></entry> + <entry></entry> + </row> + <row> + <entry>JBoss TreeCache</entry> + <entry>yes</entry> + <entry></entry> + <entry></entry> + <entry>yes</entry> + </row> + </tbody> + </tgroup> + </table> + + </sect2> + </sect1> <sect1 id="performance-sessioncache" revision="2"> Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/persistent_classes.xml =================================================================== --- core/trunk/documentation/manual/src/main/docbook/en-US/content/persistent_classes.xml 2007-11-02 04:31:34 UTC (rev 14176) +++ core/trunk/documentation/manual/src/main/docbook/en-US/content/persistent_classes.xml 2007-11-02 14:27:41 UTC (rev 14177) @@ -526,9 +526,12 @@ </sect1> - <para> - TODO: Document user-extension framework in the property and proxy packages - </para> + <sect1 id="persistent-classes-extensions"> + <title>Extentsions</title> + <para> + TODO: Document user-extension framework in the property and proxy packages + </para> + </sect1> </chapter> Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml =================================================================== --- core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml 2007-11-02 04:31:34 UTC (rev 14176) +++ core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml 2007-11-02 14:27:41 UTC (rev 14177) @@ -1260,16 +1260,16 @@ </sect2> - <para> - Let's turn this into a small web application. - </para> - </sect1> <sect1 id="tutorial-webapp"> <title>Part 3 - The EventManager web application</title> <para> + Let's turn the following discussion into a small web application... + </para> + + <para> A Hibernate web application uses <literal>Session</literal> and <literal>Transaction</literal> almost like a standalone application. However, some common patterns are useful. We now write an <literal>EventManagerServlet</literal>. This servlet can list all events stored in the