Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrsapir2010-05-19 14:24:44 -0400
committerrsapir2010-05-19 14:24:44 -0400
commit8bb59dc672ca26d67f5c1336c6953da78db0d0f2 (patch)
tree046129889ed9bf0899ec117f6c752efba7a551fa
parente93453039c975c0565ed73da73fef5fcf6d9fc64 (diff)
downloadwebtools.dali-8bb59dc672ca26d67f5c1336c6953da78db0d0f2.tar.gz
webtools.dali-8bb59dc672ca26d67f5c1336c6953da78db0d0f2.tar.xz
webtools.dali-8bb59dc672ca26d67f5c1336c6953da78db0d0f2.zip
dali 2.3 docs r2. bug 312815
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF10
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/about.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/dcommon/html/cpyr.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/upgrade_persistence_jpa_version.pngbin0 -> 5208 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/index.xml756
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/legal.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml16
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_add_converter.htm16
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_association_cardinality.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_association_table.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_create_custom_entities_wizard.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_create_jpa_entity_wizard.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_create_new_association_wizard.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_customizIndividualEntities.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_eclipselink_mapping_file.htm32
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_java_page.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_join_columns.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm10
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm86
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project_wizard.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_general.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_outline.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_prop_view.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_xmll_editor.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_primary_key.htm12
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_project_properties.htm66
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_select_cascade_dialog.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference.htm12
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm20
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm14
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm10
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm10
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm10
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm10
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm7
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm87
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm58
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm55
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm113
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm89
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm51
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm53
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm12
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_create_jpa_entity.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm20
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm10
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm27
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm10
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm5
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm39
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm52
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm78
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm70
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm56
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm61
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm162
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm132
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm40
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm123
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm145
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm114
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm138
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm137
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm102
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm93
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm137
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm39
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm79
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks022.htm93
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm42
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm93
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm50
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks026.htm63
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tips_and_tricks.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/toc.xml73
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm7
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm27
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm20
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new006.htm6
127 files changed, 2422 insertions, 1886 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF
index 1aff0ced5a..6b85b224a0 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF
@@ -1,9 +1,3 @@
Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.jpt.doc.user;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.help;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.ui.cheatsheets;bundle-version="[3.3.100,4.0.0)"
+Created-By: 1.6.0_18 (Sun Microsystems Inc.)
+
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/about.htm b/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
index e52430c05f..29a91352c6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>About this content</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:56Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:49Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="About this content" />
<meta name="relnum" content="Release 2.3" />
@@ -18,10 +18,10 @@
<!-- contents -->
</head>
<body>
-<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref290" name="sthref290"></a>
+<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref295" name="sthref295"></a>
<h1>About this content</h1>
<p>November, 2009</p>
-<a id="sthref291" name="sthref291"></a>
+<a id="sthref296" name="sthref296"></a>
<p class="subhead2">License</p>
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <code><a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></code>. For purposes of the EPL, "Program" will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <code><a href="http://www.eclipse.org">http://www.eclipse.org</a></code>.</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml
index 33b9d32881..6dbeedbeca 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml
@@ -10,7 +10,7 @@ To start work working on this cheat sheet click the &quot;Click to Begin&quot; b
Let&apos;s get started!
</description>
</intro>
- <item title="Setup the Environment" dialog="false" skip="true" href="/org.eclipse.datatools.connectivity.doc.user/doc/html/asc1229700343352.html">
+ <item title="Setup the Environment" dialog="false" skip="true" href="/org.eclipse.datatools.doc.user/c_database_development_setup.html">
<description>
Your environment must be set up before you can perform the steps in this cheat sheet.
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml
index 7521914f1a..63307f226e 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml
@@ -10,7 +10,7 @@ To start work working on this cheat sheet, click the &quot;Click to Begin&quot;
Let&apos;s get started!
</description>
</intro>
- <item title="Setup the Environment" dialog="false" skip="true" href="/org.eclipse.datatools.connectivity.doc.user/doc/html/asc1229700343352.html">
+ <item title="Setup the Environment" dialog="false" skip="true" href="/org.eclipse.datatools.doc.user/c_database_development_setup.html">
<description>
Your environment must be set up before you can perform the steps in this cheat sheet.
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm
index 618b53f16e..59f7d97bfd 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Understanding OR mappings</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:42Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Understanding OR mappings" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm
index 55953475fa..3c7f80bf06 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Understanding Java persistence</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:42Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Understanding Java persistence" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
index 548049b85a..7a140b7e90 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Concepts</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:42Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content=" Concepts" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
index 1a31988b6b..5104da12ef 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Understanding EJB 3.0 Java Persistence API</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:42Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Understanding EJB 3.0 Java Persistence API" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
index d78d0b0529..99f1e4397b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>The persistence.xml file</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:42Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="The persistence.xml file" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
index 1cf9ee5f88..9c887a7984 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>The orm.xml file</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:42Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="The orm.xml file" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/html/cpyr.htm b/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/html/cpyr.htm
index 46ec49be67..382ec67619 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/html/cpyr.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/html/cpyr.htm
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+<!-- <meta http-equiv="refresh" content="0;url=../../legal.htm"> -->
</head>
<body>
<p><a href="../../legal.htm">License Information</a></p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm
index c2904dbe2c..5d3e537811 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Getting started</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:42Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content=" Getting started" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm
index d9ccff906c..6c3c8f0452 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Requirements and installation</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:42Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Requirements and installation" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm
index 5d4430ddea..3285315b65 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Dali quick start</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:42Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Dali quick start" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm
index 5a904926d6..2cbac78532 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Creating a new JPA project</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:42Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Creating a new JPA project" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm
index 89078e9c57..249ea76a96 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Creating a Java persistent entity with persistent fields</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:42Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Creating a Java persistent entity with persistent fields" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/upgrade_persistence_jpa_version.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/upgrade_persistence_jpa_version.png
new file mode 100644
index 0000000000..96fa4d27c8
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/upgrade_persistence_jpa_version.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/index.xml b/jpa/plugins/org.eclipse.jpt.doc.user/index.xml
index 86b7d103e3..1919b02862 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/index.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/index.xml
@@ -1,315 +1,647 @@
<?xml version='1.0' encoding='iso-8859-1'?>
<index version="1.0">
-<entry keyword="@Basic, Basic mapping"><topic href="tasks009.htm#sthref115" /></entry>
-<entry keyword="@Column, General information"><topic href="ref_mapping_general.htm#sthref230" /></entry>
+ <entry keyword="@Basic">
+ <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref116" /></entry>
+ </entry>
+ <entry keyword="@Column">
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref231" /></entry>
+ </entry>
<entry keyword="@DiscriminatorColumn">
-<entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref95" /></entry>
-<entry keyword="Inheritance information"><topic href="reference009.htm#sthref224" /></entry>
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref96" /></entry>
+ <entry keyword="Inheritance information"><topic href="reference009.htm#sthref225" /></entry>
</entry>
<entry keyword="@DiscriminatorValue">
-<entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref97" /></entry>
-<entry keyword="Inheritance information"><topic href="reference009.htm#sthref222" /></entry>
- </entry>
-<entry keyword="@Embeddable, Embeddable"><topic href="tasks006.htm#sthref80" /></entry>
-<entry keyword="@Embedded, Embedded mapping"><topic href="tasks010.htm#sthref119" /></entry>
-<entry keyword="@EmbeddedId, Embedded ID mapping"><topic href="tasks011.htm#sthref123" /></entry>
-<entry keyword="@Entity, Entity"><topic href="tasks005.htm#sthref73" /></entry>
-<entry keyword="@Enumerated, General information"><topic href="ref_mapping_general.htm#sthref240" /></entry>
-<entry keyword="@GeneratedValue, Primary Key Generation information"><topic href="ref_primary_key.htm#sthref249" /></entry>
-<entry keyword="@Id, ID mapping"><topic href="tasks012.htm#sthref127" /></entry>
-<entry keyword="@Inheritance, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref93" /></entry>
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref98" /></entry>
+ <entry keyword="Inheritance information"><topic href="reference009.htm#sthref223" /></entry>
+ </entry>
+ <entry keyword="@Embeddable">
+ <entry keyword="Embeddable"><topic href="tasks007.htm#sthref81" /></entry>
+ </entry>
+ <entry keyword="@Embedded">
+ <entry keyword="Embedded mapping"><topic href="tasks011.htm#sthref120" /></entry>
+ </entry>
+ <entry keyword="@EmbeddedId">
+ <entry keyword="Embedded ID mapping"><topic href="tasks012.htm#sthref124" /></entry>
+ </entry>
+ <entry keyword="@Entity">
+ <entry keyword="Entity"><topic href="tasks006.htm#sthref74" /></entry>
+ </entry>
+ <entry keyword="@Enumerated">
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref241" /></entry>
+ </entry>
+ <entry keyword="@GeneratedValue">
+ <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref251" /></entry>
+ </entry>
+ <entry keyword="@Id">
+ <entry keyword="ID mapping"><topic href="tasks013.htm#sthref128" /></entry>
+ </entry>
+ <entry keyword="@Inheritance">
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref94" /></entry>
+ </entry>
<entry keyword="@JoinColumn">
-<entry keyword="Many-to-one mapping"><topic href="tasks014.htm#sthref138" /></entry>
-<entry keyword="One-to-one mapping"><topic href="tasks016.htm#sthref148" /></entry>
-<entry keyword="Join Table Information"><topic href="reference011.htm#sthref245" /></entry>
-<entry keyword="Join Columns Information"><topic href="reference012.htm#sthref248" /></entry>
- </entry>
-<entry keyword="@Lob, General information"><topic href="ref_mapping_general.htm#sthref235" /></entry>
-<entry keyword="@ManyToMany, Many-to-many mapping"><topic href="tasks013.htm#sthref131" /></entry>
-<entry keyword="@ManyToOne, Many-to-one mapping"><topic href="tasks014.htm#sthref136" /></entry>
-<entry keyword="@MappedSuperclass, Mapped superclass"><topic href="tasks007.htm#sthref87" /></entry>
-<entry keyword="@NamedQuery, Creating Named Queries"><topic href="tasks008.htm#sthref107" /></entry>
-<entry keyword="@OneToMany, One-to-many mapping"><topic href="tasks015.htm#sthref141" /></entry>
-<entry keyword="@OneToOne, One-to-one mapping"><topic href="tasks016.htm#sthref145" /></entry>
-<entry keyword="@OrderBy, General information"><topic href="ref_mapping_general.htm#sthref243" /></entry>
-<entry keyword="@SequenceGenerator, Primary Key Generation information"><topic href="ref_primary_key.htm#sthref251" /></entry>
-<entry keyword="@Temporal, General information"><topic href="ref_mapping_general.htm#sthref237" /></entry>
-<entry keyword="@Transient, Transient mapping"><topic href="tasks017.htm#sthref151" /></entry>
-<entry keyword="@Version, Version mapping"><topic href="tasks018.htm#sthref155" /></entry>
-<entry keyword="architecture of Dali feature, Dali Developer Documentation"><topic href="reference032.htm#sthref283" /></entry>
-<entry keyword="association tables, Create New Association"><topic href="ref_create_new_association_wizard.htm#sthref206" /></entry>
-<entry keyword="attribute overrides, Attribute overrides"><topic href="reference007.htm#sthref213" /></entry>
-<entry keyword="Attribute Overrides - in Java Details view, Attribute overrides"><topic href="reference007.htm#sthref215" /></entry>
+ <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref139" /></entry>
+ <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref149" /></entry>
+ <entry keyword="Join Table Information"><topic href="reference011.htm#sthref247" /></entry>
+ <entry keyword="Join Columns Information"><topic href="reference012.htm#sthref250" /></entry>
+ </entry>
+ <entry keyword="@Lob">
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref236" /></entry>
+ </entry>
+ <entry keyword="@ManyToMany">
+ <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref132" /></entry>
+ </entry>
+ <entry keyword="@ManyToOne">
+ <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref137" /></entry>
+ </entry>
+ <entry keyword="@MappedSuperclass">
+ <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref88" /></entry>
+ </entry>
+ <entry keyword="@NamedQuery">
+ <entry keyword="Creating Named Queries"><topic href="tasks009.htm#sthref108" /></entry>
+ </entry>
+ <entry keyword="@OneToMany">
+ <entry keyword="One-to-many mapping"><topic href="tasks016.htm#sthref142" /></entry>
+ </entry>
+ <entry keyword="@OneToOne">
+ <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref146" /></entry>
+ </entry>
+ <entry keyword="@OrderBy">
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref245" /></entry>
+ </entry>
+ <entry keyword="@SequenceGenerator">
+ <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref253" /></entry>
+ </entry>
+ <entry keyword="@Temporal">
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref238" /></entry>
+ </entry>
+ <entry keyword="@Transient">
+ <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref152" /></entry>
+ </entry>
+ <entry keyword="@Version">
+ <entry keyword="Version mapping"><topic href="tasks019.htm#sthref156" /></entry>
+ </entry>
+ <entry keyword="architecture of Dali feature">
+ <entry keyword="Dali Developer Documentation"><topic href="reference033.htm#sthref289" /></entry>
+ </entry>
+ <entry keyword="association tables">
+ <entry keyword="Create New Association"><topic href="ref_create_new_association_wizard.htm#sthref207" /></entry>
+ </entry>
+ <entry keyword="attribute overrides">
+ <entry keyword="Attribute overrides"><topic href="reference007.htm#sthref214" /></entry>
+ </entry>
+ <entry keyword="Attribute Overrides - in Java Details view">
+ <entry keyword="Attribute overrides"><topic href="reference007.htm#sthref216" /></entry>
+ </entry>
<entry keyword="attributes">
-<entry keyword="JPA Details view, JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref229" /></entry>
-<entry keyword="mapping, Understanding OR mappings"><topic href="concept_mapping.htm#sthref21" /></entry>
+ <entry keyword="JPA Details view">
+ <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref230" /></entry>
+ </entry>
+ <entry keyword="mapping">
+ <entry keyword="Understanding OR mappings"><topic href="concept_mapping.htm#sthref21" /></entry>
+ </entry>
</entry>
<entry keyword="basic mapping">
-<entry keyword="@Basic, Basic mapping"><topic href="tasks009.htm#sthref116" /></entry>
-<entry keyword="about, Basic mapping"><topic href="tasks009.htm#sthref114" /></entry>
+ <entry keyword="@Basic">
+ <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref117" /></entry>
+ </entry>
+ <entry keyword="about">
+ <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref115" /></entry>
+ </entry>
<entry keyword="(See also mappings)"></entry>
</entry>
-<entry keyword="caching, Caching"><topic href="reference020.htm#sthref262" /></entry>
-<entry keyword="cardinality - association tables, Association Cardinality"><topic href="ref_association_cardinality.htm#sthref209" /></entry>
+ <entry keyword="caching">
+ <entry keyword="Caching"><topic href="reference020.htm#sthref264" /></entry>
+ </entry>
+ <entry keyword="canonical metamodel">
+ <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref284" /></entry>
+ </entry>
+ <entry keyword="cardinality - association tables">
+ <entry keyword="Association Cardinality"><topic href="ref_association_cardinality.htm#sthref210" /></entry>
+ </entry>
<entry keyword="classes">
-<entry keyword="adding persistence to, Adding persistence to a class"><topic href="task_add_persistence.htm#sthref68" /></entry>
-<entry keyword="embeddable, Embeddable"><topic href="tasks006.htm#sthref79" /></entry>
-<entry keyword="entity, Entity"><topic href="tasks005.htm#sthref71" /></entry>
-<entry keyword="managed, Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref50" /></entry>
-<entry keyword="managing persistent classes, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref192" /></entry>
-<entry keyword="mapped superclass, Mapped superclass"><topic href="tasks007.htm#sthref85" /></entry>
-<entry keyword="synchronizing, Synchronizing classes"><topic href="tasks002.htm#sthref53" /></entry>
+ <entry keyword="adding persistence to">
+ <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref69" /></entry>
+ </entry>
+ <entry keyword="embeddable">
+ <entry keyword="Embeddable"><topic href="tasks007.htm#sthref80" /></entry>
+ </entry>
+ <entry keyword="entity">
+ <entry keyword="Entity"><topic href="tasks006.htm#sthref72" /></entry>
+ </entry>
+ <entry keyword="managed">
+ <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref50" /></entry>
+ </entry>
+ <entry keyword="managing persistent classes">
+ <entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref193" /></entry>
+ </entry>
+ <entry keyword="mapped superclass">
+ <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref86" /></entry>
+ </entry>
+ <entry keyword="synchronizing">
+ <entry keyword="Synchronizing classes"><topic href="tasks002.htm#sthref52" /></entry>
+ </entry>
</entry>
<entry keyword="columns">
<entry keyword="discriminator">
-<entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref96" /></entry>
-<entry keyword="Inheritance information"><topic href="reference009.htm#sthref225" /></entry>
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref97" /></entry>
+ <entry keyword="Inheritance information"><topic href="reference009.htm#sthref226" /></entry>
</entry>
<entry keyword="join">
-<entry keyword="Many-to-one mapping"><topic href="tasks014.htm#sthref137" /></entry>
-<entry keyword="One-to-one mapping"><topic href="tasks016.htm#sthref147" /></entry>
-<entry keyword="Join Table Information"><topic href="reference011.htm#sthref244" /></entry>
-<entry keyword="Join Columns Information"><topic href="reference012.htm#sthref247" /></entry>
+ <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref138" /></entry>
+ <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref148" /></entry>
+ <entry keyword="Join Table Information"><topic href="reference011.htm#sthref246" /></entry>
+ <entry keyword="Join Columns Information"><topic href="reference012.htm#sthref249" /></entry>
+ </entry>
+ <entry keyword="mapping to">
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref232" /></entry>
</entry>
-<entry keyword="mapping to, General information"><topic href="ref_mapping_general.htm#sthref231" /></entry>
<entry keyword="value">
-<entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref98" /></entry>
-<entry keyword="Inheritance information"><topic href="reference009.htm#sthref223" /></entry>
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref99" /></entry>
+ <entry keyword="Inheritance information"><topic href="reference009.htm#sthref224" /></entry>
</entry>
</entry>
-<entry keyword="connection pool, Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref52" /></entry>
-<entry keyword="converting Java project to JPA, Converting a Java Project to a JPA Project"><topic href="tasks001.htm#sthref37" /></entry>
-<entry keyword="Create a JPA Project Wizard, Creating a new JPA project"><topic href="task_create_new_project.htm#sthref29" /></entry>
-<entry keyword="Create New JPA Project wizard, Create New JPA Project wizard"><topic href="ref_new_jpa_project_wizard.htm#sthref189" /></entry>
+ <entry keyword="connection pool">
+ <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref51" /></entry>
+ </entry>
+ <entry keyword="converting Java project to JPA">
+ <entry keyword="Converting a Java Project to a JPA Project"><topic href="tasks001.htm#sthref37" /></entry>
+ </entry>
+ <entry keyword="Create a JPA Project Wizard">
+ <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref29" /></entry>
+ </entry>
+ <entry keyword="Create New JPA Project wizard">
+ <entry keyword="Create New JPA Project wizard"><topic href="ref_new_jpa_project_wizard.htm#sthref190" /></entry>
+ </entry>
<entry keyword="database tables">
-<entry keyword="generating entities from, Generating entities from tables"><topic href="tasks019.htm#sthref160" /></entry>
+ <entry keyword="generating entities from">
+ <entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref161" /></entry>
+ </entry>
</entry>
<entry keyword="database - persistence">
-<entry keyword="connection, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref275" /></entry>
-<entry keyword="schema, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref277" /></entry>
+ <entry keyword="connection">
+ <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref279" /></entry>
+ </entry>
+ <entry keyword="schema">
+ <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref281" /></entry>
+ </entry>
+ </entry>
+ <entry keyword="derived ID">
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref243" /></entry>
+ </entry>
+ <entry keyword="developer documentation - Dali">
+ <entry keyword="Dali Developer Documentation"><topic href="reference033.htm#sthref288" /></entry>
+ </entry>
+ <entry keyword="eager fetch">
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref234" /></entry>
</entry>
-<entry keyword="developer documentation - Dali, Dali Developer Documentation"><topic href="reference032.htm#sthref282" /></entry>
-<entry keyword="eager fetch, General information"><topic href="ref_mapping_general.htm#sthref233" /></entry>
-<entry keyword="EclipseLink XML mapping file, Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref51" /></entry>
<entry keyword="embeddable class">
-<entry keyword="@Embeddable, Embeddable"><topic href="tasks006.htm#sthref81" /></entry>
-<entry keyword="about, Embeddable"><topic href="tasks006.htm#sthref78" /></entry>
+ <entry keyword="@Embeddable">
+ <entry keyword="Embeddable"><topic href="tasks007.htm#sthref82" /></entry>
+ </entry>
+ <entry keyword="about">
+ <entry keyword="Embeddable"><topic href="tasks007.htm#sthref79" /></entry>
+ </entry>
</entry>
<entry keyword="embedded ID mapping">
-<entry keyword="@EmbeddedId, Embedded ID mapping"><topic href="tasks011.htm#sthref124" /></entry>
-<entry keyword="about, Embedded ID mapping"><topic href="tasks011.htm#sthref122" /></entry>
+ <entry keyword="@EmbeddedId">
+ <entry keyword="Embedded ID mapping"><topic href="tasks012.htm#sthref125" /></entry>
+ </entry>
+ <entry keyword="about">
+ <entry keyword="Embedded ID mapping"><topic href="tasks012.htm#sthref123" /></entry>
+ </entry>
</entry>
<entry keyword="embedded mapping">
-<entry keyword="@Embedded, Embedded mapping"><topic href="tasks010.htm#sthref120" /></entry>
-<entry keyword="about, Embedded mapping"><topic href="tasks010.htm#sthref118" /></entry>
+ <entry keyword="@Embedded">
+ <entry keyword="Embedded mapping"><topic href="tasks011.htm#sthref121" /></entry>
+ </entry>
+ <entry keyword="about">
+ <entry keyword="Embedded mapping"><topic href="tasks011.htm#sthref119" /></entry>
+ </entry>
</entry>
<entry keyword="entities">
-<entry keyword="@Entity annotation, Entity"><topic href="tasks005.htm#sthref74" /></entry>
-<entry keyword="about, Understanding Java persistence"><topic href="concept_persistence.htm#sthref20" /></entry>
-<entry keyword="creating, Creating a JPA Entity"><topic href="task_create_jpa_entity.htm#sthref40" /></entry>
-<entry keyword="customizing, Customize Individual Entities"><topic href="ref_customizIndividualEntities.htm#sthref205" /></entry>
-<entry keyword="embeddable, Embeddable"><topic href="tasks006.htm#sthref82" /></entry>
+ <entry keyword="@Entity annotation">
+ <entry keyword="Entity"><topic href="tasks006.htm#sthref75" /></entry>
+ </entry>
+ <entry keyword="about">
+ <entry keyword="Understanding Java persistence"><topic href="concept_persistence.htm#sthref20" /></entry>
+ </entry>
+ <entry keyword="creating">
+ <entry keyword="Creating a JPA Entity"><topic href="task_create_jpa_entity.htm#sthref40" /></entry>
+ </entry>
+ <entry keyword="customizing">
+ <entry keyword="Customize Individual Entities"><topic href="ref_customizIndividualEntities.htm#sthref206" /></entry>
+ </entry>
+ <entry keyword="embeddable">
+ <entry keyword="Embeddable"><topic href="tasks007.htm#sthref83" /></entry>
+ </entry>
<entry keyword="from tables">
-<entry keyword="Generating entities from tables"><topic href="tasks019.htm#sthref157" /></entry>
-<entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref201" /></entry>
- </entry>
-<entry keyword="generating, Customize Default Entity Generation"><topic href="ref_customizeDefaultEntityGeneration.htm#sthref204" /></entry>
-<entry keyword="JPA Details view, JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref212" /></entry>
-<entry keyword="mapped superclass, Mapped superclass"><topic href="tasks007.htm#sthref88" /></entry>
-<entry keyword="mapping, Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref13" /></entry>
-<entry keyword="persistence, Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref11" /></entry>
+ <entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref158" /></entry>
+ <entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref202" /></entry>
+ </entry>
+ <entry keyword="generating">
+ <entry keyword="Customize Default Entity Generation"><topic href="ref_customizeDefaultEntityGeneration.htm#sthref205" /></entry>
+ </entry>
+ <entry keyword="JPA Details view">
+ <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref213" /></entry>
+ </entry>
+ <entry keyword="mapped superclass">
+ <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref89" /></entry>
+ </entry>
+ <entry keyword="mapping">
+ <entry keyword="Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref13" /></entry>
+ </entry>
+ <entry keyword="persistence">
+ <entry keyword="Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref11" /></entry>
+ </entry>
<entry keyword="persistent">
-<entry keyword="Entity"><topic href="tasks005.htm#sthref69" /></entry>
-<entry keyword="Entity"><topic href="tasks005.htm#sthref75" /></entry>
+ <entry keyword="Entity"><topic href="tasks006.htm#sthref70" /></entry>
+ <entry keyword="Entity"><topic href="tasks006.htm#sthref76" /></entry>
+ </entry>
+ <entry keyword="secondary tables">
+ <entry keyword="Secondary table information"><topic href="reference008.htm#sthref219" /></entry>
</entry>
-<entry keyword="secondary tables, Secondary table information"><topic href="reference008.htm#sthref218" /></entry>
</entry>
-<entry keyword="Entity Class page, Selecting the Create a JPA Entity Wizard"><topic href="task_create_jpa_entity.htm#sthref43" /></entry>
-<entry keyword="Entity Properties page, &lt;a id=&quot;sthref43&quot; name=&quot;sthref43&quot;&gt;&lt;/a&gt;The Entity Class Page"><topic href="task_create_jpa_entity.htm#sthref45" /></entry>
+ <entry keyword="Entity Class page">
+ <entry keyword="Selecting the Create a JPA Entity Wizard"><topic href="task_create_jpa_entity.htm#sthref43" /></entry>
+ </entry>
+ <entry keyword="Entity Properties page">
+ <entry keyword="&lt;a id=&quot;sthref43&quot; name=&quot;sthref43&quot;&gt;&lt;/a&gt;The Entity Class Page"><topic href="task_create_jpa_entity.htm#sthref45" /></entry>
+ </entry>
<entry keyword="enumerated">
-<entry keyword="General information"><topic href="ref_mapping_general.htm#sthref239" /></entry>
-<entry keyword="General information"><topic href="ref_mapping_general.htm#sthref241" /></entry>
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref240" /></entry>
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref242" /></entry>
</entry>
<entry keyword="error messages - Dali">
-<entry keyword="Validating mappings and reporting problems"><topic href="tasks021.htm#sthref166" /></entry>
-<entry keyword="Error messages"><topic href="tasks022.htm#sthref171" /></entry>
+ <entry keyword="Validating mappings and reporting problems"><topic href="tasks023.htm#sthref167" /></entry>
+ <entry keyword="Error messages"><topic href="tasks024.htm#sthref172" /></entry>
+ </entry>
+ <entry keyword="extension points - Dali feature">
+ <entry keyword="Dali Developer Documentation"><topic href="reference033.htm#sthref290" /></entry>
+ </entry>
+ <entry keyword="fetch type">
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref233" /></entry>
</entry>
-<entry keyword="extension points - Dali feature, Dali Developer Documentation"><topic href="reference032.htm#sthref284" /></entry>
-<entry keyword="fetch type, General information"><topic href="ref_mapping_general.htm#sthref232" /></entry>
<entry keyword="Generate Entities from Tables dialog">
-<entry keyword="Generating entities from tables"><topic href="tasks019.htm#sthref159" /></entry>
-<entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref200" /></entry>
+ <entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref160" /></entry>
+ <entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref201" /></entry>
</entry>
<entry keyword="generated values">
-<entry keyword="ID mappings, Primary Key Generation information"><topic href="ref_primary_key.htm#sthref250" /></entry>
-<entry keyword="sequence, Primary Key Generation information"><topic href="ref_primary_key.htm#sthref252" /></entry>
+ <entry keyword="ID mappings">
+ <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref252" /></entry>
+ </entry>
+ <entry keyword="sequence">
+ <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref254" /></entry>
+ </entry>
+ </entry>
+ <entry keyword="hints - query">
+ <entry keyword="Creating Named Queries"><topic href="tasks009.htm#sthref110" /></entry>
</entry>
-<entry keyword="hints - query, Creating Named Queries"><topic href="tasks008.htm#sthref109" /></entry>
<entry keyword="ID mapping">
-<entry keyword="@Id, ID mapping"><topic href="tasks012.htm#sthref128" /></entry>
-<entry keyword="about, ID mapping"><topic href="tasks012.htm#sthref126" /></entry>
+ <entry keyword="@Id">
+ <entry keyword="ID mapping"><topic href="tasks013.htm#sthref129" /></entry>
+ </entry>
+ <entry keyword="about">
+ <entry keyword="ID mapping"><topic href="tasks013.htm#sthref127" /></entry>
+ </entry>
</entry>
<entry keyword="inheritance">
<entry keyword="entity">
-<entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref92" /></entry>
-<entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref194" /></entry>
-<entry keyword="Inheritance information"><topic href="reference009.htm#sthref221" /></entry>
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref93" /></entry>
+ <entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref195" /></entry>
+ <entry keyword="Inheritance information"><topic href="reference009.htm#sthref222" /></entry>
</entry>
-<entry keyword="joined tables, Single Table Inheritance"><topic href="task_inheritance.htm#sthref104" /></entry>
-<entry keyword="single table, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref99" /></entry>
+ <entry keyword="joined tables">
+ <entry keyword="Single Table Inheritance"><topic href="task_inheritance.htm#sthref105" /></entry>
+ </entry>
+ <entry keyword="single table">
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref100" /></entry>
+ </entry>
+ </entry>
+ <entry keyword="Inheritance - in Java Details view">
+ <entry keyword="Inheritance information"><topic href="reference009.htm#sthref221" /></entry>
+ </entry>
+ <entry keyword="installation - Dali">
+ <entry keyword="Requirements and installation"><topic href="getting_started001.htm#sthref3" /></entry>
+ </entry>
+ <entry keyword="Java project - converting to JPA">
+ <entry keyword="Converting a Java Project to a JPA Project"><topic href="tasks001.htm#sthref35" /></entry>
</entry>
-<entry keyword="Inheritance - in Java Details view, Inheritance information"><topic href="reference009.htm#sthref220" /></entry>
-<entry keyword="installation - Dali, Requirements and installation"><topic href="getting_started001.htm#sthref3" /></entry>
-<entry keyword="Java project - converting to JPA, Converting a Java Project to a JPA Project"><topic href="tasks001.htm#sthref35" /></entry>
<entry keyword="join columns">
-<entry keyword="Join Columns"><topic href="ref_join_columns.htm#sthref208" /></entry>
-<entry keyword="Join Columns Information"><topic href="reference012.htm#sthref246" /></entry>
+ <entry keyword="Join Columns"><topic href="ref_join_columns.htm#sthref209" /></entry>
+ <entry keyword="Join Columns Information"><topic href="reference012.htm#sthref248" /></entry>
+ </entry>
+ <entry keyword="joined tables - inheritance">
+ <entry keyword="Single Table Inheritance"><topic href="task_inheritance.htm#sthref106" /></entry>
</entry>
-<entry keyword="joined tables - inheritance, Single Table Inheritance"><topic href="task_inheritance.htm#sthref105" /></entry>
<entry keyword="JPA Details view">
-<entry keyword="attributes, JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref227" /></entry>
-<entry keyword="entities, JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref210" /></entry>
+ <entry keyword="attributes">
+ <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref228" /></entry>
+ </entry>
+ <entry keyword="entities">
+ <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref211" /></entry>
+ </entry>
+ </entry>
+ <entry keyword="JPA Development perspective">
+ <entry keyword="JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref286" /></entry>
+ </entry>
+ <entry keyword="JPA Facet page">
+ <entry keyword="The Java Source Page"><topic href="task_create_new_project.htm#sthref34" /></entry>
</entry>
-<entry keyword="JPA Development perspective, JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref280" /></entry>
-<entry keyword="JPA Facet page, The Java Source Page"><topic href="task_create_new_project.htm#sthref34" /></entry>
<entry keyword="JPA project">
-<entry keyword="converting from Java, Converting a Java Project to a JPA Project"><topic href="tasks001.htm#sthref36" /></entry>
-<entry keyword="creating new, Creating a new JPA project"><topic href="task_create_new_project.htm#sthref27" /></entry>
-<entry keyword="implementation, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref190" /></entry>
-<entry keyword="page, &lt;a id=&quot;sthref29&quot; name=&quot;sthref29&quot;&gt;&lt;/a&gt;Selecting the Create a JPA Project wizard"><topic href="task_create_new_project.htm#sthref31" /></entry>
-<entry keyword="platform, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref274" /></entry>
- </entry>
-<entry keyword="JPA Structure view, JPA Structure view"><topic href="ref_persistence_outline.htm#sthref254" /></entry>
-<entry keyword="lazy fetch, General information"><topic href="ref_mapping_general.htm#sthref234" /></entry>
-<entry keyword="library - JPA, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref191" /></entry>
+ <entry keyword="converting from Java">
+ <entry keyword="Converting a Java Project to a JPA Project"><topic href="tasks001.htm#sthref36" /></entry>
+ </entry>
+ <entry keyword="creating new">
+ <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref27" /></entry>
+ </entry>
+ <entry keyword="implementation">
+ <entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref191" /></entry>
+ </entry>
+ <entry keyword="page">
+ <entry keyword="&lt;a id=&quot;sthref29&quot; name=&quot;sthref29&quot;&gt;&lt;/a&gt;Selecting the Create a JPA Project wizard"><topic href="task_create_new_project.htm#sthref31" /></entry>
+ </entry>
+ <entry keyword="platform">
+ <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref278" /></entry>
+ </entry>
+ </entry>
+ <entry keyword="JPA Structure view">
+ <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref256" /></entry>
+ </entry>
+ <entry keyword="lazy fetch">
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref235" /></entry>
+ </entry>
+ <entry keyword="library - JPA">
+ <entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref192" /></entry>
+ </entry>
<entry keyword="many-to-many mapping">
-<entry keyword="@ManyToMany, Many-to-many mapping"><topic href="tasks013.htm#sthref132" /></entry>
-<entry keyword="about, Many-to-many mapping"><topic href="tasks013.htm#sthref130" /></entry>
+ <entry keyword="@ManyToMany">
+ <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref133" /></entry>
+ </entry>
+ <entry keyword="about">
+ <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref131" /></entry>
+ </entry>
</entry>
<entry keyword="many-to-one mapping">
-<entry keyword="@ManyToOne, Many-to-one mapping"><topic href="tasks014.htm#sthref135" /></entry>
-<entry keyword="about, Many-to-one mapping"><topic href="tasks014.htm#sthref134" /></entry>
+ <entry keyword="@ManyToOne">
+ <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref136" /></entry>
+ </entry>
+ <entry keyword="about">
+ <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref135" /></entry>
+ </entry>
</entry>
<entry keyword="mapped superclass">
-<entry keyword="@MappedSuperclass, Mapped superclass"><topic href="tasks007.htm#sthref86" /></entry>
-<entry keyword="about, Mapped superclass"><topic href="tasks007.htm#sthref84" /></entry>
+ <entry keyword="@MappedSuperclass">
+ <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref87" /></entry>
+ </entry>
+ <entry keyword="about">
+ <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref85" /></entry>
+ </entry>
+ </entry>
+ <entry keyword="mapping entities">
+ <entry keyword="Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref12" /></entry>
</entry>
-<entry keyword="mapping entities, Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref12" /></entry>
<entry keyword="mapping file">
-<entry keyword="&lt;a id=&quot;sthref57&quot; name=&quot;sthref57&quot;&gt;&lt;/a&gt;Managing the orm.xml file"><topic href="tasks003.htm#sthref60" /></entry>
-<entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref195" /></entry>
+ <entry keyword="&lt;a id=&quot;sthref58&quot; name=&quot;sthref58&quot;&gt;&lt;/a&gt;Managing the orm.xml file"><topic href="tasks004.htm#sthref61" /></entry>
+ <entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref196" /></entry>
</entry>
<entry keyword="mappings">
-<entry keyword="about, Understanding OR mappings"><topic href="concept_mapping.htm#sthref22" /></entry>
-<entry keyword="basic, Basic mapping"><topic href="tasks009.htm#sthref113" /></entry>
-<entry keyword="embedded, Embedded mapping"><topic href="tasks010.htm#sthref117" /></entry>
-<entry keyword="embedded ID, Embedded ID mapping"><topic href="tasks011.htm#sthref121" /></entry>
-<entry keyword="ID, ID mapping"><topic href="tasks012.htm#sthref125" /></entry>
-<entry keyword="many-to-many, Many-to-many mapping"><topic href="tasks013.htm#sthref129" /></entry>
-<entry keyword="many-to-one, Many-to-one mapping"><topic href="tasks014.htm#sthref133" /></entry>
-<entry keyword="one-to-many, One-to-many mapping"><topic href="tasks015.htm#sthref139" /></entry>
-<entry keyword="one-to-one, One-to-one mapping"><topic href="tasks016.htm#sthref143" /></entry>
-<entry keyword="problems, Validating mappings and reporting problems"><topic href="tasks021.htm#sthref169" /></entry>
-<entry keyword="transient, Transient mapping"><topic href="tasks017.htm#sthref149" /></entry>
-<entry keyword="version, Version mapping"><topic href="tasks018.htm#sthref153" /></entry>
+ <entry keyword="about">
+ <entry keyword="Understanding OR mappings"><topic href="concept_mapping.htm#sthref22" /></entry>
+ </entry>
+ <entry keyword="basic">
+ <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref114" /></entry>
+ </entry>
+ <entry keyword="embedded">
+ <entry keyword="Embedded mapping"><topic href="tasks011.htm#sthref118" /></entry>
+ </entry>
+ <entry keyword="embedded ID">
+ <entry keyword="Embedded ID mapping"><topic href="tasks012.htm#sthref122" /></entry>
+ </entry>
+ <entry keyword="ID">
+ <entry keyword="ID mapping"><topic href="tasks013.htm#sthref126" /></entry>
+ </entry>
+ <entry keyword="many-to-many">
+ <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref130" /></entry>
+ </entry>
+ <entry keyword="many-to-one">
+ <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref134" /></entry>
+ </entry>
+ <entry keyword="one-to-many">
+ <entry keyword="One-to-many mapping"><topic href="tasks016.htm#sthref140" /></entry>
+ </entry>
+ <entry keyword="one-to-one">
+ <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref144" /></entry>
+ </entry>
+ <entry keyword="problems">
+ <entry keyword="Validating mappings and reporting problems"><topic href="tasks023.htm#sthref170" /></entry>
+ </entry>
+ <entry keyword="transient">
+ <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref150" /></entry>
+ </entry>
+ <entry keyword="version">
+ <entry keyword="Version mapping"><topic href="tasks019.htm#sthref154" /></entry>
+ </entry>
+ </entry>
+ <entry keyword="metamodel - canonical">
+ <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref285" /></entry>
</entry>
<entry keyword="named queries">
-<entry keyword="entity, Creating Named Queries"><topic href="tasks008.htm#sthref106" /></entry>
-<entry keyword="hints, Creating Named Queries"><topic href="tasks008.htm#sthref110" /></entry>
+ <entry keyword="entity">
+ <entry keyword="Creating Named Queries"><topic href="tasks009.htm#sthref107" /></entry>
+ </entry>
+ <entry keyword="hints">
+ <entry keyword="Creating Named Queries"><topic href="tasks009.htm#sthref111" /></entry>
+ </entry>
+ </entry>
+ <entry keyword="native queries">
+ <entry keyword="Creating Named Queries"><topic href="tasks009.htm#sthref112" /></entry>
</entry>
-<entry keyword="native queries, Creating Named Queries"><topic href="tasks008.htm#sthref111" /></entry>
<entry keyword="nonpersistent">
-<entry keyword="classes, Adding persistence to a class"><topic href="task_add_persistence.htm#sthref67" /></entry>
+ <entry keyword="classes">
+ <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref68" /></entry>
+ </entry>
<entry keyword="fields. See transient"></entry>
</entry>
<entry keyword="one-to-many mapping">
-<entry keyword="@OneToMany, One-to-many mapping"><topic href="tasks015.htm#sthref142" /></entry>
-<entry keyword="about, One-to-many mapping"><topic href="tasks015.htm#sthref140" /></entry>
+ <entry keyword="@OneToMany">
+ <entry keyword="One-to-many mapping"><topic href="tasks016.htm#sthref143" /></entry>
+ </entry>
+ <entry keyword="about">
+ <entry keyword="One-to-many mapping"><topic href="tasks016.htm#sthref141" /></entry>
+ </entry>
</entry>
<entry keyword="one-to-one mapping">
-<entry keyword="@OneToOne, One-to-one mapping"><topic href="tasks016.htm#sthref146" /></entry>
-<entry keyword="about, One-to-one mapping"><topic href="tasks016.htm#sthref144" /></entry>
+ <entry keyword="@OneToOne">
+ <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref147" /></entry>
+ </entry>
+ <entry keyword="about">
+ <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref145" /></entry>
+ </entry>
+ </entry>
+ <entry keyword="ordering">
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref244" /></entry>
</entry>
-<entry keyword="ordering, General information"><topic href="ref_mapping_general.htm#sthref242" /></entry>
<entry keyword="orm.xml file">
-<entry keyword="about, The orm.xml file"><topic href="concepts003.htm#sthref24" /></entry>
-<entry keyword="creating, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref193" /></entry>
-<entry keyword="managing, Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref57" /></entry>
-<entry keyword="sample, Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref58" /></entry>
+ <entry keyword="about">
+ <entry keyword="The orm.xml file"><topic href="concepts003.htm#sthref24" /></entry>
+ </entry>
+ <entry keyword="creating">
+ <entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref194" /></entry>
+ </entry>
+ <entry keyword="managing">
+ <entry keyword="Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref58" /></entry>
+ </entry>
+ <entry keyword="sample">
+ <entry keyword="Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref59" /></entry>
+ </entry>
+ </entry>
+ <entry keyword="overrides - JPA attributes">
+ <entry keyword="Attribute overrides"><topic href="reference007.htm#sthref215" /></entry>
</entry>
-<entry keyword="overrides - JPA attributes, Attribute overrides"><topic href="reference007.htm#sthref214" /></entry>
<entry keyword="persistence">
-<entry keyword="about, Understanding Java persistence"><topic href="concept_persistence.htm#sthref19" /></entry>
-<entry keyword="database connection, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref276" /></entry>
-<entry keyword="database schema, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref279" /></entry>
-<entry keyword="entity class, Adding persistence to a class"><topic href="task_add_persistence.htm#sthref66" /></entry>
-<entry keyword="options, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref271" /></entry>
-<entry keyword="provider, Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref49" /></entry>
+ <entry keyword="about">
+ <entry keyword="Understanding Java persistence"><topic href="concept_persistence.htm#sthref19" /></entry>
+ </entry>
+ <entry keyword="database connection">
+ <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref280" /></entry>
+ </entry>
+ <entry keyword="database schema">
+ <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref283" /></entry>
+ </entry>
+ <entry keyword="entity class">
+ <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref67" /></entry>
+ </entry>
+ <entry keyword="options">
+ <entry keyword="Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref273" /></entry>
+ <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref275" /></entry>
+ </entry>
+ <entry keyword="provider">
+ <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref49" /></entry>
+ </entry>
</entry>
<entry keyword="persistence.xml file">
-<entry keyword="about, The persistence.xml file"><topic href="concepts002.htm#sthref23" /></entry>
+ <entry keyword="about">
+ <entry keyword="The persistence.xml file"><topic href="concepts002.htm#sthref23" /></entry>
+ </entry>
<entry keyword="managing">
-<entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref47" /></entry>
-<entry keyword="Working with orm.xml file"><topic href="tasks004.htm#sthref64" /></entry>
+ <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref47" /></entry>
+ <entry keyword="Working with orm.xml file"><topic href="tasks005.htm#sthref65" /></entry>
</entry>
-<entry keyword="sample, Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref48" /></entry>
-<entry keyword="synchronizing with classes, Synchronizing classes"><topic href="tasks002.htm#sthref54" /></entry>
+ <entry keyword="sample">
+ <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref48" /></entry>
+ </entry>
+ <entry keyword="synchronizing with classes">
+ <entry keyword="Synchronizing classes"><topic href="tasks002.htm#sthref53" /></entry>
+ </entry>
+ </entry>
+ <entry keyword="persistent entity">
+ <entry keyword="Entity"><topic href="tasks006.htm#sthref71" /></entry>
+ </entry>
+ <entry keyword="perspective - JPA Development">
+ <entry keyword="JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref287" /></entry>
+ </entry>
+ <entry keyword="platform - JPA">
+ <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref277" /></entry>
+ </entry>
+ <entry keyword="problems">
+ <entry keyword="Validating mappings and reporting problems"><topic href="tasks023.htm#sthref169" /></entry>
</entry>
-<entry keyword="persistent entity, Entity"><topic href="tasks005.htm#sthref70" /></entry>
-<entry keyword="perspective - JPA Development, JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref281" /></entry>
-<entry keyword="platform - JPA, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref273" /></entry>
-<entry keyword="problems, Validating mappings and reporting problems"><topic href="tasks021.htm#sthref168" /></entry>
<entry keyword="projects - JPA">
<entry keyword="creating new">
-<entry keyword="Creating a new JPA project"><topic href="getting_started003.htm#sthref9" /></entry>
-<entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref26" /></entry>
+ <entry keyword="Creating a new JPA project"><topic href="getting_started003.htm#sthref9" /></entry>
+ <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref26" /></entry>
+ </entry>
+ <entry keyword="options">
+ <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref276" /></entry>
+ </entry>
+ <entry keyword="validation preferences">
+ <entry keyword="Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref274" /></entry>
</entry>
-<entry keyword="options, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref272" /></entry>
</entry>
-<entry keyword="query hints, Creating Named Queries"><topic href="tasks008.htm#sthref108" /></entry>
-<entry keyword="quick start - Dali, Dali quick start"><topic href="getting_started002.htm#sthref8" /></entry>
+ <entry keyword="query hints">
+ <entry keyword="Creating Named Queries"><topic href="tasks009.htm#sthref109" /></entry>
+ </entry>
+ <entry keyword="quick start - Dali">
+ <entry keyword="Dali quick start"><topic href="getting_started002.htm#sthref8" /></entry>
+ </entry>
<entry keyword="requirements">
-<entry keyword="Dali Java Persistence Tools, Requirements and installation"><topic href="getting_started001.htm#sthref4" /></entry>
-<entry keyword="persistent entities, Entity"><topic href="tasks005.htm#sthref72" /></entry>
- </entry>
-<entry keyword="schema - database, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref278" /></entry>
-<entry keyword="secondary tables, Secondary table information"><topic href="reference008.htm#sthref216" /></entry>
-<entry keyword="Secondary Tables - in Java Details view, Secondary table information"><topic href="reference008.htm#sthref219" /></entry>
-<entry keyword="single table inheritance, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref100" /></entry>
-<entry keyword="superclass, Mapped superclass"><topic href="tasks007.htm#sthref89" /></entry>
-<entry keyword="synchronizing classes with persistence.xml file, Synchronizing classes"><topic href="tasks002.htm#sthref55" /></entry>
+ <entry keyword="Dali Java Persistence Tools">
+ <entry keyword="Requirements and installation"><topic href="getting_started001.htm#sthref4" /></entry>
+ </entry>
+ <entry keyword="persistent entities">
+ <entry keyword="Entity"><topic href="tasks006.htm#sthref73" /></entry>
+ </entry>
+ </entry>
+ <entry keyword="schema - database">
+ <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref282" /></entry>
+ </entry>
+ <entry keyword="secondary tables">
+ <entry keyword="Secondary table information"><topic href="reference008.htm#sthref217" /></entry>
+ </entry>
+ <entry keyword="Secondary Tables - in Java Details view">
+ <entry keyword="Secondary table information"><topic href="reference008.htm#sthref220" /></entry>
+ </entry>
+ <entry keyword="single table inheritance">
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref101" /></entry>
+ </entry>
+ <entry keyword="superclass">
+ <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref90" /></entry>
+ </entry>
+ <entry keyword="synchronizing classes with persistence.xml file">
+ <entry keyword="Synchronizing classes"><topic href="tasks002.htm#sthref54" /></entry>
+ </entry>
<entry keyword="tables">
<entry keyword="associations">
-<entry keyword="Table Associations"><topic href="ref_tableAssociations.htm#sthref203" /></entry>
-<entry keyword="Create New Association"><topic href="ref_create_new_association_wizard.htm#sthref207" /></entry>
+ <entry keyword="Table Associations"><topic href="ref_tableAssociations.htm#sthref204" /></entry>
+ <entry keyword="Create New Association"><topic href="ref_create_new_association_wizard.htm#sthref208" /></entry>
</entry>
<entry keyword="creating entities from">
-<entry keyword="Generating entities from tables"><topic href="tasks019.htm#sthref158" /></entry>
-<entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref202" /></entry>
+ <entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref159" /></entry>
+ <entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref203" /></entry>
+ </entry>
+ <entry keyword="inheritance">
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref102" /></entry>
+ </entry>
+ <entry keyword="secondary">
+ <entry keyword="Secondary table information"><topic href="reference008.htm#sthref218" /></entry>
</entry>
-<entry keyword="inheritance, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref101" /></entry>
-<entry keyword="secondary, Secondary table information"><topic href="reference008.htm#sthref217" /></entry>
</entry>
<entry keyword="temporal">
-<entry keyword="General information"><topic href="ref_mapping_general.htm#sthref236" /></entry>
-<entry keyword="General information"><topic href="ref_mapping_general.htm#sthref238" /></entry>
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref237" /></entry>
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref239" /></entry>
</entry>
<entry keyword="transient mapping">
-<entry keyword="@Transient, Transient mapping"><topic href="tasks017.htm#sthref152" /></entry>
-<entry keyword="about, Transient mapping"><topic href="tasks017.htm#sthref150" /></entry>
+ <entry keyword="@Transient">
+ <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref153" /></entry>
+ </entry>
+ <entry keyword="about">
+ <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref151" /></entry>
+ </entry>
</entry>
<entry keyword="version mapping">
-<entry keyword="@Version, Version mapping"><topic href="tasks018.htm#sthref156" /></entry>
-<entry keyword="about, Version mapping"><topic href="tasks018.htm#sthref154" /></entry>
+ <entry keyword="@Version">
+ <entry keyword="Version mapping"><topic href="tasks019.htm#sthref157" /></entry>
+ </entry>
+ <entry keyword="about">
+ <entry keyword="Version mapping"><topic href="tasks019.htm#sthref155" /></entry>
+ </entry>
</entry>
<entry keyword="views">
<entry keyword="JPA Details view">
-<entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref211" /></entry>
-<entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref228" /></entry>
+ <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref212" /></entry>
+ <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref229" /></entry>
+ </entry>
+ <entry keyword="JPA Structure view">
+ <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref255" /></entry>
</entry>
-<entry keyword="JPA Structure view, JPA Structure view"><topic href="ref_persistence_outline.htm#sthref253" /></entry>
</entry>
-<entry keyword="warning messages - Dali, Validating mappings and reporting problems"><topic href="tasks021.htm#sthref167" /></entry>
-<entry keyword="Web Tools Platform (WTP), Requirements and installation"><topic href="getting_started001.htm#sthref5" /></entry>
-<entry keyword="XML editor, Working with orm.xml file"><topic href="tasks004.htm#sthref63" /></entry>
-</index> \ No newline at end of file
+ <entry keyword="warning messages - Dali">
+ <entry keyword="Validating mappings and reporting problems"><topic href="tasks023.htm#sthref168" /></entry>
+ </entry>
+ <entry keyword="Web Tools Platform (WTP)">
+ <entry keyword="Requirements and installation"><topic href="getting_started001.htm#sthref5" /></entry>
+ </entry>
+ <entry keyword="XML editor">
+ <entry keyword="Working with orm.xml file"><topic href="tasks005.htm#sthref64" /></entry>
+ </entry>
+</index>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm b/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm
index f9f56b55ea..dfa0007f53 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Legal</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:56Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:49Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content=" Legal" />
<meta name="relnum" content="Release 2.3" />
@@ -18,7 +18,7 @@
<!-- contents -->
</head>
<body>
-<p><a id="sthref289" name="sthref289"></a></p>
+<p><a id="sthref294" name="sthref294"></a></p>
<h1>Legal</h1>
<p>Copyright &copy; 2006, 2010, Oracle. All rights reserved.</p>
<p>This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at:</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml b/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
index 342c5199d0..8bfb4e14dd 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
-<plugin>
+<plugin name="JPA Documentation Plug-in" id="org.eclipse.jpt.doc.user" version="2.3.0" provider-name="Oracle">
<!-- =========== -->
<!-- Define TOC -->
<!-- =========== -->
@@ -23,15 +23,15 @@
<!-- Cheatsheets -->
<!-- =========== -->
<extension point="org.eclipse.ui.cheatsheets.cheatSheetContent">
- <category name="%jpaDevelopment" id="com.jpa.category"/>
- <cheatsheet name="%createAJpaProject" category="com.jpa.category" contentFile="$nl$/cheatsheets/add_persistence.xml" id="org.eclipse.jpa.cheatsheet.createproject1">
- <description>%createAJpaProjectDescription</description>
+ <category name="JPA Development" id="com.jpa.category"/>
+ <cheatsheet name="Create a JPA Project" category="com.jpa.category" contentFile="$nl$/cheatsheets/add_persistence.xml" id="org.eclipse.jpa.cheatsheet.createproject1">
+ <description>Learn how to create a JPA project.</description>
</cheatsheet>
- <cheatsheet name="%createAPersistentEntity" category="com.jpa.category" contentFile="$nl$/cheatsheets/create_entity.xml" id="org.eclipse.jpa.cheatsheet.addentity">
- <description>%createAPersistentEntityDescription</description>
+ <cheatsheet name="Create a Persistent Entity" category="com.jpa.category" contentFile="$nl$/cheatsheets/create_entity.xml" id="org.eclipse.jpa.cheatsheet.addentity">
+ <description>Learn how to add a persistent entity to a Java project.</description>
</cheatsheet>
- <cheatsheet name="%MapAPersistentEntity" category="com.jpa.category" contentFile="$nl$/cheatsheets/map_entity.xml" id="org.eclipse.jpa.cheatsheet.mapentity">
- <description>%MapAPersistentEntityDescription</description>
+ <cheatsheet name="Map a Persistent Entity" category="com.jpa.category" contentFile="$nl$/cheatsheets/map_entity.xml" id="org.eclipse.jpa.cheatsheet.mapentity">
+ <description>Learn how to map a persistent entity to a database.</description>
</cheatsheet>
</extension>
</plugin>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm
index d756128fcf..f4578f1bd3 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Entity Class page</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:50Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Entity Class page" />
<meta name="relnum" content="Release 2.3" />
@@ -61,7 +61,7 @@
<td align="left" headers="r6c1-t5 r1c3-t5"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t5" headers="r1c1-t5"><a id="sthref193" name="sthref193"></a>Inheritance</td>
+<td align="left" id="r7c1-t5" headers="r1c1-t5"><a id="sthref195" name="sthref195"></a>Inheritance</td>
<td align="left" headers="r7c1-t5 r1c2-t5">Because the wizard creates a Java class with an <code>@Entity</code> notation, the <span class="bold">Entity</span> option is selected by default.
<p>Select <span class="bold">Mapped Superclass</span> if you defined a superclass.</p>
<p>To add an <code>@Inheritance</code> notation to the entity, select <span class="bold">Inheritance</span> and then select one of the inheritance mapping strategies (described in JSR 220):</p>
@@ -80,7 +80,7 @@
<td align="left" headers="r7c1-t5 r1c3-t5">Entity</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t5" headers="r1c1-t5"><a id="sthref194" name="sthref194"></a>XML Entity Mappings</td>
+<td align="left" id="r8c1-t5" headers="r1c1-t5"><a id="sthref196" name="sthref196"></a>XML Entity Mappings</td>
<td align="left" headers="r8c1-t5 r1c2-t5">Select <span class="bold">Add to entity mappings in XML</span> to create XML mappings in <code>orm.xml</code>, rather than annotations.
<p>Use the <span class="bold">Mapping file</span> field to specify the file to use. By default, mappings are stored in the <code>META-INF/orm.xml</code> file.</p>
</td>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm
index 356004a5fa..8914f86c92 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Entity Properties page</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:50Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Entity Properties page" />
<meta name="relnum" content="Release 2.3" />
@@ -22,7 +22,7 @@
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Entity Properties page</h1>
<p>This table lists the properties of the Entity Properties page of the <a href="ref_create_jpa_entity_wizard.htm#CIAGGGDF">Create JPA Entity wizard</a>.</p>
-<div class="tblformal"><a id="sthref195" name="sthref195"></a><a id="sthref196" name="sthref196"></a>
+<div class="tblformal"><a id="sthref197" name="sthref197"></a><a id="sthref198" name="sthref198"></a>
<p class="titleintable">&nbsp;</p>
<table class="Formal" title="" summary="This table to be converted to informal." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
<col width="24%" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_add_converter.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_add_converter.htm
index 48822c6ec1..f992258622 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_add_converter.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_add_converter.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Add Converter dialog</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:49Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Add Converter dialog" />
<meta name="relnum" content="Release 2.3" />
@@ -28,18 +28,18 @@
<col width="*" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t39">Property</th>
-<th align="left" valign="bottom" id="r1c2-t39">Description</th>
+<th align="left" valign="bottom" id="r1c1-t40">Property</th>
+<th align="left" valign="bottom" id="r1c2-t40">Description</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t39" headers="r1c1-t39">Name</td>
-<td align="left" headers="r2c1-t39 r1c2-t39">Enter the name for this converter</td>
+<td align="left" id="r2c1-t40" headers="r1c1-t40">Name</td>
+<td align="left" headers="r2c1-t40 r1c2-t40">Enter the name for this converter</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t39" headers="r1c1-t39">Type</td>
-<td align="left" headers="r3c1-t39 r1c2-t39">Select the converter type:
+<td align="left" id="r3c1-t40" headers="r1c1-t40">Type</td>
+<td align="left" headers="r3c1-t40 r1c2-t40">Select the converter type:
<ul>
<li>
<p>Custom</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_cardinality.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_cardinality.htm
index 2776c3fc4f..17b8e5d990 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_cardinality.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_cardinality.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Association Cardinality</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:51Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:47Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Association Cardinality" />
<meta name="relnum" content="Release 2.3" />
@@ -21,7 +21,7 @@
<p><a id="CIAFIIFH" name="CIAFIIFH"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Association Cardinality</h1>
-<p><a id="sthref208" name="sthref208"></a>Use this dialog to specify cardinality of an association table. Depending on the <span class="bold">Association Kind</span> and <span class="bold">Join Columns</span> that you selected previously, some associations may not be available.</p>
+<p><a id="sthref210" name="sthref210"></a>Use this dialog to specify cardinality of an association table. Depending on the <span class="bold">Association Kind</span> and <span class="bold">Join Columns</span> that you selected previously, some associations may not be available.</p>
<ul>
<li>
<p>Many to one</p>
@@ -40,7 +40,7 @@
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
<a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association</a><br />
-<a href="tasks019.htm#BABBAGFI">Generating entities from tables</a><br />
+<a href="tasks021.htm#BABBAGFI">Generating entities from tables</a><br />
<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_table.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_table.htm
index 1509afe672..78197f6367 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_table.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_table.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Association Tables</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:51Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:47Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Association Tables" />
<meta name="relnum" content="Release 2.3" />
@@ -51,7 +51,7 @@
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
<a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association</a><br />
-<a href="tasks019.htm#BABBAGFI">Generating entities from tables</a><br />
+<a href="tasks021.htm#BABBAGFI">Generating entities from tables</a><br />
<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_custom_entities_wizard.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_custom_entities_wizard.htm
index 88e015d9b1..6b5694a7a6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_custom_entities_wizard.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_custom_entities_wizard.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Generate Entities from Tables Wizard</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:50Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Generate Entities from Tables Wizard" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_jpa_entity_wizard.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_jpa_entity_wizard.htm
index 6b67a4d0ae..12da7476c9 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_jpa_entity_wizard.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_jpa_entity_wizard.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Create JPA Entity wizard</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:50Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Create JPA Entity wizard" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_new_association_wizard.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_new_association_wizard.htm
index 99ed19fbcf..b74aa5a71a 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_new_association_wizard.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_new_association_wizard.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Create New Association</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:51Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:47Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Create New Association" />
<meta name="relnum" content="Release 2.3" />
@@ -21,7 +21,7 @@
<p><a id="CIAFGHIF" name="CIAFGHIF"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Create New Association</h1>
-<p><a id="sthref205" name="sthref205"></a><a id="sthref206" name="sthref206"></a>Use the Create New Association wizard to specify association tables when generating an entity.</p>
+<p><a id="sthref207" name="sthref207"></a><a id="sthref208" name="sthref208"></a>Use the Create New Association wizard to specify association tables when generating an entity.</p>
<p>The wizard consists of the following pages:</p>
<ul>
<li>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizIndividualEntities.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizIndividualEntities.htm
index d7bdb7ebde..e847da34fd 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizIndividualEntities.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizIndividualEntities.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Customize Individual Entities</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:51Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Customize Individual Entities" />
<meta name="relnum" content="Release 2.3" />
@@ -21,7 +21,7 @@
<p><a id="CIACIGEE" name="CIACIGEE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Customize Individual Entities</h1>
-<p><a id="sthref204" name="sthref204"></a>Use this page to customize each generated entity. Select an item in the Table and columns area, then complete the following fields for each item.</p>
+<p><a id="sthref206" name="sthref206"></a>Use this page to customize each generated entity. Select an item in the Table and columns area, then complete the following fields for each item.</p>
<div class="inftblinformal">
<table class="Informal" title="This table describes the options on the Individual Entities dialog." summary="This table describes the options on the Individual Entities dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<col width="32%" />
@@ -63,7 +63,7 @@
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
<a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a><br />
-<a href="tasks019.htm#BABBAGFI">Generating entities from tables</a><br />
+<a href="tasks021.htm#BABBAGFI">Generating entities from tables</a><br />
<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm
index eecb018703..578801a58e 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Customize Default Entity Generation</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:51Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Customize Default Entity Generation" />
<meta name="relnum" content="Release 2.3" />
@@ -21,7 +21,7 @@
<p><a id="CIAEJDBE" name="CIAEJDBE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Customize Default Entity Generation</h1>
-<p><a id="sthref203" name="sthref203"></a>Use this page to specify the default information Dali will use when generating the entities from the database tables. You will be able to override this information for specific entities.</p>
+<p><a id="sthref205" name="sthref205"></a>Use this page to specify the default information Dali will use when generating the entities from the database tables. You will be able to override this information for specific entities.</p>
<div class="inftblinformal">
<table class="Informal" title="This table describes the options on the Generate Entities dialog." summary="This table describes the options on the Custom Default Entity Generation dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<col width="32%" />
@@ -73,7 +73,7 @@
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
<a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a><br />
-<a href="tasks019.htm#BABBAGFI">Generating entities from tables</a><br />
+<a href="tasks021.htm#BABBAGFI">Generating entities from tables</a><br />
<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm
index f4a75c394e..018594b103 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>JPA Details view (for orm.xml)</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:53Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Details view (for orm.xml)" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_eclipselink_mapping_file.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_eclipselink_mapping_file.htm
index 1335a56ab9..18a6305077 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_eclipselink_mapping_file.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_eclipselink_mapping_file.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>New EclipseLink Mapping File dialog</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="New EclipseLink Mapping File dialog" />
<meta name="relnum" content="Release 2.3" />
@@ -28,34 +28,34 @@
<col width="*" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t38">Property</th>
-<th align="left" valign="bottom" id="r1c2-t38">Description</th>
+<th align="left" valign="bottom" id="r1c1-t39">Property</th>
+<th align="left" valign="bottom" id="r1c2-t39">Description</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t38" headers="r1c1-t38">Project</td>
-<td align="left" headers="r2c1-t38 r1c2-t38">Select the project in which to add the mapping file.</td>
+<td align="left" id="r2c1-t39" headers="r1c1-t39">Project</td>
+<td align="left" headers="r2c1-t39 r1c2-t39">Select the project in which to add the mapping file.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t38" headers="r1c1-t38">Source folder</td>
-<td align="left" headers="r3c1-t38 r1c2-t38">Click <span class="bold">Browse</span> and select the source file in which to add the mapping file. The default is <code>../</code><code><span class="codeinlineitalic">&lt;PROJECT&gt;</span></code><code>/src</code>.</td>
+<td align="left" id="r3c1-t39" headers="r1c1-t39">Source folder</td>
+<td align="left" headers="r3c1-t39 r1c2-t39">Click <span class="bold">Browse</span> and select the source file in which to add the mapping file. The default is <code>../</code><code><span class="codeinlineitalic">&lt;PROJECT&gt;</span></code><code>/src</code>.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t38" headers="r1c1-t38">File path</td>
-<td align="left" headers="r4c1-t38 r1c2-t38">Enter the filename and path of the mapping file. The default is <code>META-INF/eclipselink-orm.xml</code>.</td>
+<td align="left" id="r4c1-t39" headers="r1c1-t39">File path</td>
+<td align="left" headers="r4c1-t39 r1c2-t39">Enter the filename and path of the mapping file. The default is <code>META-INF/eclipselink-orm.xml</code>.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t38" headers="r1c1-t38">Default access</td>
-<td align="left" headers="r5c1-t38 r1c2-t38">Select whether the entity's access to instance variables is <span class="bold">field</span>-based or <span class="bold">property</span>-based, as defined in the JPA specification.</td>
+<td align="left" id="r5c1-t39" headers="r1c1-t39">Default access</td>
+<td align="left" headers="r5c1-t39 r1c2-t39">Select whether the entity's access to instance variables is <span class="bold">field</span>-based or <span class="bold">property</span>-based, as defined in the JPA specification.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t38" headers="r1c1-t38">Add to persistence unit</td>
-<td align="left" headers="r6c1-t38 r1c2-t38">Specify if this mapping file should be added to the persistence unit (<code>persistence.xml</code>).</td>
+<td align="left" id="r6c1-t39" headers="r1c1-t39">Add to persistence unit</td>
+<td align="left" headers="r6c1-t39 r1c2-t39">Specify if this mapping file should be added to the persistence unit (<code>persistence.xml</code>).</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t38" headers="r1c1-t38">&nbsp;&nbsp;Persistence&nbsp;Unit</td>
-<td align="left" headers="r7c1-t38 r1c2-t38">Select the persistence unit in which to add the mapping file.</td>
+<td align="left" id="r7c1-t39" headers="r1c1-t39">&nbsp;&nbsp;Persistence&nbsp;Unit</td>
+<td align="left" headers="r7c1-t39 r1c2-t39">Select the persistence unit in which to add the mapping file.</td>
</tr>
</tbody>
</table>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_java_page.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_java_page.htm
index 60893afdae..ffbf3fdaff 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_java_page.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_java_page.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Java Page</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:50Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Java Page" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_join_columns.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_join_columns.htm
index 5f77e3b7ea..8632cbfec4 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_join_columns.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_join_columns.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Join Columns</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:51Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:47Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Join Columns" />
<meta name="relnum" content="Release 2.3" />
@@ -21,13 +21,13 @@
<p><a id="CIAEGEEG" name="CIAEGEEG"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Join Columns</h1>
-<p><a id="sthref207" name="sthref207"></a>Use this dialog to specify the join columns of an association table.</p>
+<p><a id="sthref209" name="sthref209"></a>Use this dialog to specify the join columns of an association table.</p>
<p>Click Add to specify the join columns between the two tables.</p>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
<a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association</a><br />
-<a href="tasks019.htm#BABBAGFI">Generating entities from tables</a><br />
+<a href="tasks021.htm#BABBAGFI">Generating entities from tables</a><br />
<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm
index 15f2aec948..89e4ff8a71 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>JPA Facet page</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:50Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Facet page" />
<meta name="relnum" content="Release 2.3" />
@@ -41,7 +41,7 @@
<td align="left" headers="r2c1-t4 r1c3-t4">EclipseLink</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t4" headers="r1c1-t4"><a id="sthref189" name="sthref189"></a><a id="sthref190" name="sthref190"></a>JPA Implementation</td>
+<td align="left" id="r3c1-t4" headers="r1c1-t4"><a id="sthref191" name="sthref191"></a><a id="sthref192" name="sthref192"></a>JPA Implementation</td>
<td align="left" headers="r3c1-t4 r1c2-t4">Select a specific JPA library configuration.
<p>Click <span class="bold">Manage libraries</span> to create or update a user library.</p>
<p>Click <span class="bold">Download libraries</span> to download a specific library configuration.</p>
@@ -81,14 +81,14 @@
<td align="left" headers="r8c1-t4 r1c3-t4">Determined by server.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t4" headers="r1c1-t4"><a id="sthref191" name="sthref191"></a>Persistent class management</td>
+<td align="left" id="r9c1-t4" headers="r1c1-t4"><a id="sthref193" name="sthref193"></a>Persistent class management</td>
<td align="left" headers="r9c1-t4 r1c2-t4">Specify if Dali will <span class="bold">discover annotated classes automatically</span>, or if the <span class="bold">annotated classes must be listed in the persistence.xml</span> file.
<p><span class="bold">Note</span>: To insure application portability, you should explicitly list the managed persistence classes that are included in the persistence unit.</p>
</td>
<td align="left" headers="r9c1-t4 r1c3-t4">Determined by server.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r10c1-t4" headers="r1c1-t4"><a id="sthref192" name="sthref192"></a>Create <code>orm.xml</code></td>
+<td align="left" id="r10c1-t4" headers="r1c1-t4"><a id="sthref194" name="sthref194"></a>Create <code>orm.xml</code></td>
<td align="left" headers="r10c1-t4 r1c2-t4">Specify if Dali should create a default <code>orm.xml</code> file for your entity mappings and persistence unit defaults.</td>
<td align="left" headers="r10c1-t4 r1c3-t4">Selected</td>
</tr>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm
index a220abae40..7b02bb68fd 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>General information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:52Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:47Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="General information" />
<meta name="relnum" content="Release 2.3" />
@@ -45,9 +45,9 @@
</tr>
<tr align="left" valign="top">
<td align="left" id="r3c1-t16" headers="r1c1-t16"><a id="CACGCBHB" name="CACGCBHB"></a>Column</td>
-<td align="left" headers="r3c1-t16 r1c2-t16"><a id="sthref229" name="sthref229"></a><a id="sthref230" name="sthref230"></a>The database column that contains the value for the attribute. This field corresponds to the <code>@Column</code> annotation.</td>
+<td align="left" headers="r3c1-t16 r1c2-t16"><a id="sthref231" name="sthref231"></a><a id="sthref232" name="sthref232"></a>The database column that contains the value for the attribute. This field corresponds to the <code>@Column</code> annotation.</td>
<td align="left" headers="r3c1-t16 r1c3-t16">By default, the Column is assumed to be named identically to the attribute.</td>
-<td align="left" headers="r3c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a>, <a href="tasks018.htm#BABHIBII">Version mapping</a></td>
+<td align="left" headers="r3c1-t16 r1c4-t16"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a>, <a href="tasks019.htm#BABHIBII">Version mapping</a></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r4c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Name</td>
@@ -55,64 +55,64 @@
<p>This field corresponds to the <code>@Column</code> annotation.</p>
</td>
<td align="left" headers="r4c1-t16 r1c3-t16"><br /></td>
-<td align="left" headers="r4c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" headers="r4c1-t16 r1c4-t16"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r5c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Table</td>
<td align="left" headers="r5c1-t16 r1c2-t16">Name of the database table that contains the selected column.</td>
<td align="left" headers="r5c1-t16 r1c3-t16"><br /></td>
-<td align="left" headers="r5c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" headers="r5c1-t16 r1c4-t16"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r6c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Insertable</td>
<td align="left" headers="r6c1-t16 r1c2-t16">Specifies if the column is always included in <code>SQL INSERT</code> statements.</td>
<td align="left" headers="r6c1-t16 r1c3-t16">True</td>
-<td align="left" headers="r6c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" headers="r6c1-t16 r1c4-t16"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r7c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Updatable</td>
<td align="left" headers="r7c1-t16 r1c2-t16">Specifies if this column is always included in <code>SQL UPDATE</code> statements.</td>
<td align="left" headers="r7c1-t16 r1c3-t16">True</td>
-<td align="left" headers="r7c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" headers="r7c1-t16 r1c4-t16"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r8c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Unique</td>
<td align="left" headers="r8c1-t16 r1c2-t16">Sets the <code>UNIQUE</code> constraint for the column.</td>
<td align="left" headers="r8c1-t16 r1c3-t16">False</td>
-<td align="left" headers="r8c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" headers="r8c1-t16 r1c4-t16"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r9c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Nullable</td>
<td align="left" headers="r9c1-t16 r1c2-t16">Specifies if the column allows null values.</td>
<td align="left" headers="r9c1-t16 r1c3-t16">True</td>
-<td align="left" headers="r9c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" headers="r9c1-t16 r1c4-t16"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r10c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Length</td>
<td align="left" headers="r10c1-t16 r1c2-t16">Sets the column length.</td>
<td align="left" headers="r10c1-t16 r1c3-t16">255</td>
-<td align="left" headers="r10c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" headers="r10c1-t16 r1c4-t16"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r11c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Precision</td>
<td align="left" headers="r11c1-t16 r1c2-t16">Sets the precision for the column values.</td>
<td align="left" headers="r11c1-t16 r1c3-t16">0</td>
-<td align="left" headers="r11c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" headers="r11c1-t16 r1c4-t16"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r12c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Scale</td>
<td align="left" headers="r12c1-t16 r1c2-t16">Sets the number of digits that appear to the right of the decimal point.</td>
<td align="left" headers="r12c1-t16 r1c3-t16">0</td>
-<td align="left" headers="r12c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" headers="r12c1-t16 r1c4-t16"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r13c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Column Definition</td>
<td align="left" headers="r13c1-t16 r1c2-t16">Define the DDL for a column. This is used when a table is being generated.</td>
<td align="left" headers="r13c1-t16 r1c3-t16"><br /></td>
-<td align="left" headers="r13c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" headers="r13c1-t16 r1c4-t16"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r14c1-t16" headers="r1c1-t16"><a id="CACGGGHB" name="CACGGGHB"></a><a id="sthref231" name="sthref231"></a><a id="sthref232" name="sthref232"></a><a id="sthref233" name="sthref233"></a>Fetch Type</td>
+<td align="left" id="r14c1-t16" headers="r1c1-t16"><a id="CACGGGHB" name="CACGGGHB"></a><a id="sthref233" name="sthref233"></a><a id="sthref234" name="sthref234"></a><a id="sthref235" name="sthref235"></a>Fetch Type</td>
<td align="left" headers="r14c1-t16 r1c2-t16">Defines how data is loaded from the database:
<ul>
<li>
@@ -124,24 +124,24 @@
</ul>
</td>
<td align="left" headers="r14c1-t16 r1c3-t16">Eager</td>
-<td align="left" headers="r14c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks016.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks013.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks014.htm#BABHFAFJ">Many-to-one mapping</a></td>
+<td align="left" headers="r14c1-t16 r1c4-t16"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r15c1-t16" headers="r1c1-t16">Optional</td>
<td align="left" headers="r15c1-t16 r1c2-t16">Specifies if this field is can be null.</td>
<td align="left" headers="r15c1-t16 r1c3-t16">Yes</td>
-<td align="left" headers="r15c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks016.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks014.htm#BABHFAFJ">Many-to-one mapping</a></td>
+<td align="left" headers="r15c1-t16 r1c4-t16"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r16c1-t16" headers="r1c1-t16"><a id="CACBBIBI" name="CACBBIBI"></a><a id="sthref234" name="sthref234"></a>Lob</td>
+<td align="left" id="r16c1-t16" headers="r1c1-t16"><a id="CACBBIBI" name="CACBBIBI"></a><a id="sthref236" name="sthref236"></a>Lob</td>
<td align="left" headers="r16c1-t16 r1c2-t16">Specify if the field is mapped to <code>java.sql.Clob</code> or <code>java.sql.Blob</code>.
<p>This field corresponds to the <code>@Lob</code> annotation.</p>
</td>
<td align="left" headers="r16c1-t16 r1c3-t16"><br /></td>
-<td align="left" headers="r16c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a><br /></td>
+<td align="left" headers="r16c1-t16 r1c4-t16"><a href="tasks010.htm#BABBABCE">Basic mapping</a><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r17c1-t16" headers="r1c1-t16"><a id="CACEAJGD" name="CACEAJGD"></a><a id="sthref235" name="sthref235"></a><a id="sthref236" name="sthref236"></a><a id="sthref237" name="sthref237"></a>Temporal</td>
+<td align="left" id="r17c1-t16" headers="r1c1-t16"><a id="CACEAJGD" name="CACEAJGD"></a><a id="sthref237" name="sthref237"></a><a id="sthref238" name="sthref238"></a><a id="sthref239" name="sthref239"></a>Temporal</td>
<td align="left" headers="r17c1-t16 r1c2-t16">Specifies if this field is one of the following:
<ul>
<li>
@@ -157,10 +157,10 @@
<p>This field corresponds to the <code>@Temporal</code> annotation.</p>
</td>
<td align="left" headers="r17c1-t16 r1c3-t16"><br /></td>
-<td align="left" headers="r17c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" headers="r17c1-t16 r1c4-t16"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r18c1-t16" headers="r1c1-t16"><a id="sthref238" name="sthref238"></a><a id="sthref239" name="sthref239"></a><a id="sthref240" name="sthref240"></a>Enumerated</td>
+<td align="left" id="r18c1-t16" headers="r1c1-t16"><a id="sthref240" name="sthref240"></a><a id="sthref241" name="sthref241"></a><a id="sthref242" name="sthref242"></a>Enumerated</td>
<td align="left" headers="r18c1-t16 r1c2-t16">Specify how to persist enumerated constraints if the <code>String</code> value suits your application requirements or to match an existing database schema.
<ul>
<li>
@@ -179,11 +179,17 @@
<td align="left" id="r19c1-t16" headers="r1c1-t16">Target Entity</td>
<td align="left" headers="r19c1-t16 r1c2-t16">The persistent entity to which the attribute is mapped.</td>
<td align="left" headers="r19c1-t16 r1c3-t16"><br /></td>
-<td align="left" headers="r19c1-t16 r1c4-t16"><a href="tasks016.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks015.htm#BABHGEBD">One-to-many mapping</a> <a href="tasks013.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks014.htm#BABHFAFJ">Many-to-one mapping</a></td>
+<td align="left" headers="r19c1-t16 r1c4-t16"><a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks016.htm#BABHGEBD">One-to-many mapping</a> <a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r20c1-t16" headers="r1c1-t16"><a id="CACJAIHB" name="CACJAIHB"></a>Cascade Type</td>
-<td align="left" headers="r20c1-t16 r1c2-t16">Specify which operations are propagated throughout the entity.
+<td align="left" id="r20c1-t16" headers="r1c1-t16"><a id="sthref243" name="sthref243"></a>ID</td>
+<td align="left" headers="r20c1-t16 r1c2-t16">Specify if the entity's ID is derived from the identity of another entity.</td>
+<td align="left" headers="r20c1-t16 r1c3-t16"><br /></td>
+<td align="left" headers="r20c1-t16 r1c4-t16"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r21c1-t16" headers="r1c1-t16"><a id="CACJAIHB" name="CACJAIHB"></a>Cascade Type</td>
+<td align="left" headers="r21c1-t16 r1c2-t16">Specify which operations are propagated throughout the entity.
<ul>
<li>
<p>All &ndash; All operations</p>
@@ -205,18 +211,18 @@
</li>
</ul>
</td>
-<td align="left" headers="r20c1-t16 r1c3-t16"><br /></td>
-<td align="left" headers="r20c1-t16 r1c4-t16"><a href="tasks016.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks015.htm#BABHGEBD">One-to-many mapping</a>, <a href="tasks013.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks014.htm#BABHFAFJ">Many-to-one mapping</a></td>
+<td align="left" headers="r21c1-t16 r1c3-t16"><br /></td>
+<td align="left" headers="r21c1-t16 r1c4-t16"><a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks016.htm#BABHGEBD">One-to-many mapping</a>, <a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r21c1-t16" headers="r1c1-t16"><a id="CACJDJJA" name="CACJDJJA"></a>Mapped By</td>
-<td align="left" headers="r21c1-t16 r1c2-t16">The field in the database table that "owns" the relationship. This field is required only on the non-owning side of the relationship.</td>
-<td align="left" headers="r21c1-t16 r1c3-t16"><br /></td>
-<td align="left" headers="r21c1-t16 r1c4-t16"><a href="tasks016.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks015.htm#BABHGEBD">One-to-many mapping</a></td>
+<td align="left" id="r22c1-t16" headers="r1c1-t16"><a id="CACJDJJA" name="CACJDJJA"></a>Mapped By</td>
+<td align="left" headers="r22c1-t16 r1c2-t16">The field in the database table that "owns" the relationship. This field is required only on the non-owning side of the relationship.</td>
+<td align="left" headers="r22c1-t16 r1c3-t16"><br /></td>
+<td align="left" headers="r22c1-t16 r1c4-t16"><a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks016.htm#BABHGEBD">One-to-many mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r22c1-t16" headers="r1c1-t16"><a id="CACDADIH" name="CACDADIH"></a><a id="sthref241" name="sthref241"></a><a id="sthref242" name="sthref242"></a>Order By</td>
-<td align="left" headers="r22c1-t16 r1c2-t16">Specify the default order for objects returned from a query:
+<td align="left" id="r23c1-t16" headers="r1c1-t16"><a id="CACDADIH" name="CACDADIH"></a><a id="sthref244" name="sthref244"></a><a id="sthref245" name="sthref245"></a>Order By</td>
+<td align="left" headers="r23c1-t16 r1c2-t16">Specify the default order for objects returned from a query:
<ul>
<li>
<p>No ordering</p>
@@ -230,15 +236,15 @@
</ul>
<p>This field corresponds to the <code>@OrderBy</code> annotation.</p>
</td>
-<td align="left" headers="r22c1-t16 r1c3-t16">Primary key</td>
-<td align="left" headers="r22c1-t16 r1c4-t16"><a href="tasks015.htm#BABHGEBD">One-to-many mapping</a>. <a href="tasks013.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks014.htm#BABHFAFJ">Many-to-one mapping</a></td>
+<td align="left" headers="r23c1-t16 r1c3-t16">Primary key</td>
+<td align="left" headers="r23c1-t16 r1c4-t16"><a href="tasks016.htm#BABHGEBD">One-to-many mapping</a>. <a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r23c1-t16" headers="r1c1-t16">Attribute Overrides</td>
-<td align="left" headers="r23c1-t16 r1c2-t16">Overrides <span class="bold">Basic</span> mappings of a mapped superclass (for example, if the inherited column name is incompatible with a pre-existing data model, or invalid as a column name in your database).</td>
-<td align="left" headers="r23c1-t16 r1c3-t16"><br /></td>
-<td align="left" headers="r23c1-t16 r1c4-t16"><a href="tasks010.htm#BABCBHDF">Embedded mapping</a>
-<p><a href="tasks010.htm#BABCBHDF">Embedded mapping</a></p>
+<td align="left" id="r24c1-t16" headers="r1c1-t16">Attribute Overrides</td>
+<td align="left" headers="r24c1-t16 r1c2-t16">Overrides <span class="bold">Basic</span> mappings of a mapped superclass (for example, if the inherited column name is incompatible with a pre-existing data model, or invalid as a column name in your database).</td>
+<td align="left" headers="r24c1-t16 r1c3-t16"><br /></td>
+<td align="left" headers="r24c1-t16 r1c4-t16"><a href="tasks011.htm#BABCBHDF">Embedded mapping</a>
+<p><a href="tasks011.htm#BABCBHDF">Embedded mapping</a></p>
<br /></td>
</tr>
</tbody>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project.htm
index ac32e6f31c..2a576e6eba 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>New JPA Project page</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:49Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="New JPA Project page" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project_wizard.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project_wizard.htm
index 9122979318..b59320be77 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project_wizard.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project_wizard.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Create New JPA Project wizard</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:49Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Create New JPA Project wizard" />
<meta name="relnum" content="Release 2.3" />
@@ -21,7 +21,7 @@
<p><a id="CACBJGBG" name="CACBJGBG"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Create New JPA Project wizard</h1>
-<p><a id="sthref188" name="sthref188"></a>The Create New JPA Project wizard allows you to create a new Java project using JPA. The wizard consists of the following pages:</p>
+<p><a id="sthref190" name="sthref190"></a>The Create New JPA Project wizard allows you to create a new Java project using JPA. The wizard consists of the following pages:</p>
<ul>
<li>
<p><a href="ref_new_jpa_project.htm#CACBJAGC">New JPA Project page</a></p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_general.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_general.htm
index 2bc5e79f34..ea6f099cfc 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_general.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_general.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>General</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="General" />
<meta name="relnum" content="Release 2.3" />
@@ -22,7 +22,7 @@
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>General</h1>
<p>The following table lists properties available in the General page of the <a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div class="tblformal"><a id="sthref255" name="sthref255"></a><a id="sthref256" name="sthref256"></a>
+<div class="tblformal"><a id="sthref258" name="sthref258"></a><a id="sthref259" name="sthref259"></a>
<p class="titleintable">Properties of the General Page</p>
<table class="Formal" title="Properties of the General Page" summary="This table describes the properties of the persistence.xml&rsquo;s General page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
<col width="24%" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm
index 5d1c246c5e..40d2673812 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>JPA Details view (for attributes)</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:52Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:47Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Details view (for attributes)" />
<meta name="relnum" content="Release 2.3" />
@@ -21,7 +21,7 @@
<p><a id="BABIFBAF" name="BABIFBAF"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>JPA Details view (for attributes)</h1>
-<p><a id="sthref226" name="sthref226"></a><a id="sthref227" name="sthref227"></a><a id="sthref228" name="sthref228"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected mapped attribute and contains the following areas:</p>
+<p><a id="sthref228" name="sthref228"></a><a id="sthref229" name="sthref229"></a><a id="sthref230" name="sthref230"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected mapped attribute and contains the following areas:</p>
<ul>
<li>
<p><a href="ref_mapping_general.htm#CACBHFIJ">General information</a></p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_outline.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_outline.htm
index c98fe2ca3e..abdafce3b3 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_outline.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_outline.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>JPA Structure view</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:53Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Structure view" />
<meta name="relnum" content="Release 2.3" />
@@ -21,8 +21,8 @@
<p><a id="BABEGGFE" name="BABEGGFE"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>JPA Structure view</h1>
-<p><a id="sthref252" name="sthref252"></a><a id="sthref253" name="sthref253"></a>The <span class="gui-object-title">JPA Structure</span> view displays an outline of the structure (its attributes and mappings) of the entity that is currently selected or opened in the editor. The structural elements shown in the outline are the entity and its fields.</p>
-<div class="figure"><a id="sthref254" name="sthref254"></a>
+<p><a id="sthref255" name="sthref255"></a><a id="sthref256" name="sthref256"></a>The <span class="gui-object-title">JPA Structure</span> view displays an outline of the structure (its attributes and mappings) of the entity that is currently selected or opened in the editor. The structural elements shown in the outline are the entity and its fields.</p>
+<div class="figure"><a id="sthref257" name="sthref257"></a>
<p class="titleinfigure">Sample JPA Structure View</p>
<img src="img/persistence_outline_view.png" alt="Sample JPA Structure view for an entity." title="Sample JPA Structure view for an entity." /><br /></div>
<!-- class="figure" -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm
index 28cc0634ff..0be8caf0d2 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>JPA Development perspective</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:49Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Development perspective" />
<meta name="relnum" content="Release 2.3" />
@@ -21,7 +21,7 @@
<p><a id="BABIFBDB" name="BABIFBDB"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>JPA Development perspective</h1>
-<p><a id="sthref281" name="sthref281"></a><a id="sthref282" name="sthref282"></a>The <span class="bold">JPA Development perspective</span> defines the initial set and layout of views in the Workbench window when using Dali. By default, the <span class="gui-object-title">JPA Development perspective</span> includes the following views:</p>
+<p><a id="sthref286" name="sthref286"></a><a id="sthref287" name="sthref287"></a>The <span class="bold">JPA Development perspective</span> defines the initial set and layout of views in the Workbench window when using Dali. By default, the <span class="gui-object-title">JPA Development perspective</span> includes the following views:</p>
<ul>
<li>
<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_prop_view.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_prop_view.htm
index 8f7fe6b7c8..408e016a11 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_prop_view.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_prop_view.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>JPA Details view (for entities)</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:52Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:47Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Details view (for entities)" />
<meta name="relnum" content="Release 2.3" />
@@ -21,7 +21,7 @@
<p><a id="BABFAEBB" name="BABFAEBB"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>JPA Details view (for entities)</h1>
-<p><a id="sthref209" name="sthref209"></a><a id="sthref210" name="sthref210"></a><a id="sthref211" name="sthref211"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected entity and contains the following tabs:</p>
+<p><a id="sthref211" name="sthref211"></a><a id="sthref212" name="sthref212"></a><a id="sthref213" name="sthref213"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected entity and contains the following tabs:</p>
<ul>
<li>
<p><a href="reference006.htm#CACCAGGC">General information</a></p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_xmll_editor.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_xmll_editor.htm
index 9f7aceae1a..027900047f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_xmll_editor.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_xmll_editor.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>persistence.xml Editor</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="persistence.xml Editor" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_primary_key.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_primary_key.htm
index 52de81146b..78ae018537 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_primary_key.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_primary_key.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Primary Key Generation information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:53Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:47Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Primary Key Generation information" />
<meta name="relnum" content="Release 2.3" />
@@ -21,7 +21,7 @@
<p><a id="CACFCCAB" name="CACFCCAB"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Primary Key Generation information</h1>
-<p>This table lists the fields available in the <span class="gui-object-title">Primary Key Generation</span> area in JPA Details view for <a href="tasks012.htm#BABGCBHG">ID mapping</a> types.</p>
+<p>This table lists the fields available in the <span class="gui-object-title">Primary Key Generation</span> area in JPA Details view for <a href="tasks013.htm#BABGCBHG">ID mapping</a> types.</p>
<div class="inftblruleinformal">
<table class="RuleInformal" title="This table describes the options on the Join Columns tab." summary="This table describes the options on the Join Columns tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<col width="26%" />
@@ -37,7 +37,7 @@
<tbody>
<tr align="left" valign="top">
<td align="left" id="r2c1-t19" headers="r1c1-t19"><a id="CACBAJBC" name="CACBAJBC"></a>Primary Key Generation</td>
-<td align="left" headers="r2c1-t19 r1c2-t19"><a id="sthref248" name="sthref248"></a><a id="sthref249" name="sthref249"></a>These fields define how the primary key is generated. These fields correspond to the <code>@GeneratedValue</code> annotation.</td>
+<td align="left" headers="r2c1-t19 r1c2-t19"><a id="sthref251" name="sthref251"></a><a id="sthref252" name="sthref252"></a>These fields define how the primary key is generated. These fields correspond to the <code>@GeneratedValue</code> annotation.</td>
<td align="left" headers="r2c1-t19 r1c3-t19">Generated Value</td>
</tr>
<tr align="left" valign="top">
@@ -97,7 +97,7 @@
</tr>
<tr align="left" valign="top">
<td align="left" id="r11c1-t19" headers="r1c1-t19"><a id="CACFFHEH" name="CACFFHEH"></a>Sequence&nbsp;Generator</td>
-<td align="left" headers="r11c1-t19 r1c2-t19"><a id="sthref250" name="sthref250"></a><a id="sthref251" name="sthref251"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.
+<td align="left" headers="r11c1-t19 r1c2-t19"><a id="sthref253" name="sthref253"></a><a id="sthref254" name="sthref254"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.
<p>These fields apply only when <span class="bold">Strategy</span> = <span class="bold">Sequence</span>.</p>
</td>
<td align="left" headers="r11c1-t19 r1c3-t19"><br /></td>
@@ -119,7 +119,7 @@
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="tasks012.htm#BABGCBHG">ID mapping</a>
+<a href="tasks013.htm#BABGCBHG">ID mapping</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
<br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_project_properties.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_project_properties.htm
index 3f5f54b350..7a6aa85241 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_project_properties.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_project_properties.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Project Properties page &ndash; Java Persistence Options</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Project Properties page &ndash; Java Persistence Options" />
<meta name="relnum" content="Release 2.3" />
@@ -21,8 +21,7 @@
<p><a id="BABJHBCI" name="BABJHBCI"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Project Properties page &ndash; Java Persistence Options</h1>
-<p><a id="sthref270" name="sthref270"></a><a id="sthref271" name="sthref271"></a>Use the <span class="gui-object-title">Java Persistence</span> options on the <span class="gui-object-title">Properties</span> page to select the database connection to use with the project.</p>
-<p>This table lists the properties available in the <span class="gui-object-title">JPA Details page</span>.</p>
+<p><a id="sthref273" name="sthref273"></a><a id="sthref274" name="sthref274"></a>Use the <span class="gui-object-title">Errors/Warnings</span> options on the <span class="gui-object-title">Properties</span> page to specify the validation options to use with the project.</p>
<div class="inftblinformal">
<table class="Informal" title="This table describes the options on the Persistence Properties page." summary="This table describes the options on the Persistence Properties page." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<col width="32%" />
@@ -35,56 +34,44 @@
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t36" headers="r1c1-t36"><a id="sthref272" name="sthref272"></a><a id="sthref273" name="sthref273"></a><a id="sthref274" name="sthref274"></a><a id="sthref275" name="sthref275"></a>Platform</td>
-<td align="left" headers="r2c1-t36 r1c2-t36">Select the vendor-specific platform.</td>
+<td align="left" id="r2c1-t36" headers="r1c1-t36">Enable project specific settings</td>
+<td align="left" headers="r2c1-t36 r1c2-t36">Select the to override the general settings for this project.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t36" headers="r1c1-t36">Library</td>
-<td align="left" headers="r3c1-t36 r1c2-t36">Select a specific JPA library configuration.
-<p>Click <span class="bold">Manage libraries</span> to create or update a user library.</p>
-<p>Click <span class="bold">Download libraries</span> to download a specific library configuration.</p>
-</td>
+<td align="left" id="r3c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Project level</td>
+<td align="left" headers="r3c1-t36 r1c2-t36">Select the warning level to report.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Type</td>
-<td align="left" headers="r4c1-t36 r1c2-t36">Select <span class="bold">User Library</span> to select from the available user-defined or downloaded libraries.
-<p>If you select Disable, you must manually include the JPA implementation library on the project classpath.</p>
-</td>
+<td align="left" id="r4c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Persistent unit level</td>
+<td align="left" headers="r4c1-t36 r1c2-t36">Select the warning level to report.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Include&nbsp;libraries&nbsp;with&nbsp;this&nbsp;application</td>
-<td align="left" headers="r5c1-t36 r1c2-t36">Specify if the selected libraries are included when deploying the application.</td>
+<td align="left" id="r5c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Type level</td>
+<td align="left" headers="r5c1-t36 r1c2-t36">Select the warning level to report.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t36" headers="r1c1-t36"><a id="sthref276" name="sthref276"></a><a id="sthref277" name="sthref277"></a><a id="sthref278" name="sthref278"></a>Connection</td>
-<td align="left" headers="r6c1-t36 r1c2-t36">The database connection used to map the persistent entities.
-<ul>
-<li>
-<p>To create a new connection, click <span class="bold">Add Connections</span>.</p>
-</li>
-<li>
-<p>To reconnect to an existing connection, click <span class="bold">Reconnect</span>.</p>
-</li>
-</ul>
-</td>
+<td align="left" id="r6c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Attribute level</td>
+<td align="left" headers="r6c1-t36 r1c2-t36">Select the warning level to report.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Override&nbsp;default&nbsp;catalog&nbsp;from&nbsp;connection</td>
-<td align="left" headers="r7c1-t36 r1c2-t36">Select a catalog other than the default one derived from the connection information. Use this option if the default catalog is incorrect or cannot be used.</td>
+<td align="left" id="r7c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Schema mapping</td>
+<td align="left" headers="r7c1-t36 r1c2-t36">Select the warning level to report.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Override&nbsp;default&nbsp;schema&nbsp;from&nbsp;connection</td>
-<td align="left" headers="r8c1-t36 r1c2-t36">Select a schema other than the default one derived from the connection information. Use this option if the default schema is incorrect or cannot be used. For example, use this option when the deployment login differs from the design-time login.</td>
+<td align="left" id="r8c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Implied&nbsp;attributes</td>
+<td align="left" headers="r8c1-t36 r1c2-t36">Select the warning level to report.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t36" headers="r1c1-t36">Persistent Class Management</td>
-<td align="left" headers="r9c1-t36 r1c2-t36">Specify if Dali will <span class="bold">discover annotated classes automatically</span>, or if the <span class="bold">annotated classes must be listed in the persistence.xml</span> file.
-<p><span class="bold">Note</span>: To insure application portability, you should explicitly list the managed persistence classes that are included in the persistence unit.</p>
-</td>
+<td align="left" id="r9c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Implied&nbsp;associations</td>
+<td align="left" headers="r9c1-t36 r1c2-t36">Select the warning level to report.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r10c1-t36" headers="r1c1-t36"><a id="sthref279" name="sthref279"></a><a id="sthref280" name="sthref280"></a>Canonical Metamodel</td>
-<td align="left" headers="r10c1-t36 r1c2-t36"><br /></td>
+<td align="left" id="r10c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Inheritance</td>
+<td align="left" headers="r10c1-t36 r1c2-t36">Select the warning level to report.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Queries&nbsp;and&nbsp;generators</td>
+<td align="left" headers="r11c1-t36 r1c2-t36">Select the warning level to report.</td>
</tr>
</tbody>
</table>
@@ -93,9 +80,8 @@
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="tasks024.htm#BABDBCBI">Modifying persistent project properties</a></div>
+<a href="tasks026.htm#BABDBCBI">Modifying persistent project properties</a></div>
<!-- class="sect2" -->
-<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm
index 72a396a532..ea7d3c1a7f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Select Tables</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:51Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Select Tables" />
<meta name="relnum" content="Release 2.3" />
@@ -21,7 +21,7 @@
<p><a id="CIAHCGEE" name="CIAHCGEE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Select Tables</h1>
-<p><a id="sthref199" name="sthref199"></a><a id="sthref200" name="sthref200"></a><a id="sthref201" name="sthref201"></a>Use the <span class="gui-object-title">Select Tables</span> dialog to specify the database connection and tables from which to create entities.</p>
+<p><a id="sthref201" name="sthref201"></a><a id="sthref202" name="sthref202"></a><a id="sthref203" name="sthref203"></a>Use the <span class="gui-object-title">Select Tables</span> dialog to specify the database connection and tables from which to create entities.</p>
<div class="inftblinformal">
<table class="Informal" title="This table describes the options on the Generate Entities dialog." summary="This table describes the options on the Generate Entities dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<col width="32%" />
@@ -57,7 +57,7 @@
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
<a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a><br />
-<a href="tasks019.htm#BABBAGFI">Generating entities from tables</a>
+<a href="tasks021.htm#BABBAGFI">Generating entities from tables</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_select_cascade_dialog.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_select_cascade_dialog.htm
index 59da7493a5..317bf1e1f0 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_select_cascade_dialog.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_select_cascade_dialog.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Select Cascade dialog</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Select Cascade dialog" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm
index cc39f227ac..507ef3adaa 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Table Associations</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:51Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Table Associations" />
<meta name="relnum" content="Release 2.3" />
@@ -21,7 +21,7 @@
<p><a id="CIACDICB" name="CIACDICB"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Table Associations</h1>
-<p><a id="sthref202" name="sthref202"></a>Use this page to create or edit the association between the database table and entity.</p>
+<p><a id="sthref204" name="sthref204"></a>Use this page to create or edit the association between the database table and entity.</p>
<div class="inftblinformal">
<table class="Informal" title="This table describes the options on the Generate Entities dialog." summary="This table describes the options on the Table Associations dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<col width="32%" />
@@ -55,7 +55,7 @@
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
<a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a><br />
-<a href="tasks019.htm#BABBAGFI">Generating entities from tables</a><br />
+<a href="tasks021.htm#BABBAGFI">Generating entities from tables</a><br />
<a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
index 2d9f1dc992..edb027d6f3 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Reference</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:49Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content=" Reference" />
<meta name="relnum" content="Release 2.3" />
@@ -18,7 +18,7 @@
<!-- contents -->
</head>
<body>
-<p><a id="sthref187" name="sthref187"></a></p>
+<p><a id="sthref189" name="sthref189"></a></p>
<h1>Reference</h1>
<p>This section includes detailed help information for each of the following elements in the Dali OR Mapping Tool:</p>
<ul>
@@ -32,16 +32,16 @@
<p><a href="reference026.htm#CACDEIEE">Preferences</a></p>
</li>
<li>
-<p><a href="reference027.htm#CACGEJDA">Dialogs</a></p>
+<p><a href="reference028.htm#CACGEJDA">Dialogs</a></p>
</li>
<li>
<p><a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a></p>
</li>
<li>
-<p><a href="reference029.htm#CACDHCIA">Icons and buttons</a></p>
+<p><a href="reference030.htm#CACDHCIA">Icons and buttons</a></p>
</li>
<li>
-<p><a href="reference032.htm#CACBBDIB">Dali Developer Documentation</a></p>
+<p><a href="reference033.htm#CACBBDIB">Dali Developer Documentation</a></p>
</li>
</ul>
<!-- Start Footer -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm
index 910f927d01..561db8a9ae 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Wizards</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:49Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Wizards" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
index 07c86ec822..a636406aa6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Mapping File Wizard</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:50Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Mapping File Wizard" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
index f2e94f4b9b..80773ce3bd 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Mapping File</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:50Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Mapping File" />
<meta name="relnum" content="Release 2.3" />
@@ -22,7 +22,7 @@
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Mapping File</h1>
<p>This table lists the properties of the <a href="reference002.htm#CIAIJCCE">Mapping File Wizard</a>.</p>
-<div class="tblformal"><a id="sthref197" name="sthref197"></a><a id="sthref198" name="sthref198"></a>
+<div class="tblformal"><a id="sthref199" name="sthref199"></a><a id="sthref200" name="sthref200"></a>
<p class="titleintable">Mapping File Wizard Properties</p>
<table class="Formal" title="Mapping File Wizard Properties" summary="This table lists the properties of the Mapping File Wizard." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
<col width="24%" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
index caf332ad93..8a00cd0882 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Generate Tables from Entities Wizard</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:50Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:46Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Generate Tables from Entities Wizard" />
<meta name="relnum" content="Release 2.3" />
@@ -25,7 +25,7 @@
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="tasks019.htm#BABBAGFI">Generating entities from tables</a><br />
+<a href="tasks021.htm#BABBAGFI">Generating entities from tables</a><br />
<a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a><br />
<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
<p>&nbsp;</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
index bacef21a1f..a11400d263 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Property pages</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:51Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:47Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Property pages" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
index dd8a6b2f07..31bc24dbb3 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>General information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:52Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:47Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="General information" />
<meta name="relnum" content="Release 2.3" />
@@ -41,43 +41,43 @@
<td align="left" id="r2c1-t13" headers="r1c1-t13">Mapping Type Hyperlink</td>
<td align="left" headers="r2c1-t13 r1c2-t13">Clicking the name of the mapping type, which is represented as a hyperlink, invokes the Mapping Type Selection dialog. Use this dialog to specify the type of entity: Mapped Superclass, Embeddable or the default mapping type.</td>
<td align="left" headers="r2c1-t13 r1c3-t13">Entity</td>
-<td align="left" headers="r2c1-t13 r1c4-t13"><a href="tasks005.htm#BABGBIEE">Entity</a>, <a href="tasks006.htm#BABFEICE">Embeddable</a>, and <a href="tasks007.htm#BABDAGCI">Mapped superclass</a></td>
+<td align="left" headers="r2c1-t13 r1c4-t13"><a href="tasks006.htm#BABGBIEE">Entity</a>, <a href="tasks007.htm#BABFEICE">Embeddable</a>, and <a href="tasks008.htm#BABDAGCI">Mapped superclass</a></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r3c1-t13" headers="r1c1-t13">Table</td>
<td align="left" headers="r3c1-t13 r1c2-t13">The default database table information for this entity. These fields can be overridden by the information in the <a href="reference007.htm#CACIJBGH">Attribute overrides</a> area.</td>
<td align="left" headers="r3c1-t13 r1c3-t13"><br /></td>
-<td align="left" headers="r3c1-t13 r1c4-t13"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" headers="r3c1-t13 r1c4-t13"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r4c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Name</td>
<td align="left" headers="r4c1-t13 r1c2-t13">The name of the primary database table associated with the entity.</td>
<td align="left" headers="r4c1-t13 r1c3-t13"><br /></td>
-<td align="left" headers="r4c1-t13 r1c4-t13"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" headers="r4c1-t13 r1c4-t13"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r5c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Catalog</td>
<td align="left" headers="r5c1-t13 r1c2-t13">The database catalog that contains the <span class="bold">Table</span>.</td>
<td align="left" headers="r5c1-t13 r1c3-t13">As defined in <code>orm.xml</code>.</td>
-<td align="left" headers="r5c1-t13 r1c4-t13"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" headers="r5c1-t13 r1c4-t13"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r6c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Schema</td>
<td align="left" headers="r6c1-t13 r1c2-t13">The database schema that contains the <span class="bold">Table</span>.</td>
<td align="left" headers="r6c1-t13 r1c3-t13">As defined in <code>orm.xml</code>.</td>
-<td align="left" headers="r6c1-t13 r1c4-t13"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" headers="r6c1-t13 r1c4-t13"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r7c1-t13" headers="r1c1-t13">Name</td>
<td align="left" headers="r7c1-t13 r1c2-t13">The name of this entity. By default, the class name is used as the entity name.</td>
<td align="left" headers="r7c1-t13 r1c3-t13"><br /></td>
-<td align="left" headers="r7c1-t13 r1c4-t13"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" headers="r7c1-t13 r1c4-t13"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r8c1-t13" headers="r1c1-t13">Access</td>
<td align="left" headers="r8c1-t13 r1c2-t13">The access method for this entity.</td>
<td align="left" headers="r8c1-t13 r1c3-t13">Field</td>
-<td align="left" headers="r8c1-t13 r1c4-t13"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" headers="r8c1-t13 r1c4-t13"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r9c1-t13" headers="r1c1-t13">Primary&nbsp;key&nbsp;class</td>
@@ -91,7 +91,7 @@
<p>This field corresponds to the <code>@Cachable</code> annotation.</p>
</td>
<td align="left" headers="r10c1-t13 r1c3-t13">@Cachable(false)</td>
-<td align="left" headers="r10c1-t13 r1c4-t13"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" headers="r10c1-t13 r1c4-t13"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
</tr>
</tbody>
</table>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
index a1f2accd54..3100acd390 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Attribute overrides</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:52Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:47Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Attribute overrides" />
<meta name="relnum" content="Release 2.3" />
@@ -21,7 +21,7 @@
<p><a id="CACIJBGH" name="CACIJBGH"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Attribute overrides</h1>
-<p><a id="sthref212" name="sthref212"></a><a id="sthref213" name="sthref213"></a><a id="sthref214" name="sthref214"></a>Use the <span class="gui-object-title">Attribute Overrides</span> area in the <span class="gui-object-title">JPA Details</span> view to override the default settings specified in the <a href="reference006.htm#CACCAGGC">General information</a> area of an attribute. Attribute overrides generally override/configure attributes that are inherited or embedded.</p>
+<p><a id="sthref214" name="sthref214"></a><a id="sthref215" name="sthref215"></a><a id="sthref216" name="sthref216"></a>Use the <span class="gui-object-title">Attribute Overrides</span> area in the <span class="gui-object-title">JPA Details</span> view to override the default settings specified in the <a href="reference006.htm#CACCAGGC">General information</a> area of an attribute. Attribute overrides generally override/configure attributes that are inherited or embedded.</p>
<p>This table lists the Attribute override fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
<div class="inftblinformal">
<table class="Informal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
@@ -42,13 +42,13 @@
<td align="left" id="r2c1-t14" headers="r1c1-t14">Attribute Overrides</td>
<td align="left" headers="r2c1-t14 r1c2-t14">Specify a property or field to be overridden (from the default mappings). Select <span class="bold">Override Default</span>.</td>
<td align="left" headers="r2c1-t14 r1c3-t14"><br /></td>
-<td align="left" headers="r2c1-t14 r1c4-t14"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" headers="r2c1-t14 r1c4-t14"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r3c1-t14" headers="r1c1-t14">Join Columns</td>
-<td align="left" headers="r3c1-t14 r1c2-t14"><br /></td>
-<td align="left" headers="r3c1-t14 r1c3-t14"><br /></td>
-<td align="left" headers="r3c1-t14 r1c4-t14"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" headers="r3c1-t14 r1c2-t14">Specify the joining strategy. Select <span class="bold">Override Default</span> to add a different joining strategy.</td>
+<td align="left" headers="r3c1-t14 r1c3-t14">Join columns</td>
+<td align="left" headers="r3c1-t14 r1c4-t14"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
</tr>
</tbody>
</table>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
index f857457664..edd0f9f932 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Secondary table information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:52Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:47Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Secondary table information" />
<meta name="relnum" content="Release 2.3" />
@@ -21,7 +21,7 @@
<p><a id="CACBHIDA" name="CACBHIDA"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Secondary table information</h1>
-<p><a id="sthref215" name="sthref215"></a><a id="sthref216" name="sthref216"></a><a id="sthref217" name="sthref217"></a><a id="sthref218" name="sthref218"></a>Use the <span class="gui-object-title">Secondary Tables</span> area in the <span class="gui-object-title">JPA Details</span> view to associate additional tables with an entity. Use this area if the data associated with an entity is spread across multiple tables.</p>
+<p><a id="sthref217" name="sthref217"></a><a id="sthref218" name="sthref218"></a><a id="sthref219" name="sthref219"></a><a id="sthref220" name="sthref220"></a>Use the <span class="gui-object-title">Secondary Tables</span> area in the <span class="gui-object-title">JPA Details</span> view to associate additional tables with an entity. Use this area if the data associated with an entity is spread across multiple tables.</p>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
index 2d4970ff07..b905385cad 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Inheritance information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:52Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:47Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Inheritance information" />
<meta name="relnum" content="Release 2.3" />
@@ -21,7 +21,7 @@
<p><a id="CACFHGHE" name="CACFHGHE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Inheritance information</h1>
-<p><a id="sthref219" name="sthref219"></a><a id="sthref220" name="sthref220"></a>This table lists the fields available on the <span class="gui-object-title">Inheritance</span> area in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
+<p><a id="sthref221" name="sthref221"></a><a id="sthref222" name="sthref222"></a>This table lists the fields available on the <span class="gui-object-title">Inheritance</span> area in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
<div class="inftblruleinformal">
<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, Inheritance tab." summary="This table describes the options on the Persistence Properties view, Inheritance tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<col width="24%" />
@@ -54,12 +54,12 @@
<td align="left" headers="r2c1-t15 r1c3-t15">Single table</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t15" headers="r1c1-t15"><a id="sthref221" name="sthref221"></a><a id="sthref222" name="sthref222"></a>Discriminator Value</td>
+<td align="left" id="r3c1-t15" headers="r1c1-t15"><a id="sthref223" name="sthref223"></a><a id="sthref224" name="sthref224"></a>Discriminator Value</td>
<td align="left" headers="r3c1-t15 r1c2-t15">Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified <span class="bold">Discriminator Type</span>.</td>
<td align="left" headers="r3c1-t15 r1c3-t15"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t15" headers="r1c1-t15"><a id="sthref223" name="sthref223"></a><a id="sthref224" name="sthref224"></a>Discriminator Column</td>
+<td align="left" id="r4c1-t15" headers="r1c1-t15"><a id="sthref225" name="sthref225"></a><a id="sthref226" name="sthref226"></a>Discriminator Column</td>
<td align="left" headers="r4c1-t15 r1c2-t15">These fields are available when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.
<p>This field corresponds to the <code>@DiscriminatorColumn</code> annotation.</p>
<p>Use the <span class="bold">Details</span> area to define the <span class="bold">Length</span> and <span class="bold">Column definition</span> of this Discriminator Column.</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
index 299365882c..f4b3e9ab36 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Queries</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:52Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:47Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Queries" />
<meta name="relnum" content="Release 2.3" />
@@ -18,13 +18,13 @@
<!-- contents -->
</head>
<body>
-<div class="sect3"><!-- infolevel="all" infotype="General" --><a id="sthref225" name="sthref225"></a>
+<div class="sect3"><!-- infolevel="all" infotype="General" --><a id="sthref227" name="sthref227"></a>
<h1>Queries</h1>
-<p>Use the queries area of the JPA Details view to create named queries and named native queries. Refer to <a href="tasks008.htm#BABIGBGG">"Creating Named Queries"</a> for additional information.</p>
+<p>Use the queries area of the JPA Details view to create named queries and named native queries. Refer to <a href="tasks009.htm#BABIGBGG">"Creating Named Queries"</a> for additional information.</p>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="tasks008.htm#BABIGBGG">Creating Named Queries</a>
+<a href="tasks009.htm#BABIGBGG">Creating Named Queries</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
index 29121aa5a3..25cdce9134 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Join Table Information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:52Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:47Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Join Table Information" />
<meta name="relnum" content="Release 2.3" />
@@ -22,7 +22,7 @@
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Join Table Information</h1>
<p>Use area to specify a mapped column for joining an entity association. By default, the mapping is assumed to have a single join.</p>
-<p>This table lists the fields available on the <span class="gui-object-title">Join Table</span> area in <span class="gui-object-title">the JPA Details</span> view for <a href="tasks015.htm#BABHGEBD">One-to-many mapping</a> and <a href="tasks013.htm#BABEIEGD">Many-to-many mapping</a> mapping types.</p>
+<p>This table lists the fields available on the <span class="gui-object-title">Join Table</span> area in <span class="gui-object-title">the JPA Details</span> view for <a href="tasks016.htm#BABHGEBD">One-to-many mapping</a> and <a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a> mapping types.</p>
<div class="inftblruleinformal">
<table class="RuleInformal" title="This table describes the options on the Join Table tab." summary="This table describes the options on the Join Table tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<col width="26%" />
@@ -43,7 +43,7 @@
</tr>
<tr align="left" valign="top">
<td align="left" id="r3c1-t17" headers="r1c1-t17"><a id="CACBBDFG" name="CACBBDFG"></a>Join Columns</td>
-<td align="left" headers="r3c1-t17 r1c2-t17"><a id="sthref243" name="sthref243"></a><a id="sthref244" name="sthref244"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
+<td align="left" headers="r3c1-t17 r1c2-t17"><a id="sthref246" name="sthref246"></a><a id="sthref247" name="sthref247"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
</td>
<td align="left" headers="r3c1-t17 r1c3-t17">By default, the mapping is assumed to have a single join.</td>
@@ -64,7 +64,7 @@
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="reference028.htm#CACCGEHC">Edit Join Columns Dialog</a></div>
+<a href="reference029.htm#CACCGEHC">Edit Join Columns Dialog</a></div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
index 3044cd2874..619907782d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Join Columns Information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:52Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:47Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Join Columns Information" />
<meta name="relnum" content="Release 2.3" />
@@ -21,7 +21,7 @@
<p><a id="CACFCEJC" name="CACFCEJC"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Join Columns Information</h1>
-<p><a id="sthref245" name="sthref245"></a>This table lists the fields available in the <span class="gui-object-title">Join Table</span> area in <span class="gui-object-title">JPA Details</span> view for <a href="tasks014.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks016.htm#BABFHBCJ">One-to-one mapping</a> mapping types.</p>
+<p><a id="sthref248" name="sthref248"></a>This table lists the fields available in the <span class="gui-object-title">Join Table</span> area in <span class="gui-object-title">JPA Details</span> view for <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a> mapping types.</p>
<div class="inftblruleinformal">
<table class="RuleInformal" title="This table describes the options on the Join Columns tab." summary="This table describes the options on the Join Columns tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<col width="26%" />
@@ -37,7 +37,7 @@
<tbody>
<tr align="left" valign="top">
<td align="left" id="r2c1-t18" headers="r1c1-t18">Join Column</td>
-<td align="left" headers="r2c1-t18 r1c2-t18"><a id="sthref246" name="sthref246"></a><a id="sthref247" name="sthref247"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
+<td align="left" headers="r2c1-t18 r1c2-t18"><a id="sthref249" name="sthref249"></a><a id="sthref250" name="sthref250"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
</td>
<td align="left" headers="r2c1-t18 r1c3-t18">By default, the mapping is assumed to have a single join.</td>
@@ -53,7 +53,7 @@
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="reference028.htm#CACCGEHC">Edit Join Columns Dialog</a></div>
+<a href="reference029.htm#CACCGEHC">Edit Join Columns Dialog</a></div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
index 5c497af01e..0b08922f60 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>General information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:53Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="General information" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
index a865b91e72..e824d3fab2 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Persistence Unit information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:53Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Persistence Unit information" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
index b09ee51c06..dd0c88a4e0 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Generators</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:53Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Generators" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
index 757aa6fce0..227a2b3ec2 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Queries</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:53Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Queries" />
<meta name="relnum" content="Release 2.3" />
@@ -54,7 +54,7 @@
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="tasks008.htm#BABIGBGG">Creating Named Queries</a>
+<a href="tasks009.htm#BABIGBGG">Creating Named Queries</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
index ead2b2d964..a9a21aad29 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Converters</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:53Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Converters" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
index 4d2d6b132d..8f35b73150 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Connection</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Connection" />
<meta name="relnum" content="Release 2.3" />
@@ -22,7 +22,7 @@
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Connection</h1>
<p>The following table lists the properties available in the Connection page of the <a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div class="tblformal"><a id="sthref257" name="sthref257"></a><a id="sthref258" name="sthref258"></a>
+<div class="tblformal"><a id="sthref260" name="sthref260"></a><a id="sthref261" name="sthref261"></a>
<p class="titleintable">Properties of the Connection Page</p>
<table class="Formal" title="Properties of the Connection Page" summary="This table lists the properties for the persistence.xml editor&rsquo;s connection page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
<col width="24%" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm
index 2472d99341..2a13dba748 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Customization</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Customization" />
<meta name="relnum" content="Release 2.3" />
@@ -22,7 +22,7 @@
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Customization</h1>
<p>The following table lists the properties available in the Customization page of the <a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div class="tblformal"><a id="sthref259" name="sthref259"></a><a id="sthref260" name="sthref260"></a>
+<div class="tblformal"><a id="sthref262" name="sthref262"></a><a id="sthref263" name="sthref263"></a>
<p class="titleintable">Properties of the Customization Page</p>
<table class="Formal" title="Properties of the Customization Page" summary="This table lists the properties of the persistence.xml Editor&rsquo;s Customization page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
<col width="24%" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm
index 38b7873456..769e6de077 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Caching</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Caching" />
<meta name="relnum" content="Release 2.3" />
@@ -20,9 +20,9 @@
<body>
<p><a id="CIABEDCH" name="CIABEDCH"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref261" name="sthref261"></a>Caching</h1>
+<h1><a id="sthref264" name="sthref264"></a>Caching</h1>
<p>This table lists the properties of the Caching page of the <a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div class="tblformal"><a id="sthref262" name="sthref262"></a><a id="sthref263" name="sthref263"></a>
+<div class="tblformal"><a id="sthref265" name="sthref265"></a><a id="sthref266" name="sthref266"></a>
<p class="titleintable">Properties of the Caching Page</p>
<table class="Formal" title="Properties of the Caching Page" summary="This table lists the properties of the persistence.xml&rsquo;s Caching page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
<col width="24%" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm
index 9c8f31c090..c92c362700 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Logging</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Logging" />
<meta name="relnum" content="Release 2.3" />
@@ -35,7 +35,7 @@ This page is not available for projects using the <span class="bold">Generic</sp
</table>
<br /></div>
<!-- class="inftblnote" --></div>
-<div class="tblformal"><a id="sthref264" name="sthref264"></a><a id="sthref265" name="sthref265"></a>
+<div class="tblformal"><a id="sthref267" name="sthref267"></a><a id="sthref268" name="sthref268"></a>
<p class="titleintable">Properties of the Logging Page</p>
<table class="Formal" title="Properties of the Logging Page" summary="This table lists the properties of the Logging page of the persistence.xml Editor." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
<col width="24%" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm
index a072a406f3..111b7cbf21 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Options</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Options" />
<meta name="relnum" content="Release 2.3" />
@@ -35,7 +35,7 @@ This page is not available for projects using the <span class="bold">Generic</sp
</table>
<br /></div>
<!-- class="inftblnote" --></div>
-<div class="tblformal"><a id="sthref266" name="sthref266"></a><a id="sthref267" name="sthref267"></a>
+<div class="tblformal"><a id="sthref269" name="sthref269"></a><a id="sthref270" name="sthref270"></a>
<p class="titleintable">Properties of the Options Page</p>
<table class="Formal" title="Properties of the Options Page" summary="Properties of the Options Page" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
<col width="24%" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm
index b518149a5e..52ec40416d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Schema Generation</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Schema Generation" />
<meta name="relnum" content="Release 2.3" />
@@ -35,7 +35,7 @@ This page is not available for projects using the <span class="bold">Generic</sp
</table>
<br /></div>
<!-- class="inftblnote" --></div>
-<div class="tblformal"><a id="sthref268" name="sthref268"></a><a id="sthref269" name="sthref269"></a>
+<div class="tblformal"><a id="sthref271" name="sthref271"></a><a id="sthref272" name="sthref272"></a>
<p class="titleintable">&nbsp;</p>
<table class="Formal" title="" summary="This table lists the properties of the persistence.xml Editor&rsquo;s Schema Generation page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
<col width="24%" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm
index 6134b4a1e1..1830f01b1d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Properties</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Properties" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm
index b3cf12f89c..47b984b01f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Source</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Source" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm
index efff52b18f..235ba80757 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Preferences</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Preferences" />
<meta name="relnum" content="Release 2.3" />
@@ -26,6 +26,9 @@
<li>
<p><a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; Java Persistence Options</a></p>
</li>
+<li>
+<p><a href="reference027.htm#CACFBAEH">Project Properties page &ndash; Validation Preferences</a></p>
+</li>
</ul>
<!-- Start Footer -->
<div class="footer">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm
index a1cb76aedf..f48d45b158 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Dialogs</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<title>Project Properties page &ndash; Validation Preferences</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Dialogs" />
+<meta name="doctitle" content="Project Properties page &ndash; Validation Preferences" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,21 +18,80 @@
<!-- contents -->
</head>
<body>
-<p><a id="CACGEJDA" name="CACGEJDA"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Dialogs</h1>
-<p>This section includes information on the following preference pages:</p>
+<p><a id="CACFBAEH" name="CACFBAEH"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Project Properties page &ndash; Validation Preferences</h1>
+<p><a id="sthref275" name="sthref275"></a><a id="sthref276" name="sthref276"></a>Use the <span class="gui-object-title">Java Persistence</span> options on the <span class="gui-object-title">Properties</span> page to select the database connection to use with the project.</p>
+<p>This table lists the properties available in the <span class="gui-object-title">JPA Details page</span>.</p>
+<div class="inftblinformal">
+<table class="Informal" title="This table describes the options on the Persistence Properties page." summary="This table describes the options on the Persistence Properties page." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t37">Property</th>
+<th align="left" valign="bottom" id="r1c2-t37">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t37" headers="r1c1-t37"><a id="sthref277" name="sthref277"></a><a id="sthref278" name="sthref278"></a><a id="sthref279" name="sthref279"></a><a id="sthref280" name="sthref280"></a>Platform</td>
+<td align="left" headers="r2c1-t37 r1c2-t37">Select the vendor-specific platform.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t37" headers="r1c1-t37">Library</td>
+<td align="left" headers="r3c1-t37 r1c2-t37">Select a specific JPA library configuration.
+<p>Click <span class="bold">Manage libraries</span> to create or update a user library.</p>
+<p>Click <span class="bold">Download libraries</span> to download a specific library configuration.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t37" headers="r1c1-t37">&nbsp;&nbsp;Type</td>
+<td align="left" headers="r4c1-t37 r1c2-t37">Select <span class="bold">User Library</span> to select from the available user-defined or downloaded libraries.
+<p>If you select Disable, you must manually include the JPA implementation library on the project classpath.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t37" headers="r1c1-t37">&nbsp;&nbsp;Include&nbsp;libraries&nbsp;with&nbsp;this&nbsp;application</td>
+<td align="left" headers="r5c1-t37 r1c2-t37">Specify if the selected libraries are included when deploying the application.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t37" headers="r1c1-t37"><a id="sthref281" name="sthref281"></a><a id="sthref282" name="sthref282"></a><a id="sthref283" name="sthref283"></a>Connection</td>
+<td align="left" headers="r6c1-t37 r1c2-t37">The database connection used to map the persistent entities.
<ul>
<li>
-<p><a href="reference028.htm#CACCGEHC">Edit Join Columns Dialog</a></p>
-</li>
-<li>
-<p><a href="ref_select_cascade_dialog.htm#CIAFDGIJ">Select Cascade dialog</a></p>
+<p>To create a new connection, click <span class="bold">Add Connections</span>.</p>
</li>
<li>
-<p><a href="ref_eclipselink_mapping_file.htm#CIAEDEJF">New EclipseLink Mapping File dialog</a></p>
+<p>To reconnect to an existing connection, click <span class="bold">Reconnect</span>.</p>
</li>
</ul>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t37" headers="r1c1-t37">&nbsp;&nbsp;Override&nbsp;default&nbsp;catalog&nbsp;from&nbsp;connection</td>
+<td align="left" headers="r7c1-t37 r1c2-t37">Select a catalog other than the default one derived from the connection information. Use this option if the default catalog is incorrect or cannot be used.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t37" headers="r1c1-t37">&nbsp;&nbsp;Override&nbsp;default&nbsp;schema&nbsp;from&nbsp;connection</td>
+<td align="left" headers="r8c1-t37 r1c2-t37">Select a schema other than the default one derived from the connection information. Use this option if the default schema is incorrect or cannot be used. For example, use this option when the deployment login differs from the design-time login.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t37" headers="r1c1-t37">Persistent Class Management</td>
+<td align="left" headers="r9c1-t37 r1c2-t37">Specify if Dali will <span class="bold">discover annotated classes automatically</span>, or if the <span class="bold">annotated classes must be listed in the persistence.xml</span> file.
+<p><span class="bold">Note</span>: To insure application portability, you should explicitly list the managed persistence classes that are included in the persistence unit.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t37" headers="r1c1-t37"><a id="sthref284" name="sthref284"></a><a id="sthref285" name="sthref285"></a>Canonical Metamodel</td>
+<td align="left" headers="r10c1-t37 r1c2-t37"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblinformal" --></div>
+<!-- class="sect2" -->
+<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
@@ -44,6 +103,6 @@
</tr>
</table>
</div>
-<!-- class="footer" --></div>
+<!-- class="footer" -->
</body>
</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm
index 9474b027d8..7371b2503f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Edit Join Columns Dialog</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<title>Dialogs</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Edit Join Columns Dialog" />
+<meta name="doctitle" content="Dialogs" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,39 +18,21 @@
<!-- contents -->
</head>
<body>
-<p><a id="CACCGEHC" name="CACCGEHC"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Edit Join Columns Dialog</h1>
-<p>Use the <span class="gui-object-title">Join Columns</span> dialog to create or modify the join tables and columns in relationship mappings.</p>
-<p>This table lists the properties available in the <span class="gui-object-title">Join Columns</span> dialog.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Join Columns dialog." summary="This table describes the options on the Join Columns dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="32%" />
-<col width="*" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t37">Property</th>
-<th align="left" valign="bottom" id="r1c2-t37">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t37" headers="r1c1-t37">Name</td>
-<td align="left" headers="r2c1-t37 r1c2-t37">Name of the joint table column that contains the foreign key column.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t37" headers="r1c1-t37">Referenced Column Name</td>
-<td align="left" headers="r3c1-t37 r1c2-t37">Name of the database column that contains the foreign key reference for the entity relationship.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblinformal" -->
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="reference011.htm#CACBAEBC">Join Table Information</a><br />
-<a href="reference012.htm#CACFCEJC">Join Columns Information</a></div>
-<!-- class="sect2" -->
+<p><a id="CACGEJDA" name="CACGEJDA"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>Dialogs</h1>
+<p>This section includes information on the following preference pages:</p>
+<ul>
+<li>
+<p><a href="reference029.htm#CACCGEHC">Edit Join Columns Dialog</a></p>
+</li>
+<li>
+<p><a href="ref_select_cascade_dialog.htm#CIAFDGIJ">Select Cascade dialog</a></p>
+</li>
+<li>
+<p><a href="ref_eclipselink_mapping_file.htm#CIAEDEJF">New EclipseLink Mapping File dialog</a></p>
+</li>
+</ul>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
@@ -62,6 +44,6 @@
</tr>
</table>
</div>
-<!-- class="footer" -->
+<!-- class="footer" --></div>
</body>
</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm
index 8adb5ae7ce..9f66678703 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Icons and buttons</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<title>Edit Join Columns Dialog</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:48Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Icons and buttons" />
+<meta name="doctitle" content="Edit Join Columns Dialog" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,18 +18,39 @@
<!-- contents -->
</head>
<body>
-<p><a id="CACDHCIA" name="CACDHCIA"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Icons and buttons</h1>
-<p>This section includes information on each of the icons and buttons used in the Dali OR Mapping Tool.</p>
-<ul>
-<li>
-<p><a href="reference030.htm#CACGEACG">Icons</a></p>
-</li>
-<li>
-<p><a href="reference031.htm#CACDJCEI">Buttons</a></p>
-</li>
-</ul>
+<p><a id="CACCGEHC" name="CACCGEHC"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Edit Join Columns Dialog</h1>
+<p>Use the <span class="gui-object-title">Join Columns</span> dialog to create or modify the join tables and columns in relationship mappings.</p>
+<p>This table lists the properties available in the <span class="gui-object-title">Join Columns</span> dialog.</p>
+<div class="inftblinformal">
+<table class="Informal" title="This table describes the options on the Join Columns dialog." summary="This table describes the options on the Join Columns dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t38">Property</th>
+<th align="left" valign="bottom" id="r1c2-t38">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t38" headers="r1c1-t38">Name</td>
+<td align="left" headers="r2c1-t38 r1c2-t38">Name of the joint table column that contains the foreign key column.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t38" headers="r1c1-t38">Referenced Column Name</td>
+<td align="left" headers="r3c1-t38 r1c2-t38">Name of the database column that contains the foreign key reference for the entity relationship.</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblinformal" -->
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="reference011.htm#CACBAEBC">Join Table Information</a><br />
+<a href="reference012.htm#CACFCEJC">Join Columns Information</a></div>
+<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
@@ -41,6 +62,6 @@
</tr>
</table>
</div>
-<!-- class="footer" --></div>
+<!-- class="footer" -->
</body>
</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm
index fa07115620..70279780ba 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Icons</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:54Z" />
+<title>Icons and buttons</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:49Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Icons" />
+<meta name="doctitle" content="Icons and buttons" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,97 +18,18 @@
<!-- contents -->
</head>
<body>
-<p><a id="CACGEACG" name="CACGEACG"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Icons</h1>
-<p>The following icons are used throughout the Dali OR Mapping Tool.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the icons used in the Dali plug-in." summary="This table describes the icons used in the Dali plug-in." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="23%" />
-<col width="*" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t40">Icon</th>
-<th align="left" valign="bottom" id="r1c2-t40">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t40" headers="r1c1-t40"><img src="img/new_icon_mappedentity.png" alt="" title="" /><br /></td>
-<td align="left" headers="r2c1-t40 r1c2-t40"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t40" headers="r1c1-t40"><img src="img/new_icon_embeddableentitymapping.png" alt="Embeddable entity icon" title="Embeddable entity icon" /><br /></td>
-<td align="left" headers="r3c1-t40 r1c2-t40"><a href="tasks006.htm#BABFEICE">Embeddable</a> entity</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t40" headers="r1c1-t40"><img src="img/new_icon_mappedsuperclass.png" alt="Mapped superclass icon" title="Mapped superclass icon" /><br /></td>
-<td align="left" headers="r4c1-t40 r1c2-t40"><a href="tasks007.htm#BABDAGCI">Mapped superclass</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t40" headers="r1c1-t40"><img src="img/new_icon_basicmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
-<td align="left" headers="r5c1-t40 r1c2-t40"><a href="tasks009.htm#BABBABCE">Basic mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t40" headers="r1c1-t40"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
-<td align="left" headers="r6c1-t40 r1c2-t40">Basic collection mapping</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t40" headers="r1c1-t40"><img src="img/icon_basicmapping.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
-<td align="left" headers="r7c1-t40 r1c2-t40">Basic map mapping</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t40" headers="r1c1-t40"><img src="img/new_icon_embeddedidmapping.png" alt="Embedded mapping icon" title="Embedded mapping icon" /><br /></td>
-<td align="left" headers="r8c1-t40 r1c2-t40"><a href="tasks010.htm#BABCBHDF">Embedded mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r9c1-t40" headers="r1c1-t40"><img src="img/new_icon_embeddedmapping.png" alt="Embedded ID mapping icon" title="Embedded ID mapping icon" /><br /></td>
-<td align="left" headers="r9c1-t40 r1c2-t40"><a href="tasks011.htm#CIHDIAEE">Embedded ID mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r10c1-t40" headers="r1c1-t40"><img src="img/new_icon_idmapping.png" alt="ID mapping icon" title="ID mapping icon" /><br /></td>
-<td align="left" headers="r10c1-t40 r1c2-t40"><a href="tasks012.htm#BABGCBHG">ID mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r11c1-t40" headers="r1c1-t40"><img src="img/new_icon_manytomanymapping.png" alt="Many-to-many mapping icon" title="Many-to-many mapping icon" /><br /></td>
-<td align="left" headers="r11c1-t40 r1c2-t40"><a href="tasks013.htm#BABEIEGD">Many-to-many mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r12c1-t40" headers="r1c1-t40"><img src="img/new_icon_manytoonemapping.png" alt="Many-to-one mapping icon." title="Many-to-one mapping icon." /><br /></td>
-<td align="left" headers="r12c1-t40 r1c2-t40"><a href="tasks014.htm#BABHFAFJ">Many-to-one mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r13c1-t40" headers="r1c1-t40"><img src="img/new_icon_onetomanymapping.png" alt="One-to-many mapping icon" title="One-to-many mapping icon" /><br /></td>
-<td align="left" headers="r13c1-t40 r1c2-t40"><a href="tasks015.htm#BABHGEBD">One-to-many mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r14c1-t40" headers="r1c1-t40"><img src="img/new_icon_onetoonemapping.png" alt="One-to-one mapping icon." title="One-to-one mapping icon." /><br /></td>
-<td align="left" headers="r14c1-t40 r1c2-t40"><a href="tasks016.htm#BABFHBCJ">One-to-one mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r15c1-t40" headers="r1c1-t40"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
-<td align="left" headers="r15c1-t40 r1c2-t40">Transformation mappings</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r16c1-t40" headers="r1c1-t40"><img src="img/new_icon_transientmapping.png" alt="Transient mapping icon." title="Transient mapping icon." /><br /></td>
-<td align="left" headers="r16c1-t40 r1c2-t40"><a href="tasks017.htm#BABHFHEI">Transient mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r17c1-t40" headers="r1c1-t40"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
-<td align="left" headers="r17c1-t40 r1c2-t40">Variable one-to-one mappings</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r18c1-t40" headers="r1c1-t40"><img src="img/new_icon_versionmapping.png" alt="Version mapping icon." title="Version mapping icon." /><br /></td>
-<td align="left" headers="r18c1-t40 r1c2-t40"><a href="tasks018.htm#BABHIBII">Version mapping</a><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" -->
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<p><a href="reference029.htm#CACDHCIA">Icons and buttons</a></p>
-</div>
-<!-- class="sect2" -->
+<p><a id="CACDHCIA" name="CACDHCIA"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>Icons and buttons</h1>
+<p>This section includes information on each of the icons and buttons used in the Dali OR Mapping Tool.</p>
+<ul>
+<li>
+<p><a href="reference031.htm#CACGEACG">Icons</a></p>
+</li>
+<li>
+<p><a href="reference032.htm#CACDJCEI">Buttons</a></p>
+</li>
+</ul>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
@@ -120,6 +41,6 @@
</tr>
</table>
</div>
-<!-- class="footer" -->
+<!-- class="footer" --></div>
</body>
</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm
index 9e497bfbcb..35760eef4f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Buttons</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:55Z" />
+<title>Icons</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:49Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Buttons" />
+<meta name="doctitle" content="Icons" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,13 +18,13 @@
<!-- contents -->
</head>
<body>
-<p><a id="CACDJCEI" name="CACDJCEI"></a></p>
+<p><a id="CACGEACG" name="CACGEACG"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Buttons</h1>
-<p>The following buttons are used throughout the Dali OR Mapping Tool.</p>
+<h1>Icons</h1>
+<p>The following icons are used throughout the Dali OR Mapping Tool.</p>
<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the buttons used in the Dali plug-in." summary="This table describes the buttons used in the Dali plug-in." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="27%" />
+<table class="RuleInformal" title="This table describes the icons used in the Dali plug-in." summary="This table describes the icons used in the Dali plug-in." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="23%" />
<col width="*" />
<thead>
<tr align="left" valign="top">
@@ -34,18 +34,81 @@
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t41" headers="r1c1-t41"><img src="img/new_jpa_perspective_button.png" alt="The JPA Perspective icon" title="The JPA Perspective icon" /><br /></td>
-<td align="left" headers="r2c1-t41 r1c2-t41">JPA Development perspective</td>
+<td align="left" id="r2c1-t41" headers="r1c1-t41"><img src="img/new_icon_mappedentity.png" alt="" title="" /><br /></td>
+<td align="left" headers="r2c1-t41 r1c2-t41"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t41" headers="r1c1-t41"><img src="img/new_icon_embeddableentitymapping.png" alt="Embeddable entity icon" title="Embeddable entity icon" /><br /></td>
+<td align="left" headers="r3c1-t41 r1c2-t41"><a href="tasks007.htm#BABFEICE">Embeddable</a> entity</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t41" headers="r1c1-t41"><img src="img/new_icon_mappedsuperclass.png" alt="Mapped superclass icon" title="Mapped superclass icon" /><br /></td>
+<td align="left" headers="r4c1-t41 r1c2-t41"><a href="tasks008.htm#BABDAGCI">Mapped superclass</a></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t41" headers="r1c1-t41"><img src="img/new_icon_basicmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
+<td align="left" headers="r5c1-t41 r1c2-t41"><a href="tasks010.htm#BABBABCE">Basic mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t41" headers="r1c1-t41"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
+<td align="left" headers="r6c1-t41 r1c2-t41">Basic collection mapping</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t41" headers="r1c1-t41"><img src="img/icon_basicmapping.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
+<td align="left" headers="r7c1-t41 r1c2-t41">Basic map mapping</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t41" headers="r1c1-t41"><img src="img/new_icon_embeddedidmapping.png" alt="Embedded mapping icon" title="Embedded mapping icon" /><br /></td>
+<td align="left" headers="r8c1-t41 r1c2-t41"><a href="tasks011.htm#BABCBHDF">Embedded mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t41" headers="r1c1-t41"><img src="img/new_icon_embeddedmapping.png" alt="Embedded ID mapping icon" title="Embedded ID mapping icon" /><br /></td>
+<td align="left" headers="r9c1-t41 r1c2-t41"><a href="tasks012.htm#CIHDIAEE">Embedded ID mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t41" headers="r1c1-t41"><img src="img/new_icon_idmapping.png" alt="ID mapping icon" title="ID mapping icon" /><br /></td>
+<td align="left" headers="r10c1-t41 r1c2-t41"><a href="tasks013.htm#BABGCBHG">ID mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t41" headers="r1c1-t41"><img src="img/new_icon_manytomanymapping.png" alt="Many-to-many mapping icon" title="Many-to-many mapping icon" /><br /></td>
+<td align="left" headers="r11c1-t41 r1c2-t41"><a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t41" headers="r1c1-t41"><img src="img/new_icon_manytoonemapping.png" alt="Many-to-one mapping icon." title="Many-to-one mapping icon." /><br /></td>
+<td align="left" headers="r12c1-t41 r1c2-t41"><a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r13c1-t41" headers="r1c1-t41"><img src="img/new_icon_onetomanymapping.png" alt="One-to-many mapping icon" title="One-to-many mapping icon" /><br /></td>
+<td align="left" headers="r13c1-t41 r1c2-t41"><a href="tasks016.htm#BABHGEBD">One-to-many mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r14c1-t41" headers="r1c1-t41"><img src="img/new_icon_onetoonemapping.png" alt="One-to-one mapping icon." title="One-to-one mapping icon." /><br /></td>
+<td align="left" headers="r14c1-t41 r1c2-t41"><a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r15c1-t41" headers="r1c1-t41"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
+<td align="left" headers="r15c1-t41 r1c2-t41">Transformation mappings</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r16c1-t41" headers="r1c1-t41"><img src="img/new_icon_transientmapping.png" alt="Transient mapping icon." title="Transient mapping icon." /><br /></td>
+<td align="left" headers="r16c1-t41 r1c2-t41"><a href="tasks018.htm#BABHFHEI">Transient mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r17c1-t41" headers="r1c1-t41"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
+<td align="left" headers="r17c1-t41 r1c2-t41">Variable one-to-one mappings</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r18c1-t41" headers="r1c1-t41"><img src="img/new_icon_versionmapping.png" alt="Version mapping icon." title="Version mapping icon." /><br /></td>
+<td align="left" headers="r18c1-t41 r1c2-t41"><a href="tasks019.htm#BABHIBII">Version mapping</a><br /></td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblruleinformal" -->
<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<p><a href="reference029.htm#CACDHCIA">Icons and buttons</a></p>
+<p><a href="reference030.htm#CACDHCIA">Icons and buttons</a></p>
</div>
<!-- class="sect2" -->
-<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm
index 3a91994329..36db5405f8 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Dali Developer Documentation</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:56Z" />
+<title>Buttons</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:49Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Dali Developer Documentation" />
+<meta name="doctitle" content="Buttons" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,24 +18,33 @@
<!-- contents -->
</head>
<body>
-<p><a id="CACBBDIB" name="CACBBDIB"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Dali Developer Documentation</h1>
-<p><a id="sthref283" name="sthref283"></a><a id="sthref284" name="sthref284"></a><a id="sthref285" name="sthref285"></a>Additional Dali documentation is available online at:</p>
-<p><code><a href="http://wiki.eclipse.org/index.php/Dali_Developer_Documentation">http://wiki.eclipse.org/index.php/Dali_Developer_Documentation</a></code></p>
-<p>This developer documentation includes information about:</p>
-<ul>
-<li>
-<p>Dali architecture</p>
-</li>
-<li>
-<p>Plugins that comprise the Dali JPA Eclipse feature</p>
-</li>
-<li>
-<p>Extension points</p>
-</li>
-</ul>
+<p><a id="CACDJCEI" name="CACDJCEI"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Buttons</h1>
+<p>The following buttons are used throughout the Dali OR Mapping Tool.</p>
+<div class="inftblruleinformal">
+<table class="RuleInformal" title="This table describes the buttons used in the Dali plug-in." summary="This table describes the buttons used in the Dali plug-in." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="27%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t42">Icon</th>
+<th align="left" valign="bottom" id="r1c2-t42">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t42" headers="r1c1-t42"><img src="img/new_jpa_perspective_button.png" alt="The JPA Perspective icon" title="The JPA Perspective icon" /><br /></td>
+<td align="left" headers="r2c1-t42 r1c2-t42">JPA Development perspective</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblruleinformal" -->
+<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
+<p><a href="reference030.htm#CACDHCIA">Icons and buttons</a></p>
</div>
+<!-- class="sect2" -->
<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm
new file mode 100644
index 0000000000..9a706b9f2d
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Dali Developer Documentation</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:49Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Dali Developer Documentation" />
+<meta name="relnum" content="Release 2.3" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CACBBDIB" name="CACBBDIB"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>Dali Developer Documentation</h1>
+<p><a id="sthref288" name="sthref288"></a><a id="sthref289" name="sthref289"></a><a id="sthref290" name="sthref290"></a>Additional Dali documentation is available online at:</p>
+<p><code><a href="http://wiki.eclipse.org/index.php/Dali_Developer_Documentation">http://wiki.eclipse.org/index.php/Dali_Developer_Documentation</a></code></p>
+<p>This developer documentation includes information about:</p>
+<ul>
+<li>
+<p>Dali architecture</p>
+</li>
+<li>
+<p>Plugins that comprise the Dali JPA Eclipse feature</p>
+</li>
+<li>
+<p>Extension points</p>
+</li>
+</ul>
+</div>
+<!-- class="sect1" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm
index 777f964e35..4c9842ee03 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Adding persistence to a class</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:45Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:43Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Adding persistence to a class" />
<meta name="relnum" content="Release 2.3" />
@@ -21,16 +21,16 @@
<p><a id="BABHICAI" name="BABHICAI"></a></p>
<div class="sect1">
<h1>Adding persistence to a class</h1>
-<p><a id="sthref65" name="sthref65"></a><a id="sthref66" name="sthref66"></a><a id="sthref67" name="sthref67"></a>You can make a Java class into one of the following persistent types:</p>
+<p><a id="sthref67" name="sthref67"></a><a id="sthref68" name="sthref68"></a><a id="sthref69" name="sthref69"></a>You can make a Java class into one of the following persistent types:</p>
<ul>
<li>
-<p><a href="tasks005.htm#BABGBIEE">Entity</a></p>
+<p><a href="tasks006.htm#BABGBIEE">Entity</a></p>
</li>
<li>
-<p><a href="tasks006.htm#BABFEICE">Embeddable</a></p>
+<p><a href="tasks007.htm#BABFEICE">Embeddable</a></p>
</li>
<li>
-<p><a href="tasks007.htm#BABDAGCI">Mapped superclass</a></p>
+<p><a href="tasks008.htm#BABDAGCI">Mapped superclass</a></p>
</li>
</ul>
<p>&nbsp;</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm
index 65b9d2ee96..77d584cd6b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Specifying additional tables</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:45Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:43Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Specifying additional tables" />
<meta name="relnum" content="Release 2.3" />
@@ -29,7 +29,7 @@
</li>
<li>
<p>In the <span class="gui-object-title">JPA Details</span> view, select the <span class="gui-object-action">Secondary Tables</span> information.</p>
-<div class="figure"><a id="sthref90" name="sthref90"></a>
+<div class="figure"><a id="sthref92" name="sthref92"></a>
<p class="titleinfigure">Specifying Secondary Tables</p>
<img src="img/secondary_tables.png" alt="Secondary Tables area on the JPA Details view." title="Secondary Tables area on the JPA Details view." /><br /></div>
<!-- class="figure" --></li>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_create_jpa_entity.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_create_jpa_entity.htm
index 8684a7fe1d..a83f787ffc 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_create_jpa_entity.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_create_jpa_entity.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Creating a JPA Entity</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:43Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:42Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Creating a JPA Entity" />
<meta name="relnum" content="Release 2.3" />
@@ -59,7 +59,7 @@
<p>Accept the <span class="bold">Entity</span> option (the default) to create a Java class with the <code>@Entity</code> option.</p>
</li>
<li>
-<p>Alternatively, select <a href="tasks007.htm#BABDAGCI">Mapped superclass</a> (if you defined a super class).</p>
+<p>Alternatively, select <a href="tasks008.htm#BABDAGCI">Mapped superclass</a> (if you defined a super class).</p>
</li>
<li>
<p>Select <span class="bold">Inheritance</span> and then select one of the JSR 220 inheritance mapping strategies (SINGLE_TABLE, TABLE_PER_CLASS, JOINED).</p>
@@ -94,7 +94,7 @@
<tr>
<td align="left">
<p class="notep1">Note:</p>
-The Entity Name-related options are not available if you selected <a href="tasks007.htm#BABDAGCI">Mapped superclass</a> on the <a href="ref_EntityClassPage.htm#CIAFEIGF">Entity Class page</a></td>
+The Entity Name-related options are not available if you selected <a href="tasks008.htm#BABDAGCI">Mapped superclass</a> on the <a href="ref_EntityClassPage.htm#CIAFEIGF">Entity Class page</a></td>
</tr>
</tbody>
</table>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm
index 4a686e312e..ee7e1ede8e 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Creating a new JPA project</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:43Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Creating a new JPA project" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm
index 5c95a13232..15a4d073d7 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Specifying entity inheritance</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:46Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:43Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Specifying entity inheritance" />
<meta name="relnum" content="Release 2.3" />
@@ -21,7 +21,7 @@
<p><a id="CIHCCCJD" name="CIHCCCJD"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>Specifying entity inheritance</h1>
-<p><a id="sthref91" name="sthref91"></a><a id="sthref92" name="sthref92"></a>An entity may inherit properties from other entities. You can specify a specific strategy to use for inheritance.</p>
+<p><a id="sthref93" name="sthref93"></a><a id="sthref94" name="sthref94"></a>An entity may inherit properties from other entities. You can specify a specific strategy to use for inheritance.</p>
<p>Use this procedure to specify inheritance (<code>@Inheritance)</code> for an existing entity (<code>@Entity</code>):</p>
<ol>
<li>
@@ -29,7 +29,7 @@
</li>
<li>
<p>In the <span class="gui-object-title">JPA Details</span> view, select the <span class="gui-object-action">Inheritance</span> information.</p>
-<div class="figure"><a id="sthref93" name="sthref93"></a>
+<div class="figure"><a id="sthref95" name="sthref95"></a>
<p class="titleinfigure">Specifying Inheritance</p>
<img src="img/inheritance_tab.png" alt="Selecting the Inheritance area on the JPA Details view." title="Selecting the Inheritance area on the JPA Details view." /><br /></div>
<!-- class="figure" --></li>
@@ -63,7 +63,7 @@
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t13" headers="r1c1-t13"><a id="sthref94" name="sthref94"></a><a id="sthref95" name="sthref95"></a>Discriminator Column</td>
+<td align="left" id="r2c1-t13" headers="r1c1-t13"><a id="sthref96" name="sthref96"></a><a id="sthref97" name="sthref97"></a>Discriminator Column</td>
<td align="left" headers="r2c1-t13 r1c2-t13">Name of the discriminator column when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.
<p>This field corresponds to the <code>@DiscriminatorColumn</code> annotation.</p>
</td>
@@ -75,7 +75,7 @@
<td align="left" headers="r3c1-t13 r1c3-t13">String</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t13" headers="r1c1-t13"><a id="sthref96" name="sthref96"></a><a id="sthref97" name="sthref97"></a>Discriminator Value</td>
+<td align="left" id="r4c1-t13" headers="r1c1-t13"><a id="sthref98" name="sthref98"></a><a id="sthref99" name="sthref99"></a>Discriminator Value</td>
<td align="left" headers="r4c1-t13 r1c2-t13">Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified <span class="bold">Discriminator Type</span>.
<p>This field corresponds to the <code>@DiscriminatorValue</code> annotation.</p>
</td>
@@ -103,13 +103,13 @@
referencedColumnName = "<span class="italic">&lt;REFERENCED_COLUMN_NAME&gt;</span>")
</pre>
-<p><a id="sthref98" name="sthref98"></a><a id="sthref99" name="sthref99"></a><a id="sthref100" name="sthref100"></a>The following figures illustrates the different inheritance strategies.</p>
-<div class="figure"><a id="sthref101" name="sthref101"></a>
+<p><a id="sthref100" name="sthref100"></a><a id="sthref101" name="sthref101"></a><a id="sthref102" name="sthref102"></a>The following figures illustrates the different inheritance strategies.</p>
+<div class="figure"><a id="sthref103" name="sthref103"></a>
<p class="titleinfigure">Single Table Inheritance</p>
<img src="img/inheritance_single.png" alt="This figure illustrates entity inheritance in a single table." title="This figure illustrates entity inheritance in a single table." /><br /></div>
<!-- class="figure" -->
-<div class="figure"><a id="sthref102" name="sthref102"></a>
-<p class="titleinfigure"><a id="sthref103" name="sthref103"></a><a id="sthref104" name="sthref104"></a>Joined Table Inheritance</p>
+<div class="figure"><a id="sthref104" name="sthref104"></a>
+<p class="titleinfigure"><a id="sthref105" name="sthref105"></a><a id="sthref106" name="sthref106"></a>Joined Table Inheritance</p>
<img src="img/inheritance_join.png" alt="This figure illustrates a joined subclass inheritance strategy." title="This figure illustrates a joined subclass inheritance strategy." /><br /></div>
<!-- class="figure" -->
<br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm
index d8b5b2fd2d..8968739b98 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Managing the orm.xml file</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:44Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:42Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Managing the orm.xml file" />
<meta name="relnum" content="Release 2.3" />
@@ -20,9 +20,9 @@
<body>
<p><a id="CIHDGDCD" name="CIHDGDCD"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref56" name="sthref56"></a>Managing the orm.xml file</h1>
+<h1><a id="sthref58" name="sthref58"></a>Managing the orm.xml file</h1>
<p>When creating a JPA project, (see <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a>) you can also create the <code>orm.xml</code> file that defines the mapping metadata and defaults.</p>
-<p><a id="sthref57" name="sthref57"></a>Eclipse creates the <code>META-INF\orm.xml</code> file in your project's directory:</p>
+<p><a id="sthref59" name="sthref59"></a>Eclipse creates the <code>META-INF\orm.xml</code> file in your project's directory:</p>
<pre xml:space="preserve" class="oac_no_warn">
&lt;?xml version="1.0" encoding="UTF-8"?&gt;
&lt;persistence version="<span class="italic">&lt;PERSISTENCE_VERSION&gt;</span>"
@@ -43,7 +43,7 @@
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="tasks004.htm#CIHBCDCE">Working with orm.xml file</a><br />
+<a href="tasks005.htm#CIHBCDCE">Working with orm.xml file</a><br />
<p>&nbsp;</p>
<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
<br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm
index 1461a8cc28..92f618b401 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Managing the persistence.xml file</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:44Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:42Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Managing the persistence.xml file" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm
index 782d60d495..be8d8f1f48 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Mapping an entity</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:46Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:43Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Mapping an entity" />
<meta name="relnum" content="Release 2.3" />
@@ -24,34 +24,37 @@
<p>Dali supports the following mapping types for Java persistent entities:</p>
<ul>
<li>
-<p><a href="tasks009.htm#BABBABCE">Basic mapping</a></p>
+<p><a href="tasks010.htm#BABBABCE">Basic mapping</a></p>
</li>
<li>
-<p><a href="tasks010.htm#BABCBHDF">Embedded mapping</a></p>
+<p><a href="tasks011.htm#BABCBHDF">Embedded mapping</a></p>
</li>
<li>
-<p><a href="tasks011.htm#CIHDIAEE">Embedded ID mapping</a></p>
+<p><a href="tasks012.htm#CIHDIAEE">Embedded ID mapping</a></p>
</li>
<li>
-<p><a href="tasks012.htm#BABGCBHG">ID mapping</a></p>
+<p><a href="tasks013.htm#BABGCBHG">ID mapping</a></p>
</li>
<li>
-<p><a href="tasks013.htm#BABEIEGD">Many-to-many mapping</a></p>
+<p><a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a></p>
</li>
<li>
-<p><a href="tasks014.htm#BABHFAFJ">Many-to-one mapping</a></p>
+<p><a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></p>
</li>
<li>
-<p><a href="tasks015.htm#BABHGEBD">One-to-many mapping</a></p>
+<p><a href="tasks016.htm#BABHGEBD">One-to-many mapping</a></p>
</li>
<li>
-<p><a href="tasks016.htm#BABFHBCJ">One-to-one mapping</a></p>
+<p><a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a></p>
</li>
<li>
-<p><a href="tasks017.htm#BABHFHEI">Transient mapping</a></p>
+<p><a href="tasks018.htm#BABHFHEI">Transient mapping</a></p>
</li>
<li>
-<p><a href="tasks018.htm#BABHIBII">Version mapping</a></p>
+<p><a href="tasks019.htm#BABHIBII">Version mapping</a></p>
+</li>
+<li>
+<p><a href="tasks020.htm#CIHBDEAJ">Element Collection mapping</a></p>
</li>
</ul>
<p>Additional mapping types (such as Basic Collection mappings) may be available when using Dali with EclipseLink.</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm
index c3460b8b36..4951daa5d0 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Tasks</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:42Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content=" Tasks" />
<meta name="relnum" content="Release 2.3" />
@@ -50,13 +50,13 @@
<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
</li>
<li>
-<p><a href="tasks019.htm#BABBAGFI">Generating entities from tables</a></p>
+<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
</li>
<li>
-<p><a href="tasks021.htm#BABFAIBA">Validating mappings and reporting problems</a></p>
+<p><a href="tasks023.htm#BABFAIBA">Validating mappings and reporting problems</a></p>
</li>
<li>
-<p><a href="tasks024.htm#BABDBCBI">Modifying persistent project properties</a></p>
+<p><a href="tasks026.htm#BABDBCBI">Modifying persistent project properties</a></p>
</li>
</ul>
<!-- Start Footer -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm
index 03be784b07..0960434330 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Converting a Java Project to a JPA Project</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:43Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Converting a Java Project to a JPA Project" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm
index 93a424f490..96f9bb0090 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Synchronizing classes</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:44Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:42Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Synchronizing classes" />
<meta name="relnum" content="Release 2.3" />
@@ -58,7 +58,6 @@ Use this function if you selected <span class="bold">Annotated classes must be l
<a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a><br />
<br /></div>
<!-- class="sect2" -->
-<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm
index aa2fb3601f..818f14603c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Creating an orm.xml file</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:44Z" />
+<title>Upgrading document version</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:42Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Creating an orm.xml file" />
+<meta name="doctitle" content="Upgrading document version" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,30 +18,15 @@
<!-- contents -->
</head>
<body>
-<div class="sect2"><!-- infolevel="all" infotype="General" --><a id="sthref58" name="sthref58"></a>
-<h1>Creating an orm.xml file</h1>
-<p><a id="sthref59" name="sthref59"></a>If you opt not to create an <code>orm.xml</code> file when you create a JPA project, you can create one using the <a href="reference002.htm#CIAIJCCE">Mapping File Wizard</a>.</p>
-<p>Use this procedure to create an <code>orm.xml</code> file:</p>
-<ol>
-<li>
-<p>From the Navigator or Project Explorer, select <span class="bold">File &gt; New &gt; Other</span>. The Select a Wizard dialog appears.</p>
-<div class="figure"><a id="sthref60" name="sthref60"></a>
-<p class="titleinfigure">The Select a Wizard Dialog</p>
-<img src="img/select_a_wizard_mapping.png" alt="The Select a Wizard dialog with Mapping file selected." title="The Select a Wizard dialog with Mapping file selected." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Select <span class="bold">Mapping File</span> and then click <span class="bold">Next</span>. The Mapping File page appears.</p>
-<p>If you are using EclipseLink, you can select <span class="bold">EclipseLink &gt; EclipseLink Mapping File</span>.</p>
-<div class="figure"><a id="sthref61" name="sthref61"></a>
-<p class="titleinfigure">The Mapping File Page</p>
-<img src="img/mapping_file_new.png" alt="The Mapping File page." title="The Mapping File page." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Define the properties in the page and click <span class="bold">Finish</span>. The <code>orm.xml</code> file appears in the src directory of the selected JPA project. You can manage the orm.xml file using the JPA Details view or through the XML Editor. See also <a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a>.</p>
-</li>
-</ol>
-</div>
+<div class="sect2"><!-- infolevel="all" infotype="General" --><a id="sthref56" name="sthref56"></a>
+<h1>Upgrading document version</h1>
+<p>Use this procedure to migrate your project from JPA 1.0 to JPA 2.0. You must complete this upgrade to use the current JPA 2.0 features in Dali.</p>
+<div class="figure"><a id="sthref57" name="sthref57"></a>
+<p class="titleinfigure">Upgrading the persistence.xml File</p>
+<img src="img/upgrade_persistence_jpa_version.png" alt="This figure shows the JPA Tools &gt; Synchronize Classes option." title="This figure shows the JPA Tools &gt; Synchronize Classes option." /><br /></div>
+<!-- class="figure" --></div>
<!-- class="sect2" -->
+<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm
index 1dbf6bc3b7..90441ad325 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Working with orm.xml file</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:44Z" />
+<title>Creating an orm.xml file</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:42Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Working with orm.xml file" />
+<meta name="doctitle" content="Creating an orm.xml file" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,38 +18,30 @@
<!-- contents -->
</head>
<body>
-<p><a id="CIHBCDCE" name="CIHBCDCE"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Working with orm.xml file</h1>
-<p><a id="sthref62" name="sthref62"></a><a id="sthref63" name="sthref63"></a>You can work with the <code>orm.xml</code> by using the JPA Details view.</p>
-<p>Use this procedure to work with the <code>orm.xml</code> file:</p>
+<div class="sect2"><!-- infolevel="all" infotype="General" --><a id="sthref60" name="sthref60"></a>
+<h1>Creating an orm.xml file</h1>
+<p><a id="sthref61" name="sthref61"></a>If you opt not to create an <code>orm.xml</code> file when you create a JPA project, you can create one using the <a href="reference002.htm#CIAIJCCE">Mapping File Wizard</a>.</p>
+<p>Use this procedure to create an <code>orm.xml</code> file:</p>
<ol>
<li>
-<p>Right-click the <code>orm.xml</code> file in the <span class="gui-object-title">Project Explorer</span> and select <span class="gui-object-action">Open</span>.</p>
-</li>
-<li>
-<p>In the JPA Structure view, select <span class="bold">EntityMappings</span>.</p>
-</li>
+<p>From the Navigator or Project Explorer, select <span class="bold">File &gt; New &gt; Other</span>. The Select a Wizard dialog appears.</p>
+<div class="figure"><a id="sthref62" name="sthref62"></a>
+<p class="titleinfigure">The Select a Wizard Dialog</p>
+<img src="img/select_a_wizard_mapping.png" alt="The Select a Wizard dialog with Mapping file selected." title="The Select a Wizard dialog with Mapping file selected." /><br /></div>
+<!-- class="figure" --></li>
<li>
-<p>Use the JPA Details view to configure the entity mapping and persistence unit defaults.</p>
-<div class="figure"><a id="sthref64" name="sthref64"></a>
-<p class="titleinfigure">JPA Details view for EntityMappings (orm.xml)</p>
-<img src="img/details_entitymappings.png" alt="JPA Details view for orm.xml file." title="JPA Details view for orm.xml file." /><br /></div>
+<p>Select <span class="bold">Mapping File</span> and then click <span class="bold">Next</span>. The Mapping File page appears.</p>
+<p>If you are using EclipseLink, you can select <span class="bold">EclipseLink &gt; EclipseLink Mapping File</span>.</p>
+<div class="figure"><a id="sthref63" name="sthref63"></a>
+<p class="titleinfigure">The Mapping File Page</p>
+<img src="img/mapping_file_new.png" alt="The Mapping File page." title="The Mapping File page." /><br /></div>
<!-- class="figure" --></li>
+<li>
+<p>Define the properties in the page and click <span class="bold">Finish</span>. The <code>orm.xml</code> file appears in the src directory of the selected JPA project. You can manage the orm.xml file using the JPA Details view or through the XML Editor. See also <a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a>.</p>
+</li>
</ol>
-<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a><br />
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="#CIHBCDCE">Working with orm.xml file</a><br />
-<a href="../org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html">Working with XML Files</a><br />
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concepts003.htm#CHDBIJAC">The orm.xml file</a><br /></div>
+</div>
<!-- class="sect2" -->
-<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm
index a9446f0c69..1f960838f9 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Entity</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:45Z" />
+<title>Working with orm.xml file</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:42Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Entity" />
+<meta name="doctitle" content="Working with orm.xml file" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,68 +18,38 @@
<!-- contents -->
</head>
<body>
-<p><a id="BABGBIEE" name="BABGBIEE"></a></p>
+<p><a id="CIHBCDCE" name="CIHBCDCE"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Entity</h1>
-<p><a id="sthref68" name="sthref68"></a><a id="sthref69" name="sthref69"></a><a id="sthref70" name="sthref70"></a><a id="sthref71" name="sthref71"></a>An <span class="bold">Entity</span> is a persistent domain object.</p>
-<p>An entity <span class="italic">can be</span>:</p>
-<ul>
-<li>
-<p>Abstract or concrete classes. Entities may also extend non-entity classes as well as entity classes, and non-entity classes may extend entity classes.</p>
-</li>
-</ul>
-<p>An entity <span class="italic">must have</span>:</p>
-<ul>
-<li>
-<p>A no-arg constructor (public or protected); the entity class may have other constructors as well.</p>
-</li>
-</ul>
-<p><a id="sthref72" name="sthref72"></a><a id="sthref73" name="sthref73"></a><a id="sthref74" name="sthref74"></a>Each persistent entity must be mapped to a database table and contain a primary key. Persistent entities are identified by the <code>@Entity</code> annotation.</p>
-<p>Use this procedure to add persistence to an existing entity:</p>
+<h1>Working with orm.xml file</h1>
+<p><a id="sthref64" name="sthref64"></a><a id="sthref65" name="sthref65"></a>You can work with the <code>orm.xml</code> by using the JPA Details view.</p>
+<p>Use this procedure to work with the <code>orm.xml</code> file:</p>
<ol>
<li>
-<p>Open the Java class in the <span class="gui-object-title">Project Explorer.</span></p>
+<p>Right-click the <code>orm.xml</code> file in the <span class="gui-object-title">Project Explorer</span> and select <span class="gui-object-action">Open</span>.</p>
</li>
<li>
-<p>Select the class in the JPA Structure view.</p>
+<p>In the JPA Structure view, select <span class="bold">EntityMappings</span>.</p>
</li>
<li>
-<p>In the JPA Details view, click the mapping type hyperlink to access the Mapping Type Selection dialog. In the following figure, clicking <span class="italic">entity</span> invokes the dialog from the JPA Details View.</p>
-<div class="figure"><a id="sthref75" name="sthref75"></a>
-<p class="titleinfigure">The Mapping Type Hyperlink</p>
-<img src="img/mapped_entity_type_link.png" alt="The JPA Details view for an entity showing the mapping type hyperlink." title="The JPA Details view for an entity showing the mapping type hyperlink." /><br /></div>
-<!-- class="figure" -->
-<div align="center">
-<div class="inftblnotealso"><br />
-<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Tip:</p>
-You can also change (or add) persistence for an entity by right-clicking the class in the JPA Structure View and then clicking <span class="bold">Map As &gt; Entity</span>.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnotealso" --></div>
-</li>
-<li>
-<p>Select <span class="bold">Entity</span> from the Mapping Type Selection dialog and then click <span class="bold">OK</span>.</p>
-<div class="figure"><a id="sthref76" name="sthref76"></a>
-<p class="titleinfigure">The Mapping Type Selection Dialog</p>
-<img src="img/mapping_type_selection_entity.png" alt="The Mapping Type selection dialog with Enity selected." title="The Mapping Type selection dialog with Enity selected." /><br /></div>
+<p>Use the JPA Details view to configure the entity mapping and persistence unit defaults.</p>
+<div class="figure"><a id="sthref66" name="sthref66"></a>
+<p class="titleinfigure">JPA Details view for EntityMappings (orm.xml)</p>
+<img src="img/details_entitymappings.png" alt="JPA Details view for orm.xml file." title="JPA Details view for orm.xml file." /><br /></div>
<!-- class="figure" --></li>
-<li>
-<p>Complete the remaining <a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>.</p>
-</li>
</ol>
+<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a><br />
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="#CIHBCDCE">Working with orm.xml file</a><br />
+<a href="../org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html">Working with XML Files</a><br />
<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
+<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
<br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a><br />
-<a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a><br />
-<a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a><br /></div>
+<a href="concepts003.htm#CHDBIJAC">The orm.xml file</a><br /></div>
<!-- class="sect2" -->
+<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm
index 38991a1f90..eca0d7006b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Embeddable</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:45Z" />
+<title>Entity</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:43Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Embeddable" />
+<meta name="doctitle" content="Entity" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,28 +18,56 @@
<!-- contents -->
</head>
<body>
-<p><a id="BABFEICE" name="BABFEICE"></a></p>
+<p><a id="BABGBIEE" name="BABGBIEE"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Embeddable</h1>
-<p><a id="sthref77" name="sthref77"></a><a id="sthref78" name="sthref78"></a>An <span class="bold">Embedded</span> class is a class whose instances are stored as part of an owning entity; it shares the identity of the owning entity. Each field of the embedded class is mapped to the database table associated with the owning entity.</p>
-<p>To override the mapping information for a specific subclass, use the <code>@AttributeOverride</code> annotation for that specific class.</p>
-<p><a id="sthref79" name="sthref79"></a><a id="sthref80" name="sthref80"></a><a id="sthref81" name="sthref81"></a>An embeddable entity is identified by the <code>@Embeddable</code> annotation.</p>
-<p>Use this procedure to add embeddable persistence to an existing entity:</p>
+<h1>Entity</h1>
+<p><a id="sthref70" name="sthref70"></a><a id="sthref71" name="sthref71"></a><a id="sthref72" name="sthref72"></a><a id="sthref73" name="sthref73"></a>An <span class="bold">Entity</span> is a persistent domain object.</p>
+<p>An entity <span class="italic">can be</span>:</p>
+<ul>
+<li>
+<p>Abstract or concrete classes. Entities may also extend non-entity classes as well as entity classes, and non-entity classes may extend entity classes.</p>
+</li>
+</ul>
+<p>An entity <span class="italic">must have</span>:</p>
+<ul>
+<li>
+<p>A no-arg constructor (public or protected); the entity class may have other constructors as well.</p>
+</li>
+</ul>
+<p><a id="sthref74" name="sthref74"></a><a id="sthref75" name="sthref75"></a><a id="sthref76" name="sthref76"></a>Each persistent entity must be mapped to a database table and contain a primary key. Persistent entities are identified by the <code>@Entity</code> annotation.</p>
+<p>Use this procedure to add persistence to an existing entity:</p>
<ol>
<li>
-<p>Open the Java class in the <span class="gui-object-title">Project Explorer</span>.</p>
+<p>Open the Java class in the <span class="gui-object-title">Project Explorer.</span></p>
</li>
<li>
<p>Select the class in the JPA Structure view.</p>
</li>
<li>
-<p>Click the mapping type hyperlink to open the Mapping Type Selection dialog.</p>
+<p>In the JPA Details view, click the mapping type hyperlink to access the Mapping Type Selection dialog. In the following figure, clicking <span class="italic">entity</span> invokes the dialog from the JPA Details View.</p>
+<div class="figure"><a id="sthref77" name="sthref77"></a>
+<p class="titleinfigure">The Mapping Type Hyperlink</p>
+<img src="img/mapped_entity_type_link.png" alt="The JPA Details view for an entity showing the mapping type hyperlink." title="The JPA Details view for an entity showing the mapping type hyperlink." /><br /></div>
+<!-- class="figure" -->
+<div align="center">
+<div class="inftblnotealso"><br />
+<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0">
+<tbody>
+<tr>
+<td align="left">
+<p class="notep1">Tip:</p>
+You can also change (or add) persistence for an entity by right-clicking the class in the JPA Structure View and then clicking <span class="bold">Map As &gt; Entity</span>.</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblnotealso" --></div>
</li>
<li>
-<p>Select <span class="bold">Embeddable</span> and then click <span class="bold">OK</span>.</p>
-<div class="figure"><a id="sthref82" name="sthref82"></a>
-<p class="titleinfigure">Mapping Type Selection Dialog (Embeddable)</p>
-<img src="img/mapping_type_selection_embed.png" alt="The Mapping Type Selection dialog with Embeddable selected." title="The Mapping Type Selection dialog with Embeddable selected." /><br /></div>
+<p>Select <span class="bold">Entity</span> from the Mapping Type Selection dialog and then click <span class="bold">OK</span>.</p>
+<div class="figure"><a id="sthref78" name="sthref78"></a>
+<p class="titleinfigure">The Mapping Type Selection Dialog</p>
+<img src="img/mapping_type_selection_entity.png" alt="The Mapping Type selection dialog with Enity selected." title="The Mapping Type selection dialog with Enity selected." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>Complete the remaining <a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>.</p>
@@ -47,12 +75,10 @@
</ol>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
-<dl>
-<dd><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></dd>
-<dd><a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a></dd>
-<dd><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></dd>
-</dl>
-</div>
+<br />
+<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a><br />
+<a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a><br />
+<a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a><br /></div>
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm
index 4e3a3c94fb..004a1691dd 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Mapped superclass</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:45Z" />
+<title>Embeddable</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:43Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Mapped superclass" />
+<meta name="doctitle" content="Embeddable" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,28 +18,13 @@
<!-- contents -->
</head>
<body>
-<p><a id="BABDAGCI" name="BABDAGCI"></a></p>
+<p><a id="BABFEICE" name="BABFEICE"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Mapped superclass</h1>
-<p><a id="sthref83" name="sthref83"></a><a id="sthref84" name="sthref84"></a>An entity that extends a <span class="bold">Mapped Superclass</span> class inherits the persistent state and mapping information from a superclass. You should use a mapped superclass to define mapping information that is common to multiple entity classes.</p>
-<p>A mapped superclass <span class="italic">can be</span>:</p>
-<ul>
-<li>
-<p>Abstract or concrete classes</p>
-</li>
-</ul>
-<p>A mapped superclass <span class="italic">cannot be</span>:</p>
-<ul>
-<li>
-<p>Be queried or passed as an argument to Entity-Manager or Query operations</p>
-</li>
-<li>
-<p>Be the target of a persistent relationship</p>
-</li>
-</ul>
-<p>A mapped superclass does not have a defined database table. Instead, its mapping information is derived from its superclass. To override the mapping information for a specific subclass, use the <code>@AttributeOverride</code> annotation for that specific class.</p>
-<p><a id="sthref85" name="sthref85"></a><a id="sthref86" name="sthref86"></a><a id="sthref87" name="sthref87"></a><a id="sthref88" name="sthref88"></a>A mapped superclass is identified by the <code>@MappedSuperclass</code> annotation.</p>
-<p>Use this procedure to add Mapped Superclass persistence to an existing entity:</p>
+<h1>Embeddable</h1>
+<p><a id="sthref79" name="sthref79"></a><a id="sthref80" name="sthref80"></a>An <span class="bold">Embedded</span> class is a class whose instances are stored as part of an owning entity; it shares the identity of the owning entity. Each field of the embedded class is mapped to the database table associated with the owning entity.</p>
+<p>To override the mapping information for a specific subclass, use the <code>@AttributeOverride</code> annotation for that specific class.</p>
+<p><a id="sthref81" name="sthref81"></a><a id="sthref82" name="sthref82"></a><a id="sthref83" name="sthref83"></a>An embeddable entity is identified by the <code>@Embeddable</code> annotation.</p>
+<p>Use this procedure to add embeddable persistence to an existing entity:</p>
<ol>
<li>
<p>Open the Java class in the <span class="gui-object-title">Project Explorer</span>.</p>
@@ -48,13 +33,13 @@
<p>Select the class in the JPA Structure view.</p>
</li>
<li>
-<p>In the JPA Details view, click the mapping type hyperlink to open the Mapping Type Selection dialog.</p>
+<p>Click the mapping type hyperlink to open the Mapping Type Selection dialog.</p>
</li>
<li>
-<p>Select <span class="bold">Mapped Superclass</span> and then <span class="bold">OK</span>.</p>
-<div class="figure"><a id="sthref89" name="sthref89"></a>
-<p class="titleinfigure">Mapping Type Selection Dialog (Mapped Superclass)</p>
-<img src="img/mapping_type_selection_superclass.png" alt="The Mapping Type Selection dialog with Mapped Superclass selected." title="The Mapping Type Selection dialog with Mapped Superclass selected." /><br /></div>
+<p>Select <span class="bold">Embeddable</span> and then click <span class="bold">OK</span>.</p>
+<div class="figure"><a id="sthref84" name="sthref84"></a>
+<p class="titleinfigure">Mapping Type Selection Dialog (Embeddable)</p>
+<img src="img/mapping_type_selection_embed.png" alt="The Mapping Type Selection dialog with Embeddable selected." title="The Mapping Type Selection dialog with Embeddable selected." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>Complete the remaining <a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>.</p>
@@ -62,12 +47,13 @@
</ol>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
-<br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a><br />
-<a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a><br />
-<a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a><br /></div>
+<dl>
+<dd><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></dd>
+<dd><a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a></dd>
+<dd><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></dd>
+</dl>
+</div>
<!-- class="sect2" -->
-<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm
index 55a6ed15f1..1b5054e055 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Creating Named Queries</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:46Z" />
+<title>Mapped superclass</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:43Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Creating Named Queries" />
+<meta name="doctitle" content="Mapped superclass" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,36 +18,55 @@
<!-- contents -->
</head>
<body>
-<p><a id="BABIGBGG" name="BABIGBGG"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Creating Named Queries</h1>
-<p><a id="sthref105" name="sthref105"></a><a id="sthref106" name="sthref106"></a>Named queries improve application performance because they are prepared once and they (and all of their associated supporting objects) can be efficiently reused thereafter, making them well suited for complex and frequently executed operations. Named queries use the JPA query language for portable execution on any underlying database; named native queries use the SQL language native to the underlying database.</p>
-<p>Use this procedure to add <code>@NamedQuery</code> and <code>@NamedNativeQuery</code> annotations to the entity.</p>
-<p>To create a named query:</p>
-<ol>
+<p><a id="BABDAGCI" name="BABDAGCI"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Mapped superclass</h1>
+<p><a id="sthref85" name="sthref85"></a><a id="sthref86" name="sthref86"></a>An entity that extends a <span class="bold">Mapped Superclass</span> class inherits the persistent state and mapping information from a superclass. You should use a mapped superclass to define mapping information that is common to multiple entity classes.</p>
+<p>A mapped superclass <span class="italic">can be</span>:</p>
+<ul>
+<li>
+<p>Abstract or concrete classes</p>
+</li>
+</ul>
+<p>A mapped superclass <span class="italic">cannot be</span>:</p>
+<ul>
<li>
-<p>Select the entity in the Project Explorer.</p>
+<p>Be queried or passed as an argument to Entity-Manager or Query operations</p>
</li>
<li>
-<p>In the JPA Details view, expand Queries.</p>
+<p>Be the target of a persistent relationship</p>
</li>
+</ul>
+<p>A mapped superclass does not have a defined database table. Instead, its mapping information is derived from its superclass. To override the mapping information for a specific subclass, use the <code>@AttributeOverride</code> annotation for that specific class.</p>
+<p><a id="sthref87" name="sthref87"></a><a id="sthref88" name="sthref88"></a><a id="sthref89" name="sthref89"></a><a id="sthref90" name="sthref90"></a>A mapped superclass is identified by the <code>@MappedSuperclass</code> annotation.</p>
+<p>Use this procedure to add Mapped Superclass persistence to an existing entity:</p>
+<ol>
<li>
-<p>Click <span class="bold">Add</span> for a named query, or <span class="bold">Add Native</span> for a native query.</p>
+<p>Open the Java class in the <span class="gui-object-title">Project Explorer</span>.</p>
</li>
<li>
-<p>In the dialog that appears, enter the name of the query in the Name field and then click OK.</p>
+<p>Select the class in the JPA Structure view.</p>
</li>
<li>
-<p>Enter the query in the Query field.</p>
+<p>In the JPA Details view, click the mapping type hyperlink to open the Mapping Type Selection dialog.</p>
</li>
<li>
-<p><a id="sthref107" name="sthref107"></a><a id="sthref108" name="sthref108"></a><a id="sthref109" name="sthref109"></a><a id="sthref110" name="sthref110"></a>To add a Query hint, click <span class="bold">Add</span>.</p>
-<div class="figure"><a id="sthref111" name="sthref111"></a>
-<p class="titleinfigure">Entering a Named Query</p>
-<img src="img/task_entering_query.png" alt="The Queries section of the JPA Details view." title="The Queries section of the JPA Details view." /><br /></div>
+<p>Select <span class="bold">Mapped Superclass</span> and then <span class="bold">OK</span>.</p>
+<div class="figure"><a id="sthref91" name="sthref91"></a>
+<p class="titleinfigure">Mapping Type Selection Dialog (Mapped Superclass)</p>
+<img src="img/mapping_type_selection_superclass.png" alt="The Mapping Type Selection dialog with Mapped Superclass selected." title="The Mapping Type Selection dialog with Mapped Superclass selected." /><br /></div>
<!-- class="figure" --></li>
+<li>
+<p>Complete the remaining <a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>.</p>
+</li>
</ol>
-</div>
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
+<br />
+<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a><br />
+<a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a><br />
+<a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a><br /></div>
+<!-- class="sect2" -->
<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm
index 536fda3660..82e8697c54 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Basic mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:46Z" />
+<title>Creating Named Queries</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:43Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Basic mapping" />
+<meta name="doctitle" content="Creating Named Queries" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,155 +18,37 @@
<!-- contents -->
</head>
<body>
-<p><a id="BABBABCE" name="BABBABCE"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Basic mapping</h1>
-<p><a id="sthref112" name="sthref112"></a><a id="sthref113" name="sthref113"></a><a id="sthref114" name="sthref114"></a><a id="sthref115" name="sthref115"></a>Use a <span class="bold">Basic Mapping</span> to map an attribute directly to a database column. Basic mappings may be used only with the following attribute types:</p>
-<ul>
-<li>
-<p>Java primitive types and wrappers of the primitive types</p>
-</li>
-<li>
-<p><code>java.lang.String, java.math.BigInteger</code></p>
-</li>
-<li>
-<p><code>java.math.BigDecimal</code></p>
-</li>
-<li>
-<p><code>java.util.Date</code></p>
-</li>
-<li>
-<p><code>java.util.Calendar, java.sql.Date</code></p>
-</li>
-<li>
-<p><code>java.sql.Time</code></p>
-</li>
-<li>
-<p><code>java.sql.Timestamp</code></p>
-</li>
-<li>
-<p><code>byte[]</code></p>
-</li>
-<li>
-<p><code>Byte[]</code></p>
-</li>
-<li>
-<p><code>char[]</code></p>
-</li>
-<li>
-<p><code>Character[]</code></p>
-</li>
-<li>
-<p>enums</p>
-</li>
-<li>
-<p>any other type that implements <code>Serializable</code></p>
-</li>
-</ul>
-<p>To create a basic mapping:</p>
+<p><a id="BABIGBGG" name="BABIGBGG"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>Creating Named Queries</h1>
+<p><a id="sthref107" name="sthref107"></a><a id="sthref108" name="sthref108"></a>Named queries improve application performance because they are prepared once and they (and all of their associated supporting objects) can be efficiently reused thereafter, making them well suited for complex and frequently executed operations. Named queries use the JPA query language for portable execution on any underlying database; named native queries use the SQL language native to the underlying database.</p>
+<p>Use this procedure to add <code>@NamedQuery</code> and <code>@NamedNativeQuery</code> annotations to the entity.</p>
+<p>To create a named query:</p>
<ol>
<li>
-<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, right-click the field to map. Select <span class="bold">Map As &gt; Basic</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
-</li>
-<li>
-<p>Use this table to complete the remaining fields on the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="19%" />
-<col width="*" />
-<col width="41%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t14">Property</th>
-<th align="left" valign="bottom" id="r1c2-t14">Description</th>
-<th align="left" valign="bottom" id="r1c3-t14">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t14" headers="r1c1-t14">Entity Map Hyperlink</td>
-<td align="left" headers="r2c1-t14 r1c2-t14">Defines this mapping as a <span class="bold">Basic Mapping</span>.
-<p>This corresponds to the <code>@Basic</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t14 r1c3-t14">Basic</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t14" headers="r1c1-t14">Column</td>
-<td align="left" headers="r3c1-t14 r1c2-t14">The database column mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.</td>
-<td align="left" headers="r3c1-t14 r1c3-t14">By default, the Column is assumed to be named identically to the attribute and always included in the <code>INSERT</code> and <code>UPDATE</code> statements.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t14" headers="r1c1-t14">Table</td>
-<td align="left" headers="r4c1-t14 r1c2-t14">Name of the database table.</td>
-<td align="left" headers="r4c1-t14 r1c3-t14"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t14" headers="r1c1-t14">Fetch</td>
-<td align="left" headers="r5c1-t14 r1c2-t14">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
-<ul>
-<li>
-<p>Eager</p>
+<p>Select the entity in the Project Explorer.</p>
</li>
<li>
-<p>Lazy</p>
+<p>In the JPA Details view, expand Queries.</p>
</li>
-</ul>
-</td>
-<td align="left" headers="r5c1-t14 r1c3-t14">Eager</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t14" headers="r1c1-t14">Optional</td>
-<td align="left" headers="r6c1-t14 r1c2-t14">Specifies if this field is can be null.</td>
-<td align="left" headers="r6c1-t14 r1c3-t14">Yes</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t14" headers="r1c1-t14">Type</td>
-<td align="left" headers="r7c1-t14 r1c2-t14">Specifies the type of data:
-<ul>
<li>
-<p>Default</p>
+<p>Click <span class="bold">Add</span> for a named query, or <span class="bold">Add Native</span> for a native query.</p>
</li>
<li>
-<p>LOB &ndash; Specifies if this is a large objects (BLOB or CLOB). See <a href="ref_mapping_general.htm#CACBBIBI">"Lob"</a> for details.</p>
+<p>In the dialog that appears, enter the name of the query in the Name field and then click OK.</p>
</li>
<li>
-<p>Temporal &ndash; Specify if this is a Date, Time, or Timestamp object. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.</p>
+<p>Enter the query in the Query field.</p>
</li>
<li>
-<p>Enumerated &ndash; Specify how to persist enumerated constraints as ordinal or string, in order to match an existing database schema.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r7c1-t14 r1c3-t14"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
+<p><a id="sthref109" name="sthref109"></a><a id="sthref110" name="sthref110"></a><a id="sthref111" name="sthref111"></a><a id="sthref112" name="sthref112"></a>To add a Query hint, click <span class="bold">Add</span>.</p>
+<div class="figure"><a id="sthref113" name="sthref113"></a>
+<p class="titleinfigure">Entering a Named Query</p>
+<img src="img/task_entering_query.png" alt="The Queries section of the JPA Details view." title="The Queries section of the JPA Details view." /><br /></div>
+<!-- class="figure" --></li>
</ol>
-<p>Eclipse adds the following annotations to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@Column(name="<span class="italic">&lt;COLUMN_NAME&gt;</span>", table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>",
- insertable=<span class="italic">&lt;INSERTABLE&gt;</span>, updatable=<span class="italic">&lt;UPDATABLE&gt;</span>)
-@Basic(fetch=FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>, optional = <span class="italic">&lt;OPTIONAL&gt;</span>)
-@Temporal(TemporalType.<span class="italic">&lt;TEMPORAL&gt;</span>)
-
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
-<!-- class="sect2" -->
+</div>
+<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm
index 4b29ebbc81..f4022d9d10 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Embedded mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:46Z" />
+<title>Basic mapping</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:43Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Embedded mapping" />
+<meta name="doctitle" content="Basic mapping" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,16 +18,55 @@
<!-- contents -->
</head>
<body>
-<p><a id="BABCBHDF" name="BABCBHDF"></a></p>
+<p><a id="BABBABCE" name="BABBABCE"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Embedded mapping</h1>
-<p><a id="sthref116" name="sthref116"></a><a id="sthref117" name="sthref117"></a><a id="sthref118" name="sthref118"></a><a id="sthref119" name="sthref119"></a>Use an <span class="bold">Embedded Mapping</span> to specify a persistent field or property of an entity whose value is an instance of an embeddable class.</p>
-<ol>
+<h1>Basic mapping</h1>
+<p><a id="sthref114" name="sthref114"></a><a id="sthref115" name="sthref115"></a><a id="sthref116" name="sthref116"></a><a id="sthref117" name="sthref117"></a>Use a <span class="bold">Basic Mapping</span> to map an attribute directly to a database column. Basic mappings may be used only with the following attribute types:</p>
+<ul>
+<li>
+<p>Java primitive types and wrappers of the primitive types</p>
+</li>
+<li>
+<p><code>java.lang.String, java.math.BigInteger</code></p>
+</li>
+<li>
+<p><code>java.math.BigDecimal</code></p>
+</li>
+<li>
+<p><code>java.util.Date</code></p>
+</li>
+<li>
+<p><code>java.util.Calendar, java.sql.Date</code></p>
+</li>
+<li>
+<p><code>java.sql.Time</code></p>
+</li>
+<li>
+<p><code>java.sql.Timestamp</code></p>
+</li>
+<li>
+<p><code>byte[]</code></p>
+</li>
+<li>
+<p><code>Byte[]</code></p>
+</li>
+<li>
+<p><code>char[]</code></p>
+</li>
+<li>
+<p><code>Character[]</code></p>
+</li>
+<li>
+<p>enums</p>
+</li>
<li>
-<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, right-click the field to map.</p>
+<p>any other type that implements <code>Serializable</code></p>
</li>
+</ul>
+<p>To create a basic mapping:</p>
+<ol>
<li>
-<p>Select <span class="bold">Map as &gt; Embedded</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
+<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, right-click the field to map. Select <span class="bold">Map As &gt; Basic</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
</li>
<li>
<p>Use this table to complete the remaining fields on the <span class="gui-object-title">JPA Details</span> view.</p>
@@ -35,26 +74,70 @@
<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<col width="19%" />
<col width="*" />
-<col width="38%" />
+<col width="41%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t15">Property</th>
-<th align="left" valign="bottom" id="r1c2-t15">Description</th>
-<th align="left" valign="bottom" id="r1c3-t15">Default</th>
+<th align="left" valign="bottom" id="r1c1-t14">Property</th>
+<th align="left" valign="bottom" id="r1c2-t14">Description</th>
+<th align="left" valign="bottom" id="r1c3-t14">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t15" headers="r1c1-t15">Entity Mapping Hyperlink</td>
-<td align="left" headers="r2c1-t15 r1c2-t15">Defines this mapping as a <span class="bold">Embedded</span>.
-<p>This corresponds to the <code>@Embedded</code> annotation.</p>
+<td align="left" id="r2c1-t14" headers="r1c1-t14">Entity Map Hyperlink</td>
+<td align="left" headers="r2c1-t14 r1c2-t14">Defines this mapping as a <span class="bold">Basic Mapping</span>.
+<p>This corresponds to the <code>@Basic</code> annotation.</p>
+</td>
+<td align="left" headers="r2c1-t14 r1c3-t14">Basic</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t14" headers="r1c1-t14">Column</td>
+<td align="left" headers="r3c1-t14 r1c2-t14">The database column mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.</td>
+<td align="left" headers="r3c1-t14 r1c3-t14">By default, the Column is assumed to be named identically to the attribute and always included in the <code>INSERT</code> and <code>UPDATE</code> statements.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t14" headers="r1c1-t14">Table</td>
+<td align="left" headers="r4c1-t14 r1c2-t14">Name of the database table.</td>
+<td align="left" headers="r4c1-t14 r1c3-t14"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t14" headers="r1c1-t14">Fetch</td>
+<td align="left" headers="r5c1-t14 r1c2-t14">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
+<ul>
+<li>
+<p>Eager</p>
+</li>
+<li>
+<p>Lazy</p>
+</li>
+</ul>
</td>
-<td align="left" headers="r2c1-t15 r1c3-t15">Embedded</td>
+<td align="left" headers="r5c1-t14 r1c3-t14">Eager</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t14" headers="r1c1-t14">Optional</td>
+<td align="left" headers="r6c1-t14 r1c2-t14">Specifies if this field is can be null.</td>
+<td align="left" headers="r6c1-t14 r1c3-t14">Yes</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t15" headers="r1c1-t15">Attribute Overrides</td>
-<td align="left" headers="r3c1-t15 r1c2-t15">Specify to override the default mapping of an entity's attribute. Select <span class="bold">Override Default</span>.</td>
-<td align="left" headers="r3c1-t15 r1c3-t15"><br /></td>
+<td align="left" id="r7c1-t14" headers="r1c1-t14">Type</td>
+<td align="left" headers="r7c1-t14 r1c2-t14">Specifies the type of data:
+<ul>
+<li>
+<p>Default</p>
+</li>
+<li>
+<p>LOB &ndash; Specifies if this is a large objects (BLOB or CLOB). See <a href="ref_mapping_general.htm#CACBBIBI">"Lob"</a> for details.</p>
+</li>
+<li>
+<p>Temporal &ndash; Specify if this is a Date, Time, or Timestamp object. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.</p>
+</li>
+<li>
+<p>Enumerated &ndash; Specify how to persist enumerated constraints as ordinal or string, in order to match an existing database schema.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r7c1-t14 r1c3-t14"><br /></td>
</tr>
</tbody>
</table>
@@ -63,8 +146,11 @@
</ol>
<p>Eclipse adds the following annotations to the field:</p>
<pre xml:space="preserve" class="oac_no_warn">
-@Embedded
-@AttributeOverride(column=@Column(table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>", name = "<span class="italic">&lt;COLUMN_NAME&gt;</span>"))
+@Column(name="<span class="italic">&lt;COLUMN_NAME&gt;</span>", table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>",
+ insertable=<span class="italic">&lt;INSERTABLE&gt;</span>, updatable=<span class="italic">&lt;UPDATABLE&gt;</span>)
+@Basic(fetch=FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>, optional = <span class="italic">&lt;OPTIONAL&gt;</span>)
+@Temporal(TemporalType.<span class="italic">&lt;TEMPORAL&gt;</span>)
+
</pre>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm
index 01aa24a12a..5634d786c3 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Embedded ID mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:46Z" />
+<title>Embedded mapping</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:44Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Embedded ID mapping" />
+<meta name="doctitle" content="Embedded mapping" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,16 +18,16 @@
<!-- contents -->
</head>
<body>
-<p><a id="CIHDIAEE" name="CIHDIAEE"></a></p>
+<p><a id="BABCBHDF" name="BABCBHDF"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Embedded ID mapping</h1>
-<p><a id="sthref120" name="sthref120"></a><a id="sthref121" name="sthref121"></a><a id="sthref122" name="sthref122"></a><a id="sthref123" name="sthref123"></a>Use an <span class="bold">Embedded ID Mapping</span> to specify the primary key of an embedded ID. These mappings may be used with a <a href="tasks006.htm#BABFEICE">Embeddable</a> entities.</p>
+<h1>Embedded mapping</h1>
+<p><a id="sthref118" name="sthref118"></a><a id="sthref119" name="sthref119"></a><a id="sthref120" name="sthref120"></a><a id="sthref121" name="sthref121"></a>Use an <span class="bold">Embedded Mapping</span> to specify a persistent field or property of an entity whose value is an instance of an embeddable class.</p>
<ol>
<li>
-<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
+<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, right-click the field to map.</p>
</li>
<li>
-<p>Right-click the field and then select <span class="bold">Map As &gt; Embedded Id</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
+<p>Select <span class="bold">Map as &gt; Embedded</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
</li>
<li>
<p>Use this table to complete the remaining fields on the <span class="gui-object-title">JPA Details</span> view.</p>
@@ -38,18 +38,23 @@
<col width="38%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t16">Property</th>
-<th align="left" valign="bottom" id="r1c2-t16">Description</th>
-<th align="left" valign="bottom" id="r1c3-t16">Default</th>
+<th align="left" valign="bottom" id="r1c1-t15">Property</th>
+<th align="left" valign="bottom" id="r1c2-t15">Description</th>
+<th align="left" valign="bottom" id="r1c3-t15">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t16" headers="r1c1-t16">Entity Mapping Hyperlink</td>
-<td align="left" headers="r2c1-t16 r1c2-t16">Defines this mapping as a <span class="bold">Embedded Id</span>.
-<p>This corresponds to the <code>@EmbeddedId</code> annotation.</p>
+<td align="left" id="r2c1-t15" headers="r1c1-t15">Entity Mapping Hyperlink</td>
+<td align="left" headers="r2c1-t15 r1c2-t15">Defines this mapping as a <span class="bold">Embedded</span>.
+<p>This corresponds to the <code>@Embedded</code> annotation.</p>
</td>
-<td align="left" headers="r2c1-t16 r1c3-t16">Embedded Id</td>
+<td align="left" headers="r2c1-t15 r1c3-t15">Embedded</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t15" headers="r1c1-t15">Attribute Overrides</td>
+<td align="left" headers="r3c1-t15 r1c2-t15">Specify to override the default mapping of an entity's attribute. Select <span class="bold">Override Default</span>.</td>
+<td align="left" headers="r3c1-t15 r1c3-t15"><br /></td>
</tr>
</tbody>
</table>
@@ -58,7 +63,8 @@
</ol>
<p>Eclipse adds the following annotations to the field:</p>
<pre xml:space="preserve" class="oac_no_warn">
-@EmbeddedId
+@Embedded
+@AttributeOverride(column=@Column(table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>", name = "<span class="italic">&lt;COLUMN_NAME&gt;</span>"))
</pre>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm
index dc6d21b252..425fb6498c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>ID mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:47Z" />
+<title>Embedded ID mapping</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:44Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="ID mapping" />
+<meta name="doctitle" content="Embedded ID mapping" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,132 +18,47 @@
<!-- contents -->
</head>
<body>
-<p><a id="BABGCBHG" name="BABGCBHG"></a></p>
+<p><a id="CIHDIAEE" name="CIHDIAEE"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>ID mapping</h1>
-<p><a id="sthref124" name="sthref124"></a><a id="sthref125" name="sthref125"></a><a id="sthref126" name="sthref126"></a><a id="sthref127" name="sthref127"></a>Use an <span class="bold">ID Mapping</span> to specify the primary key of an entity. ID mappings may be used with a <a href="tasks005.htm#BABGBIEE">Entity</a> or <a href="tasks007.htm#BABDAGCI">Mapped superclass</a>. Each <a href="tasks005.htm#BABGBIEE">Entity</a> must have an ID mapping.</p>
+<h1>Embedded ID mapping</h1>
+<p><a id="sthref122" name="sthref122"></a><a id="sthref123" name="sthref123"></a><a id="sthref124" name="sthref124"></a><a id="sthref125" name="sthref125"></a>Use an <span class="bold">Embedded ID Mapping</span> to specify the primary key of an embedded ID. These mappings may be used with a <a href="tasks007.htm#BABFEICE">Embeddable</a> entities.</p>
<ol>
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
</li>
<li>
-<p>Right click the filed and then select <span class="bold">Map as &gt; ID</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
+<p>Right-click the field and then select <span class="bold">Map As &gt; Embedded Id</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
</li>
<li>
-<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields in the <span class="gui-object-title">JPA Details</span> view.</p>
+<p>Use this table to complete the remaining fields on the <span class="gui-object-title">JPA Details</span> view.</p>
<div class="inftblruleinformal">
<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="22%" />
+<col width="19%" />
<col width="*" />
-<col width="35%" />
+<col width="38%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t17">Property</th>
-<th align="left" valign="bottom" id="r1c2-t17">Description</th>
-<th align="left" valign="bottom" id="r1c3-t17">Default</th>
+<th align="left" valign="bottom" id="r1c1-t16">Property</th>
+<th align="left" valign="bottom" id="r1c2-t16">Description</th>
+<th align="left" valign="bottom" id="r1c3-t16">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t17" headers="r1c1-t17">Entity Mapping Hyperlink</td>
-<td align="left" headers="r2c1-t17 r1c2-t17">Defines this mapping as an <span class="bold">ID Mapping</span>.
-<p>This field corresponds to the <code>@Id</code> annotation.</p>
+<td align="left" id="r2c1-t16" headers="r1c1-t16">Entity Mapping Hyperlink</td>
+<td align="left" headers="r2c1-t16 r1c2-t16">Defines this mapping as a <span class="bold">Embedded Id</span>.
+<p>This corresponds to the <code>@EmbeddedId</code> annotation.</p>
</td>
-<td align="left" headers="r2c1-t17 r1c3-t17">ID</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t17" headers="r1c1-t17">Column</td>
-<td align="left" headers="r3c1-t17 r1c2-t17">The database column mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.</td>
-<td align="left" headers="r3c1-t17 r1c3-t17">By default, the Column is assumed to be named identically to the attribute.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t17" headers="r1c1-t17">Table</td>
-<td align="left" headers="r4c1-t17 r1c2-t17">The database table mapped to the entity attribute.</td>
-<td align="left" headers="r4c1-t17 r1c3-t17">By default, the Table is assumed to be identical to the table associated with the entity.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t17" headers="r1c1-t17">Temporal</td>
-<td align="left" headers="r5c1-t17 r1c2-t17">Specifies the type of data. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.
-<ul>
-<li>
-<p>Date</p>
-</li>
-<li>
-<p>Time</p>
-</li>
-<li>
-<p>Timestamp</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r5c1-t17 r1c3-t17"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-<li>
-<p>Use this table to complete the fields in <a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a> area in the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the PK Generation tab." summary="This table lists the fields in the PK Generation tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="22%" />
-<col width="*" />
-<col width="35%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t18">Property</th>
-<th align="left" valign="bottom" id="r1c2-t18">Description</th>
-<th align="left" valign="bottom" id="r1c3-t18">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t18" headers="r1c1-t18">Primary Key Generation</td>
-<td align="left" headers="r2c1-t18 r1c2-t18">These fields define how the primary key is generated.</td>
-<td align="left" headers="r2c1-t18 r1c3-t18"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t18" headers="r1c1-t18">&nbsp;&nbsp;Strategy</td>
-<td align="left" headers="r3c1-t18 r1c2-t18">See <a href="ref_primary_key.htm#CACBAJBC">"Primary Key Generation"</a> for details.
-<ul>
-<li>
-<p>Auto</p>
-</li>
-<li>
-<p>Sequence</p>
-</li>
-<li>
-<p>Identity</p>
-</li>
-<li>
-<p>Table</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r3c1-t18 r1c3-t18">Auto</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t18" headers="r1c1-t18">&nbsp;&nbsp;Generator&nbsp;Name</td>
-<td align="left" headers="r4c1-t18 r1c2-t18">Name of the primary key generator specified in the <span class="bold">Strategy</span></td>
-<td align="left" headers="r4c1-t18 r1c3-t18"><br /></td>
+<td align="left" headers="r2c1-t16 r1c3-t16">Embedded Id</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblruleinformal" --></li>
</ol>
-<p>Additional fields will appear in the <a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a> area, depending on the selected Strategy. See <a href="ref_persistence_map_view.htm#BABIFBAF">"JPA Details view (for attributes)"</a> for additional information.</p>
<p>Eclipse adds the following annotations to the field:</p>
<pre xml:space="preserve" class="oac_no_warn">
-@Id
-@Column(name="<span class="italic">&lt;COLUMN_NAME&gt;</span>", table="<span class="italic">&lt;TABLE_NAME&gt;</span>", insertable=<span class="italic">&lt;INSERTABLE&gt;</span>,
- updatable=<span class="italic">&lt;UPDATABLE&gt;</span>)
-@Temporal(<span class="italic">&lt;TEMPORAL&gt;</span>)
-@GeneratedValue(strategy=GeneratorType.<span class="italic">&lt;STRATEGY&gt;</span>, generator="<span class="italic">&lt;GENERATOR_NAME&gt;</span>")@TableGenerator(name="<span class="italic">&lt;TABLE_GENERATOR_NAME&gt;</span>", table = "<span class="italic">&lt;TABLE_GENERATOR_TABLE&gt;</span>",
- pkColumnName = "<span class="italic">&lt;TABLE_GENERATOR_PK&gt;</span>",
- valueColumnName = "<span class="italic">&lt;TABLE_GENERATOR_VALUE_COLUMN&gt;</span>",
- pkColumnValue = "<span class="italic">&lt;TABLE_GENERATOR_PK_COLUMN_VALUE&gt;</span>")@SequenceGenerator(name="<span class="italic">&lt;SEQUENCE_GENERATOR_NAME&gt;</span>",
- sequenceName="<span class="italic">&lt;SEQUENCE_GENERATOR_SEQUENCE&gt;</span>")
+@EmbeddedId
</pre>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm
index bcd575f542..8aadf81887 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Many-to-many mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:47Z" />
+<title>ID mapping</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:44Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Many-to-many mapping" />
+<meta name="doctitle" content="ID mapping" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,135 +18,132 @@
<!-- contents -->
</head>
<body>
-<p><a id="BABEIEGD" name="BABEIEGD"></a></p>
+<p><a id="BABGCBHG" name="BABGCBHG"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Many-to-many mapping</h1>
-<p><a id="sthref128" name="sthref128"></a><a id="sthref129" name="sthref129"></a><a id="sthref130" name="sthref130"></a><a id="sthref131" name="sthref131"></a>Use a <span class="bold">Many-to-Many Mapping</span> to define a many-valued association with many-to-many multiplicity. A many-to-many mapping has two sides: the <span class="italic">owning side</span> and <span class="italic">non-owning side</span>. You must specify the join table on the owning side. For bidirectional mappings, either side may be the owning side.</p>
+<h1>ID mapping</h1>
+<p><a id="sthref126" name="sthref126"></a><a id="sthref127" name="sthref127"></a><a id="sthref128" name="sthref128"></a><a id="sthref129" name="sthref129"></a>Use an <span class="bold">ID Mapping</span> to specify the primary key of an entity. ID mappings may be used with a <a href="tasks006.htm#BABGBIEE">Entity</a> or <a href="tasks008.htm#BABDAGCI">Mapped superclass</a>. Each <a href="tasks006.htm#BABGBIEE">Entity</a> must have an ID mapping.</p>
<ol>
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
</li>
<li>
-<p>Right-click the field and then select <span class="bold">Map As &gt; Many-to-Many</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
+<p>Right click the filed and then select <span class="bold">Map as &gt; ID</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
</li>
<li>
-<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields of the <span class="gui-object-title">JPA Details</span> view.</p>
+<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields in the <span class="gui-object-title">JPA Details</span> view.</p>
<div class="inftblruleinformal">
<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="19%" />
+<col width="22%" />
<col width="*" />
-<col width="41%" />
+<col width="35%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t19">Property</th>
-<th align="left" valign="bottom" id="r1c2-t19">Description</th>
-<th align="left" valign="bottom" id="r1c3-t19">Default</th>
+<th align="left" valign="bottom" id="r1c1-t17">Property</th>
+<th align="left" valign="bottom" id="r1c2-t17">Description</th>
+<th align="left" valign="bottom" id="r1c3-t17">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t19" headers="r1c1-t19">Mapping Entity Hyperlink</td>
-<td align="left" headers="r2c1-t19 r1c2-t19">Defines this mapping as a <span class="bold">Many to Many Mapping</span>.
-<p>This field corresponds to the <code>@ManyToMany</code> annotation.</p>
+<td align="left" id="r2c1-t17" headers="r1c1-t17">Entity Mapping Hyperlink</td>
+<td align="left" headers="r2c1-t17 r1c2-t17">Defines this mapping as an <span class="bold">ID Mapping</span>.
+<p>This field corresponds to the <code>@Id</code> annotation.</p>
</td>
-<td align="left" headers="r2c1-t19 r1c3-t19">Many to Many</td>
+<td align="left" headers="r2c1-t17 r1c3-t17">ID</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t19" headers="r1c1-t19">Target Entity</td>
-<td align="left" headers="r3c1-t19 r1c2-t19">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r3c1-t19 r1c3-t19">null
-<p>You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t19" headers="r1c1-t19">Fetch</td>
-<td align="left" headers="r4c1-t19 r1c2-t19">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
-<ul>
-<li>
-<p>Eager</p>
-</li>
-<li>
-<p>Lazy</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r4c1-t19 r1c3-t19">Lazy</td>
+<td align="left" id="r3c1-t17" headers="r1c1-t17">Column</td>
+<td align="left" headers="r3c1-t17 r1c2-t17">The database column mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.</td>
+<td align="left" headers="r3c1-t17 r1c3-t17">By default, the Column is assumed to be named identically to the attribute.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t19" headers="r1c1-t19">Mapped By</td>
-<td align="left" headers="r5c1-t19 r1c2-t19">The database field that owns the relationship.</td>
-<td align="left" headers="r5c1-t19 r1c3-t19"><br /></td>
+<td align="left" id="r4c1-t17" headers="r1c1-t17">Table</td>
+<td align="left" headers="r4c1-t17 r1c2-t17">The database table mapped to the entity attribute.</td>
+<td align="left" headers="r4c1-t17 r1c3-t17">By default, the Table is assumed to be identical to the table associated with the entity.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t19" headers="r1c1-t19">Order By</td>
-<td align="left" headers="r6c1-t19 r1c2-t19">Specify the default order for objects returned from a query. See <a href="ref_mapping_general.htm#CACDADIH">"Order By"</a> for details.
+<td align="left" id="r5c1-t17" headers="r1c1-t17">Temporal</td>
+<td align="left" headers="r5c1-t17 r1c2-t17">Specifies the type of data. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.
<ul>
<li>
-<p>No ordering</p>
+<p>Date</p>
</li>
<li>
-<p>Primary key</p>
+<p>Time</p>
</li>
<li>
-<p>Custom</p>
+<p>Timestamp</p>
</li>
</ul>
</td>
-<td align="left" headers="r6c1-t19 r1c3-t19">No ordering</td>
+<td align="left" headers="r5c1-t17 r1c3-t17"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblruleinformal" --></li>
<li>
-<p>Use this table to complete the fields in the <a href="reference011.htm#CACBAEBC">Join Table Information</a> area in the <span class="gui-object-title">JPA Details</span> view.</p>
+<p>Use this table to complete the fields in <a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a> area in the <span class="gui-object-title">JPA Details</span> view.</p>
<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." summary="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="19%" />
+<table class="RuleInformal" title="This table lists the fields in the PK Generation tab." summary="This table lists the fields in the PK Generation tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="22%" />
<col width="*" />
-<col width="38%" />
+<col width="35%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t20">Property</th>
-<th align="left" valign="bottom" id="r1c2-t20">Description</th>
-<th align="left" valign="bottom" id="r1c3-t20">Default</th>
+<th align="left" valign="bottom" id="r1c1-t18">Property</th>
+<th align="left" valign="bottom" id="r1c2-t18">Description</th>
+<th align="left" valign="bottom" id="r1c3-t18">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t20" headers="r1c1-t20">Name</td>
-<td align="left" headers="r2c1-t20 r1c2-t20">Name of the join table that contains the foreign key column.</td>
-<td align="left" headers="r2c1-t20 r1c3-t20">You must specify the join table on the owning side.
-<p>By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</p>
-</td>
+<td align="left" id="r2c1-t18" headers="r1c1-t18">Primary Key Generation</td>
+<td align="left" headers="r2c1-t18 r1c2-t18">These fields define how the primary key is generated.</td>
+<td align="left" headers="r2c1-t18 r1c3-t18"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t20" headers="r1c1-t20">Join Columns</td>
-<td align="left" headers="r3c1-t20 r1c2-t20">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
-<td align="left" headers="r3c1-t20 r1c3-t20">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
+<td align="left" id="r3c1-t18" headers="r1c1-t18">&nbsp;&nbsp;Strategy</td>
+<td align="left" headers="r3c1-t18 r1c2-t18">See <a href="ref_primary_key.htm#CACBAJBC">"Primary Key Generation"</a> for details.
+<ul>
+<li>
+<p>Auto</p>
+</li>
+<li>
+<p>Sequence</p>
+</li>
+<li>
+<p>Identity</p>
+</li>
+<li>
+<p>Table</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r3c1-t18 r1c3-t18">Auto</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t20" headers="r1c1-t20">Inverse Join Columns</td>
-<td align="left" headers="r4c1-t20 r1c2-t20">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
-<td align="left" headers="r4c1-t20 r1c3-t20">By default, the mapping is assumed to have a single join.</td>
+<td align="left" id="r4c1-t18" headers="r1c1-t18">&nbsp;&nbsp;Generator&nbsp;Name</td>
+<td align="left" headers="r4c1-t18 r1c2-t18">Name of the primary key generator specified in the <span class="bold">Strategy</span></td>
+<td align="left" headers="r4c1-t18 r1c3-t18"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblruleinformal" --></li>
-<li>
-<p>To add a new Join or Inverse Join Column, click <span class="gui-object-action">Add</span>.</p>
-<p>To edit an existing Join or Inverse Join Column, select the field to and click <span class="gui-object-action">Edit</span>.</p>
-</li>
</ol>
+<p>Additional fields will appear in the <a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a> area, depending on the selected Strategy. See <a href="ref_persistence_map_view.htm#BABIFBAF">"JPA Details view (for attributes)"</a> for additional information.</p>
<p>Eclipse adds the following annotations to the field:</p>
<pre xml:space="preserve" class="oac_no_warn">
-@JoinTable(joinColumns=@JoinColumn(name="<span class="italic">&lt;JOIN_COLUMN&gt;</span>"),
- name = "<span class="italic">&lt;JOIN_TABLE_NAME&gt;</span>")
-@ManyToMany(cascade=CascadeType.<span class="italic">&lt;CASCADE_TYPE&gt;</span>, fetch=FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>,
- targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>, mappedBy = "<span class="italic">&lt;MAPPED_BY&gt;</span>")
-@OrderBy("<span class="italic">&lt;ORDER_BY&gt;</span>")
-
+@Id
+@Column(name="<span class="italic">&lt;COLUMN_NAME&gt;</span>", table="<span class="italic">&lt;TABLE_NAME&gt;</span>", insertable=<span class="italic">&lt;INSERTABLE&gt;</span>,
+ updatable=<span class="italic">&lt;UPDATABLE&gt;</span>)
+@Temporal(<span class="italic">&lt;TEMPORAL&gt;</span>)
+@GeneratedValue(strategy=GeneratorType.<span class="italic">&lt;STRATEGY&gt;</span>, generator="<span class="italic">&lt;GENERATOR_NAME&gt;</span>")@TableGenerator(name="<span class="italic">&lt;TABLE_GENERATOR_NAME&gt;</span>", table = "<span class="italic">&lt;TABLE_GENERATOR_TABLE&gt;</span>",
+ pkColumnName = "<span class="italic">&lt;TABLE_GENERATOR_PK&gt;</span>",
+ valueColumnName = "<span class="italic">&lt;TABLE_GENERATOR_VALUE_COLUMN&gt;</span>",
+ pkColumnValue = "<span class="italic">&lt;TABLE_GENERATOR_PK_COLUMN_VALUE&gt;</span>")@SequenceGenerator(name="<span class="italic">&lt;SEQUENCE_GENERATOR_NAME&gt;</span>",
+ sequenceName="<span class="italic">&lt;SEQUENCE_GENERATOR_SEQUENCE&gt;</span>")
</pre>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm
index a8760db335..d158190edb 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Many-to-one mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:47Z" />
+<title>Many-to-many mapping</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:44Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Many-to-one mapping" />
+<meta name="doctitle" content="Many-to-many mapping" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,47 +18,49 @@
<!-- contents -->
</head>
<body>
-<p><a id="BABHFAFJ" name="BABHFAFJ"></a></p>
+<p><a id="BABEIEGD" name="BABEIEGD"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Many-to-one mapping</h1>
-<p><a id="sthref132" name="sthref132"></a><a id="sthref133" name="sthref133"></a><a id="sthref134" name="sthref134"></a><a id="sthref135" name="sthref135"></a>Use a <span class="bold">Many-to-One</span> mapping to defines a single-valued association to another entity class that has many-to-one multiplicity.</p>
+<h1>Many-to-many mapping</h1>
+<p><a id="sthref130" name="sthref130"></a><a id="sthref131" name="sthref131"></a><a id="sthref132" name="sthref132"></a><a id="sthref133" name="sthref133"></a>Use a <span class="bold">Many-to-Many Mapping</span> to define a many-valued association with many-to-many multiplicity. A many-to-many mapping has two sides: the <span class="italic">owning side</span> and <span class="italic">non-owning side</span>. You must specify the join table on the owning side. For bidirectional mappings, either side may be the owning side.</p>
<ol>
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
</li>
<li>
-<p>Right click the field and then select <span class="bold">Map As &gt; Many-to-One</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
+<p>Right-click the field and then select <span class="bold">Map As &gt; Many-to-Many</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
</li>
<li>
-<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields JPA Details view.</p>
+<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields of the <span class="gui-object-title">JPA Details</span> view.</p>
<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields ion the General tab for this mapping." summary="This table lists the fields ion the General tab for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<col width="19%" />
<col width="*" />
<col width="41%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t21">Property</th>
-<th align="left" valign="bottom" id="r1c2-t21">Description</th>
-<th align="left" valign="bottom" id="r1c3-t21">Default</th>
+<th align="left" valign="bottom" id="r1c1-t19">Property</th>
+<th align="left" valign="bottom" id="r1c2-t19">Description</th>
+<th align="left" valign="bottom" id="r1c3-t19">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t21" headers="r1c1-t21">Mapping Entity Hyperlink</td>
-<td align="left" headers="r2c1-t21 r1c2-t21">Defines mapping as <span class="bold">Many-to-One</span>. This corresponds to the <code>@ManyToOne</code> annotation.</td>
-<td align="left" headers="r2c1-t21 r1c3-t21">Many-to-One</td>
+<td align="left" id="r2c1-t19" headers="r1c1-t19">Mapping Entity Hyperlink</td>
+<td align="left" headers="r2c1-t19 r1c2-t19">Defines this mapping as a <span class="bold">Many to Many Mapping</span>.
+<p>This field corresponds to the <code>@ManyToMany</code> annotation.</p>
+</td>
+<td align="left" headers="r2c1-t19 r1c3-t19">Many to Many</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t21" headers="r1c1-t21">Target Entity</td>
-<td align="left" headers="r3c1-t21 r1c2-t21">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r3c1-t21 r1c3-t21">null
+<td align="left" id="r3c1-t19" headers="r1c1-t19">Target Entity</td>
+<td align="left" headers="r3c1-t19 r1c2-t19">The entity to which this attribute is mapped.</td>
+<td align="left" headers="r3c1-t19 r1c3-t19">null
<p>You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t21" headers="r1c1-t21">Fetch</td>
-<td align="left" headers="r4c1-t21 r1c2-t21">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
+<td align="left" id="r4c1-t19" headers="r1c1-t19">Fetch</td>
+<td align="left" headers="r4c1-t19 r1c2-t19">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
<ul>
<li>
<p>Eager</p>
@@ -68,73 +70,83 @@
</li>
</ul>
</td>
-<td align="left" headers="r4c1-t21 r1c3-t21">Eager</td>
+<td align="left" headers="r4c1-t19 r1c3-t19">Lazy</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t21" headers="r1c1-t21">Cascade</td>
-<td align="left" headers="r5c1-t21 r1c2-t21">See <a href="ref_mapping_general.htm#CACJAIHB">"Cascade Type"</a> for details.
+<td align="left" id="r5c1-t19" headers="r1c1-t19">Mapped By</td>
+<td align="left" headers="r5c1-t19 r1c2-t19">The database field that owns the relationship.</td>
+<td align="left" headers="r5c1-t19 r1c3-t19"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t19" headers="r1c1-t19">Order By</td>
+<td align="left" headers="r6c1-t19 r1c2-t19">Specify the default order for objects returned from a query. See <a href="ref_mapping_general.htm#CACDADIH">"Order By"</a> for details.
<ul>
<li>
-<p>Default</p>
+<p>No ordering</p>
</li>
<li>
-<p>All</p>
+<p>Primary key</p>
</li>
<li>
-<p>Persist</p>
-</li>
-<li>
-<p>Merge</p>
-</li>
-<li>
-<p>Remove</p>
+<p>Custom</p>
</li>
</ul>
</td>
-<td align="left" headers="r5c1-t21 r1c3-t21">Default</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t21" headers="r1c1-t21">Optional</td>
-<td align="left" headers="r6c1-t21 r1c2-t21">Specifies if this field is can be null.</td>
-<td align="left" headers="r6c1-t21 r1c3-t21">Yes</td>
+<td align="left" headers="r6c1-t19 r1c3-t19">No ordering</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblruleinformal" --></li>
<li>
-<p>Use this table to complete the fields on the <a href="reference012.htm#CACFCEJC">Join Columns Information</a> tab in the <span class="gui-object-title">JPA Details</span> view.</p>
+<p>Use this table to complete the fields in the <a href="reference011.htm#CACBAEBC">Join Table Information</a> area in the <span class="gui-object-title">JPA Details</span> view.</p>
<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<table class="RuleInformal" title="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." summary="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<col width="19%" />
<col width="*" />
-<col width="41%" />
+<col width="38%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t22">Property</th>
-<th align="left" valign="bottom" id="r1c2-t22">Description</th>
-<th align="left" valign="bottom" id="r1c3-t22">Default</th>
+<th align="left" valign="bottom" id="r1c1-t20">Property</th>
+<th align="left" valign="bottom" id="r1c2-t20">Description</th>
+<th align="left" valign="bottom" id="r1c3-t20">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t22" headers="r1c1-t22">Join Column</td>
-<td align="left" headers="r2c1-t22 r1c2-t22"><a id="sthref136" name="sthref136"></a><a id="sthref137" name="sthref137"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
-<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
+<td align="left" id="r2c1-t20" headers="r1c1-t20">Name</td>
+<td align="left" headers="r2c1-t20 r1c2-t20">Name of the join table that contains the foreign key column.</td>
+<td align="left" headers="r2c1-t20 r1c3-t20">You must specify the join table on the owning side.
+<p>By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</p>
</td>
-<td align="left" headers="r2c1-t22 r1c3-t22">By default, the mapping is assumed to have a single join.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t20" headers="r1c1-t20">Join Columns</td>
+<td align="left" headers="r3c1-t20 r1c2-t20">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
+<td align="left" headers="r3c1-t20 r1c3-t20">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t20" headers="r1c1-t20">Inverse Join Columns</td>
+<td align="left" headers="r4c1-t20 r1c2-t20">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
+<td align="left" headers="r4c1-t20 r1c3-t20">By default, the mapping is assumed to have a single join.</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblruleinformal" --></li>
+<li>
+<p>To add a new Join or Inverse Join Column, click <span class="gui-object-action">Add</span>.</p>
+<p>To edit an existing Join or Inverse Join Column, select the field to and click <span class="gui-object-action">Edit</span>.</p>
+</li>
</ol>
<p>Eclipse adds the following annotations to the field:</p>
<pre xml:space="preserve" class="oac_no_warn">
@JoinTable(joinColumns=@JoinColumn(name="<span class="italic">&lt;JOIN_COLUMN&gt;</span>"),
name = "<span class="italic">&lt;JOIN_TABLE_NAME&gt;</span>")
-@ManyToOne(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>, fetch=<span class="italic">&lt;FETCH_TYPE&gt;</span>,
- cascade=<span class="italic">&lt;CASCADE_TYPE&gt;</span>)
+@ManyToMany(cascade=CascadeType.<span class="italic">&lt;CASCADE_TYPE&gt;</span>, fetch=FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>,
+ targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>, mappedBy = "<span class="italic">&lt;MAPPED_BY&gt;</span>")
+@OrderBy("<span class="italic">&lt;ORDER_BY&gt;</span>")
+
</pre>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm
index 95bddfc26b..05eba6a8dd 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>One-to-many mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:47Z" />
+<title>Many-to-one mapping</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:44Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="One-to-many mapping" />
+<meta name="doctitle" content="Many-to-one mapping" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,134 +18,111 @@
<!-- contents -->
</head>
<body>
-<p><a id="BABHGEBD" name="BABHGEBD"></a></p>
+<p><a id="BABHFAFJ" name="BABHFAFJ"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>One-to-many mapping</h1>
-<p><a id="sthref138" name="sthref138"></a><a id="sthref139" name="sthref139"></a><a id="sthref140" name="sthref140"></a><a id="sthref141" name="sthref141"></a>Use a <span class="bold">One-to-Many Mapping</span> to define a relationship with one-to-many multiplicity.</p>
+<h1>Many-to-one mapping</h1>
+<p><a id="sthref134" name="sthref134"></a><a id="sthref135" name="sthref135"></a><a id="sthref136" name="sthref136"></a><a id="sthref137" name="sthref137"></a>Use a <span class="bold">Many-to-One</span> mapping to defines a single-valued association to another entity class that has many-to-one multiplicity.</p>
<ol>
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
</li>
<li>
-<p>Right-click the field and then select <span class="bold">Map As &gt; One-to-many</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
+<p>Right click the field and then select <span class="bold">Map As &gt; Many-to-One</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
</li>
<li>
<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields JPA Details view.</p>
<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the General tab of the Persistence Properties view for this mapping." summary="This table lists the fields in the General tab of the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<table class="RuleInformal" title="This table lists the fields ion the General tab for this mapping." summary="This table lists the fields ion the General tab for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<col width="19%" />
<col width="*" />
-<col width="38%" />
+<col width="41%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t23">Property</th>
-<th align="left" valign="bottom" id="r1c2-t23">Description</th>
-<th align="left" valign="bottom" id="r1c3-t23">Default</th>
+<th align="left" valign="bottom" id="r1c1-t21">Property</th>
+<th align="left" valign="bottom" id="r1c2-t21">Description</th>
+<th align="left" valign="bottom" id="r1c3-t21">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t23" headers="r1c1-t23">Mapping Entity Type Hyperlink</td>
-<td align="left" headers="r2c1-t23 r1c2-t23">Defines mapping as <span class="bold">One-to-Many</span>. This corresponds to the <code>@OneToMany</code> annotation.</td>
-<td align="left" headers="r2c1-t23 r1c3-t23">One-to-Many</td>
+<td align="left" id="r2c1-t21" headers="r1c1-t21">Mapping Entity Hyperlink</td>
+<td align="left" headers="r2c1-t21 r1c2-t21">Defines mapping as <span class="bold">Many-to-One</span>. This corresponds to the <code>@ManyToOne</code> annotation.</td>
+<td align="left" headers="r2c1-t21 r1c3-t21">Many-to-One</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t23" headers="r1c1-t23">Target Entity</td>
-<td align="left" headers="r3c1-t23 r1c2-t23">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r3c1-t23 r1c3-t23"><br /></td>
+<td align="left" id="r3c1-t21" headers="r1c1-t21">Target Entity</td>
+<td align="left" headers="r3c1-t21 r1c2-t21">The entity to which this attribute is mapped.</td>
+<td align="left" headers="r3c1-t21 r1c3-t21">null
+<p>You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t23" headers="r1c1-t23">Cascade</td>
-<td align="left" headers="r4c1-t23 r1c2-t23">See <a href="ref_mapping_general.htm#CACJAIHB">"Cascade Type"</a> for details.
+<td align="left" id="r4c1-t21" headers="r1c1-t21">Fetch</td>
+<td align="left" headers="r4c1-t21 r1c2-t21">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
<ul>
<li>
-<p>Default</p>
-</li>
-<li>
-<p>All</p>
-</li>
-<li>
-<p>Persist</p>
-</li>
-<li>
-<p>Merge</p>
+<p>Eager</p>
</li>
<li>
-<p>Remove</p>
+<p>Lazy</p>
</li>
</ul>
</td>
-<td align="left" headers="r4c1-t23 r1c3-t23"><br /></td>
+<td align="left" headers="r4c1-t21 r1c3-t21">Eager</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t23" headers="r1c1-t23">Fetch</td>
-<td align="left" headers="r5c1-t23 r1c2-t23">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
+<td align="left" id="r5c1-t21" headers="r1c1-t21">Cascade</td>
+<td align="left" headers="r5c1-t21 r1c2-t21">See <a href="ref_mapping_general.htm#CACJAIHB">"Cascade Type"</a> for details.
<ul>
<li>
-<p>Eager</p>
+<p>Default</p>
</li>
<li>
-<p>Lazy</p>
+<p>All</p>
</li>
-</ul>
-</td>
-<td align="left" headers="r5c1-t23 r1c3-t23">Eager</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t23" headers="r1c1-t23">Mapped By</td>
-<td align="left" headers="r6c1-t23 r1c2-t23">The database field that owns the relationship.</td>
-<td align="left" headers="r6c1-t23 r1c3-t23"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t23" headers="r1c1-t23">Order By</td>
-<td align="left" headers="r7c1-t23 r1c2-t23">Specify the default order for objects returned from a query. See <a href="ref_mapping_general.htm#CACDADIH">"Order By"</a> for details.
-<ul>
<li>
-<p>No ordering</p>
+<p>Persist</p>
</li>
<li>
-<p>Primary key</p>
+<p>Merge</p>
</li>
<li>
-<p>Custom</p>
+<p>Remove</p>
</li>
</ul>
</td>
-<td align="left" headers="r7c1-t23 r1c3-t23">No ordering</td>
+<td align="left" headers="r5c1-t21 r1c3-t21">Default</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t21" headers="r1c1-t21">Optional</td>
+<td align="left" headers="r6c1-t21 r1c2-t21">Specifies if this field is can be null.</td>
+<td align="left" headers="r6c1-t21 r1c3-t21">Yes</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblruleinformal" --></li>
<li>
-<p>Use this table to complete the <a href="reference011.htm#CACBAEBC">Join Table Information</a> fields in the JPA Details view.</p>
+<p>Use this table to complete the fields on the <a href="reference012.htm#CACFCEJC">Join Columns Information</a> tab in the <span class="gui-object-title">JPA Details</span> view.</p>
<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." summary="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<col width="19%" />
<col width="*" />
-<col width="38%" />
+<col width="41%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t24">Property</th>
-<th align="left" valign="bottom" id="r1c2-t24">Description</th>
-<th align="left" valign="bottom" id="r1c3-t24">Default</th>
+<th align="left" valign="bottom" id="r1c1-t22">Property</th>
+<th align="left" valign="bottom" id="r1c2-t22">Description</th>
+<th align="left" valign="bottom" id="r1c3-t22">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t24" headers="r1c1-t24">Name</td>
-<td align="left" headers="r2c1-t24 r1c2-t24">Name of the join table</td>
-<td align="left" headers="r2c1-t24 r1c3-t24">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t24" headers="r1c1-t24">Join Columns</td>
-<td align="left" headers="r3c1-t24 r1c2-t24">Specify two or more join columns (that is, a primary key).</td>
-<td align="left" headers="r3c1-t24 r1c3-t24"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t24" headers="r1c1-t24">Inverse Join Columns</td>
-<td align="left" headers="r4c1-t24 r1c2-t24">The join column on the owned (or inverse) side of the association: the owned entity's primary key column.</td>
-<td align="left" headers="r4c1-t24 r1c3-t24"><br /></td>
+<td align="left" id="r2c1-t22" headers="r1c1-t22">Join Column</td>
+<td align="left" headers="r2c1-t22 r1c2-t22"><a id="sthref138" name="sthref138"></a><a id="sthref139" name="sthref139"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
+<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
+</td>
+<td align="left" headers="r2c1-t22 r1c3-t22">By default, the mapping is assumed to have a single join.</td>
</tr>
</tbody>
</table>
@@ -154,17 +131,10 @@
</ol>
<p>Eclipse adds the following annotations to the field:</p>
<pre xml:space="preserve" class="oac_no_warn">
-@OneToMany(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>)
-@Column(name="<span class="italic">&lt;COLUMN&gt;</span>")
-
-
-@OneToMany(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>.class, cascade=CascadeType.<span class="italic">&lt;CASCADE_TYPE&gt;</span>,
- fetch = FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>, mappedBy = "<span class="italic">&lt;MAPPED_BY&gt;</span>")@OrderBy("<span class="italic">&lt;ORDER_BY&gt;</span>")
-@JoinTable(name="<span class="italic">&lt;JOIN_TABLE_NAME&gt;</span>", joinColumns=@JoinColumn(name=
- "<span class="italic">&lt;JOIN_COLUMN_NAME&gt;</span>", referencedColumnName="<span class="italic">&lt;JOIN_COLUMN_REFERENCED_COLUMN&gt;</span>"),
- inverseJoinColumns=@JoinColumn(name="<span class="italic">&lt;INVERSE_JOIN_COLUMN_NAME&gt;</span>",
- referencedColumnName="<span class="italic">&lt;INVERSE_JOIN_COLUMN_REFERENCED_COLUMN&gt;</span>"))
-
+@JoinTable(joinColumns=@JoinColumn(name="<span class="italic">&lt;JOIN_COLUMN&gt;</span>"),
+ name = "<span class="italic">&lt;JOIN_TABLE_NAME&gt;</span>")
+@ManyToOne(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>, fetch=<span class="italic">&lt;FETCH_TYPE&gt;</span>,
+ cascade=<span class="italic">&lt;CASCADE_TYPE&gt;</span>)
</pre>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm
index d057a8845f..417c743805 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>One-to-one mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:48Z" />
+<title>One-to-many mapping</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:44Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="One-to-one mapping" />
+<meta name="doctitle" content="One-to-many mapping" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,47 +18,68 @@
<!-- contents -->
</head>
<body>
-<p><a id="BABFHBCJ" name="BABFHBCJ"></a></p>
+<p><a id="BABHGEBD" name="BABHGEBD"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>One-to-one mapping</h1>
-<p><a id="sthref142" name="sthref142"></a><a id="sthref143" name="sthref143"></a><a id="sthref144" name="sthref144"></a><a id="sthref145" name="sthref145"></a>Use a <span class="bold">One-to-One Mapping</span> to define a relationship with one-to-many multiplicity.</p>
+<h1>One-to-many mapping</h1>
+<p><a id="sthref140" name="sthref140"></a><a id="sthref141" name="sthref141"></a><a id="sthref142" name="sthref142"></a><a id="sthref143" name="sthref143"></a>Use a <span class="bold">One-to-Many Mapping</span> to define a relationship with one-to-many multiplicity.</p>
<ol>
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
</li>
<li>
-<p>Right-click the field and then select <span class="bold">Map As &gt; One-to-One</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
+<p>Right-click the field and then select <span class="bold">Map As &gt; One-to-many</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
</li>
<li>
-<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields in the JPA Details view.</p>
+<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields JPA Details view.</p>
<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<table class="RuleInformal" title="This table lists the fields in the General tab of the Persistence Properties view for this mapping." summary="This table lists the fields in the General tab of the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<col width="19%" />
<col width="*" />
-<col width="41%" />
+<col width="38%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t25">Property</th>
-<th align="left" valign="bottom" id="r1c2-t25">Description</th>
-<th align="left" valign="bottom" id="r1c3-t25">Default</th>
+<th align="left" valign="bottom" id="r1c1-t23">Property</th>
+<th align="left" valign="bottom" id="r1c2-t23">Description</th>
+<th align="left" valign="bottom" id="r1c3-t23">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t25" headers="r1c1-t25">Mapped Entity Hyperlink</td>
-<td align="left" headers="r2c1-t25 r1c2-t25">Defines mapping as <span class="bold">One-to-One</span>. This corresponds to the <code>@OneToOne</code> annotation.</td>
-<td align="left" headers="r2c1-t25 r1c3-t25">One-to-One</td>
+<td align="left" id="r2c1-t23" headers="r1c1-t23">Mapping Entity Type Hyperlink</td>
+<td align="left" headers="r2c1-t23 r1c2-t23">Defines mapping as <span class="bold">One-to-Many</span>. This corresponds to the <code>@OneToMany</code> annotation.</td>
+<td align="left" headers="r2c1-t23 r1c3-t23">One-to-Many</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t25" headers="r1c1-t25">Target Entity</td>
-<td align="left" headers="r3c1-t25 r1c2-t25">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r3c1-t25 r1c3-t25">null
-<p>You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.</p>
+<td align="left" id="r3c1-t23" headers="r1c1-t23">Target Entity</td>
+<td align="left" headers="r3c1-t23 r1c2-t23">The entity to which this attribute is mapped.</td>
+<td align="left" headers="r3c1-t23 r1c3-t23"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t23" headers="r1c1-t23">Cascade</td>
+<td align="left" headers="r4c1-t23 r1c2-t23">See <a href="ref_mapping_general.htm#CACJAIHB">"Cascade Type"</a> for details.
+<ul>
+<li>
+<p>Default</p>
+</li>
+<li>
+<p>All</p>
+</li>
+<li>
+<p>Persist</p>
+</li>
+<li>
+<p>Merge</p>
+</li>
+<li>
+<p>Remove</p>
+</li>
+</ul>
</td>
+<td align="left" headers="r4c1-t23 r1c3-t23"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t25" headers="r1c1-t25">Fetch Type</td>
-<td align="left" headers="r4c1-t25 r1c2-t25">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
+<td align="left" id="r5c1-t23" headers="r1c1-t23">Fetch</td>
+<td align="left" headers="r5c1-t23 r1c2-t23">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
<ul>
<li>
<p>Eager</p>
@@ -68,38 +89,63 @@
</li>
</ul>
</td>
-<td align="left" headers="r4c1-t25 r1c3-t25">Eager</td>
+<td align="left" headers="r5c1-t23 r1c3-t23">Eager</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t23" headers="r1c1-t23">Mapped By</td>
+<td align="left" headers="r6c1-t23 r1c2-t23">The database field that owns the relationship.</td>
+<td align="left" headers="r6c1-t23 r1c3-t23"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t25" headers="r1c1-t25">Mapped By</td>
-<td align="left" headers="r5c1-t25 r1c2-t25">The database field that owns the relationship.</td>
-<td align="left" headers="r5c1-t25 r1c3-t25"><br /></td>
+<td align="left" id="r7c1-t23" headers="r1c1-t23">Order By</td>
+<td align="left" headers="r7c1-t23 r1c2-t23">Specify the default order for objects returned from a query. See <a href="ref_mapping_general.htm#CACDADIH">"Order By"</a> for details.
+<ul>
+<li>
+<p>No ordering</p>
+</li>
+<li>
+<p>Primary key</p>
+</li>
+<li>
+<p>Custom</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r7c1-t23 r1c3-t23">No ordering</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblruleinformal" --></li>
<li>
-<p>Use this table to complete the <a href="reference012.htm#CACFCEJC">Join Columns Information</a> fields in the <span class="gui-object-title">JPA Details</span> view.</p>
+<p>Use this table to complete the <a href="reference011.htm#CACBAEBC">Join Table Information</a> fields in the JPA Details view.</p>
<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<table class="RuleInformal" title="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." summary="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<col width="19%" />
<col width="*" />
-<col width="41%" />
+<col width="38%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t26">Property</th>
-<th align="left" valign="bottom" id="r1c2-t26">Description</th>
-<th align="left" valign="bottom" id="r1c3-t26">Default</th>
+<th align="left" valign="bottom" id="r1c1-t24">Property</th>
+<th align="left" valign="bottom" id="r1c2-t24">Description</th>
+<th align="left" valign="bottom" id="r1c3-t24">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t26" headers="r1c1-t26">Join Column</td>
-<td align="left" headers="r2c1-t26 r1c2-t26"><a id="sthref146" name="sthref146"></a><a id="sthref147" name="sthref147"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
-<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
-</td>
-<td align="left" headers="r2c1-t26 r1c3-t26">By default, the mapping is assumed to have a single join.</td>
+<td align="left" id="r2c1-t24" headers="r1c1-t24">Name</td>
+<td align="left" headers="r2c1-t24 r1c2-t24">Name of the join table</td>
+<td align="left" headers="r2c1-t24 r1c3-t24">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t24" headers="r1c1-t24">Join Columns</td>
+<td align="left" headers="r3c1-t24 r1c2-t24">Specify two or more join columns (that is, a primary key).</td>
+<td align="left" headers="r3c1-t24 r1c3-t24"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t24" headers="r1c1-t24">Inverse Join Columns</td>
+<td align="left" headers="r4c1-t24 r1c2-t24">The join column on the owned (or inverse) side of the association: the owned entity's primary key column.</td>
+<td align="left" headers="r4c1-t24 r1c3-t24"><br /></td>
</tr>
</tbody>
</table>
@@ -108,11 +154,16 @@
</ol>
<p>Eclipse adds the following annotations to the field:</p>
<pre xml:space="preserve" class="oac_no_warn">
-@OneToOne(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>, cascade=CascadeType.<span class="italic">&lt;CASCADE_TYPE&gt;</span>,
- fetch = FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>, mappedBy = "<span class="italic">&lt;MAPPED_BY&gt;</span>")
-@JoinColumn(name="<span class="italic">&lt;JOIN_COLUMN_NAME&gt;</span>", referencedColumnName=
- "<span class="italic">&lt;JOIN_COLUMN_REFERENCED_COLUMN&gt;</span>", insertable = <span class="italic">&lt;INSERTABLE&gt;</span>,
- updatable = <span class="italic">&lt;UPDATABLE&gt;</span>)
+@OneToMany(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>)
+@Column(name="<span class="italic">&lt;COLUMN&gt;</span>")
+
+
+@OneToMany(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>.class, cascade=CascadeType.<span class="italic">&lt;CASCADE_TYPE&gt;</span>,
+ fetch = FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>, mappedBy = "<span class="italic">&lt;MAPPED_BY&gt;</span>")@OrderBy("<span class="italic">&lt;ORDER_BY&gt;</span>")
+@JoinTable(name="<span class="italic">&lt;JOIN_TABLE_NAME&gt;</span>", joinColumns=@JoinColumn(name=
+ "<span class="italic">&lt;JOIN_COLUMN_NAME&gt;</span>", referencedColumnName="<span class="italic">&lt;JOIN_COLUMN_REFERENCED_COLUMN&gt;</span>"),
+ inverseJoinColumns=@JoinColumn(name="<span class="italic">&lt;INVERSE_JOIN_COLUMN_NAME&gt;</span>",
+ referencedColumnName="<span class="italic">&lt;INVERSE_JOIN_COLUMN_REFERENCED_COLUMN&gt;</span>"))
</pre>
<p>&nbsp;</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm
index 7d00676a13..9c58f8a42b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Transient mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:48Z" />
+<title>One-to-one mapping</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:44Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Transient mapping" />
+<meta name="doctitle" content="One-to-one mapping" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,22 +18,102 @@
<!-- contents -->
</head>
<body>
-<p><a id="BABHFHEI" name="BABHFHEI"></a></p>
+<p><a id="BABFHBCJ" name="BABFHBCJ"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Transient mapping</h1>
-<p><a id="sthref148" name="sthref148"></a><a id="sthref149" name="sthref149"></a><a id="sthref150" name="sthref150"></a><a id="sthref151" name="sthref151"></a>Use the Transient Mapping to specify a field of the entity class that <span class="italic">is not</span> persistent.</p>
-<p>To create a transient mapping:</p>
+<h1>One-to-one mapping</h1>
+<p><a id="sthref144" name="sthref144"></a><a id="sthref145" name="sthref145"></a><a id="sthref146" name="sthref146"></a><a id="sthref147" name="sthref147"></a>Use a <span class="bold">One-to-One Mapping</span> to define a relationship with one-to-many multiplicity.</p>
<ol>
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
</li>
<li>
-<p>Right-click the field and then select <span class="bold">Map As Transient</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
+<p>Right-click the field and then select <span class="bold">Map As &gt; One-to-One</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
</li>
+<li>
+<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields in the JPA Details view.</p>
+<div class="inftblruleinformal">
+<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="19%" />
+<col width="*" />
+<col width="41%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t25">Property</th>
+<th align="left" valign="bottom" id="r1c2-t25">Description</th>
+<th align="left" valign="bottom" id="r1c3-t25">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t25" headers="r1c1-t25">Mapped Entity Hyperlink</td>
+<td align="left" headers="r2c1-t25 r1c2-t25">Defines mapping as <span class="bold">One-to-One</span>. This corresponds to the <code>@OneToOne</code> annotation.</td>
+<td align="left" headers="r2c1-t25 r1c3-t25">One-to-One</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t25" headers="r1c1-t25">Target Entity</td>
+<td align="left" headers="r3c1-t25 r1c2-t25">The entity to which this attribute is mapped.</td>
+<td align="left" headers="r3c1-t25 r1c3-t25">null
+<p>You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t25" headers="r1c1-t25">Fetch Type</td>
+<td align="left" headers="r4c1-t25 r1c2-t25">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
+<ul>
+<li>
+<p>Eager</p>
+</li>
+<li>
+<p>Lazy</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r4c1-t25 r1c3-t25">Eager</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t25" headers="r1c1-t25">Mapped By</td>
+<td align="left" headers="r5c1-t25 r1c2-t25">The database field that owns the relationship.</td>
+<td align="left" headers="r5c1-t25 r1c3-t25"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblruleinformal" --></li>
+<li>
+<p>Use this table to complete the <a href="reference012.htm#CACFCEJC">Join Columns Information</a> fields in the <span class="gui-object-title">JPA Details</span> view.</p>
+<div class="inftblruleinformal">
+<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="19%" />
+<col width="*" />
+<col width="41%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t26">Property</th>
+<th align="left" valign="bottom" id="r1c2-t26">Description</th>
+<th align="left" valign="bottom" id="r1c3-t26">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t26" headers="r1c1-t26">Join Column</td>
+<td align="left" headers="r2c1-t26 r1c2-t26"><a id="sthref148" name="sthref148"></a><a id="sthref149" name="sthref149"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
+<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
+</td>
+<td align="left" headers="r2c1-t26 r1c3-t26">By default, the mapping is assumed to have a single join.</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblruleinformal" --></li>
</ol>
-<p>Eclipse adds the following annotation to the field:</p>
+<p>Eclipse adds the following annotations to the field:</p>
<pre xml:space="preserve" class="oac_no_warn">
-@Transient
+@OneToOne(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>, cascade=CascadeType.<span class="italic">&lt;CASCADE_TYPE&gt;</span>,
+ fetch = FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>, mappedBy = "<span class="italic">&lt;MAPPED_BY&gt;</span>")
+@JoinColumn(name="<span class="italic">&lt;JOIN_COLUMN_NAME&gt;</span>", referencedColumnName=
+ "<span class="italic">&lt;JOIN_COLUMN_REFERENCED_COLUMN&gt;</span>", insertable = <span class="italic">&lt;INSERTABLE&gt;</span>,
+ updatable = <span class="italic">&lt;UPDATABLE&gt;</span>)
+
</pre>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm
index d33b7ab508..b04bdb3c0a 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Version mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:48Z" />
+<title>Transient mapping</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:45Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Version mapping" />
+<meta name="doctitle" content="Transient mapping" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,92 +18,22 @@
<!-- contents -->
</head>
<body>
-<p><a id="BABHIBII" name="BABHIBII"></a></p>
+<p><a id="BABHFHEI" name="BABHFHEI"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Version mapping</h1>
-<p><a id="sthref152" name="sthref152"></a><a id="sthref153" name="sthref153"></a><a id="sthref154" name="sthref154"></a><a id="sthref155" name="sthref155"></a>Use a <span class="bold">Version Mapping</span> to specify the field used for optimistic locking. If the entity is associated with multiple tables, you should use a version mapping only with the primary table. You should have only a single version mapping per persistent entity. Version mappings may be used only with the following attribute types:</p>
-<ul>
-<li>
-<p><code>int</code></p>
-</li>
-<li>
-<p><code>Integer</code></p>
-</li>
-<li>
-<p><code>short, Short</code></p>
-</li>
-<li>
-<p><code>long, Long</code></p>
-</li>
-<li>
-<p><code>Timestamp</code></p>
-</li>
-</ul>
-<p>To create a version mapping:</p>
+<h1>Transient mapping</h1>
+<p><a id="sthref150" name="sthref150"></a><a id="sthref151" name="sthref151"></a><a id="sthref152" name="sthref152"></a><a id="sthref153" name="sthref153"></a>Use the Transient Mapping to specify a field of the entity class that <span class="italic">is not</span> persistent.</p>
+<p>To create a transient mapping:</p>
<ol>
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
</li>
<li>
-<p>Right-click the field and then select <span class="bold">Map As &gt; Version</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
-</li>
-<li>
-<p>Use this table to complete the remaining fields in the JPA Details view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="19%" />
-<col width="*" />
-<col width="38%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t27">Property</th>
-<th align="left" valign="bottom" id="r1c2-t27">Description</th>
-<th align="left" valign="bottom" id="r1c3-t27">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t27" headers="r1c1-t27">Mapped Entity Hyperlink</td>
-<td align="left" headers="r2c1-t27 r1c2-t27">Defines the mapping as Version. This corresponds to the <code>@Version</code> annotation.</td>
-<td align="left" headers="r2c1-t27 r1c3-t27">Version</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t27" headers="r1c1-t27">Column</td>
-<td align="left" headers="r3c1-t27 r1c2-t27">The database column mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.</td>
-<td align="left" headers="r3c1-t27 r1c3-t27">By default, the Column is assumed to be named identically to the attribute and always included in the <code>INSERT</code> and <code>UPDATE</code> statements.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t27" headers="r1c1-t27">Table</td>
-<td align="left" headers="r4c1-t27 r1c2-t27">Name of the database table. This must be the primary table associated with the attribute's entity.</td>
-<td align="left" headers="r4c1-t27 r1c3-t27"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t27" headers="r1c1-t27">Temporal</td>
-<td align="left" headers="r5c1-t27 r1c2-t27">Specifies the type of data. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.
-<ul>
-<li>
-<p>Date</p>
+<p>Right-click the field and then select <span class="bold">Map As Transient</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
</li>
-<li>
-<p>Time</p>
-</li>
-<li>
-<p>Timestamp</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r5c1-t27 r1c3-t27"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
</ol>
-<p>Eclipse adds the following annotations to the field:</p>
+<p>Eclipse adds the following annotation to the field:</p>
<pre xml:space="preserve" class="oac_no_warn">
-@Version
-@Column(table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>", name="&lt;<span class="italic">COLUMN_NAME</span>&gt;")
-
+@Transient
</pre>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
@@ -120,7 +50,6 @@
<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
<!-- class="sect2" -->
-<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm
index 8efbe14ba7..f9f3209292 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Generating entities from tables</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:48Z" />
+<title>Version mapping</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:45Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Generating entities from tables" />
+<meta name="doctitle" content="Version mapping" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,67 +18,108 @@
<!-- contents -->
</head>
<body>
-<p><a id="BABBAGFI" name="BABBAGFI"></a></p>
-<div class="sect1">
-<h1>Generating entities from tables</h1>
-<p><a id="sthref156" name="sthref156"></a><a id="sthref157" name="sthref157"></a>Use this procedure to generate Java persistent entities from database tables. You must create a JPA project and establish a database connection <span class="italic">before</span> generating persistent entities. See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> for more information.<a id="sthref158" name="sthref158"></a><a id="sthref159" name="sthref159"></a></p>
-<ol>
+<p><a id="BABHIBII" name="BABHIBII"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Version mapping</h1>
+<p><a id="sthref154" name="sthref154"></a><a id="sthref155" name="sthref155"></a><a id="sthref156" name="sthref156"></a><a id="sthref157" name="sthref157"></a>Use a <span class="bold">Version Mapping</span> to specify the field used for optimistic locking. If the entity is associated with multiple tables, you should use a version mapping only with the primary table. You should have only a single version mapping per persistent entity. Version mappings may be used only with the following attribute types:</p>
+<ul>
<li>
-<p>Right-click the JPA project in the <span class="gui-object-title">Project Explorer</span> and select <span class="gui-object-action">JPA Tools &gt; Generate Entities from Tables</span>.</p>
-<div class="figure"><a id="sthref160" name="sthref160"></a>
-<p class="titleinfigure">Generating Entities</p>
-<img src="img/generate_entities.png" alt="Using the JPA Tools &gt; Generate Entities menu option." title="Using the JPA Tools &gt; Generate Entities menu option." /><br /></div>
-<!-- class="figure" --></li>
+<p><code>int</code></p>
+</li>
<li>
-<p>On the <a href="ref_selectTables.htm#CIAHCGEE">Select Tables</a> page, select your database connection and schema.</p>
-<p>To create a new database connection, click <span class="bold">Add connection</span>.</p>
-<p>If you are not currently connected to the database, the Database Connection page appears. Select your database connection and schema, and click <span class="bold">Reconnect</span>.</p>
-<div class="figure"><a id="sthref161" name="sthref161"></a>
-<p class="titleinfigure">Select Tables</p>
-<img src="img/select_tables.png" alt="" title="" /><br /></div>
-<!-- class="figure" --></li>
+<p><code>Integer</code></p>
+</li>
<li>
-<p>After selecting a schema, select the tables from which to generate Java persistent entities and click <span class="bold">Next</span>.</p>
+<p><code>short, Short</code></p>
</li>
<li>
-<p>On the <a href="ref_tableAssociations.htm#CIACDICB">Table Associations</a> page, select the associations to generate. You can specify to generate specific references for each association.</p>
-<p>To create a new association, click <span class="bold">Add Association</span>. Use the <a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association</a> wizard to define the association.</p>
-<div class="figure"><a id="sthref162" name="sthref162"></a>
-<p class="titleinfigure">Table Associations</p>
-<img src="img/table_associations.png" alt="" title="" /><br /></div>
-<!-- class="figure" --></li>
+<p><code>long, Long</code></p>
+</li>
<li>
-<p>After editing the table associations, click <span class="bold">Next</span>.</p>
+<p><code>Timestamp</code></p>
</li>
+</ul>
+<p>To create a version mapping:</p>
+<ol>
+<li>
+<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
+</li>
+<li>
+<p>Right-click the field and then select <span class="bold">Map As &gt; Version</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
+</li>
+<li>
+<p>Use this table to complete the remaining fields in the JPA Details view.</p>
+<div class="inftblruleinformal">
+<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="19%" />
+<col width="*" />
+<col width="38%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t27">Property</th>
+<th align="left" valign="bottom" id="r1c2-t27">Description</th>
+<th align="left" valign="bottom" id="r1c3-t27">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t27" headers="r1c1-t27">Mapped Entity Hyperlink</td>
+<td align="left" headers="r2c1-t27 r1c2-t27">Defines the mapping as Version. This corresponds to the <code>@Version</code> annotation.</td>
+<td align="left" headers="r2c1-t27 r1c3-t27">Version</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t27" headers="r1c1-t27">Column</td>
+<td align="left" headers="r3c1-t27 r1c2-t27">The database column mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.</td>
+<td align="left" headers="r3c1-t27 r1c3-t27">By default, the Column is assumed to be named identically to the attribute and always included in the <code>INSERT</code> and <code>UPDATE</code> statements.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t27" headers="r1c1-t27">Table</td>
+<td align="left" headers="r4c1-t27 r1c2-t27">Name of the database table. This must be the primary table associated with the attribute's entity.</td>
+<td align="left" headers="r4c1-t27 r1c3-t27"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t27" headers="r1c1-t27">Temporal</td>
+<td align="left" headers="r5c1-t27 r1c2-t27">Specifies the type of data. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.
+<ul>
<li>
-<p>On the <a href="ref_customizeDefaultEntityGeneration.htm#CIAEJDBE">Customize Default Entity Generation</a> page, customize the mapping and class information for each generated entity.</p>
-<div class="figure"><a id="sthref163" name="sthref163"></a>
-<p class="titleinfigure">Customize Default Entity Generation</p>
-<img src="img/customize_default_entity_generation.png" alt="" title="" /><br /></div>
-<!-- class="figure" --></li>
+<p>Date</p>
+</li>
<li>
-<p>After customizing the mappings, click <span class="bold">Next</span>.</p>
+<p>Time</p>
</li>
<li>
-<p>On the <a href="ref_customizIndividualEntities.htm#CIACIGEE">Customize Individual Entities</a> page, review the mapping and class information for each entity that will be generated, then click <span class="bold">Finish</span>.</p>
-<div class="figure"><a id="sthref164" name="sthref164"></a>
-<p class="titleinfigure">Customize Individual Entities</p>
-<img src="img/customize_individual_entities.png" alt="" title="" /><br /></div>
-<!-- class="figure" --></li>
+<p>Timestamp</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r5c1-t27 r1c3-t27"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblruleinformal" --></li>
</ol>
-<p>Eclipse creates a Java persistent entity for each database table. Each entity contains fields based on the table's columns. Eclipse will also generate entity relationships (such as one-to-one) based on the table constraints. <a href="#CIHJIJJC">Figure: Generating Entities from Tables</a> illustrates how Eclipse generates entities from tables.</p>
-<div class="figure"><a id="CIHJIJJC" name="CIHJIJJC"></a>
-<p class="titleinfigure">Generating Entities from Tables</p>
-<img src="img/table_entity.png" alt="This figure shows the EMPLOYEE and ADDRESS entities generated from database tables." title="This figure shows the EMPLOYEE and ADDRESS entities generated from database tables." /><br /></div>
-<!-- class="figure" -->
+<p>Eclipse adds the following annotations to the field:</p>
+<pre xml:space="preserve" class="oac_no_warn">
+@Version
+@Column(table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>", name="&lt;<span class="italic">COLUMN_NAME</span>&gt;")
+
+</pre>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
+<br />
+<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
-<a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; Java Persistence Options</a></div>
-<!-- class="sect1" -->
+<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
+<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
+<p>&nbsp;</p>
+<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
+<br />
+<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
+<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
+<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm
index ab49e2e9d3..c785cd4dc0 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Generating tables from entities</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:49Z" />
+<title>Element Collection mapping</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:45Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Generating tables from entities" />
+<meta name="doctitle" content="Element Collection mapping" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,32 +18,11 @@
<!-- contents -->
</head>
<body>
-<p><a id="CIHJIGBE" name="CIHJIGBE"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Generating tables from entities</h1>
-<p>When using a vendor-specific platform, you can create a DDL script from your persistent entities.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-The DDL script with DROP existing tables on the database and CREATE new tables, based on the entities in your project.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-<p>To generate a DDL script:</p>
-<p>Right-click the JPA project in the <span class="gui-object-title">Project Explorer</span> and select <span class="gui-object-action">JPA Tools &gt; Generate Tables from Entities</span>.</p>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a></p>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; Java Persistence Options</a></div>
+<p><a id="CIHBDEAJ" name="CIHBDEAJ"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Element Collection mapping</h1>
+</div>
+<!-- class="sect2" -->
<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm
index 8d302ead68..358ebb8f33 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Validating mappings and reporting problems</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:49Z" />
+<title>Generating entities from tables</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:45Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Validating mappings and reporting problems" />
+<meta name="doctitle" content="Generating entities from tables" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,26 +18,67 @@
<!-- contents -->
</head>
<body>
-<p><a id="BABFAIBA" name="BABFAIBA"></a></p>
+<p><a id="BABBAGFI" name="BABBAGFI"></a></p>
<div class="sect1">
-<h1>Validating mappings and reporting problems</h1>
-<p><a id="sthref165" name="sthref165"></a><a id="sthref166" name="sthref166"></a><a id="sthref167" name="sthref167"></a><a id="sthref168" name="sthref168"></a>Errors and warnings on persistent entities and mappings are indicated with a red error or yellow warning next to the resource with the error, as well as the parent containers up to the project.</p>
-<div class="figure"><a id="sthref169" name="sthref169"></a>
-<p class="titleinfigure">Sample Errors and Warnings</p>
-<img src="img/error_sample.png" alt="This figure shows sample error and warning icons in the Explorer view." title="This figure shows sample error and warning icons in the Explorer view." /><br /></div>
-<!-- class="figure" -->
-<p>This section contains information on the following:</p>
-<ul>
+<h1>Generating entities from tables</h1>
+<p><a id="sthref158" name="sthref158"></a><a id="sthref159" name="sthref159"></a>Use this procedure to generate Java persistent entities from database tables. You must create a JPA project and establish a database connection <span class="italic">before</span> generating persistent entities. See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> for more information.<a id="sthref160" name="sthref160"></a><a id="sthref161" name="sthref161"></a></p>
+<ol>
+<li>
+<p>Right-click the JPA project in the <span class="gui-object-title">Project Explorer</span> and select <span class="gui-object-action">JPA Tools &gt; Generate Entities from Tables</span>.</p>
+<div class="figure"><a id="sthref162" name="sthref162"></a>
+<p class="titleinfigure">Generating Entities</p>
+<img src="img/generate_entities.png" alt="Using the JPA Tools &gt; Generate Entities menu option." title="Using the JPA Tools &gt; Generate Entities menu option." /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>On the <a href="ref_selectTables.htm#CIAHCGEE">Select Tables</a> page, select your database connection and schema.</p>
+<p>To create a new database connection, click <span class="bold">Add connection</span>.</p>
+<p>If you are not currently connected to the database, the Database Connection page appears. Select your database connection and schema, and click <span class="bold">Reconnect</span>.</p>
+<div class="figure"><a id="sthref163" name="sthref163"></a>
+<p class="titleinfigure">Select Tables</p>
+<img src="img/select_tables.png" alt="" title="" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>After selecting a schema, select the tables from which to generate Java persistent entities and click <span class="bold">Next</span>.</p>
+</li>
<li>
-<p><a href="tasks022.htm#CIHFEDEI">Error messages</a></p>
+<p>On the <a href="ref_tableAssociations.htm#CIACDICB">Table Associations</a> page, select the associations to generate. You can specify to generate specific references for each association.</p>
+<p>To create a new association, click <span class="bold">Add Association</span>. Use the <a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association</a> wizard to define the association.</p>
+<div class="figure"><a id="sthref164" name="sthref164"></a>
+<p class="titleinfigure">Table Associations</p>
+<img src="img/table_associations.png" alt="" title="" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>After editing the table associations, click <span class="bold">Next</span>.</p>
</li>
<li>
-<p><a href="tasks023.htm#CIHGEAIJ">Warning messages</a></p>
+<p>On the <a href="ref_customizeDefaultEntityGeneration.htm#CIAEJDBE">Customize Default Entity Generation</a> page, customize the mapping and class information for each generated entity.</p>
+<div class="figure"><a id="sthref165" name="sthref165"></a>
+<p class="titleinfigure">Customize Default Entity Generation</p>
+<img src="img/customize_default_entity_generation.png" alt="" title="" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>After customizing the mappings, click <span class="bold">Next</span>.</p>
</li>
-</ul>
+<li>
+<p>On the <a href="ref_customizIndividualEntities.htm#CIACIGEE">Customize Individual Entities</a> page, review the mapping and class information for each entity that will be generated, then click <span class="bold">Finish</span>.</p>
+<div class="figure"><a id="sthref166" name="sthref166"></a>
+<p class="titleinfigure">Customize Individual Entities</p>
+<img src="img/customize_individual_entities.png" alt="" title="" /><br /></div>
+<!-- class="figure" --></li>
+</ol>
+<p>Eclipse creates a Java persistent entity for each database table. Each entity contains fields based on the table's columns. Eclipse will also generate entity relationships (such as one-to-one) based on the table constraints. <a href="#CIHJIJJC">Figure: Generating Entities from Tables</a> illustrates how Eclipse generates entities from tables.</p>
+<div class="figure"><a id="CIHJIJJC" name="CIHJIJJC"></a>
+<p class="titleinfigure">Generating Entities from Tables</p>
+<img src="img/table_entity.png" alt="This figure shows the EMPLOYEE and ADDRESS entities generated from database tables." title="This figure shows the EMPLOYEE and ADDRESS entities generated from database tables." /><br /></div>
+<!-- class="figure" -->
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<p><a href="../org.eclipse.platform.doc.user/concepts/cprbview.htm">Problems view</a></p>
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; Java Persistence Options</a></div>
+<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
@@ -49,6 +90,6 @@
</tr>
</table>
</div>
-<!-- class="footer" --></div>
+<!-- class="footer" -->
</body>
</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks022.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks022.htm
index 26315e783b..6341e8970b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks022.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks022.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Error messages</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:49Z" />
+<title>Generating tables from entities</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:45Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Error messages" />
+<meta name="doctitle" content="Generating tables from entities" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,64 +18,33 @@
<!-- contents -->
</head>
<body>
-<p><a id="CIHFEDEI" name="CIHFEDEI"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Error messages<a id="sthref170" name="sthref170"></a></h1>
-<p>This section contains information on error messages (including how to resolve the issue) you may encounter while working with Dali.</p>
-<a id="sthref171" name="sthref171"></a>
-<p class="subhead2">Attribute "<span class="italic">&lt;ATTRIBUTE__NAME&gt;</span>" has invalid mapping type in this context</p>
-<p>The mapped attribute is invalid. Either change the mapping type or change the entity type.</p>
-<p>See <a href="task_mapping.htm#BABDGBIJ">"Mapping an entity"</a> for more information.</p>
-<a id="sthref172" name="sthref172"></a>
-<p class="subhead2">Attribute "<span class="italic">&lt;ATTRIBUTE_NAME&gt;</span>" cannot be resolved.</p>
-<p>Dali cannot map the attribute to a database table and column. Verify that you database connection information is correct.</p>
-<p>See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> for more information.</p>
-<a id="sthref173" name="sthref173"></a>
-<p class="subhead2">Class "<span class="italic">&lt;CLASS_NAME&gt;</span>" is not annotated as a persistent class.</p>
-<p>The class has not been identified as a persistent class. Configure the class as an Entity, Mapped Superclass, or Embeddable persistent entity.</p>
-<p>See <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a>.</p>
-<a id="sthref174" name="sthref174"></a>
-<p class="subhead2">Column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" cannot be resolved.</p>
-<p>You mapped an entity's field to an incorrect or invalid column in the database table. By default, Dali will attempt to map each field in the entity with an identically named row in the database table. If the field's name differs from the row's name, you must explicitly create the mapping.</p>
-<p>Map the field to a valid row in the database table as shown in <a href="task_mapping.htm#BABDGBIJ">"Mapping an entity"</a>.</p>
-<a id="sthref175" name="sthref175"></a>
-<p class="subhead2">Duplicate class "<span class="italic">&lt;CLASS_NAME&gt;</span>".</p>
-<p>You created to persistence classes with the same name. Each Java class must have a unique name. See <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a> for more information.</p>
-<a id="sthref176" name="sthref176"></a>
-<p class="subhead2">Entity does not have an Id or Embedded Id.</p>
-<p>You created a persistent entity without identifying its primary key. A persistent entity must have a primary key field designated with an <code>@Id</code> or <code>@EmbeddedId</code> annotation.</p>
-<p>Add an ID mapping to the entity as shown in <a href="tasks012.htm#BABGCBHG">"ID mapping"</a> or <a href="tasks011.htm#CIHDIAEE">"Embedded ID mapping"</a>.</p>
-<a id="sthref177" name="sthref177"></a>
-<p class="subhead2">Multiple persistence.xml files in project.</p>
-<p>You created a JPA project with more than one <code>persistence.xml</code> file. Each JPA project must contain a <span class="italic">single</span> <code>persistence.xml</code> file.</p>
-<p>See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for more information.</p>
-<a id="sthref178" name="sthref178"></a>
-<p class="subhead2">No persistence unit defined.</p>
-<p>There is no persistence unit defined in the <code>persistence.xml</code> file. Use the &lt;persistence-unit name="<span class="italic">&lt;PERSISTENCE_UNIT_NAME&gt;</span>" tag to define the persistent unit.</p>
-<p>See <a href="task_manage_orm.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
-<a id="sthref179" name="sthref179"></a>
-<p class="subhead2">No persistence.xml file in project.</p>
-<p>You created a JPA project without a <code>persistence.xml</code> file. Each JPA project must contain a <span class="italic">single</span> <code>persistence.xml</code> file.</p>
-<p>See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for more information.</p>
-<a id="sthref180" name="sthref180"></a>
-<p class="subhead2">Referenced column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" in join column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" cannot be resolved.</p>
-<p>The column that you selected to join a relationship mapping does not exist on the database table. Either select a different column on the <a href="reference011.htm#CACBAEBC">Join Table Information</a> or create the necessary column on the database table.</p>
-<p>See <a href="ref_persistence_map_view.htm#BABIFBAF">"JPA Details view (for attributes)"</a> for more information.</p>
-<a id="sthref181" name="sthref181"></a>
-<p class="subhead2">Schema "&lt;<span class="italic">SCHEMA_NAME</span>&gt;" cannot be resolved for table/join table "&lt;<span class="italic">TABLE_NAME</span>&gt;".</p>
-<p>Define the default database schema information in the persistence unit.</p>
-<p>See <a href="task_manage_orm.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
-<a id="sthref182" name="sthref182"></a>
-<p class="subhead2">Table "<span class="italic">&lt;TABLE_NAME&gt;</span>" cannot be resolved.</p>
-<p>You associated a persistent entity to an incorrect or invalid database table. By default, Dali will attempt to associate each persistent entity with an identically named database table. If the entity's name differs from the table's name, you must explicitly create the association.</p>
-<p>Associate the entity with a valid database table as shown in <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a>.</p>
-<a id="sthref183" name="sthref183"></a>
-<p class="subhead2">Unresolved generator "<span class="italic">&lt;GENERATOR_NAME&gt;</span>" is defined in persistence unit.</p>
-<p>You created a persistence entity that uses sequencing or a table generator, but did not define the generator in the persistence unit. Either define the generator by using an annotation or including it in the XML mapping file.</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<p><a href="../org.eclipse.platform.doc.user/concepts/cprbview.htm">Problems view</a></p>
-</div>
-<!-- class="sect2" -->
+<p><a id="CIHJIGBE" name="CIHJIGBE"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>Generating tables from entities</h1>
+<p>When using a vendor-specific platform, you can create a DDL script from your persistent entities.</p>
+<div align="center">
+<div class="inftblnote"><br />
+<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
+<tbody>
+<tr>
+<td align="left">
+<p class="notep1">Note:</p>
+The DDL script with DROP existing tables on the database and CREATE new tables, based on the entities in your project.</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblnote" --></div>
+<p>To generate a DDL script:</p>
+<p>Right-click the JPA project in the <span class="gui-object-title">Project Explorer</span> and select <span class="gui-object-action">JPA Tools &gt; Generate Tables from Entities</span>.</p>
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a></p>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; Java Persistence Options</a></div>
+<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm
index 85bc97c9d2..a1870e4d58 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Warning messages</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:49Z" />
+<title>Validating mappings and reporting problems</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:45Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Warning messages" />
+<meta name="doctitle" content="Validating mappings and reporting problems" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,22 +18,26 @@
<!-- contents -->
</head>
<body>
-<p><a id="CIHGEAIJ" name="CIHGEAIJ"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Warning messages</h1>
-<p>This section contains information on warning messages (including how to resolve the issue) you may encounter while working with Dali.</p>
-<a id="sthref184" name="sthref184"></a>
-<p class="subhead2">Connection "<span class="italic">&lt;CONNECTION_NAME&gt;</span>" is not active. No validation will be done against the data source.</p>
-<p>The database connection you specified to use with the JPA project is not active. The JPA project requires an active connection.</p>
-<a id="sthref185" name="sthref185"></a>
-<p class="subhead2">No connection specified for the project. No data-specific validation will be performed.</p>
-<p>You created a JPA project without specifying a database connection. The JPA project requires an active connection.</p>
-<p>See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> or <a href="tasks024.htm#BABDBCBI">"Modifying persistent project properties"</a> for information on specifying a database connection.</p>
+<p><a id="BABFAIBA" name="BABFAIBA"></a></p>
+<div class="sect1">
+<h1>Validating mappings and reporting problems</h1>
+<p><a id="sthref167" name="sthref167"></a><a id="sthref168" name="sthref168"></a><a id="sthref169" name="sthref169"></a><a id="sthref170" name="sthref170"></a>Errors and warnings on persistent entities and mappings are indicated with a red error or yellow warning next to the resource with the error, as well as the parent containers up to the project.</p>
+<div class="figure"><a id="sthref171" name="sthref171"></a>
+<p class="titleinfigure">Sample Errors and Warnings</p>
+<img src="img/error_sample.png" alt="This figure shows sample error and warning icons in the Explorer view." title="This figure shows sample error and warning icons in the Explorer view." /><br /></div>
+<!-- class="figure" -->
+<p>This section contains information on the following:</p>
+<ul>
+<li>
+<p><a href="tasks024.htm#CIHFEDEI">Error messages</a></p>
+</li>
+<li>
+<p><a href="tasks025.htm#CIHGEAIJ">Warning messages</a></p>
+</li>
+</ul>
+<p>&nbsp;</p>
<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
<p><a href="../org.eclipse.platform.doc.user/concepts/cprbview.htm">Problems view</a></p>
-</div>
-<!-- class="sect2" -->
-<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
@@ -45,6 +49,6 @@
</tr>
</table>
</div>
-<!-- class="footer" -->
+<!-- class="footer" --></div>
</body>
</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm
index 13bfc0d327..b3fee1f68d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Modifying persistent project properties</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:49Z" />
+<title>Error messages</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:45Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Modifying persistent project properties" />
+<meta name="doctitle" content="Error messages" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -18,35 +18,64 @@
<!-- contents -->
</head>
<body>
-<p><a id="BABDBCBI" name="BABDBCBI"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Modifying persistent project properties</h1>
-<p>Each persistent project must be associated with a database connection. To create a new database connection, click <span class="gui-object-action">Database Connection</span> use the New Connection wizard.</p>
-<p>Use this procedure to modify the vender-specific platform and database connection associated with your JPA project.</p>
-<ol>
-<li>
-<p>Right-click the project in the <span class="gui-object-title">Explorer</span> view and select <span class="gui-object-action">Properties</span>. The Properties page appears.</p>
-<div class="figure"><a id="sthref186" name="sthref186"></a>
-<p class="titleinfigure">The Properties Page</p>
-<img src="img/project_properties_tasks.png" alt="The Persistence page." title="The Persistence page." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Complete each field on the <a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; Java Persistence Options</a> click <span class="bold">OK</span>.</p>
-</li>
-</ol>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; Java Persistence Options</a>
-<p>&nbsp;</p>
+<p><a id="CIHFEDEI" name="CIHFEDEI"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Error messages<a id="sthref172" name="sthref172"></a></h1>
+<p>This section contains information on error messages (including how to resolve the issue) you may encounter while working with Dali.</p>
+<a id="sthref173" name="sthref173"></a>
+<p class="subhead2">Attribute "<span class="italic">&lt;ATTRIBUTE__NAME&gt;</span>" has invalid mapping type in this context</p>
+<p>The mapped attribute is invalid. Either change the mapping type or change the entity type.</p>
+<p>See <a href="task_mapping.htm#BABDGBIJ">"Mapping an entity"</a> for more information.</p>
+<a id="sthref174" name="sthref174"></a>
+<p class="subhead2">Attribute "<span class="italic">&lt;ATTRIBUTE_NAME&gt;</span>" cannot be resolved.</p>
+<p>Dali cannot map the attribute to a database table and column. Verify that you database connection information is correct.</p>
+<p>See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> for more information.</p>
+<a id="sthref175" name="sthref175"></a>
+<p class="subhead2">Class "<span class="italic">&lt;CLASS_NAME&gt;</span>" is not annotated as a persistent class.</p>
+<p>The class has not been identified as a persistent class. Configure the class as an Entity, Mapped Superclass, or Embeddable persistent entity.</p>
+<p>See <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a>.</p>
+<a id="sthref176" name="sthref176"></a>
+<p class="subhead2">Column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" cannot be resolved.</p>
+<p>You mapped an entity's field to an incorrect or invalid column in the database table. By default, Dali will attempt to map each field in the entity with an identically named row in the database table. If the field's name differs from the row's name, you must explicitly create the mapping.</p>
+<p>Map the field to a valid row in the database table as shown in <a href="task_mapping.htm#BABDGBIJ">"Mapping an entity"</a>.</p>
+<a id="sthref177" name="sthref177"></a>
+<p class="subhead2">Duplicate class "<span class="italic">&lt;CLASS_NAME&gt;</span>".</p>
+<p>You created to persistence classes with the same name. Each Java class must have a unique name. See <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a> for more information.</p>
+<a id="sthref178" name="sthref178"></a>
+<p class="subhead2">Entity does not have an Id or Embedded Id.</p>
+<p>You created a persistent entity without identifying its primary key. A persistent entity must have a primary key field designated with an <code>@Id</code> or <code>@EmbeddedId</code> annotation.</p>
+<p>Add an ID mapping to the entity as shown in <a href="tasks013.htm#BABGCBHG">"ID mapping"</a> or <a href="tasks012.htm#CIHDIAEE">"Embedded ID mapping"</a>.</p>
+<a id="sthref179" name="sthref179"></a>
+<p class="subhead2">Multiple persistence.xml files in project.</p>
+<p>You created a JPA project with more than one <code>persistence.xml</code> file. Each JPA project must contain a <span class="italic">single</span> <code>persistence.xml</code> file.</p>
+<p>See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for more information.</p>
+<a id="sthref180" name="sthref180"></a>
+<p class="subhead2">No persistence unit defined.</p>
+<p>There is no persistence unit defined in the <code>persistence.xml</code> file. Use the &lt;persistence-unit name="<span class="italic">&lt;PERSISTENCE_UNIT_NAME&gt;</span>" tag to define the persistent unit.</p>
+<p>See <a href="task_manage_orm.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
+<a id="sthref181" name="sthref181"></a>
+<p class="subhead2">No persistence.xml file in project.</p>
+<p>You created a JPA project without a <code>persistence.xml</code> file. Each JPA project must contain a <span class="italic">single</span> <code>persistence.xml</code> file.</p>
+<p>See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for more information.</p>
+<a id="sthref182" name="sthref182"></a>
+<p class="subhead2">Referenced column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" in join column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" cannot be resolved.</p>
+<p>The column that you selected to join a relationship mapping does not exist on the database table. Either select a different column on the <a href="reference011.htm#CACBAEBC">Join Table Information</a> or create the necessary column on the database table.</p>
+<p>See <a href="ref_persistence_map_view.htm#BABIFBAF">"JPA Details view (for attributes)"</a> for more information.</p>
+<a id="sthref183" name="sthref183"></a>
+<p class="subhead2">Schema "&lt;<span class="italic">SCHEMA_NAME</span>&gt;" cannot be resolved for table/join table "&lt;<span class="italic">TABLE_NAME</span>&gt;".</p>
+<p>Define the default database schema information in the persistence unit.</p>
+<p>See <a href="task_manage_orm.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
+<a id="sthref184" name="sthref184"></a>
+<p class="subhead2">Table "<span class="italic">&lt;TABLE_NAME&gt;</span>" cannot be resolved.</p>
+<p>You associated a persistent entity to an incorrect or invalid database table. By default, Dali will attempt to associate each persistent entity with an identically named database table. If the entity's name differs from the table's name, you must explicitly create the association.</p>
+<p>Associate the entity with a valid database table as shown in <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a>.</p>
+<a id="sthref185" name="sthref185"></a>
+<p class="subhead2">Unresolved generator "<span class="italic">&lt;GENERATOR_NAME&gt;</span>" is defined in persistence unit.</p>
+<p>You created a persistence entity that uses sequencing or a table generator, but did not define the generator in the persistence unit. Either define the generator by using an annotation or including it in the XML mapping file.</p>
<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a></div>
-<!-- class="sect1" -->
+<p><a href="../org.eclipse.platform.doc.user/concepts/cprbview.htm">Problems view</a></p>
+</div>
+<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm
new file mode 100644
index 0000000000..f6bbacb426
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm
@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Warning messages</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:45Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Warning messages" />
+<meta name="relnum" content="Release 2.3" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIHGEAIJ" name="CIHGEAIJ"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Warning messages</h1>
+<p>This section contains information on warning messages (including how to resolve the issue) you may encounter while working with Dali.</p>
+<a id="sthref186" name="sthref186"></a>
+<p class="subhead2">Connection "<span class="italic">&lt;CONNECTION_NAME&gt;</span>" is not active. No validation will be done against the data source.</p>
+<p>The database connection you specified to use with the JPA project is not active. The JPA project requires an active connection.</p>
+<a id="sthref187" name="sthref187"></a>
+<p class="subhead2">No connection specified for the project. No data-specific validation will be performed.</p>
+<p>You created a JPA project without specifying a database connection. The JPA project requires an active connection.</p>
+<p>See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> or <a href="tasks026.htm#BABDBCBI">"Modifying persistent project properties"</a> for information on specifying a database connection.</p>
+<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
+<p><a href="../org.eclipse.platform.doc.user/concepts/cprbview.htm">Problems view</a></p>
+</div>
+<!-- class="sect2" -->
+<!-- class="sect1" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks026.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks026.htm
new file mode 100644
index 0000000000..295a03a8bb
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks026.htm
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Modifying persistent project properties</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:45Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Modifying persistent project properties" />
+<meta name="relnum" content="Release 2.3" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="BABDBCBI" name="BABDBCBI"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>Modifying persistent project properties</h1>
+<p>Each persistent project must be associated with a database connection. To create a new database connection, click <span class="gui-object-action">Database Connection</span> use the New Connection wizard.</p>
+<p>Use this procedure to modify the vender-specific platform and database connection associated with your JPA project.</p>
+<ol>
+<li>
+<p>Right-click the project in the <span class="gui-object-title">Explorer</span> view and select <span class="gui-object-action">Properties</span>. The Properties page appears.</p>
+<div class="figure"><a id="sthref188" name="sthref188"></a>
+<p class="titleinfigure">The Properties Page</p>
+<img src="img/project_properties_tasks.png" alt="The Persistence page." title="The Persistence page." /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Complete each field on the <a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; Java Persistence Options</a> click <span class="bold">OK</span>.</p>
+</li>
+</ol>
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; Java Persistence Options</a>
+<p>&nbsp;</p>
+<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
+<br />
+<a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a></div>
+<!-- class="sect1" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tips_and_tricks.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tips_and_tricks.htm
index 49f3a06271..a47917f7e1 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tips_and_tricks.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tips_and_tricks.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Tips and tricks</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:56Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:49Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content=" Tips and tricks" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml b/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml
index 8251cc9b93..62e7a550f6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='iso-8859-1'?>
<!-- User Guide -->
- <toc label="Dali Java Persistence Tools User Guide">
+ <toc label="Dali Java Persistence Tools User Guide"><topic label="Dali Java Persistence Tools User Guide">
<topic href="getting_started.htm" label="Getting started">
<topic href="getting_started001.htm#BABEFHCD" label="Requirements and installation" />
<topic href="getting_started002.htm#BABIGCJA" label="Dali quick start">
@@ -22,38 +22,40 @@
<topic href="task_create_jpa_entity.htm#BABFBJBG" label="Creating a JPA Entity" />
<topic href="task_manage_persistence.htm#CIHDAJID" label="Managing the persistence.xml file">
<topic href="tasks002.htm#CIHFEBAI" label="Synchronizing classes" />
+ <topic href="tasks003.htm#sthref56" label="Upgrading document version" />
</topic>
<topic href="task_manage_orm.htm#CIHDGDCD" label="Managing the orm.xml file">
- <topic href="tasks003.htm#sthref59" label="Creating an orm.xml file" />
- <topic href="tasks004.htm#CIHBCDCE" label="Working with orm.xml file" />
+ <topic href="tasks004.htm#sthref60" label="Creating an orm.xml file" />
+ <topic href="tasks005.htm#CIHBCDCE" label="Working with orm.xml file" />
</topic>
<topic href="task_add_persistence.htm#BABHICAI" label="Adding persistence to a class">
- <topic href="tasks005.htm#BABGBIEE" label="Entity" />
- <topic href="tasks006.htm#BABFEICE" label="Embeddable" />
- <topic href="tasks007.htm#BABDAGCI" label="Mapped superclass" />
+ <topic href="tasks006.htm#BABGBIEE" label="Entity" />
+ <topic href="tasks007.htm#BABFEICE" label="Embeddable" />
+ <topic href="tasks008.htm#BABDAGCI" label="Mapped superclass" />
</topic>
<topic href="task_additonal_tables.htm#CIHGBIEI" label="Specifying additional tables" />
<topic href="task_inheritance.htm#CIHCCCJD" label="Specifying entity inheritance" />
- <topic href="tasks008.htm#BABIGBGG" label="Creating Named Queries" />
+ <topic href="tasks009.htm#BABIGBGG" label="Creating Named Queries" />
<topic href="task_mapping.htm#BABDGBIJ" label="Mapping an entity">
- <topic href="tasks009.htm#BABBABCE" label="Basic mapping" />
- <topic href="tasks010.htm#BABCBHDF" label="Embedded mapping" />
- <topic href="tasks011.htm#CIHDIAEE" label="Embedded ID mapping" />
- <topic href="tasks012.htm#BABGCBHG" label="ID mapping" />
- <topic href="tasks013.htm#BABEIEGD" label="Many-to-many mapping" />
- <topic href="tasks014.htm#BABHFAFJ" label="Many-to-one mapping" />
- <topic href="tasks015.htm#BABHGEBD" label="One-to-many mapping" />
- <topic href="tasks016.htm#BABFHBCJ" label="One-to-one mapping" />
- <topic href="tasks017.htm#BABHFHEI" label="Transient mapping" />
- <topic href="tasks018.htm#BABHIBII" label="Version mapping" />
+ <topic href="tasks010.htm#BABBABCE" label="Basic mapping" />
+ <topic href="tasks011.htm#BABCBHDF" label="Embedded mapping" />
+ <topic href="tasks012.htm#CIHDIAEE" label="Embedded ID mapping" />
+ <topic href="tasks013.htm#BABGCBHG" label="ID mapping" />
+ <topic href="tasks014.htm#BABEIEGD" label="Many-to-many mapping" />
+ <topic href="tasks015.htm#BABHFAFJ" label="Many-to-one mapping" />
+ <topic href="tasks016.htm#BABHGEBD" label="One-to-many mapping" />
+ <topic href="tasks017.htm#BABFHBCJ" label="One-to-one mapping" />
+ <topic href="tasks018.htm#BABHFHEI" label="Transient mapping" />
+ <topic href="tasks019.htm#BABHIBII" label="Version mapping" />
+ <topic href="tasks020.htm#CIHBDEAJ" label="Element Collection mapping" />
</topic>
- <topic href="tasks019.htm#BABBAGFI" label="Generating entities from tables" />
- <topic href="tasks020.htm#CIHJIGBE" label="Generating tables from entities" />
- <topic href="tasks021.htm#BABFAIBA" label="Validating mappings and reporting problems">
- <topic href="tasks022.htm#CIHFEDEI" label="Error messages" />
- <topic href="tasks023.htm#CIHGEAIJ" label="Warning messages" />
+ <topic href="tasks021.htm#BABBAGFI" label="Generating entities from tables" />
+ <topic href="tasks022.htm#CIHJIGBE" label="Generating tables from entities" />
+ <topic href="tasks023.htm#BABFAIBA" label="Validating mappings and reporting problems">
+ <topic href="tasks024.htm#CIHFEDEI" label="Error messages" />
+ <topic href="tasks025.htm#CIHGEAIJ" label="Warning messages" />
</topic>
- <topic href="tasks024.htm#BABDBCBI" label="Modifying persistent project properties" />
+ <topic href="tasks026.htm#BABDBCBI" label="Modifying persistent project properties" />
</topic>
<topic label=" Reference">
<topic label="Wizards">
@@ -88,7 +90,7 @@
<topic href="reference007.htm#CACIJBGH" label="Attribute overrides" />
<topic href="reference008.htm#CACBHIDA" label="Secondary table information" />
<topic href="reference009.htm#CACFHGHE" label="Inheritance information" />
- <topic href="reference010.htm#sthref226" label="Queries" />
+ <topic href="reference010.htm#sthref227" label="Queries" />
</topic>
<topic href="ref_persistence_map_view.htm#BABIFBAF" label="JPA Details view (for attributes)">
<topic href="ref_mapping_general.htm#CACBHFIJ" label="General information" />
@@ -118,28 +120,31 @@
</topic>
<topic label="Preferences">
<topic href="ref_project_properties.htm#BABJHBCI" label="Project Properties page - Java Persistence Options" />
+ <topic href="reference027.htm#CACFBAEH" label="Project Properties page - Validation Preferences" />
</topic>
<topic label="Dialogs">
- <topic href="reference028.htm#CACCGEHC" label="Edit Join Columns Dialog" />
+ <topic href="reference029.htm#CACCGEHC" label="Edit Join Columns Dialog" />
<topic href="ref_select_cascade_dialog.htm#CIAFDGIJ" label="Select Cascade dialog" />
<topic href="ref_eclipselink_mapping_file.htm#CIAEDEJF" label="New EclipseLink Mapping File dialog" />
<topic href="ref_add_converter.htm#CIAGCGIJ" label="Add Converter dialog" />
</topic>
<topic href="ref_persistence_perspective.htm#BABIFBDB" label="JPA Development perspective" />
<topic label="Icons and buttons">
- <topic href="reference030.htm#CACGEACG" label="Icons" />
- <topic href="reference031.htm#CACDJCEI" label="Buttons" />
+ <topic href="reference031.htm#CACGEACG" label="Icons" />
+ <topic href="reference032.htm#CACDJCEI" label="Buttons" />
</topic>
- <topic href="reference032.htm#CACBBDIB" label="Dali Developer Documentation" />
+ <topic href="reference033.htm#CACBBDIB" label="Dali Developer Documentation" />
</topic>
<topic href="tips_and_tricks.htm" label="Tips and tricks">
- <topic href="whats_new001.htm#CJACEDDE" label="JPA Library Management" />
- <topic href="whats_new002.htm#CJADIFHJ" label="New Generate Entities from Tables Wizard" />
- <topic href="whats_new003.htm#CJABIJEC" label="Conversion of Java Projects to JPA Projects" />
- <topic href="whats_new004.htm#CJACJBDA" label="EclipseLink 1.1 Support" />
- <topic href="whats_new005.htm#sthref286" label="Table-per-Concrete-Class Inheritance" />
+ <topic href="whats_new001.htm#sthref292" label="Improved Internationalization and Localization" />
+ <topic href="whats_new002.htm#CJACEDDE" label="Multiple Improvements to the Dali Perspective" />
+ <topic href="whats_new003.htm#CJADIFHJ" label="Support for JPA 2.0 and EclipseLink" />
+ <topic href="whats_new004.htm#CJABIJEC" label="Conversion of Java Projects to JPA Projects" />
+ <topic href="whats_new005.htm#CJACJBDA" label="EclipseLink 2.x Support" />
+ <topic href="whats_new006.htm#sthref293" label="Table-per-Concrete-Class Inheritance" />
</topic>
<topic href="legal.htm" label=" Legal">
- <topic href="about.htm#sthref288" label="About this content" />
+ <topic href="about.htm#sthref295" label="About this content" />
</topic>
+ </topic>
</toc>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm
index 2dd89cb722..95294a3e2d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>What's new</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:56Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:49Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content=" What's new" />
<meta name="relnum" content="Release 2.3" />
@@ -18,7 +18,7 @@
<!-- contents -->
</head>
<body>
-<p><a id="sthref286" name="sthref286"></a> What's new</p>
+<p><a id="sthref291" name="sthref291"></a> What's new</p>
<p>This section contains descriptions of the following new features and significant changes made to the Dali OR Mapping Tool for Release 2.3:</p>
<ul>
<li>
@@ -31,7 +31,7 @@
<p><a href="whats_new004.htm#CJABIJEC">Conversion of Java Projects to JPA Projects</a></p>
</li>
<li>
-<p><a href="whats_new005.htm#CJACJBDA">EclipseLink 1.1 Support</a></p>
+<p><a href="whats_new005.htm#CJACJBDA">EclipseLink 2.x Support</a></p>
</li>
</ul>
<!-- Start Footer -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm
index 2efa8a6d3e..70ca442b7b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Improved Internationalization and Localization</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:56Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:49Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Improved Internationalization and Localization" />
<meta name="relnum" content="Release 2.3" />
@@ -18,7 +18,7 @@
<!-- contents -->
</head>
<body>
-<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref287" name="sthref287"></a>
+<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref292" name="sthref292"></a>
<h1>Improved Internationalization and Localization</h1>
<p>This release of the Dali OR Mapping Tool provides improved internationalization (i18n) and localization support. Dali projects can support different locales and processing of international data (such as dates and strings).</p>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm
index 2ea82eec01..46b15e5afc 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Multiple Improvements to the Dali Perspective</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:56Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:49Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Multiple Improvements to the Dali Perspective" />
<meta name="relnum" content="Release 2.3" />
@@ -29,6 +29,9 @@
<li>
<p>Dali will perform validation after refreshing database information.</p>
</li>
+<li>
+<p>Dali allows project-level customization for validation (error and warning reports)</p>
+</li>
</ul>
</div>
<!-- class="sect1" -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm
index 13f731a5e5..5061cc4f3a 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Support for JPA 2.0 and EclipseLink</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:56Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:49Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Support for JPA 2.0 and EclipseLink" />
<meta name="relnum" content="Release 2.3" />
@@ -22,6 +22,29 @@
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>Support for JPA 2.0 and EclipseLink</h1>
<p>This release of the Dali OR Mapping Tool supports generic JPA 2.0 as well as specific items for EclispeLink 1.2.</p>
+<ul>
+<li>
+<p>Derived IDs</p>
+</li>
+<li>
+<p>Caching (Shared Cache and Cachable)</p>
+</li>
+<li>
+<p>Canonical metamodel generation</p>
+</li>
+<li>
+<p>Order Column configuration</p>
+</li>
+<li>
+<p>ElementCollection mapping type</p>
+</li>
+<li>
+<p>Cascade detach</p>
+</li>
+<li>
+<p>Dali will upgrade your <code>persistence.xml</code> from JPA 1.0 to 2.0.</p>
+</li>
+</ul>
</div>
<!-- class="sect1" -->
<!-- Start Footer -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm
index dcdff9ca48..7ad545bfb6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Conversion of Java Projects to JPA Projects</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:56Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:49Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Conversion of Java Projects to JPA Projects" />
<meta name="relnum" content="Release 2.3" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm
index baa5e14f03..431f99807f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>EclipseLink 1.1 Support</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:56Z" />
+<title>EclipseLink 2.x Support</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:49Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="EclipseLink 1.1 Support" />
+<meta name="doctitle" content="EclipseLink 2.x Support" />
<meta name="relnum" content="Release 2.3" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -20,16 +20,8 @@
<body>
<p><a id="CJACJBDA" name="CJACJBDA"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>EclipseLink 1.1 Support</h1>
-<p>Release 2.3 provides support of the following EclipseLink 1.1 features.</p>
-<ul>
-<li>
-<p>EclipseLink XML mapping file and its configuration options</p>
-</li>
-<li>
-<p>One-to-Many mapping <span class="italic">without</span> a join table.</p>
-</li>
-</ul>
+<h1>EclipseLink 2.x Support</h1>
+<p>Release 2.3 provides support for EclipseLink 2.x features.</p>
<p>EclipseLink (the Eclipse Persistence Services Project) is a complete persistence frame work. Refer to <code><a href="http://www.eclipse.org/eclipselink/">http://www.eclipse.org/eclipselink/</a></code> for more information.</p>
</div>
<!-- class="sect1" -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new006.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new006.htm
index 213652d5c9..712867a5cc 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new006.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new006.htm
@@ -7,8 +7,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Table-per-Concrete-Class Inheritance</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
-<meta name="date" content="2010-01-22T9:29:56Z" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
+<meta name="date" content="2010-05-19T8:12:49Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Table-per-Concrete-Class Inheritance" />
<meta name="relnum" content="Release 2.3" />
@@ -18,7 +18,7 @@
<!-- contents -->
</head>
<body>
-<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref288" name="sthref288"></a>
+<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref293" name="sthref293"></a>
<h1>Table-per-Concrete-Class Inheritance</h1>
<p>The Dali OR Mapping Tool now supports the JPA 1.0-optional table-per-concrete-class inheritance option. This functionality may be required in JPA 2.0.</p>
</div>

Back to the top