From 9900a73769d77d6a22ca6d418b9363eba45f5aca Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Fri, 2 Nov 2007 14:27:41 +0000 Subject: [PATCH] corrected DTD incongruities git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@14177 1b8cb986-b30d-0410-93ca-fae66ebed9b2 --- .../docbook/en-US/content/basic_mapping.xml | 2 +- .../en-US/content/collection_mapping.xml | 14 +- .../docbook/en-US/content/performance.xml | 132 ++++++++++-------- .../en-US/content/persistent_classes.xml | 9 +- .../main/docbook/en-US/content/tutorial.xml | 8 +- 5 files changed, 90 insertions(+), 75 deletions(-) diff --git a/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml b/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml index 4b4ee52cf9..7d8e3e7f71 100644 --- a/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml +++ b/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml @@ -1821,13 +1821,13 @@ entity-name (optional): The entity name of the associated class. - formula (optional): an SQL expression that defines the value for a computed foreign key. + diff --git a/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml b/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml index 087ac37175..1db6e4fcc6 100644 --- a/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml +++ b/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml @@ -80,6 +80,14 @@ kittens = cat.getKittens(); // Okay, kittens collection is a Set Collection mappings + + + 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. + + + The Hibernate mapping element used for mapping a collection depends upon the type of the interface. For example, a <set> @@ -409,12 +417,6 @@ kittens = cat.getKittens(); // Okay, kittens collection is a Set - - 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. - - Collections of values and many-to-many associations diff --git a/documentation/manual/src/main/docbook/en-US/content/performance.xml b/documentation/manual/src/main/docbook/en-US/content/performance.xml index 10d37b97ab..61c2e49de6 100644 --- a/documentation/manual/src/main/docbook/en-US/content/performance.xml +++ b/documentation/manual/src/main/docbook/en-US/content/performance.xml @@ -829,68 +829,78 @@ Cat fritz = (Cat) iter.next();]]> - - - None of the cache providers support all of the cache concurrency strategies. The following table shows - which providers are compatible with which concurrency strategies. - - - Cache Concurrency Strategy Support - - - - - - - - - Cache - read-only - nonstrict-read-write - read-write - transactional - - - - - Hashtable (not intended for production use) - yes - yes - yes - - - - EHCache - yes - yes - yes - - - - OSCache - yes - yes - yes - - - - SwarmCache - yes - yes - - - - - JBoss TreeCache - yes - - - yes - - - -
+ + Cache-provider/concurrency-strategy compatibility + + + + None of the cache providers support all of the cache concurrency strategies. + + + + + The following table shows which providers are compatible with which concurrency strategies. + + + + Cache Concurrency Strategy Support + + + + + + + + + Cache + read-only + nonstrict-read-write + read-write + transactional + + + + + Hashtable (not intended for production use) + yes + yes + yes + + + + EHCache + yes + yes + yes + + + + OSCache + yes + yes + yes + + + + SwarmCache + yes + yes + + + + + JBoss TreeCache + yes + + + yes + + + +
+ + diff --git a/documentation/manual/src/main/docbook/en-US/content/persistent_classes.xml b/documentation/manual/src/main/docbook/en-US/content/persistent_classes.xml index 819cbcfd5a..4738fb2dd5 100644 --- a/documentation/manual/src/main/docbook/en-US/content/persistent_classes.xml +++ b/documentation/manual/src/main/docbook/en-US/content/persistent_classes.xml @@ -526,9 +526,12 @@ public class CustomMapTuplizerImpl - - TODO: Document user-extension framework in the property and proxy packages - + + Extentsions + + TODO: Document user-extension framework in the property and proxy packages + + diff --git a/documentation/manual/src/main/docbook/en-US/content/tutorial.xml b/documentation/manual/src/main/docbook/en-US/content/tutorial.xml index 47dbd9d212..e8e8c3b0c0 100644 --- a/documentation/manual/src/main/docbook/en-US/content/tutorial.xml +++ b/documentation/manual/src/main/docbook/en-US/content/tutorial.xml @@ -1260,15 +1260,15 @@ public void removeFromEvent(Event event) { - - Let's turn this into a small web application. - - Part 3 - The EventManager web application + + Let's turn the following discussion into a small web application... + + A Hibernate web application uses Session and Transaction almost like a standalone application. However, some common patterns are useful. We now write