Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/about.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm12
-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.htm16
-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/css/blafdoc.css10
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm7
-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/new_jaxb_facet_task.pngbin0 -> 19649 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/new_jaxb_project_task.pngbin0 -> 26623 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_jaxb_project.pngbin0 -> 19247 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/index.xml782
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/legal.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm12
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_add_converter.htm22
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_association_cardinality.htm12
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_association_table.htm22
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_create_custom_entities_wizard.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_create_jpa_entity_wizard.htm6
-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.htm12
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm12
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm16
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_eclipselink_mapping_file.htm36
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_java_page.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_join_columns.htm12
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm14
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project.htm8
-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.htm90
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm42
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_outline.htm10
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm10
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_prop_view.htm34
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_xmll_editor.htm28
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_primary_key.htm144
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_project_properties.htm62
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm12
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_select_cascade_dialog.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm12
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference.htm16
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm11
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm12
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm12
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm12
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm12
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm10
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm10
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm40
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm114
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm77
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm125
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm74
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm67
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm240
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm186
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm156
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm73
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm257
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm280
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm159
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm129
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm151
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm199
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm137
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm143
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm100
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm143
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm119
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm130
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm137
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm201
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm203
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference035.htm132
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference036.htm137
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference037.htm142
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference038.htm145
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference039.htm129
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference040.htm57
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference041.htm144
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference042.htm137
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference043.htm171
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference044.htm123
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference045.htm91
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference046.htm238
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference047.htm241
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference048.htm189
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference049.htm279
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference050.htm299
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference051.htm210
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference052.htm143
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference053.htm280
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference054.htm231
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference055.htm131
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference056.htm88
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference057.htm88
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference058.htm74
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference059.htm79
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference060.htm104
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference061.htm71
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference062.htm77
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference063.htm72
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference064.htm83
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference065.htm83
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference066.htm79
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference067.htm56
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference068.htm95
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference069.htm159
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference070.htm52
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference071.htm83
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference072.htm86
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference073.htm92
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference074.htm79
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference075.htm83
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference076.htm46
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference077.htm192
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference078.htm69
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference079.htm53
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm22
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm12
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_create_jpa_entity.htm30
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm26
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm18
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm74
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm30
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm25
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm109
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm105
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm63
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm48
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm67
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm58
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm73
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm57
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm68
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm115
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm79
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm40
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm34
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm56
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm58
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm48
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm58
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm53
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm48
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm65
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm113
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks022.htm129
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm135
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm106
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm108
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks026.htm71
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks027.htm57
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks028.htm47
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks029.htm61
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tips_and_tricks.htm12
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/title.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/toc.xml182
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm4
-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.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm4
173 files changed, 7297 insertions, 6285 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/about.htm b/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
index d07445c03d..4626da6588 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
@@ -8,7 +8,7 @@
<title>About this content</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:45Z" />
+<meta name="date" content="2012-09-19T13:28:3Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="About this content" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref650" name="sthref650"></a>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref698" name="sthref698"></a>
<h1>About this content</h1>
<p>August, 2012</p>
-<a id="sthref651" name="sthref651"></a>
+<a id="sthref699" name="sthref699"></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/concept_mapping.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm
index 9d0dd9d343..fc0302f212 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm
@@ -8,7 +8,7 @@
<title>Understanding OR mappings</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:37Z" />
+<meta name="date" content="2012-09-19T13:27:54Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Understanding OR mappings" />
<meta name="relnum" content="Release 3.2" />
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="BABBDJFI" name="BABBDJFI"></a></p>
<div class="sect1">
<h1>Understanding OR mappings</h1>
@@ -26,8 +26,12 @@
<p>You can use these mappings to map simple data types including primitives (such as <code>int</code>), JDK classes (such as <code>String</code>), and large object (LOB) values. You can also use them to transform object data members that reference other domain objects by way of association where data source representations require object identity maintenance (such as sequencing and back references) and possess various types of multiplicity and navigability. The appropriate mapping class is chosen primarily by the cardinality of the relationship.</p>
<a id="sthref24" name="sthref24"></a>
<p class="subhead2">Related tasks</p>
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></div>
+<ul>
+<li>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
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 0d0f63d0bb..58213bedca 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm
@@ -8,7 +8,7 @@
<title>Understanding Java persistence</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:36Z" />
+<meta name="date" content="2012-09-19T13:27:54Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Understanding Java persistence" />
<meta name="relnum" content="Release 3.2" />
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="BABCAHIC" name="BABCAHIC"></a></p>
<div class="sect1">
<h1>Understanding Java persistence</h1>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
index 26f981e398..f93e345703 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
@@ -8,7 +8,7 @@
<title>Concepts</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:36Z" />
+<meta name="date" content="2012-09-19T13:27:54Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Concepts" />
<meta name="relnum" content="Release 3.2" />
@@ -18,7 +18,7 @@
</head>
<body>
<p><a id="sthref19" name="sthref19"></a></p>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<h1>Concepts</h1>
<p>This section contains an overview of concepts you should be familiar with when using Dali to create mappings for Java persistent entities.</p>
<ul>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
index e6520d8c93..16045051b7 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
@@ -8,7 +8,7 @@
<title>Understanding Java Persistence API</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:37Z" />
+<meta name="date" content="2012-09-19T13:27:54Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Understanding Java Persistence API" />
<meta name="relnum" content="Release 3.2" />
@@ -17,17 +17,25 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="BABBGFJG" name="BABBGFJG"></a></p>
<div class="sect1">
<h1>Understanding Java Persistence API</h1>
<p><a id="sthref25" name="sthref25"></a>The Java Persistence API (JPA) part of the Java EE EJB 3.0 specification, simplifies Java persistence. It provides an object-relational mapping approach that lets you declaratively define how to map Java objects to relational database tables in a standard, portable way. JPA works both inside a Java EE application server and outside an EJB container in a Java Standard Edition (Java SE) application. An application written according to the JPA specification is scalable, transactional, and secure.</p>
<a id="sthref26" name="sthref26"></a>
<p class="subhead2">Related tasks</p>
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a><a id="sthref27" name="sthref27"></a>
+<ul>
+<li>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
+</li>
+</ul>
+<a id="sthref27" name="sthref27"></a>
<p class="subhead2">Related concepts</p>
+<ul>
+<li>
<p>Java Persistence Architecture 2.0 specification (<code><a href="http://jcp.org/en/jsr/detail?id=317">http://jcp.org/en/jsr/detail?id=317</a></code>)</p>
+</li>
+</ul>
<!-- 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/concepts002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
index d2e8e0c0eb..904d8c7ad4 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
@@ -8,7 +8,7 @@
<title>The persistence.xml file</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:37Z" />
+<meta name="date" content="2012-09-19T13:27:54Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="The persistence.xml file" />
<meta name="relnum" content="Release 3.2" />
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CHDHAGIH" name="CHDHAGIH"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1><a id="sthref28" name="sthref28"></a>The persistence.xml file</h1>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
index 5c76c673f5..920b466dca 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
@@ -8,7 +8,7 @@
<title>The orm.xml file</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:37Z" />
+<meta name="date" content="2012-09-19T13:27:54Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="The orm.xml file" />
<meta name="relnum" content="Release 3.2" />
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CHDBIJAC" name="CHDBIJAC"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1><a id="sthref31" name="sthref31"></a>The orm.xml file</h1>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/css/blafdoc.css b/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/css/blafdoc.css
index ccecb96541..2f80e27062 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/css/blafdoc.css
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/css/blafdoc.css
@@ -1,3 +1,7 @@
+/*
+CSS for Dali Java Persistence Tools User Guide
+*/
+
@import url("../../../PRODUCT_PLUGIN/book.css");
@@ -5,13 +9,13 @@ span.control, span.gui-object-action, p.subhead2, span.bold, p.notep1 {
font-weight: bold;
}
-span.name, p.titleinfigure, span.italic {
+p.titleinexample, span.name, p.titleinfigure, span.italic {
font-style: italic;
}
-p.titleinfigure {font-size:0.8em; font-weight:bold;}
+p.titleinexample, p.titleinfigure {font-size:0.8em; font-weight:bold;}
-p.titleinfigure, p.subhead2 {
+p.titleinexample, p.titleinfigure, p.subhead2 {
padding-top: 1em;
}
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 41e2daa933..c17022a576 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm
@@ -8,7 +8,7 @@
<title>Getting started</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:36Z" />
+<meta name="date" content="2012-09-19T13:27:53Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Getting started" />
<meta name="relnum" content="Release 3.2" />
@@ -18,7 +18,7 @@
</head>
<body>
<p><a id="sthref2" name="sthref2"></a></p>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<h1>Getting started</h1>
<p>This section provides information on getting started with the Java Persistence Tools.</p>
<ul>
@@ -29,8 +29,7 @@
<p><a href="getting_started002.htm#BABIGCJA">Dali quick start</a></p>
</li>
</ul>
-<p>For additional information, please visit the Dali home page at:</p>
-<p><code><a href="http://www.eclipse.org/webtools/dali/">http://www.eclipse.org/webtools/dali/</a></code>.</p>
+<p>For additional information, please visit the Dali home page at: <code><a href="http://www.eclipse.org/webtools/dali/">http://www.eclipse.org/webtools/dali/</a></code>.</p>
<!-- 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/getting_started001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm
index 1a5083f582..62e40772f6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm
@@ -8,7 +8,7 @@
<title>Requirements and installation</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:36Z" />
+<meta name="date" content="2012-09-19T13:27:53Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Requirements and installation" />
<meta name="relnum" content="Release 3.2" />
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="BABEFHCD" name="BABEFHCD"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>Requirements and installation<a id="sthref3" name="sthref3"></a><a id="sthref4" name="sthref4"></a></h1>
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 5ee28c73c4..6752246802 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm
@@ -8,7 +8,7 @@
<title>Dali quick start</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:36Z" />
+<meta name="date" content="2012-09-19T13:27:53Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Dali quick start" />
<meta name="relnum" content="Release 3.2" />
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="BABIGCJA" name="BABIGCJA"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>Dali quick start</h1>
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 3d40f45c10..44e4625731 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm
@@ -8,7 +8,7 @@
<title>Creating a new JPA project</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:36Z" />
+<meta name="date" content="2012-09-19T13:27:54Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Creating a new JPA project" />
<meta name="relnum" content="Release 3.2" />
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="BABDFHDA" name="BABDFHDA"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Creating a new JPA project</h1>
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 a640c799b1..14c1bc4d15 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm
@@ -8,7 +8,7 @@
<title>Creating a Java persistent entity with persistent fields</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:36Z" />
+<meta name="date" content="2012-09-19T13:27:54Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Creating a Java persistent entity with persistent fields" />
<meta name="relnum" content="Release 3.2" />
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="BABFGDDG" name="BABFGDDG"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Creating a Java persistent entity with persistent fields</h1>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jaxb_facet_task.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jaxb_facet_task.png
new file mode 100644
index 0000000000..08f5b02404
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jaxb_facet_task.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jaxb_project_task.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jaxb_project_task.png
new file mode 100644
index 0000000000..d4cb295011
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jaxb_project_task.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_jaxb_project.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_jaxb_project.png
new file mode 100644
index 0000000000..56b5469c55
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_jaxb_project.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 19b6d75617..804d1b0619 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/index.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/index.xml
@@ -1,562 +1,624 @@
<?xml version='1.0' encoding='iso-8859-1'?>
<index version="1.0">
<entry keyword="@Basic">
-<entry keyword="Basic mapping"><topic href="tasks010.htm#sthref172" /></entry>
-<entry keyword="Basic Mapping"><topic href="reference025.htm#sthref474" /></entry>
+<entry keyword="Basic mapping"><topic href="tasks011.htm#sthref185" /></entry>
+<entry keyword="Basic Mapping"><topic href="reference029.htm#sthref501" /></entry>
</entry>
<entry keyword="@Column">
-<entry keyword="Basic Mapping"><topic href="reference025.htm#sthref476" /></entry>
-<entry keyword="ID Mapping"><topic href="reference029.htm#sthref486" /></entry>
-<entry keyword="Version Mapping"><topic href="reference034.htm#sthref503" /></entry>
- </entry>
-<entry keyword="@DiscriminatorColumn, Inheritance"><topic href="reference018.htm#sthref425" /></entry>
-<entry keyword="@DiscriminatorValue, Inheritance"><topic href="reference018.htm#sthref423" /></entry>
-<entry keyword="@Embeddable, Embeddable"><topic href="tasks003.htm#sthref82" /></entry>
-<entry keyword="@Embedded, Embedded mapping"><topic href="tasks012.htm#sthref187" /></entry>
-<entry keyword="@EmbeddedId, Embedded ID mapping"><topic href="tasks013.htm#sthref195" /></entry>
-<entry keyword="@Entity, Entity"><topic href="tasks002.htm#sthref74" /></entry>
-<entry keyword="@Enumerated, Type information"><topic href="reference035.htm#sthref511" /></entry>
-<entry keyword="@GeneratedValue, Primary Key Generation information"><topic href="ref_primary_key.htm#sthref525" /></entry>
+<entry keyword="Basic Mapping"><topic href="reference029.htm#sthref503" /></entry>
+<entry keyword="ID Mapping"><topic href="reference033.htm#sthref513" /></entry>
+<entry keyword="Version Mapping"><topic href="reference038.htm#sthref530" /></entry>
+ </entry>
+<entry keyword="@DiscriminatorColumn, Inheritance"><topic href="reference022.htm#sthref450" /></entry>
+<entry keyword="@DiscriminatorValue, Inheritance"><topic href="reference022.htm#sthref448" /></entry>
+<entry keyword="@Embeddable, Embeddable"><topic href="tasks004.htm#sthref94" /></entry>
+<entry keyword="@Embedded, Embedded mapping"><topic href="tasks013.htm#sthref200" /></entry>
+<entry keyword="@EmbeddedId, Embedded ID mapping"><topic href="tasks014.htm#sthref208" /></entry>
+<entry keyword="@Entity, Entity"><topic href="tasks003.htm#sthref86" /></entry>
+<entry keyword="@Enumerated, Type information"><topic href="reference039.htm#sthref538" /></entry>
+<entry keyword="@GeneratedValue, Primary Key Generation information"><topic href="ref_primary_key.htm#sthref552" /></entry>
<entry keyword="@Id">
-<entry keyword="ID mapping"><topic href="tasks014.htm#sthref203" /></entry>
-<entry keyword="ID Mapping"><topic href="reference029.htm#sthref484" /></entry>
+<entry keyword="ID mapping"><topic href="tasks015.htm#sthref216" /></entry>
+<entry keyword="ID Mapping"><topic href="reference033.htm#sthref511" /></entry>
</entry>
-<entry keyword="@Inheritance, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref147" /></entry>
-<entry keyword="@JoinColumn, Joining Strategy"><topic href="reference039.htm#sthref521" /></entry>
-<entry keyword="@Lob, Type information"><topic href="reference035.htm#sthref506" /></entry>
+<entry keyword="@Inheritance, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref159" /></entry>
+<entry keyword="@JoinColumn, Joining Strategy"><topic href="reference043.htm#sthref548" /></entry>
+<entry keyword="@Lob, Type information"><topic href="reference039.htm#sthref533" /></entry>
<entry keyword="@ManyToMany">
-<entry keyword="Many-to-many mapping"><topic href="tasks015.htm#sthref212" /></entry>
-<entry keyword="Many-to-Many Mapping"><topic href="reference030.htm#sthref489" /></entry>
+<entry keyword="Many-to-many mapping"><topic href="tasks016.htm#sthref225" /></entry>
+<entry keyword="Many-to-Many Mapping"><topic href="reference034.htm#sthref516" /></entry>
</entry>
<entry keyword="@ManyToOne">
-<entry keyword="Many-to-one mapping"><topic href="tasks016.htm#sthref222" /></entry>
-<entry keyword="Many-to-One Mapping"><topic href="reference031.htm#sthref492" /></entry>
+<entry keyword="Many-to-one mapping"><topic href="tasks017.htm#sthref235" /></entry>
+<entry keyword="Many-to-One Mapping"><topic href="reference035.htm#sthref519" /></entry>
</entry>
-<entry keyword="@MappedSuperclass, Mapped superclass"><topic href="tasks004.htm#sthref90" /></entry>
-<entry keyword="@NamedQuery, Creating queries"><topic href="tasks009.htm#sthref159" /></entry>
-<entry keyword="@ObjectTypeConverter, Converters"><topic href="reference023.htm#sthref450" /></entry>
+<entry keyword="@MappedSuperclass, Mapped superclass"><topic href="tasks005.htm#sthref102" /></entry>
+<entry keyword="@NamedQuery, Creating queries"><topic href="tasks010.htm#sthref171" /></entry>
+<entry keyword="@ObjectTypeConverter, Converters"><topic href="reference027.htm#sthref475" /></entry>
<entry keyword="@OneToMany">
-<entry keyword="One-to-many mapping"><topic href="tasks017.htm#sthref229" /></entry>
-<entry keyword="One-to-Many Mapping"><topic href="reference032.htm#sthref495" /></entry>
+<entry keyword="One-to-many mapping"><topic href="tasks018.htm#sthref242" /></entry>
+<entry keyword="One-to-Many Mapping"><topic href="reference036.htm#sthref522" /></entry>
</entry>
<entry keyword="@OneToOne">
-<entry keyword="One-to-one mapping"><topic href="tasks018.htm#sthref237" /></entry>
-<entry keyword="One-to-One Mapping"><topic href="reference033.htm#sthref498" /></entry>
+<entry keyword="One-to-one mapping"><topic href="tasks019.htm#sthref250" /></entry>
+<entry keyword="One-to-One Mapping"><topic href="reference037.htm#sthref525" /></entry>
</entry>
-<entry keyword="@OrderBy, Ordering"><topic href="reference038.htm#sthref516" /></entry>
-<entry keyword="@SecondaryTable, Specifying additional tables"><topic href="task_additonal_tables.htm#sthref142" /></entry>
+<entry keyword="@OrderBy, Ordering"><topic href="reference042.htm#sthref543" /></entry>
+<entry keyword="@SecondaryTable, Specifying additional tables"><topic href="task_additonal_tables.htm#sthref154" /></entry>
<entry keyword="@SequenceGenerator">
-<entry keyword="Primary Key Generation"><topic href="reference021.htm#sthref438" /></entry>
-<entry keyword="Primary Key Generation"><topic href="reference021.htm#sthref440" /></entry>
-<entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref527" /></entry>
+<entry keyword="Primary Key Generation"><topic href="reference025.htm#sthref463" /></entry>
+<entry keyword="Primary Key Generation"><topic href="reference025.htm#sthref465" /></entry>
+<entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref554" /></entry>
</entry>
-<entry keyword="@StructConverter, Converters"><topic href="reference023.htm#sthref452" /></entry>
+<entry keyword="@StructConverter, Converters"><topic href="reference027.htm#sthref477" /></entry>
<entry keyword="@Temporal">
-<entry keyword="Type information"><topic href="reference035.htm#sthref508" /></entry>
-<entry keyword="Type information"><topic href="reference035.htm#sthref509" /></entry>
+<entry keyword="Type information"><topic href="reference039.htm#sthref535" /></entry>
+<entry keyword="Type information"><topic href="reference039.htm#sthref536" /></entry>
</entry>
-<entry keyword="@Transient, Transient mapping"><topic href="tasks019.htm#sthref245" /></entry>
-<entry keyword="@TypeConverter, Converters"><topic href="reference023.htm#sthref451" /></entry>
+<entry keyword="@Transient, Transient mapping"><topic href="tasks020.htm#sthref258" /></entry>
+<entry keyword="@TypeConverter, Converters"><topic href="reference027.htm#sthref476" /></entry>
<entry keyword="@Version">
-<entry keyword="Version mapping"><topic href="tasks020.htm#sthref252" /></entry>
-<entry keyword="Version Mapping"><topic href="reference034.htm#sthref501" /></entry>
- </entry>
-<entry keyword="@XMLPath, Tips and tricks"><topic href="tips_and_tricks.htm#sthref647" /></entry>
-<entry keyword="Add Converter dialog, Add Converter dialog"><topic href="ref_add_converter.htm#sthref622" /></entry>
-<entry keyword="Add Join Column dialog, Add Join Column dialog"><topic href="reference062.htm#sthref614" /></entry>
-<entry keyword="Add Primary Key Join Column dialog, Add Primary Key Join Column dialog"><topic href="reference067.htm#sthref632" /></entry>
-<entry keyword="Add Query dialog, Add Query dialog"><topic href="reference066.htm#sthref630" /></entry>
-<entry keyword="Advanced - in Java Details view, Advanced"><topic href="reference024.htm#sthref457" /></entry>
-<entry keyword="architecture of Dali feature, Dali Developer Documentation"><topic href="reference071.htm#sthref642" /></entry>
-<entry keyword="association tables, Create New Association wizard"><topic href="ref_create_new_association_wizard.htm#sthref389" /></entry>
-<entry keyword="Attribute Overrides - in Java Details view, Attribute Overrides"><topic href="reference019.htm#sthref431" /></entry>
+<entry keyword="Version mapping"><topic href="tasks021.htm#sthref265" /></entry>
+<entry keyword="Version Mapping"><topic href="reference038.htm#sthref528" /></entry>
+ </entry>
+<entry keyword="@XMLPath, Tips and tricks"><topic href="tips_and_tricks.htm#sthref695" /></entry>
+<entry keyword="about, JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref496" /></entry>
+<entry keyword="Add Converter dialog, Add Converter dialog"><topic href="ref_add_converter.htm#sthref662" /></entry>
+<entry keyword="Add Join Column dialog, Add Join Column dialog"><topic href="reference068.htm#sthref654" /></entry>
+<entry keyword="Add Primary Key Join Column dialog, Add Primary Key Join Column dialog"><topic href="reference073.htm#sthref672" /></entry>
+<entry keyword="Add Query dialog, Add Query dialog"><topic href="reference072.htm#sthref670" /></entry>
+<entry keyword="Add Schema Location dialog, Add Schema Location dialog"><topic href="reference074.htm#sthref675" /></entry>
+<entry keyword="Advanced - in Java Details view, Advanced"><topic href="reference028.htm#sthref482" /></entry>
+<entry keyword="architecture of Dali feature, Dali Developer Documentation"><topic href="reference079.htm#sthref690" /></entry>
+<entry keyword="association tables, Create New Association wizard"><topic href="ref_create_new_association_wizard.htm#sthref414" /></entry>
+<entry keyword="Attribute Overrides - in Java Details view, Attribute Overrides"><topic href="reference023.htm#sthref456" /></entry>
<entry keyword="attributes">
-<entry keyword="JPA Details view, JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref469" /></entry>
+<entry keyword="JPA Details view, JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref494" /></entry>
<entry keyword="mapping, Understanding OR mappings"><topic href="concept_mapping.htm#sthref22" /></entry>
-<entry keyword="overrides, Attribute Overrides"><topic href="reference019.htm#sthref429" /></entry>
-<entry keyword="virtual, Adding virtual attributes"><topic href="tasks005.htm#sthref96" /></entry>
+<entry keyword="overrides, Attribute Overrides"><topic href="reference023.htm#sthref454" /></entry>
+<entry keyword="virtual, Adding virtual attributes"><topic href="tasks006.htm#sthref108" /></entry>
</entry>
<entry keyword="basic mapping">
-<entry keyword="@Basic, Basic mapping"><topic href="tasks010.htm#sthref173" /></entry>
+<entry keyword="@Basic, Basic mapping"><topic href="tasks011.htm#sthref186" /></entry>
<entry keyword="about">
-<entry keyword="Basic mapping"><topic href="tasks010.htm#sthref171" /></entry>
-<entry keyword="Basic Mapping"><topic href="reference025.htm#sthref475" /></entry>
+<entry keyword="Basic mapping"><topic href="tasks011.htm#sthref184" /></entry>
+<entry keyword="Basic Mapping"><topic href="reference029.htm#sthref502" /></entry>
</entry>
<entry keyword="(See also mappings)"></entry>
</entry>
-<entry keyword="batch writing - persistence unit, Connection"><topic href="reference046.htm#sthref565" /></entry>
+<entry keyword="batch writing - persistence unit, Connection"><topic href="reference050.htm#sthref592" /></entry>
<entry keyword="caching">
-<entry keyword="Caching"><topic href="reference016.htm#sthref414" /></entry>
-<entry keyword="Caching"><topic href="reference048.htm#sthref569" /></entry>
+<entry keyword="Caching"><topic href="reference020.htm#sthref439" /></entry>
+<entry keyword="Caching"><topic href="reference052.htm#sthref596" /></entry>
</entry>
-<entry keyword="Caching - in persistence.xml editor, Caching"><topic href="reference048.htm#sthref570" /></entry>
-<entry keyword="canonical metamodel, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref601" /></entry>
-<entry keyword="cardinality - association tables, Association Cardinality"><topic href="ref_association_cardinality.htm#sthref397" /></entry>
-<entry keyword="change tracking, Advanced"><topic href="reference024.htm#sthref462" /></entry>
+<entry keyword="Caching - in persistence.xml editor, Caching"><topic href="reference052.htm#sthref597" /></entry>
+<entry keyword="canonical metamodel, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref628" /></entry>
+<entry keyword="cardinality - association tables, Association Cardinality"><topic href="ref_association_cardinality.htm#sthref422" /></entry>
+<entry keyword="change tracking, Advanced"><topic href="reference028.htm#sthref487" /></entry>
<entry keyword="classes">
-<entry keyword="adding persistence to, Adding persistence to a class"><topic href="task_add_persistence.htm#sthref66" /></entry>
-<entry keyword="embeddable, Embeddable"><topic href="tasks003.htm#sthref81" /></entry>
-<entry keyword="entity, Entity"><topic href="tasks002.htm#sthref72" /></entry>
-<entry keyword="managed, General"><topic href="ref_persistence_general.htm#sthref561" /></entry>
-<entry keyword="managing persistent classes, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref378" /></entry>
-<entry keyword="mapped superclass, Mapped superclass"><topic href="tasks004.htm#sthref88" /></entry>
-<entry keyword="properties, Properties"><topic href="reference052.htm#sthref582" /></entry>
-<entry keyword="synchronizing, Synchronizing classes"><topic href="tasks006.htm#sthref115" /></entry>
- </entry>
-<entry keyword="collection mappings, Element collection mapping"><topic href="tasks011.htm#sthref180" /></entry>
+<entry keyword="adding persistence to, Adding persistence to a class"><topic href="task_add_persistence.htm#sthref78" /></entry>
+<entry keyword="embeddable, Embeddable"><topic href="tasks004.htm#sthref93" /></entry>
+<entry keyword="entity, Entity"><topic href="tasks003.htm#sthref84" /></entry>
+<entry keyword="managed, General"><topic href="ref_persistence_general.htm#sthref588" /></entry>
+<entry keyword="managing persistent classes, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref391" /></entry>
+<entry keyword="mapped superclass, Mapped superclass"><topic href="tasks005.htm#sthref100" /></entry>
+<entry keyword="properties, Properties"><topic href="reference056.htm#sthref609" /></entry>
+<entry keyword="synchronizing, Synchronizing classes"><topic href="tasks007.htm#sthref127" /></entry>
+ </entry>
+<entry keyword="collection mappings, Element collection mapping"><topic href="tasks012.htm#sthref193" /></entry>
<entry keyword="columns">
-<entry keyword="discriminator, Inheritance"><topic href="reference018.htm#sthref426" /></entry>
-<entry keyword="join, Joining Strategy"><topic href="reference039.htm#sthref520" /></entry>
+<entry keyword="discriminator, Inheritance"><topic href="reference022.htm#sthref451" /></entry>
+<entry keyword="join, Joining Strategy"><topic href="reference043.htm#sthref547" /></entry>
<entry keyword="mapping to">
-<entry keyword="Basic Mapping"><topic href="reference025.htm#sthref477" /></entry>
-<entry keyword="ID Mapping"><topic href="reference029.htm#sthref487" /></entry>
-<entry keyword="Version Mapping"><topic href="reference034.htm#sthref504" /></entry>
+<entry keyword="Basic Mapping"><topic href="reference029.htm#sthref504" /></entry>
+<entry keyword="ID Mapping"><topic href="reference033.htm#sthref514" /></entry>
+<entry keyword="Version Mapping"><topic href="reference038.htm#sthref531" /></entry>
</entry>
-<entry keyword="value, Inheritance"><topic href="reference018.htm#sthref424" /></entry>
+<entry keyword="value, Inheritance"><topic href="reference022.htm#sthref449" /></entry>
</entry>
-<entry keyword="connection pool, The persistence.xml Editor"><topic href="task_manage_persistence.htm#sthref101" /></entry>
-<entry keyword="Connection - in persistence.xml Editor, Connection"><topic href="reference046.htm#sthref563" /></entry>
-<entry keyword="connections - database, Tips and tricks"><topic href="tips_and_tricks.htm#sthref644" /></entry>
-<entry keyword="converters, Converters"><topic href="reference037.htm#sthref513" /></entry>
+<entry keyword="connection pool, The persistence.xml Editor"><topic href="task_manage_persistence.htm#sthref113" /></entry>
+<entry keyword="Connection - in persistence.xml Editor, Connection"><topic href="reference050.htm#sthref590" /></entry>
+<entry keyword="connections - database, Tips and tricks"><topic href="tips_and_tricks.htm#sthref692" /></entry>
+<entry keyword="converters, Converters"><topic href="reference041.htm#sthref540" /></entry>
<entry keyword="Converters - in JPA Details view">
-<entry keyword="Converters"><topic href="reference023.htm#sthref449" /></entry>
-<entry keyword="Converters"><topic href="reference037.htm#sthref512" /></entry>
-<entry keyword="Converters"><topic href="reference045.htm#sthref552" /></entry>
+<entry keyword="Converters"><topic href="reference027.htm#sthref474" /></entry>
+<entry keyword="Converters"><topic href="reference041.htm#sthref539" /></entry>
+<entry keyword="Converters"><topic href="reference049.htm#sthref579" /></entry>
</entry>
<entry keyword="converting">
-<entry keyword="Java project to JPA, Converting a Java project to a JPA project"><topic href="tasks001.htm#sthref47" /></entry>
-<entry keyword="JPA metadata to XML, Converting JPA metadata to XML"><topic href="tasks028.htm#sthref317" /></entry>
- </entry>
-<entry keyword="Create a JPA Project Wizard, Creating a new JPA project"><topic href="task_create_new_project.htm#sthref37" /></entry>
-<entry keyword="Create JPA Entity wizard, Create JPA Entity wizard"><topic href="ref_create_jpa_entity_wizard.htm#sthref354" /></entry>
-<entry keyword="Create New Association wizard, Create New Association wizard"><topic href="ref_create_new_association_wizard.htm#sthref391" /></entry>
-<entry keyword="Create New JPA Project wizard, Create New JPA Project wizard"><topic href="ref_new_jpa_project_wizard.htm#sthref369" /></entry>
-<entry keyword="Create ORM Mapping File wizard, Create ORM Mapping File wizard"><topic href="reference007.htm#sthref362" /></entry>
-<entry keyword="Customization - in persistence.xml editor, Customization"><topic href="reference047.htm#sthref567" /></entry>
-<entry keyword="customizer class - for entities, Advanced"><topic href="reference024.htm#sthref460" /></entry>
-<entry keyword="database tables - generating entities from, Generating entities from tables"><topic href="tasks021.htm#sthref261" /></entry>
+<entry keyword="Java project to JPA, Converting a Java project to a JPA project"><topic href="tasks002.htm#sthref59" /></entry>
+<entry keyword="JPA metadata to XML, Converting JPA metadata to XML"><topic href="tasks029.htm#sthref330" /></entry>
+ </entry>
+ <entry keyword="Create a JPA Project Wizard">
+<entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref37" /></entry>
+<entry keyword="Creating a new JAXB project"><topic href="tasks001.htm#sthref48" /></entry>
+ </entry>
+<entry keyword="Create JPA Entity wizard, Create JPA Entity wizard"><topic href="ref_create_jpa_entity_wizard.htm#sthref367" /></entry>
+<entry keyword="Create New Association wizard, Create New Association wizard"><topic href="ref_create_new_association_wizard.htm#sthref416" /></entry>
+<entry keyword="Create New JAXB Project wizard, Create New JAXB Project wizard"><topic href="reference010.htm#sthref395" /></entry>
+<entry keyword="Create New JPA Project wizard, Create New JPA Project wizard"><topic href="ref_new_jpa_project_wizard.htm#sthref382" /></entry>
+<entry keyword="Create ORM Mapping File wizard, Create ORM Mapping File wizard"><topic href="reference007.htm#sthref375" /></entry>
+<entry keyword="Customization - in persistence.xml editor, Customization"><topic href="reference051.htm#sthref594" /></entry>
+<entry keyword="customizer class - for entities, Advanced"><topic href="reference028.htm#sthref485" /></entry>
+<entry keyword="database tables - generating entities from, Generating entities from tables"><topic href="tasks022.htm#sthref274" /></entry>
<entry keyword="database - persistence">
-<entry keyword="connection, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref596" /></entry>
-<entry keyword="schema, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref598" /></entry>
- </entry>
-<entry keyword="DDL script - generating, Generating tables from entities"><topic href="tasks022.htm#sthref271" /></entry>
-<entry keyword="DDL - generating, Generate Tables from Entities wizard"><topic href="reference010.htm#sthref385" /></entry>
-<entry keyword="Derived Identity - in JPA Details view, Derived Identity"><topic href="reference040.htm#sthref523" /></entry>
-<entry keyword="developer documentation - Dali, Dali Developer Documentation"><topic href="reference071.htm#sthref641" /></entry>
-<entry keyword="dynamic entities - from tables, Generating dynamic entities from tables"><topic href="tasks023.htm#sthref277" /></entry>
-<entry keyword="eager fetch, Basic Mapping"><topic href="reference025.htm#sthref479" /></entry>
-<entry keyword="EclipseLink XML mapping file, General"><topic href="ref_persistence_general.htm#sthref562" /></entry>
-<entry keyword="eclipselink-orm.xml file - with dynamic entities, Sample eclipselink-orm.xml File with Dynamic Entities"><topic href="tasks023.htm#sthref283" /></entry>
-<entry keyword="Edit Join Columns dialog, Edit Join Columns Dialog"><topic href="reference061.htm#sthref612" /></entry>
+ <entry keyword="connection">
+<entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref623" /></entry>
+<entry keyword="Project Properties page - JAXB Options"><topic href="reference064.htm#sthref644" /></entry>
+ </entry>
+<entry keyword="schema, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref625" /></entry>
+ </entry>
+<entry keyword="DDL script - generating, Generating tables from entities"><topic href="tasks023.htm#sthref284" /></entry>
+<entry keyword="DDL - generating, Generate Tables from Entities wizard"><topic href="reference014.htm#sthref410" /></entry>
+<entry keyword="Derived Identity - in JPA Details view, Derived Identity"><topic href="reference044.htm#sthref550" /></entry>
+<entry keyword="developer documentation - Dali, Dali Developer Documentation"><topic href="reference079.htm#sthref689" /></entry>
+<entry keyword="dynamic entities - from tables, Generating dynamic entities from tables"><topic href="tasks024.htm#sthref290" /></entry>
+<entry keyword="eager fetch, Basic Mapping"><topic href="reference029.htm#sthref506" /></entry>
+<entry keyword="EclipseLink XML mapping file, General"><topic href="ref_persistence_general.htm#sthref589" /></entry>
+<entry keyword="eclipselink-orm.xml file - with dynamic entities, Sample eclipselink-orm.xml File with Dynamic Entities"><topic href="tasks024.htm#sthref296" /></entry>
+<entry keyword="Edit Join Columns dialog, Edit Join Columns Dialog"><topic href="reference067.htm#sthref652" /></entry>
<entry keyword="element collection mapping">
-<entry keyword="about, Element Collection Mapping"><topic href="reference026.htm#sthref482" /></entry>
-<entry keyword="creating, Element collection mapping"><topic href="tasks011.htm#sthref179" /></entry>
+<entry keyword="about, Element Collection Mapping"><topic href="reference030.htm#sthref509" /></entry>
+<entry keyword="creating, Element collection mapping"><topic href="tasks012.htm#sthref192" /></entry>
</entry>
<entry keyword="embeddable class">
-<entry keyword="@Embeddable, Embeddable"><topic href="tasks003.htm#sthref83" /></entry>
-<entry keyword="about, Embeddable"><topic href="tasks003.htm#sthref80" /></entry>
-<entry keyword="JPA Details view, Embeddable"><topic href="reference014.htm#sthref408" /></entry>
+<entry keyword="@Embeddable, Embeddable"><topic href="tasks004.htm#sthref95" /></entry>
+<entry keyword="about, Embeddable"><topic href="tasks004.htm#sthref92" /></entry>
+<entry keyword="JPA Details view, Embeddable"><topic href="reference018.htm#sthref433" /></entry>
</entry>
<entry keyword="embedded ID mapping">
-<entry keyword="@EmbeddedId, Embedded ID mapping"><topic href="tasks013.htm#sthref196" /></entry>
-<entry keyword="about, Embedded ID mapping"><topic href="tasks013.htm#sthref194" /></entry>
+<entry keyword="@EmbeddedId, Embedded ID mapping"><topic href="tasks014.htm#sthref209" /></entry>
+<entry keyword="about, Embedded ID mapping"><topic href="tasks014.htm#sthref207" /></entry>
</entry>
<entry keyword="embedded mapping">
-<entry keyword="@Embedded, Embedded mapping"><topic href="tasks012.htm#sthref188" /></entry>
-<entry keyword="about, Embedded mapping"><topic href="tasks012.htm#sthref186" /></entry>
+<entry keyword="@Embedded, Embedded mapping"><topic href="tasks013.htm#sthref201" /></entry>
+<entry keyword="about, Embedded mapping"><topic href="tasks013.htm#sthref199" /></entry>
</entry>
<entry keyword="entities">
-<entry keyword="@Entity annotation, Entity"><topic href="tasks002.htm#sthref75" /></entry>
+<entry keyword="@Entity annotation, Entity"><topic href="tasks003.htm#sthref87" /></entry>
<entry keyword="about, Understanding Java persistence"><topic href="concept_persistence.htm#sthref21" /></entry>
<entry keyword="creating">
-<entry keyword="Creating a JPA entity"><topic href="task_create_jpa_entity.htm#sthref53" /></entry>
-<entry keyword="Create JPA Entity wizard"><topic href="ref_create_jpa_entity_wizard.htm#sthref355" /></entry>
+<entry keyword="Creating a JPA entity"><topic href="task_create_jpa_entity.htm#sthref65" /></entry>
+<entry keyword="Create JPA Entity wizard"><topic href="ref_create_jpa_entity_wizard.htm#sthref368" /></entry>
</entry>
<entry keyword="creating tables from">
-<entry keyword="Generating tables from entities"><topic href="tasks022.htm#sthref270" /></entry>
-<entry keyword="Generate Tables from Entities wizard"><topic href="reference010.htm#sthref384" /></entry>
+<entry keyword="Generating tables from entities"><topic href="tasks023.htm#sthref283" /></entry>
+<entry keyword="Generate Tables from Entities wizard"><topic href="reference014.htm#sthref409" /></entry>
</entry>
-<entry keyword="customer class, Advanced"><topic href="reference024.htm#sthref461" /></entry>
+<entry keyword="customer class, Advanced"><topic href="reference028.htm#sthref486" /></entry>
<entry keyword="customizing">
-<entry keyword="Customize Individual Entities"><topic href="ref_customizIndividualEntities.htm#sthref336" /></entry>
-<entry keyword="Customize Individual Entities"><topic href="reference006.htm#sthref351" /></entry>
+<entry keyword="Customize Individual Entities"><topic href="ref_customizIndividualEntities.htm#sthref349" /></entry>
+<entry keyword="Customize Individual Entities"><topic href="reference006.htm#sthref364" /></entry>
</entry>
-<entry keyword="embeddable, Embeddable"><topic href="tasks003.htm#sthref84" /></entry>
+<entry keyword="embeddable, Embeddable"><topic href="tasks004.htm#sthref96" /></entry>
<entry keyword="from tables">
-<entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref258" /></entry>
-<entry keyword="Generating dynamic entities from tables"><topic href="tasks023.htm#sthref275" /></entry>
-<entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref326" /></entry>
-<entry keyword="Select Tables"><topic href="reference003.htm#sthref341" /></entry>
+<entry keyword="Generating entities from tables"><topic href="tasks022.htm#sthref271" /></entry>
+<entry keyword="Generating dynamic entities from tables"><topic href="tasks024.htm#sthref288" /></entry>
+<entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref339" /></entry>
+<entry keyword="Select Tables"><topic href="reference003.htm#sthref354" /></entry>
</entry>
<entry keyword="generating">
-<entry keyword="Customize Default Entity Generation"><topic href="ref_customizeDefaultEntityGeneration.htm#sthref333" /></entry>
-<entry keyword="Customize Default Entity Generation"><topic href="reference005.htm#sthref348" /></entry>
+<entry keyword="Customize Default Entity Generation"><topic href="ref_customizeDefaultEntityGeneration.htm#sthref346" /></entry>
+<entry keyword="Customize Default Entity Generation"><topic href="reference005.htm#sthref361" /></entry>
</entry>
-<entry keyword="JPA Details view, JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref403" /></entry>
-<entry keyword="mapped superclass, Mapped superclass"><topic href="tasks004.htm#sthref91" /></entry>
+<entry keyword="JPA Details view, JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref428" /></entry>
+<entry keyword="mapped superclass, Mapped superclass"><topic href="tasks005.htm#sthref103" /></entry>
<entry keyword="mapping">
<entry keyword="Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref14" /></entry>
-<entry keyword="Mapping an entity"><topic href="task_mapping.htm#sthref168" /></entry>
+<entry keyword="Mapping an entity"><topic href="task_mapping.htm#sthref181" /></entry>
</entry>
<entry keyword="persistent">
<entry keyword="Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref12" /></entry>
-<entry keyword="Entity"><topic href="tasks002.htm#sthref70" /></entry>
-<entry keyword="Entity"><topic href="tasks002.htm#sthref76" /></entry>
+<entry keyword="Entity"><topic href="tasks003.htm#sthref82" /></entry>
+<entry keyword="Entity"><topic href="tasks003.htm#sthref88" /></entry>
</entry>
-<entry keyword="read-only, Advanced"><topic href="reference024.htm#sthref459" /></entry>
-<entry keyword="secondary tables, Secondary tables"><topic href="reference022.htm#sthref445" /></entry>
-<entry keyword="tracking changes, Advanced"><topic href="reference024.htm#sthref465" /></entry>
+<entry keyword="read-only, Advanced"><topic href="reference028.htm#sthref484" /></entry>
+<entry keyword="secondary tables, Secondary tables"><topic href="reference026.htm#sthref470" /></entry>
+<entry keyword="tracking changes, Advanced"><topic href="reference028.htm#sthref490" /></entry>
</entry>
-<entry keyword="Entity Class page, Selecting the Create a JPA Entity Wizard"><topic href="task_create_jpa_entity.htm#sthref57" /></entry>
-<entry keyword="Entity Properties page, &lt;a id=&quot;sthref57&quot; name=&quot;sthref57&quot;&gt;&lt;/a&gt;The Entity Class Page"><topic href="task_create_jpa_entity.htm#sthref59" /></entry>
-<entry keyword="enumerated, Type information"><topic href="reference035.htm#sthref510" /></entry>
+<entry keyword="Entity Class page, Selecting the Create a JPA Entity Wizard"><topic href="task_create_jpa_entity.htm#sthref69" /></entry>
+<entry keyword="Entity Properties page, &lt;a id=&quot;sthref69&quot; name=&quot;sthref69&quot;&gt;&lt;/a&gt;The Entity Class Page"><topic href="task_create_jpa_entity.htm#sthref71" /></entry>
+<entry keyword="enumerated, Type information"><topic href="reference039.htm#sthref537" /></entry>
<entry keyword="error messages - Dali">
-<entry keyword="Validating mappings and reporting problems"><topic href="tasks024.htm#sthref284" /></entry>
-<entry keyword="Error messages"><topic href="tasks025.htm#sthref291" /></entry>
- </entry>
-<entry keyword="extension points - Dali feature, Dali Developer Documentation"><topic href="reference071.htm#sthref643" /></entry>
-<entry keyword="fetch type, Basic Mapping"><topic href="reference025.htm#sthref478" /></entry>
-<entry keyword="firewall, Tips and tricks"><topic href="tips_and_tricks.htm#sthref646" /></entry>
-<entry keyword="General - in persistence.xml Editor, General"><topic href="ref_persistence_general.htm#sthref559" /></entry>
-<entry keyword="Generate Dynamic Entities from Tables wizard, Generate Dynamic Entities from Tables wizard"><topic href="reference002.htm#sthref339" /></entry>
+<entry keyword="Validating mappings and reporting problems"><topic href="tasks025.htm#sthref297" /></entry>
+<entry keyword="Error messages"><topic href="tasks026.htm#sthref304" /></entry>
+ </entry>
+<entry keyword="extension points - Dali feature, Dali Developer Documentation"><topic href="reference079.htm#sthref691" /></entry>
+<entry keyword="fetch type, Basic Mapping"><topic href="reference029.htm#sthref505" /></entry>
+<entry keyword="firewall, Tips and tricks"><topic href="tips_and_tricks.htm#sthref694" /></entry>
+<entry keyword="General - in persistence.xml Editor, General"><topic href="ref_persistence_general.htm#sthref586" /></entry>
+<entry keyword="Generate Dynamic Entities from Tables wizard, Generate Dynamic Entities from Tables wizard"><topic href="reference002.htm#sthref352" /></entry>
<entry keyword="Generate Entities from Tables dialog">
-<entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref260" /></entry>
-<entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref325" /></entry>
-<entry keyword="Select Tables"><topic href="reference003.htm#sthref340" /></entry>
+<entry keyword="Generating entities from tables"><topic href="tasks022.htm#sthref273" /></entry>
+<entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref338" /></entry>
+<entry keyword="Select Tables"><topic href="reference003.htm#sthref353" /></entry>
</entry>
-<entry keyword="Generate Entities from Tables wizard, Generate Entities from Tables wizard"><topic href="ref_create_custom_entities_wizard.htm#sthref324" /></entry>
-<entry keyword="Generate Tables from Entities wizard, Generate Tables from Entities wizard"><topic href="reference010.htm#sthref382" /></entry>
+<entry keyword="Generate Entities from Tables wizard, Generate Entities from Tables wizard"><topic href="ref_create_custom_entities_wizard.htm#sthref337" /></entry>
+<entry keyword="Generate Tables from Entities wizard, Generate Tables from Entities wizard"><topic href="reference014.htm#sthref407" /></entry>
<entry keyword="generated values">
-<entry keyword="entities - preferences, Project Properties Page - Entity Generation"><topic href="reference058.htm#sthref608" /></entry>
-<entry keyword="ID mappings, Primary Key Generation information"><topic href="ref_primary_key.htm#sthref526" /></entry>
+<entry keyword="entities - preferences, Project Properties page - Entity Generation"><topic href="reference062.htm#sthref635" /></entry>
+<entry keyword="ID mappings, Primary Key Generation information"><topic href="ref_primary_key.htm#sthref553" /></entry>
<entry keyword="sequence">
-<entry keyword="Primary Key Generation"><topic href="reference021.htm#sthref439" /></entry>
-<entry keyword="Primary Key Generation"><topic href="reference021.htm#sthref441" /></entry>
-<entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref528" /></entry>
+<entry keyword="Primary Key Generation"><topic href="reference025.htm#sthref464" /></entry>
+<entry keyword="Primary Key Generation"><topic href="reference025.htm#sthref466" /></entry>
+<entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref555" /></entry>
</entry>
</entry>
-<entry keyword="generating DDL, Generate Tables from Entities wizard"><topic href="reference010.htm#sthref386" /></entry>
-<entry keyword="Generators - in JPA Detail view, Generators"><topic href="reference043.htm#sthref539" /></entry>
+<entry keyword="generating DDL, Generate Tables from Entities wizard"><topic href="reference014.htm#sthref411" /></entry>
+<entry keyword="Generators - in JPA Detail view, Generators"><topic href="reference047.htm#sthref566" /></entry>
<entry keyword="hints - query">
-<entry keyword="Add Query Dialog"><topic href="tasks009.htm#sthref164" /></entry>
-<entry keyword="Queries"><topic href="reference044.htm#sthref549" /></entry>
+<entry keyword="Add Query Dialog"><topic href="tasks010.htm#sthref176" /></entry>
+<entry keyword="Queries"><topic href="reference048.htm#sthref576" /></entry>
</entry>
<entry keyword="ID mapping">
-<entry keyword="@Id, ID mapping"><topic href="tasks014.htm#sthref204" /></entry>
+<entry keyword="@Id, ID mapping"><topic href="tasks015.htm#sthref217" /></entry>
<entry keyword="about">
-<entry keyword="ID mapping"><topic href="tasks014.htm#sthref202" /></entry>
-<entry keyword="ID Mapping"><topic href="reference029.htm#sthref485" /></entry>
+<entry keyword="ID mapping"><topic href="tasks015.htm#sthref215" /></entry>
+<entry keyword="ID Mapping"><topic href="reference033.htm#sthref512" /></entry>
</entry>
</entry>
-<entry keyword="identity - derived, Derived Identity"><topic href="reference040.htm#sthref522" /></entry>
+<entry keyword="identity - derived, Derived Identity"><topic href="reference044.htm#sthref549" /></entry>
<entry keyword="inheritance">
<entry keyword="entity">
-<entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref146" /></entry>
-<entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref356" /></entry>
-<entry keyword="Inheritance"><topic href="reference018.htm#sthref422" /></entry>
+<entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref158" /></entry>
+<entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref369" /></entry>
+<entry keyword="Inheritance"><topic href="reference022.htm#sthref447" /></entry>
</entry>
-<entry keyword="joined tables, Single Table Inheritance"><topic href="task_inheritance.htm#sthref154" /></entry>
-<entry keyword="single table, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref149" /></entry>
+<entry keyword="joined tables, Single Table Inheritance"><topic href="task_inheritance.htm#sthref166" /></entry>
+<entry keyword="single table, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref161" /></entry>
</entry>
-<entry keyword="Inheritance - in Java Details view, Inheritance"><topic href="reference018.htm#sthref421" /></entry>
+<entry keyword="Inheritance - in Java Details view, Inheritance"><topic href="reference022.htm#sthref446" /></entry>
<entry keyword="installation - Dali, Requirements and installation"><topic href="getting_started001.htm#sthref3" /></entry>
<entry keyword="Java Persistence API (JPA)">
<entry keyword="about, Understanding Java Persistence API"><topic href="concepts001.htm#sthref25" /></entry>
</entry>
-<entry keyword="Java project - converting to JPA, Converting a Java project to a JPA project"><topic href="tasks001.htm#sthref45" /></entry>
+<entry keyword="Java project - converting to JPA, Converting a Java project to a JPA project"><topic href="tasks002.htm#sthref57" /></entry>
+ <entry keyword="JAXB">
+ <entry keyword="options">
+<entry keyword="Project Properties page - JAXB Options"><topic href="reference064.htm#sthref639" /></entry>
+<entry keyword="Project Properties page - Schemas"><topic href="reference065.htm#sthref647" /></entry>
+ </entry>
+ </entry>
+ <entry keyword="JAXB project">
+ <entry keyword="creating">
+<entry keyword="Creating a new JAXB project"><topic href="tasks001.htm#sthref46" /></entry>
+<entry keyword="Create New JAXB Project wizard"><topic href="reference010.htm#sthref397" /></entry>
+ </entry>
+<entry keyword="implementation, JAXB Facet page"><topic href="reference013.htm#sthref403" /></entry>
+ </entry>
+ <entry keyword="JAXB schema - adding">
+<entry keyword="Add Schema Location dialog"><topic href="reference074.htm#sthref677" /></entry>
+<entry keyword="Select Schema Location dialog"><topic href="reference075.htm#sthref681" /></entry>
+ </entry>
<entry keyword="join columns">
-<entry keyword="Join Columns"><topic href="ref_join_columns.htm#sthref394" /></entry>
-<entry keyword="Add Join Column dialog"><topic href="reference062.htm#sthref615" /></entry>
+<entry keyword="Join Columns"><topic href="ref_join_columns.htm#sthref419" /></entry>
+<entry keyword="Add Join Column dialog"><topic href="reference068.htm#sthref655" /></entry>
</entry>
-<entry keyword="joined tables - inheritance, Single Table Inheritance"><topic href="task_inheritance.htm#sthref155" /></entry>
-<entry keyword="joining, Joining Strategy"><topic href="reference039.htm#sthref518" /></entry>
-<entry keyword="Joining Strategy - in JPA Details view, Joining Strategy"><topic href="reference039.htm#sthref519" /></entry>
+<entry keyword="joined tables - inheritance, Single Table Inheritance"><topic href="task_inheritance.htm#sthref167" /></entry>
+<entry keyword="joining, Joining Strategy"><topic href="reference043.htm#sthref545" /></entry>
+<entry keyword="Joining Strategy - in JPA Details view, Joining Strategy"><topic href="reference043.htm#sthref546" /></entry>
<entry keyword="JPA Details view">
-<entry keyword="attributes, JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref467" /></entry>
-<entry keyword="entities, JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref401" /></entry>
-<entry keyword="orm.xml file, JPA Details view (for orm.xml)"><topic href="ref_details_orm.htm#sthref531" /></entry>
- </entry>
-<entry keyword="JPA Development perspective, JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref635" /></entry>
-<entry keyword="JPA entity - creating, Creating a JPA entity"><topic href="task_create_jpa_entity.htm#sthref54" /></entry>
-<entry keyword="JPA Facet page, The Java Source Page"><topic href="task_create_new_project.htm#sthref41" /></entry>
-<entry keyword="JPA Metadata Conversion dialog, JPA Metadata Conversion dialog"><topic href="reference064.htm#sthref626" /></entry>
+<entry keyword="attributes, JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref492" /></entry>
+<entry keyword="entities, JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref426" /></entry>
+<entry keyword="Mappings tab, JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref497" /></entry>
+<entry keyword="orm.xml file, JPA Details view (for orm.xml)"><topic href="ref_details_orm.htm#sthref558" /></entry>
+ </entry>
+<entry keyword="JPA Development perspective, JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref683" /></entry>
+<entry keyword="JPA entity - creating, Creating a JPA entity"><topic href="task_create_jpa_entity.htm#sthref66" /></entry>
+ <entry keyword="JPA Facet page">
+<entry keyword="The Java Source Page"><topic href="task_create_new_project.htm#sthref41" /></entry>
+<entry keyword="The Java Source Page"><topic href="tasks001.htm#sthref53" /></entry>
+ </entry>
+<entry keyword="JPA Metadata Conversion dialog, JPA Metadata Conversion dialog"><topic href="reference070.htm#sthref666" /></entry>
<entry keyword="JPA project">
-<entry keyword="converting from Java, Converting a Java project to a JPA project"><topic href="tasks001.htm#sthref46" /></entry>
-<entry keyword="converting metadata to XML, Converting JPA metadata to XML"><topic href="tasks028.htm#sthref318" /></entry>
+<entry keyword="converting from Java, Converting a Java project to a JPA project"><topic href="tasks002.htm#sthref58" /></entry>
+<entry keyword="converting metadata to XML, Converting JPA metadata to XML"><topic href="tasks029.htm#sthref331" /></entry>
<entry keyword="creating">
<entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref35" /></entry>
-<entry keyword="Create New JPA Project wizard"><topic href="ref_new_jpa_project_wizard.htm#sthref371" /></entry>
- </entry>
-<entry keyword="implementation, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref376" /></entry>
-<entry keyword="page, &lt;a id=&quot;sthref37&quot; name=&quot;sthref37&quot;&gt;&lt;/a&gt;Selecting the Create a JPA Project wizard"><topic href="task_create_new_project.htm#sthref39" /></entry>
-<entry keyword="platform, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref595" /></entry>
- </entry>
-<entry keyword="JPA Structure view, JPA Structure view"><topic href="ref_persistence_outline.htm#sthref555" /></entry>
-<entry keyword="key - primary, Primary Key Generation"><topic href="reference021.htm#sthref437" /></entry>
-<entry keyword="lazy fetch, Basic Mapping"><topic href="reference025.htm#sthref480" /></entry>
-<entry keyword="library - JPA, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref377" /></entry>
-<entry keyword="Logging - in persistence.xml editor, Logging"><topic href="reference049.htm#sthref572" /></entry>
-<entry keyword="Make Persistent dialog, Make Persistent dialog"><topic href="reference065.htm#sthref628" /></entry>
+<entry keyword="Create New JPA Project wizard"><topic href="ref_new_jpa_project_wizard.htm#sthref384" /></entry>
+ </entry>
+<entry keyword="implementation, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref389" /></entry>
+ <entry keyword="page">
+<entry keyword="&lt;a id=&quot;sthref37&quot; name=&quot;sthref37&quot;&gt;&lt;/a&gt;Selecting the Create a JPA Project wizard"><topic href="task_create_new_project.htm#sthref39" /></entry>
+<entry keyword="&lt;a id=&quot;sthref48&quot; name=&quot;sthref48&quot;&gt;&lt;/a&gt;Selecting the Create a JAXB Project wizard"><topic href="tasks001.htm#sthref50" /></entry>
+ </entry>
+ <entry keyword="platform">
+<entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref622" /></entry>
+<entry keyword="Project Properties page - JAXB Options"><topic href="reference064.htm#sthref643" /></entry>
+ </entry>
+ </entry>
+<entry keyword="JPA Structure view, JPA Structure view"><topic href="ref_persistence_outline.htm#sthref582" /></entry>
+<entry keyword="key - primary, Primary Key Generation"><topic href="reference025.htm#sthref462" /></entry>
+<entry keyword="lazy fetch, Basic Mapping"><topic href="reference029.htm#sthref507" /></entry>
+<entry keyword="library - JAXB, JAXB Facet page"><topic href="reference013.htm#sthref404" /></entry>
+<entry keyword="library - JPA, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref390" /></entry>
+<entry keyword="Logging - in persistence.xml editor, Logging"><topic href="reference053.htm#sthref599" /></entry>
+<entry keyword="Make Persistent dialog, Make Persistent dialog"><topic href="reference071.htm#sthref668" /></entry>
<entry keyword="many-to-many mapping">
-<entry keyword="@ManyToMany, Many-to-many mapping"><topic href="tasks015.htm#sthref213" /></entry>
+<entry keyword="@ManyToMany, Many-to-many mapping"><topic href="tasks016.htm#sthref226" /></entry>
<entry keyword="about">
-<entry keyword="Many-to-many mapping"><topic href="tasks015.htm#sthref211" /></entry>
-<entry keyword="Many-to-Many Mapping"><topic href="reference030.htm#sthref490" /></entry>
+<entry keyword="Many-to-many mapping"><topic href="tasks016.htm#sthref224" /></entry>
+<entry keyword="Many-to-Many Mapping"><topic href="reference034.htm#sthref517" /></entry>
</entry>
</entry>
<entry keyword="many-to-one mapping">
-<entry keyword="@ManyToOne, Many-to-one mapping"><topic href="tasks016.htm#sthref221" /></entry>
+<entry keyword="@ManyToOne, Many-to-one mapping"><topic href="tasks017.htm#sthref234" /></entry>
<entry keyword="about">
-<entry keyword="Many-to-one mapping"><topic href="tasks016.htm#sthref220" /></entry>
-<entry keyword="Many-to-One Mapping"><topic href="reference031.htm#sthref493" /></entry>
+<entry keyword="Many-to-one mapping"><topic href="tasks017.htm#sthref233" /></entry>
+<entry keyword="Many-to-One Mapping"><topic href="reference035.htm#sthref520" /></entry>
</entry>
</entry>
<entry keyword="mapped superclass">
-<entry keyword="@MappedSuperclass, Mapped superclass"><topic href="tasks004.htm#sthref89" /></entry>
-<entry keyword="about, Mapped superclass"><topic href="tasks004.htm#sthref87" /></entry>
-<entry keyword="JPA Details view, Mapped Superclass"><topic href="reference015.htm#sthref411" /></entry>
+<entry keyword="@MappedSuperclass, Mapped superclass"><topic href="tasks005.htm#sthref101" /></entry>
+<entry keyword="about, Mapped superclass"><topic href="tasks005.htm#sthref99" /></entry>
+<entry keyword="JPA Details view, Mapped Superclass"><topic href="reference019.htm#sthref436" /></entry>
</entry>
<entry keyword="mapping entities, Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref13" /></entry>
<entry keyword="mapping file">
-<entry keyword="Creating an orm.xml file"><topic href="tasks007.htm#sthref127" /></entry>
-<entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref357" /></entry>
-<entry keyword="Create ORM Mapping File wizard"><topic href="reference007.htm#sthref363" /></entry>
+<entry keyword="Creating an orm.xml file"><topic href="tasks008.htm#sthref139" /></entry>
+<entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref370" /></entry>
+<entry keyword="Create ORM Mapping File wizard"><topic href="reference007.htm#sthref376" /></entry>
</entry>
-<entry keyword="Mapping Type Selection dialog, Mapping Type Selection dialog"><topic href="reference063.htm#sthref624" /></entry>
+<entry keyword="Mapping Type Selection dialog, Mapping Type Selection dialog"><topic href="reference069.htm#sthref664" /></entry>
<entry keyword="mappings">
+<entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref495" /></entry>
<entry keyword="about">
<entry keyword="Understanding OR mappings"><topic href="concept_mapping.htm#sthref23" /></entry>
-<entry keyword="Mapping an entity"><topic href="task_mapping.htm#sthref167" /></entry>
+<entry keyword="Mapping an entity"><topic href="task_mapping.htm#sthref180" /></entry>
</entry>
<entry keyword="basic">
-<entry keyword="Basic mapping"><topic href="tasks010.htm#sthref170" /></entry>
-<entry keyword="Basic Mapping"><topic href="reference025.htm#sthref473" /></entry>
+<entry keyword="Basic mapping"><topic href="tasks011.htm#sthref183" /></entry>
+<entry keyword="Basic Mapping"><topic href="reference029.htm#sthref500" /></entry>
</entry>
<entry keyword="element collection">
-<entry keyword="Element collection mapping"><topic href="tasks011.htm#sthref178" /></entry>
-<entry keyword="Element Collection Mapping"><topic href="reference026.htm#sthref481" /></entry>
+<entry keyword="Element collection mapping"><topic href="tasks012.htm#sthref191" /></entry>
+<entry keyword="Element Collection Mapping"><topic href="reference030.htm#sthref508" /></entry>
</entry>
-<entry keyword="embedded, Embedded mapping"><topic href="tasks012.htm#sthref185" /></entry>
-<entry keyword="embedded ID, Embedded ID mapping"><topic href="tasks013.htm#sthref193" /></entry>
+<entry keyword="embedded, Embedded mapping"><topic href="tasks013.htm#sthref198" /></entry>
+<entry keyword="embedded ID, Embedded ID mapping"><topic href="tasks014.htm#sthref206" /></entry>
<entry keyword="ID">
-<entry keyword="ID mapping"><topic href="tasks014.htm#sthref201" /></entry>
-<entry keyword="ID Mapping"><topic href="reference029.htm#sthref483" /></entry>
+<entry keyword="ID mapping"><topic href="tasks015.htm#sthref214" /></entry>
+<entry keyword="ID Mapping"><topic href="reference033.htm#sthref510" /></entry>
</entry>
<entry keyword="many-to-many">
-<entry keyword="Many-to-many mapping"><topic href="tasks015.htm#sthref210" /></entry>
-<entry keyword="Many-to-Many Mapping"><topic href="reference030.htm#sthref488" /></entry>
+<entry keyword="Many-to-many mapping"><topic href="tasks016.htm#sthref223" /></entry>
+<entry keyword="Many-to-Many Mapping"><topic href="reference034.htm#sthref515" /></entry>
</entry>
<entry keyword="many-to-one">
-<entry keyword="Many-to-one mapping"><topic href="tasks016.htm#sthref219" /></entry>
-<entry keyword="Many-to-One Mapping"><topic href="reference031.htm#sthref491" /></entry>
+<entry keyword="Many-to-one mapping"><topic href="tasks017.htm#sthref232" /></entry>
+<entry keyword="Many-to-One Mapping"><topic href="reference035.htm#sthref518" /></entry>
</entry>
<entry keyword="one-to-many">
-<entry keyword="One-to-many mapping"><topic href="tasks017.htm#sthref227" /></entry>
-<entry keyword="One-to-Many Mapping"><topic href="reference032.htm#sthref494" /></entry>
+<entry keyword="One-to-many mapping"><topic href="tasks018.htm#sthref240" /></entry>
+<entry keyword="One-to-Many Mapping"><topic href="reference036.htm#sthref521" /></entry>
</entry>
<entry keyword="one-to-one">
-<entry keyword="One-to-one mapping"><topic href="tasks018.htm#sthref235" /></entry>
-<entry keyword="One-to-One Mapping"><topic href="reference033.htm#sthref497" /></entry>
+<entry keyword="One-to-one mapping"><topic href="tasks019.htm#sthref248" /></entry>
+<entry keyword="One-to-One Mapping"><topic href="reference037.htm#sthref524" /></entry>
</entry>
-<entry keyword="problems, Validating mappings and reporting problems"><topic href="tasks024.htm#sthref287" /></entry>
-<entry keyword="transient, Transient mapping"><topic href="tasks019.htm#sthref243" /></entry>
+<entry keyword="problems, Validating mappings and reporting problems"><topic href="tasks025.htm#sthref300" /></entry>
+<entry keyword="transient, Transient mapping"><topic href="tasks020.htm#sthref256" /></entry>
<entry keyword="version">
-<entry keyword="Version mapping"><topic href="tasks020.htm#sthref250" /></entry>
-<entry keyword="Version Mapping"><topic href="reference034.htm#sthref500" /></entry>
+<entry keyword="Version mapping"><topic href="tasks021.htm#sthref263" /></entry>
+<entry keyword="Version Mapping"><topic href="reference038.htm#sthref527" /></entry>
</entry>
</entry>
-<entry keyword="mappings - about, JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref470" /></entry>
-<entry keyword="metadata - converting to XML, Converting JPA metadata to XML"><topic href="tasks028.htm#sthref316" /></entry>
-<entry keyword="metamodel - canonical, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref602" /></entry>
-<entry keyword="multitenancy, Multitenancy"><topic href="reference020.htm#sthref434" /></entry>
+<entry keyword="metadata - converting to XML, Converting JPA metadata to XML"><topic href="tasks029.htm#sthref329" /></entry>
+<entry keyword="metamodel - canonical, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref629" /></entry>
+<entry keyword="multitenancy, Multitenancy"><topic href="reference024.htm#sthref459" /></entry>
<entry keyword="named queries">
-<entry keyword="Queries"><topic href="reference044.htm#sthref546" /></entry>
+<entry keyword="Queries"><topic href="reference048.htm#sthref573" /></entry>
<entry keyword="entity">
-<entry keyword="Creating queries"><topic href="tasks009.htm#sthref158" /></entry>
+<entry keyword="Creating queries"><topic href="tasks010.htm#sthref170" /></entry>
</entry>
-<entry keyword="hints, Add Query Dialog"><topic href="tasks009.htm#sthref165" /></entry>
-<entry keyword="JPA Detail view, Queries"><topic href="reference017.htm#sthref417" /></entry>
+<entry keyword="hints, Add Query Dialog"><topic href="tasks010.htm#sthref177" /></entry>
+<entry keyword="JPA Detail view, Queries"><topic href="reference021.htm#sthref442" /></entry>
</entry>
<entry keyword="native queries">
-<entry keyword="Add Query Dialog"><topic href="tasks009.htm#sthref166" /></entry>
-<entry keyword="Queries"><topic href="reference017.htm#sthref418" /></entry>
-<entry keyword="Queries"><topic href="reference044.htm#sthref547" /></entry>
+<entry keyword="Add Query Dialog"><topic href="tasks010.htm#sthref178" /></entry>
+<entry keyword="Queries"><topic href="reference021.htm#sthref443" /></entry>
+<entry keyword="Queries"><topic href="reference048.htm#sthref574" /></entry>
</entry>
-<entry keyword="New EclipseLink Mapping File dialog, New EclipseLink Mapping File dialog"><topic href="ref_eclipselink_mapping_file.htm#sthref618" /></entry>
+<entry keyword="New EclipseLink Mapping File dialog, New EclipseLink Mapping File dialog"><topic href="ref_eclipselink_mapping_file.htm#sthref658" /></entry>
<entry keyword="nonpersistent">
-<entry keyword="classes, Adding persistence to a class"><topic href="task_add_persistence.htm#sthref65" /></entry>
+<entry keyword="classes, Adding persistence to a class"><topic href="task_add_persistence.htm#sthref77" /></entry>
<entry keyword="fields. See transient"></entry>
</entry>
-<entry keyword="object type converter, Converters"><topic href="reference023.htm#sthref453" /></entry>
-<entry keyword="ObjectChangePolicy, Advanced"><topic href="reference024.htm#sthref464" /></entry>
+<entry keyword="object type converter, Converters"><topic href="reference027.htm#sthref478" /></entry>
+<entry keyword="ObjectChangePolicy, Advanced"><topic href="reference028.htm#sthref489" /></entry>
<entry keyword="one-to-many mapping">
-<entry keyword="@OneToMany, One-to-many mapping"><topic href="tasks017.htm#sthref230" /></entry>
+<entry keyword="@OneToMany, One-to-many mapping"><topic href="tasks018.htm#sthref243" /></entry>
<entry keyword="about">
-<entry keyword="One-to-many mapping"><topic href="tasks017.htm#sthref228" /></entry>
-<entry keyword="One-to-Many Mapping"><topic href="reference032.htm#sthref496" /></entry>
+<entry keyword="One-to-many mapping"><topic href="tasks018.htm#sthref241" /></entry>
+<entry keyword="One-to-Many Mapping"><topic href="reference036.htm#sthref523" /></entry>
</entry>
</entry>
<entry keyword="one-to-one mapping">
-<entry keyword="@OneToOne, One-to-one mapping"><topic href="tasks018.htm#sthref238" /></entry>
+<entry keyword="@OneToOne, One-to-one mapping"><topic href="tasks019.htm#sthref251" /></entry>
<entry keyword="about">
-<entry keyword="One-to-one mapping"><topic href="tasks018.htm#sthref236" /></entry>
-<entry keyword="One-to-One Mapping"><topic href="reference033.htm#sthref499" /></entry>
+<entry keyword="One-to-one mapping"><topic href="tasks019.htm#sthref249" /></entry>
+<entry keyword="One-to-One Mapping"><topic href="reference037.htm#sthref526" /></entry>
</entry>
</entry>
-<entry keyword="Options - in persistence.xml editor, Options"><topic href="reference050.htm#sthref576" /></entry>
-<entry keyword="ordering, Ordering"><topic href="reference038.htm#sthref515" /></entry>
-<entry keyword="Ordering - in JPA Details view, Ordering"><topic href="reference038.htm#sthref517" /></entry>
+<entry keyword="Options - in persistence.xml editor, Options"><topic href="reference054.htm#sthref603" /></entry>
+<entry keyword="ordering, Ordering"><topic href="reference042.htm#sthref542" /></entry>
+<entry keyword="Ordering - in JPA Details view, Ordering"><topic href="reference042.htm#sthref544" /></entry>
<entry keyword="orm.xml file">
<entry keyword="about, The orm.xml file"><topic href="concepts003.htm#sthref31" /></entry>
<entry keyword="creating">
-<entry keyword="Create ORM Mapping File wizard"><topic href="reference007.htm#sthref364" /></entry>
-<entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref379" /></entry>
+<entry keyword="Create ORM Mapping File wizard"><topic href="reference007.htm#sthref377" /></entry>
+<entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref392" /></entry>
</entry>
-<entry keyword="generators, Generators"><topic href="reference043.htm#sthref540" /></entry>
-<entry keyword="JPA Details view, JPA Details view (for orm.xml)"><topic href="ref_details_orm.htm#sthref532" /></entry>
-<entry keyword="managing, Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref121" /></entry>
-<entry keyword="queries, Queries"><topic href="reference044.htm#sthref545" /></entry>
-<entry keyword="sample, Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref122" /></entry>
+<entry keyword="generators, Generators"><topic href="reference047.htm#sthref567" /></entry>
+<entry keyword="JPA Details view, JPA Details view (for orm.xml)"><topic href="ref_details_orm.htm#sthref559" /></entry>
+<entry keyword="managing, Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref133" /></entry>
+<entry keyword="queries, Queries"><topic href="reference048.htm#sthref572" /></entry>
+<entry keyword="sample, Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref134" /></entry>
</entry>
-<entry keyword="overrides - JPA attributes, Attribute Overrides"><topic href="reference019.htm#sthref430" /></entry>
+<entry keyword="overrides - JPA attributes, Attribute Overrides"><topic href="reference023.htm#sthref455" /></entry>
<entry keyword="persistence">
<entry keyword="about, Understanding Java persistence"><topic href="concept_persistence.htm#sthref20" /></entry>
-<entry keyword="database connection, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref597" /></entry>
-<entry keyword="database schema, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref600" /></entry>
-<entry keyword="entity class, Adding persistence to a class"><topic href="task_add_persistence.htm#sthref64" /></entry>
-<entry keyword="options, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref591" /></entry>
-<entry keyword="provider, General"><topic href="ref_persistence_general.htm#sthref560" /></entry>
-<entry keyword="unit, Persistence Unit"><topic href="reference042.htm#sthref536" /></entry>
- </entry>
-<entry keyword="Persistence Unit - in JPA Details, Persistence Unit"><topic href="reference042.htm#sthref535" /></entry>
+ <entry keyword="database connection">
+<entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref624" /></entry>
+<entry keyword="Project Properties page - JAXB Options"><topic href="reference064.htm#sthref645" /></entry>
+ </entry>
+<entry keyword="database schema, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref627" /></entry>
+<entry keyword="entity class, Adding persistence to a class"><topic href="task_add_persistence.htm#sthref76" /></entry>
+<entry keyword="options, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref618" /></entry>
+<entry keyword="provider, General"><topic href="ref_persistence_general.htm#sthref587" /></entry>
+<entry keyword="unit, Persistence Unit"><topic href="reference046.htm#sthref563" /></entry>
+ </entry>
+<entry keyword="Persistence Unit - in JPA Details, Persistence Unit"><topic href="reference046.htm#sthref562" /></entry>
<entry keyword="persistence.xml Editor">
<entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#ABC4949575SRI1" /></entry>
-<entry keyword="persistence.xml Editor"><topic href="ref_persistence_xmll_editor.htm#sthref558" /></entry>
+<entry keyword="persistence.xml Editor"><topic href="ref_persistence_xmll_editor.htm#sthref585" /></entry>
</entry>
<entry keyword="persistence.xml file">
<entry keyword="about, The persistence.xml file"><topic href="concepts002.htm#sthref28" /></entry>
<entry keyword="managing">
<entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#ABC4949575" /></entry>
-<entry keyword="Working with orm.xml file"><topic href="tasks008.htm#sthref135" /></entry>
+<entry keyword="Working with orm.xml file"><topic href="tasks009.htm#sthref147" /></entry>
</entry>
-<entry keyword="sample, Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref97" /></entry>
-<entry keyword="schema based, Tips and tricks"><topic href="tips_and_tricks.htm#sthref645" /></entry>
-<entry keyword="synchronizing with classes, Synchronizing classes"><topic href="tasks006.htm#sthref116" /></entry>
+<entry keyword="sample, Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref109" /></entry>
+<entry keyword="schema based, Tips and tricks"><topic href="tips_and_tricks.htm#sthref693" /></entry>
+<entry keyword="synchronizing with classes, Synchronizing classes"><topic href="tasks007.htm#sthref128" /></entry>
+ </entry>
+<entry keyword="persistent entity, Entity"><topic href="tasks003.htm#sthref83" /></entry>
+<entry keyword="perspective - JPA Development, JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref684" /></entry>
+ <entry keyword="platform - JPA">
+<entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref621" /></entry>
+<entry keyword="Project Properties page - JAXB Options"><topic href="reference064.htm#sthref642" /></entry>
</entry>
-<entry keyword="persistent entity, Entity"><topic href="tasks002.htm#sthref71" /></entry>
-<entry keyword="perspective - JPA Development, JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref636" /></entry>
-<entry keyword="platform - JPA, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref594" /></entry>
<entry keyword="preferences">
-<entry keyword="errors and warnings, Java Persistence Preferences page - Errors/Warnings"><topic href="reference056.htm#sthref589" /></entry>
-<entry keyword="JPA, Java Persistence Preferences page - JPA"><topic href="reference055.htm#sthref587" /></entry>
-<entry keyword="project - EclipseLink, Project Properties page - EclipseLink"><topic href="reference057.htm#sthref604" /></entry>
-<entry keyword="project - Entity Generation, Project Properties Page - Entity Generation"><topic href="reference058.htm#sthref607" /></entry>
-<entry keyword="project - errors and warnings, Project Properties page - Errors/Warnings"><topic href="reference059.htm#sthref610" /></entry>
-<entry keyword="project - JPA, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref593" /></entry>
- </entry>
-<entry keyword="preferences - Dali, Preferences"><topic href="reference054.htm#sthref586" /></entry>
+<entry keyword="errors and warnings, Java Persistence Preferences page - Errors/Warnings"><topic href="reference060.htm#sthref616" /></entry>
+<entry keyword="JPA, Java Persistence Preferences page - JPA"><topic href="reference059.htm#sthref614" /></entry>
+<entry keyword="project - EclipseLink, Project Properties page - EclipseLink"><topic href="reference061.htm#sthref631" /></entry>
+<entry keyword="project - Entity Generation, Project Properties page - Entity Generation"><topic href="reference062.htm#sthref634" /></entry>
+<entry keyword="project - errors and warnings, Project Properties page - Errors/Warnings"><topic href="reference063.htm#sthref637" /></entry>
+ <entry keyword="project - JAXB">
+<entry keyword="Project Properties page - JAXB Options"><topic href="reference064.htm#sthref641" /></entry>
+<entry keyword="Project Properties page - Schemas"><topic href="reference065.htm#sthref649" /></entry>
+ </entry>
+<entry keyword="project - JPA, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref620" /></entry>
+ </entry>
+<entry keyword="preferences - Dali, Preferences"><topic href="reference058.htm#sthref613" /></entry>
<entry keyword="Primary Key Generation - in JPA Details view">
-<entry keyword="Primary Key Generation"><topic href="reference021.htm#sthref436" /></entry>
-<entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref524" /></entry>
+<entry keyword="Primary Key Generation"><topic href="reference025.htm#sthref461" /></entry>
+<entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref551" /></entry>
+ </entry>
+<entry keyword="problems, Validating mappings and reporting problems"><topic href="tasks025.htm#sthref299" /></entry>
+ <entry keyword="projects - JAXB">
+ <entry keyword="creating new">
+<entry keyword="Creating a new JAXB project"><topic href="tasks001.htm#sthref45" /></entry>
+<entry keyword="Create New JAXB Project wizard"><topic href="reference010.htm#sthref396" /></entry>
+ </entry>
+ <entry keyword="options">
+<entry keyword="Project Properties page - JAXB Options"><topic href="reference064.htm#sthref640" /></entry>
+<entry keyword="Project Properties page - Schemas"><topic href="reference065.htm#sthref648" /></entry>
+ </entry>
</entry>
-<entry keyword="problems, Validating mappings and reporting problems"><topic href="tasks024.htm#sthref286" /></entry>
<entry keyword="projects - JPA">
<entry keyword="creating new">
<entry keyword="Creating a new JPA project"><topic href="getting_started003.htm#sthref10" /></entry>
<entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref34" /></entry>
-<entry keyword="Create New JPA Project wizard"><topic href="ref_new_jpa_project_wizard.htm#sthref370" /></entry>
+<entry keyword="Create New JPA Project wizard"><topic href="ref_new_jpa_project_wizard.htm#sthref383" /></entry>
</entry>
-<entry keyword="options, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref592" /></entry>
-<entry keyword="properties, Modifying persistent project properties"><topic href="tasks027.htm#sthref310" /></entry>
+<entry keyword="options, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref619" /></entry>
+<entry keyword="properties, Modifying persistent project properties"><topic href="tasks028.htm#sthref323" /></entry>
</entry>
<entry keyword="properties">
-<entry keyword="project, Modifying persistent project properties"><topic href="tasks027.htm#sthref311" /></entry>
+<entry keyword="project, Modifying persistent project properties"><topic href="tasks028.htm#sthref324" /></entry>
</entry>
-<entry keyword="Properties - in persistence.xml editor, Properties"><topic href="reference052.htm#sthref580" /></entry>
-<entry keyword="property pages, Property pages"><topic href="reference012.htm#sthref400" /></entry>
+<entry keyword="Properties - in persistence.xml editor, Properties"><topic href="reference056.htm#sthref607" /></entry>
+<entry keyword="property pages, Property pages"><topic href="reference016.htm#sthref425" /></entry>
<entry keyword="queries">
-<entry keyword="Queries"><topic href="reference017.htm#sthref416" /></entry>
-<entry keyword="Queries"><topic href="reference044.htm#sthref543" /></entry>
+<entry keyword="Queries"><topic href="reference021.htm#sthref441" /></entry>
+<entry keyword="Queries"><topic href="reference048.htm#sthref570" /></entry>
</entry>
<entry keyword="query hints">
-<entry keyword="Add Query Dialog"><topic href="tasks009.htm#sthref163" /></entry>
-<entry keyword="Queries"><topic href="reference044.htm#sthref548" /></entry>
+<entry keyword="Add Query Dialog"><topic href="tasks010.htm#sthref175" /></entry>
+<entry keyword="Queries"><topic href="reference048.htm#sthref575" /></entry>
</entry>
-<entry keyword="Query - in JPA Details view, Queries"><topic href="reference044.htm#sthref544" /></entry>
+<entry keyword="Query - in JPA Details view, Queries"><topic href="reference048.htm#sthref571" /></entry>
<entry keyword="quick start - Dali, Dali quick start"><topic href="getting_started002.htm#sthref8" /></entry>
-<entry keyword="read-only entities, Advanced"><topic href="reference024.htm#sthref458" /></entry>
+<entry keyword="read-only entities, Advanced"><topic href="reference028.htm#sthref483" /></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="tasks002.htm#sthref73" /></entry>
+<entry keyword="persistent entities, Entity"><topic href="tasks003.htm#sthref85" /></entry>
+ </entry>
+<entry keyword="Schema Generation - in persistence.xml editor, Schema Generation"><topic href="reference055.htm#sthref605" /></entry>
+<entry keyword="schema - database, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref626" /></entry>
+ <entry keyword="schema - JAXB">
+<entry keyword="Add Schema Location dialog"><topic href="reference074.htm#sthref676" /></entry>
+<entry keyword="Select Schema Location dialog"><topic href="reference075.htm#sthref680" /></entry>
</entry>
-<entry keyword="Schema Generation - in persistence.xml editor, Schema Generation"><topic href="reference051.htm#sthref578" /></entry>
-<entry keyword="schema - database, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref599" /></entry>
<entry keyword="secondary tables">
-<entry keyword="Specifying additional tables"><topic href="task_additonal_tables.htm#sthref141" /></entry>
-<entry keyword="Secondary tables"><topic href="reference022.htm#sthref443" /></entry>
- </entry>
-<entry keyword="Secondary Tables - in Java Details view, Secondary tables"><topic href="reference022.htm#sthref446" /></entry>
-<entry keyword="Select Cascade dialog, Select Cascade dialog"><topic href="ref_select_cascade_dialog.htm#sthref617" /></entry>
-<entry keyword="single table inheritance, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref150" /></entry>
-<entry keyword="Source - in persistence.xml editor, Source"><topic href="reference053.htm#sthref584" /></entry>
-<entry keyword="struct converter, Converters"><topic href="reference023.htm#sthref455" /></entry>
-<entry keyword="superclass, Mapped superclass"><topic href="tasks004.htm#sthref92" /></entry>
-<entry keyword="synchronizing classes with persistence.xml file, Synchronizing classes"><topic href="tasks006.htm#sthref117" /></entry>
+<entry keyword="Specifying additional tables"><topic href="task_additonal_tables.htm#sthref153" /></entry>
+<entry keyword="Secondary tables"><topic href="reference026.htm#sthref468" /></entry>
+ </entry>
+<entry keyword="Secondary Tables - in Java Details view, Secondary tables"><topic href="reference026.htm#sthref471" /></entry>
+<entry keyword="Select Cascade dialog, Select Cascade dialog"><topic href="ref_select_cascade_dialog.htm#sthref657" /></entry>
+<entry keyword="Select Schema Location dialog, Select Schema Location dialog"><topic href="reference075.htm#sthref679" /></entry>
+<entry keyword="single table inheritance, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref162" /></entry>
+<entry keyword="Source - in persistence.xml editor, Source"><topic href="reference057.htm#sthref611" /></entry>
+<entry keyword="struct converter, Converters"><topic href="reference027.htm#sthref480" /></entry>
+<entry keyword="superclass, Mapped superclass"><topic href="tasks005.htm#sthref104" /></entry>
+<entry keyword="synchronizing classes with persistence.xml file, Synchronizing classes"><topic href="tasks007.htm#sthref129" /></entry>
<entry keyword="tables">
<entry keyword="associations">
-<entry keyword="Table Associations"><topic href="ref_tableAssociations.htm#sthref330" /></entry>
-<entry keyword="Table Associations"><topic href="reference004.htm#sthref345" /></entry>
-<entry keyword="Create New Association wizard"><topic href="ref_create_new_association_wizard.htm#sthref390" /></entry>
+<entry keyword="Table Associations"><topic href="ref_tableAssociations.htm#sthref343" /></entry>
+<entry keyword="Table Associations"><topic href="reference004.htm#sthref358" /></entry>
+<entry keyword="Create New Association wizard"><topic href="ref_create_new_association_wizard.htm#sthref415" /></entry>
</entry>
-<entry keyword="creating dynamic entities from, Generating dynamic entities from tables"><topic href="tasks023.htm#sthref276" /></entry>
+<entry keyword="creating dynamic entities from, Generating dynamic entities from tables"><topic href="tasks024.htm#sthref289" /></entry>
<entry keyword="creating entities from">
-<entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref259" /></entry>
-<entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref327" /></entry>
-<entry keyword="Select Tables"><topic href="reference003.htm#sthref342" /></entry>
+<entry keyword="Generating entities from tables"><topic href="tasks022.htm#sthref272" /></entry>
+<entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref340" /></entry>
+<entry keyword="Select Tables"><topic href="reference003.htm#sthref355" /></entry>
</entry>
-<entry keyword="creating from entities, Generate Tables from Entities wizard"><topic href="reference010.htm#sthref383" /></entry>
-<entry keyword="from entities, Generating tables from entities"><topic href="tasks022.htm#sthref269" /></entry>
-<entry keyword="inheritance, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref151" /></entry>
+<entry keyword="creating from entities, Generate Tables from Entities wizard"><topic href="reference014.htm#sthref408" /></entry>
+<entry keyword="from entities, Generating tables from entities"><topic href="tasks023.htm#sthref282" /></entry>
+<entry keyword="inheritance, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref163" /></entry>
<entry keyword="secondary">
-<entry keyword="Specifying additional tables"><topic href="task_additonal_tables.htm#sthref140" /></entry>
-<entry keyword="Secondary tables"><topic href="reference022.htm#sthref444" /></entry>
+<entry keyword="Specifying additional tables"><topic href="task_additonal_tables.htm#sthref152" /></entry>
+<entry keyword="Secondary tables"><topic href="reference026.htm#sthref469" /></entry>
</entry>
</entry>
-<entry keyword="temporal, Type information"><topic href="reference035.htm#sthref507" /></entry>
-<entry keyword="thread identifier - in logging, Logging"><topic href="reference049.htm#sthref574" /></entry>
-<entry keyword="timestamp - in logging, Logging"><topic href="reference049.htm#sthref573" /></entry>
-<entry keyword="tracking changes, Advanced"><topic href="reference024.htm#sthref463" /></entry>
-<entry keyword="transaction type - persistence unit, Connection"><topic href="reference046.htm#sthref564" /></entry>
+<entry keyword="temporal, Type information"><topic href="reference039.htm#sthref534" /></entry>
+<entry keyword="thread identifier - in logging, Logging"><topic href="reference053.htm#sthref601" /></entry>
+<entry keyword="timestamp - in logging, Logging"><topic href="reference053.htm#sthref600" /></entry>
+<entry keyword="tracking changes, Advanced"><topic href="reference028.htm#sthref488" /></entry>
+<entry keyword="transaction type - persistence unit, Connection"><topic href="reference050.htm#sthref591" /></entry>
<entry keyword="transient mapping">
-<entry keyword="@Transient, Transient mapping"><topic href="tasks019.htm#sthref246" /></entry>
-<entry keyword="about, Transient mapping"><topic href="tasks019.htm#sthref244" /></entry>
+<entry keyword="@Transient, Transient mapping"><topic href="tasks020.htm#sthref259" /></entry>
+<entry keyword="about, Transient mapping"><topic href="tasks020.htm#sthref257" /></entry>
</entry>
-<entry keyword="type converter, Converters"><topic href="reference023.htm#sthref454" /></entry>
-<entry keyword="Type Information - in JPA Details view, Type information"><topic href="reference035.htm#sthref505" /></entry>
-<entry keyword="vendor-specific properties, Properties"><topic href="reference052.htm#sthref581" /></entry>
+<entry keyword="type converter, Converters"><topic href="reference027.htm#sthref479" /></entry>
+<entry keyword="Type Information - in JPA Details view, Type information"><topic href="reference039.htm#sthref532" /></entry>
+<entry keyword="vendor-specific properties, Properties"><topic href="reference056.htm#sthref608" /></entry>
<entry keyword="version mapping">
-<entry keyword="@Version, Version mapping"><topic href="tasks020.htm#sthref253" /></entry>
+<entry keyword="@Version, Version mapping"><topic href="tasks021.htm#sthref266" /></entry>
<entry keyword="about">
-<entry keyword="Version mapping"><topic href="tasks020.htm#sthref251" /></entry>
-<entry keyword="Version Mapping"><topic href="reference034.htm#sthref502" /></entry>
+<entry keyword="Version mapping"><topic href="tasks021.htm#sthref264" /></entry>
+<entry keyword="Version Mapping"><topic href="reference038.htm#sthref529" /></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#sthref402" /></entry>
-<entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref468" /></entry>
+<entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref427" /></entry>
+<entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref493" /></entry>
</entry>
-<entry keyword="JPA Structure view, JPA Structure view"><topic href="ref_persistence_outline.htm#sthref554" /></entry>
+<entry keyword="JPA Structure view, JPA Structure view"><topic href="ref_persistence_outline.htm#sthref581" /></entry>
</entry>
-<entry keyword="virtual access type, Generating dynamic entities from tables"><topic href="tasks023.htm#sthref278" /></entry>
-<entry keyword="virtual attributes - adding, Adding virtual attributes"><topic href="tasks005.htm#sthref95" /></entry>
-<entry keyword="warning messages - Dali, Validating mappings and reporting problems"><topic href="tasks024.htm#sthref285" /></entry>
+<entry keyword="virtual access type, Generating dynamic entities from tables"><topic href="tasks024.htm#sthref291" /></entry>
+<entry keyword="virtual attributes - adding, Adding virtual attributes"><topic href="tasks006.htm#sthref107" /></entry>
+<entry keyword="warning messages - Dali, Validating mappings and reporting problems"><topic href="tasks025.htm#sthref298" /></entry>
<entry keyword="weaving">
-<entry keyword="EclipseLink, Project Properties page - EclipseLink"><topic href="reference057.htm#sthref605" /></entry>
+<entry keyword="EclipseLink, Project Properties page - EclipseLink"><topic href="reference061.htm#sthref632" /></entry>
</entry>
<entry keyword="Web Tools Platform (WTP), Requirements and installation"><topic href="getting_started001.htm#sthref5" /></entry>
-<entry keyword="wizards, Wizards"><topic href="reference001.htm#sthref323" /></entry>
-<entry keyword="XML editor, Working with orm.xml file"><topic href="tasks008.htm#sthref134" /></entry>
-<entry keyword="XML - project metatdata, Converting JPA metadata to XML"><topic href="tasks028.htm#sthref319" /></entry>
-<entry keyword="XMLPath, Tips and tricks"><topic href="tips_and_tricks.htm#sthref648" /></entry>
+<entry keyword="wizards, Wizards"><topic href="reference001.htm#sthref336" /></entry>
+<entry keyword="XML editor, Working with orm.xml file"><topic href="tasks009.htm#sthref146" /></entry>
+<entry keyword="XML - project metatdata, Converting JPA metadata to XML"><topic href="tasks029.htm#sthref332" /></entry>
+<entry keyword="XMLPath, Tips and tricks"><topic href="tips_and_tricks.htm#sthref696" /></entry>
</index> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm b/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm
index d55fbdfd02..344af5687f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm
@@ -8,7 +8,7 @@
<title>Legal</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:45Z" />
+<meta name="date" content="2012-09-19T13:28:3Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content=" Legal" />
<meta name="relnum" content="Release 3.2" />
@@ -17,8 +17,8 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p><a id="sthref649" name="sthref649"></a></p>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p><a id="sthref697" name="sthref697"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<h1>Legal</h1>
<p>Copyright &copy; 2011, 2012, 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/ref_EntityClassPage.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm
index 437d4a2f4f..8860cd3aae 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm
@@ -8,7 +8,7 @@
<title>Entity Class page</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Entity Class page" />
<meta name="relnum" content="Release 3.2" />
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIAFEIGF" name="CIAFEIGF"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Entity Class page</h1>
@@ -84,7 +84,7 @@
</tr>
<tr align="left" valign="top">
<td align="left" id="r7c1-t10" headers="r1c1-t10">
-<p><a id="sthref356" name="sthref356"></a>Inheritance</p>
+<p><a id="sthref369" name="sthref369"></a>Inheritance</p>
</td>
<td align="left" headers="r7c1-t10 r1c2-t10">
<p>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>
@@ -108,7 +108,7 @@
</tr>
<tr align="left" valign="top">
<td align="left" id="r8c1-t10" headers="r1c1-t10">
-<p><a id="sthref357" name="sthref357"></a>XML Entity Mappings</p>
+<p><a id="sthref370" name="sthref370"></a>XML Entity Mappings</p>
</td>
<td align="left" headers="r8c1-t10 r1c2-t10">
<p>Select <span class="bold">Add to entity mappings in XML</span> to create XML mappings in <code>orm.xml</code>, rather than annotations.</p>
@@ -120,14 +120,14 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref358" name="sthref358"></a>
+<a id="sthref371" name="sthref371"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
</li>
</ul>
-<a id="sthref359" name="sthref359"></a>
+<a id="sthref372" name="sthref372"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
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 ab7a4bed86..717c7b1f61 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm
@@ -8,7 +8,7 @@
<title>Entity Properties page</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Entity Properties page" />
<meta name="relnum" content="Release 3.2" />
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIADECIA" name="CIADECIA"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Entity Properties page</h1>
@@ -89,7 +89,7 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref360" name="sthref360"></a>
+<a id="sthref373" name="sthref373"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
@@ -99,7 +99,7 @@
<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
</li>
</ul>
-<a id="sthref361" name="sthref361"></a>
+<a id="sthref374" name="sthref374"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
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 2fddfc005f..8ac65c3aa0 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
@@ -8,7 +8,7 @@
<title>Add Converter dialog</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:28:1Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Add Converter dialog" />
<meta name="relnum" content="Release 3.2" />
@@ -17,35 +17,35 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIAGCGIJ" name="CIAGCGIJ"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Add Converter dialog</h1>
-<p><a id="sthref622" name="sthref622"></a>Use this dialog to create a new EclipseLink converter.</p>
+<p><a id="sthref662" name="sthref662"></a>Use this dialog to create a new EclipseLink converter.</p>
<div class="inftblhruleinformal">
<table class="HRuleInformal" summary="This table lists the options on the New EclipseLink Mapping File dialog." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="24%" />
<col width="*" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t70">Property</th>
-<th align="left" valign="bottom" id="r1c2-t70">Description</th>
+<th align="left" valign="bottom" id="r1c1-t75">Property</th>
+<th align="left" valign="bottom" id="r1c2-t75">Description</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t70" headers="r1c1-t70">
+<td align="left" id="r2c1-t75" headers="r1c1-t75">
<p>Name</p>
</td>
-<td align="left" headers="r2c1-t70 r1c2-t70">
+<td align="left" headers="r2c1-t75 r1c2-t75">
<p>Enter the name for this converter</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t70" headers="r1c1-t70">
+<td align="left" id="r3c1-t75" headers="r1c1-t75">
<p>Type</p>
</td>
-<td align="left" headers="r3c1-t70 r1c2-t70">
+<td align="left" headers="r3c1-t75 r1c2-t75">
<p>Select the converter type:</p>
<ul>
<li>
@@ -67,11 +67,11 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref623" name="sthref623"></a>
+<a id="sthref663" name="sthref663"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
-<p><a href="reference023.htm#CACJGDAJ">Converters</a></p>
+<p><a href="reference027.htm#CACJGDAJ">Converters</a></p>
</li>
</ul>
</div>
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 cbe8a130b6..a44abdeb7c 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
@@ -8,7 +8,7 @@
<title>Association Cardinality</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Association Cardinality" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIAFIIFH" name="CIAFIIFH"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Association Cardinality</h1>
-<p><a id="sthref397" name="sthref397"></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="sthref422" name="sthref422"></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>
@@ -36,20 +36,20 @@
<p>Many to many</p>
</li>
</ul>
-<a id="sthref398" name="sthref398"></a>
+<a id="sthref423" name="sthref423"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
<p><a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association wizard</a></p>
</li>
<li>
-<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+<p><a href="tasks022.htm#BABBAGFI">Generating entities from tables</a></p>
</li>
<li>
<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
</ul>
-<a id="sthref399" name="sthref399"></a>
+<a id="sthref424" name="sthref424"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
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 53e3e00e5d..ff800af1c8 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
@@ -8,7 +8,7 @@
<title>Association Tables</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Association Tables" />
<meta name="relnum" content="Release 3.2" />
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIAGJHDC" name="CIAGJHDC"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Association Tables</h1>
@@ -28,24 +28,24 @@
<col width="*" />
<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="r1c1-t22">Property</th>
+<th align="left" valign="bottom" id="r1c2-t22">Description</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t19" headers="r1c1-t19">
+<td align="left" id="r2c1-t22" headers="r1c1-t22">
<p>Association kind</p>
</td>
-<td align="left" headers="r2c1-t19 r1c2-t19">
+<td align="left" headers="r2c1-t22 r1c2-t22">
<p>Specify if the association is <span class="bold">Simple</span> (1:M) or <span class="bold">Many to Many</span> (M:M).</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t19" headers="r1c1-t19">
+<td align="left" id="r3c1-t22" headers="r1c1-t22">
<p>Association tables</p>
</td>
-<td align="left" headers="r3c1-t19 r1c2-t19">
+<td align="left" headers="r3c1-t22 r1c2-t22">
<p>Click <span class="bold">Table Selection</span>, then select the two tables to associate.</p>
<p>When creating a <span class="bold">Many to Many</span> association, you can select a <span class="bold">Join Table</span> for the association.</p>
</td>
@@ -54,20 +54,20 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref392" name="sthref392"></a>
+<a id="sthref417" name="sthref417"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
<p><a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association wizard</a></p>
</li>
<li>
-<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+<p><a href="tasks022.htm#BABBAGFI">Generating entities from tables</a></p>
</li>
<li>
<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
</ul>
-<a id="sthref393" name="sthref393"></a>
+<a id="sthref418" name="sthref418"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
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 e5efb5e9f6..2a7103ff3f 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
@@ -8,7 +8,7 @@
<title>Generate Entities from Tables wizard</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:40Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Generate Entities from Tables wizard" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIAGBFJE" name="CIAGBFJE"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Generate Entities from Tables wizard</h1>
-<p><a id="sthref324" name="sthref324"></a>Use the Generate Custom Entities Wizard to create JPA entities from your database tables.</p>
+<p><a id="sthref337" name="sthref337"></a>Use the Generate Custom Entities Wizard to create JPA entities from your database tables.</p>
<p>The wizard consists of the following pages:</p>
<ul>
<li>
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 f5d0997ac9..5c7adab8b7 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
@@ -8,7 +8,7 @@
<title>Create JPA Entity wizard</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Create JPA Entity wizard" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIAGGGDF" name="CIAGGGDF"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Create JPA Entity wizard</h1>
-<p><a id="sthref354" name="sthref354"></a><a id="sthref355" name="sthref355"></a>The Create JPA wizard enables you to quickly add an entity and also add persistence fields to that entity. In addition, this wizard adds the accessor methods (<code>getter</code> and <code>setter</code>) in the class file. The wizard consists of the following pages:</p>
+<p><a id="sthref367" name="sthref367"></a><a id="sthref368" name="sthref368"></a>The Create JPA wizard enables you to quickly add an entity and also add persistence fields to that entity. In addition, this wizard adds the accessor methods (<code>getter</code> and <code>setter</code>) in the class file. The wizard consists of the following pages:</p>
<ul>
<li>
<p><a href="ref_EntityClassPage.htm#CIAFEIGF">Entity Class page</a></p>
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 c55354a5a2..2ed5aaef62 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
@@ -8,7 +8,7 @@
<title>Create New Association wizard</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Create New Association wizard" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIAFGHIF" name="CIAFGHIF"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Create New Association wizard</h1>
-<p><a id="sthref389" name="sthref389"></a><a id="sthref390" name="sthref390"></a><a id="sthref391" name="sthref391"></a>Use the Create New Association wizard to specify association tables when generating an entity.</p>
+<p><a id="sthref414" name="sthref414"></a><a id="sthref415" name="sthref415"></a><a id="sthref416" name="sthref416"></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 8d22303405..e37c975f89 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizIndividualEntities.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizIndividualEntities.htm
@@ -8,7 +8,7 @@
<title>Customize Individual Entities</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Customize Individual Entities" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIACIGEE" name="CIACIGEE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Customize Individual Entities</h1>
-<p><a id="sthref336" name="sthref336"></a>Use this page to customize each generated entity. Select an item in the <span class="bold">Table and columns</span> area, then complete the following fields for each item.</p>
+<p><a id="sthref349" name="sthref349"></a>Use this page to customize each generated entity. Select an item in the <span class="bold">Table and columns</span> area, then complete the following fields for each item.</p>
<div class="inftblhruleinformal">
<table class="HRuleInformal" title="Options on the Customize Entities page of the Generate Entities from Tables wizard" summary="Options on the Customize Entities page of the Generate Entities from Tables wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="32%" />
@@ -138,20 +138,20 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref337" name="sthref337"></a>
+<a id="sthref350" name="sthref350"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
</li>
<li>
-<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+<p><a href="tasks022.htm#BABBAGFI">Generating entities from tables</a></p>
</li>
<li>
<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
</ul>
-<a id="sthref338" name="sthref338"></a>
+<a id="sthref351" name="sthref351"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
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 c34578b545..41e006d495 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm
@@ -8,7 +8,7 @@
<title>Customize Default Entity Generation</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:40Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Customize Default Entity Generation" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIAEJDBE" name="CIAEJDBE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Customize Default Entity Generation</h1>
-<p><a id="sthref333" name="sthref333"></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="sthref346" name="sthref346"></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="inftblhruleinformal">
<table class="HRuleInformal" title="Options on the Customize Defautl Entity page of the Generate Entities from Tables wizard" summary="Options on the Customize Defautl Entity page of the Generate Entities from Tables wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="32%" />
@@ -102,20 +102,20 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref334" name="sthref334"></a>
+<a id="sthref347" name="sthref347"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
</li>
<li>
-<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+<p><a href="tasks022.htm#BABBAGFI">Generating entities from tables</a></p>
</li>
<li>
<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
</ul>
-<a id="sthref335" name="sthref335"></a>
+<a id="sthref348" name="sthref348"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
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 7a44e7c811..9979d20e16 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
@@ -8,7 +8,7 @@
<title>JPA Details view (for orm.xml)</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:28:0Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Details view (for orm.xml)" />
<meta name="relnum" content="Release 3.2" />
@@ -17,26 +17,26 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CACGDGHC" name="CACGDGHC"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>JPA Details view (for orm.xml)</h1>
-<p><a id="sthref531" name="sthref531"></a><a id="sthref532" name="sthref532"></a>The <span class="gui-object-title">JPA Details</span> view displays the default mapping and persistence information for the project and contains the following areas:</p>
+<p><a id="sthref558" name="sthref558"></a><a id="sthref559" name="sthref559"></a>The <span class="gui-object-title">JPA Details</span> view displays the default mapping and persistence information for the project and contains the following areas:</p>
<ul>
<li>
-<p><a href="reference041.htm#CACCACGH">Entity Mappings</a></p>
+<p><a href="reference045.htm#CACCACGH">Entity Mappings</a></p>
</li>
<li>
-<p><a href="reference042.htm#CACEAGBG">Persistence Unit</a></p>
+<p><a href="reference046.htm#CACEAGBG">Persistence Unit</a></p>
</li>
<li>
-<p><a href="reference043.htm#CIAFGAIJ">Generators</a></p>
+<p><a href="reference047.htm#CIAFGAIJ">Generators</a></p>
</li>
<li>
-<p><a href="reference044.htm#CIAIBAAJ">Queries</a></p>
+<p><a href="reference048.htm#CIAIBAAJ">Queries</a></p>
</li>
<li>
-<p><a href="reference045.htm#CIADGCID">Converters</a> (when using EclipseLink)</p>
+<p><a href="reference049.htm#CIADGCID">Converters</a> (when using EclipseLink)</p>
</li>
</ul>
<p>These defaults can be overridden by the settings on a specific entity or mapping.</p>
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 d96df8f7cb..df3bf76720 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
@@ -8,7 +8,7 @@
<title>New EclipseLink Mapping File dialog</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:28:1Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="New EclipseLink Mapping File dialog" />
<meta name="relnum" content="Release 3.2" />
@@ -17,67 +17,67 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIAEDEJF" name="CIAEDEJF"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>New EclipseLink Mapping File dialog</h1>
-<p><a id="sthref618" name="sthref618"></a><a id="sthref619" name="sthref619"></a><a id="sthref620" name="sthref620"></a>Specify the location and properties of the EclipseLink mapping file (<code>eclipselink-orm.xml</code>).</p>
+<p><a id="sthref658" name="sthref658"></a><a id="sthref659" name="sthref659"></a><a id="sthref660" name="sthref660"></a>Specify the location and properties of the EclipseLink mapping file (<code>eclipselink-orm.xml</code>).</p>
<div class="inftblhruleinformal">
<table class="HRuleInformal" summary="This table lists the options on the New EclipseLink Mapping File dialog." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="24%" />
<col width="*" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t69">Property</th>
-<th align="left" valign="bottom" id="r1c2-t69">Description</th>
+<th align="left" valign="bottom" id="r1c1-t74">Property</th>
+<th align="left" valign="bottom" id="r1c2-t74">Description</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t69" headers="r1c1-t69">
+<td align="left" id="r2c1-t74" headers="r1c1-t74">
<p>Project</p>
</td>
-<td align="left" headers="r2c1-t69 r1c2-t69">
+<td align="left" headers="r2c1-t74 r1c2-t74">
<p>Select the project in which to add the mapping file.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t69" headers="r1c1-t69">
+<td align="left" id="r3c1-t74" headers="r1c1-t74">
<p>Source folder</p>
</td>
-<td align="left" headers="r3c1-t69 r1c2-t69">
+<td align="left" headers="r3c1-t74 r1c2-t74">
<p>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>.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t69" headers="r1c1-t69">
+<td align="left" id="r4c1-t74" headers="r1c1-t74">
<p>File path</p>
</td>
-<td align="left" headers="r4c1-t69 r1c2-t69">
+<td align="left" headers="r4c1-t74 r1c2-t74">
<p>Enter the filename and path of the mapping file. The default is <code>META-INF/eclipselink-orm.xml</code>.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t69" headers="r1c1-t69">
+<td align="left" id="r5c1-t74" headers="r1c1-t74">
<p>Default access</p>
</td>
-<td align="left" headers="r5c1-t69 r1c2-t69">
+<td align="left" headers="r5c1-t74 r1c2-t74">
<p>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.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t69" headers="r1c1-t69">
+<td align="left" id="r6c1-t74" headers="r1c1-t74">
<p>Add to persistence unit</p>
</td>
-<td align="left" headers="r6c1-t69 r1c2-t69">
+<td align="left" headers="r6c1-t74 r1c2-t74">
<p>Specify if this mapping file should be added to the persistence unit (<code>persistence.xml</code>).</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t69" headers="r1c1-t69">
+<td align="left" id="r7c1-t74" headers="r1c1-t74">
<p>&nbsp;&nbsp;Persistence&nbsp;Unit</p>
</td>
-<td align="left" headers="r7c1-t69 r1c2-t69">
+<td align="left" headers="r7c1-t74 r1c2-t74">
<p>Select the persistence unit in which to add the mapping file.</p>
</td>
</tr>
@@ -85,7 +85,7 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref621" name="sthref621"></a>
+<a id="sthref661" name="sthref661"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
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 194369bfed..0df55b4fb1 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
@@ -8,7 +8,7 @@
<title>Java Page</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Java Page" />
<meta name="relnum" content="Release 3.2" />
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIAGEBAA" name="CIAGEBAA"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Java Page</h1>
@@ -61,14 +61,14 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref374" name="sthref374"></a>
+<a id="sthref387" name="sthref387"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
</li>
</ul>
-<a id="sthref375" name="sthref375"></a>
+<a id="sthref388" name="sthref388"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
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 765aeeb020..022b2d579b 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
@@ -8,7 +8,7 @@
<title>Join Columns</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Join Columns" />
<meta name="relnum" content="Release 3.2" />
@@ -17,26 +17,26 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIAEGEEG" name="CIAEGEEG"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Join Columns</h1>
-<p><a id="sthref394" name="sthref394"></a>Use this dialog to specify the join columns of an association table.</p>
+<p><a id="sthref419" name="sthref419"></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>
-<a id="sthref395" name="sthref395"></a>
+<a id="sthref420" name="sthref420"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
<p><a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association wizard</a></p>
</li>
<li>
-<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+<p><a href="tasks022.htm#BABBAGFI">Generating entities from tables</a></p>
</li>
<li>
<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
</ul>
-<a id="sthref396" name="sthref396"></a>
+<a id="sthref421" name="sthref421"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
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 30cfc38b4c..820efc2a12 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
@@ -8,7 +8,7 @@
<title>JPA Facet page</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Facet page" />
<meta name="relnum" content="Release 3.2" />
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CACIFDIF" name="CACIFDIF"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>JPA Facet page</h1>
@@ -48,7 +48,7 @@
</tr>
<tr align="left" valign="top">
<td align="left" id="r3c1-t16" headers="r1c1-t16">
-<p><a id="sthref376" name="sthref376"></a><a id="sthref377" name="sthref377"></a><span class="bold">JPA Implementation</span></p>
+<p><a id="sthref389" name="sthref389"></a><a id="sthref390" name="sthref390"></a><span class="bold">JPA Implementation</span></p>
</td>
<td align="left" headers="r3c1-t16 r1c2-t16">
<p>Select a specific JPA library configuration.</p>
@@ -113,7 +113,7 @@
</tr>
<tr align="left" valign="top">
<td align="left" id="r9c1-t16" headers="r1c1-t16">
-<p><a id="sthref378" name="sthref378"></a><span class="bold">Persistent class management</span></p>
+<p><a id="sthref391" name="sthref391"></a><span class="bold">Persistent class management</span></p>
</td>
<td align="left" headers="r9c1-t16 r1c2-t16">
<p>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>
@@ -125,7 +125,7 @@
</tr>
<tr align="left" valign="top">
<td align="left" id="r10c1-t16" headers="r1c1-t16">
-<p><a id="sthref379" name="sthref379"></a><span class="bold">Create mapping file (orm.xml)</span></p>
+<p><a id="sthref392" name="sthref392"></a><span class="bold">Create mapping file (orm.xml)</span></p>
</td>
<td align="left" headers="r10c1-t16 r1c2-t16">
<p>Specify if Dali should create a default <code>orm.xml</code> file for your entity mappings and persistence unit defaults.</p>
@@ -138,14 +138,14 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref380" name="sthref380"></a>
+<a id="sthref393" name="sthref393"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
</li>
</ul>
-<a id="sthref381" name="sthref381"></a>
+<a id="sthref394" name="sthref394"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
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 ba2f75bee0..71ff0de8e4 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
@@ -8,7 +8,7 @@
<title>New JPA Project page</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="New JPA Project page" />
<meta name="relnum" content="Release 3.2" />
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CACBJAGC" name="CACBJAGC"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>New JPA Project page</h1>
@@ -113,14 +113,14 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref372" name="sthref372"></a>
+<a id="sthref385" name="sthref385"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
</li>
</ul>
-<a id="sthref373" name="sthref373"></a>
+<a id="sthref386" name="sthref386"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
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 3e52c780e1..618bb9f944 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
@@ -8,7 +8,7 @@
<title>Create New JPA Project wizard</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Create New JPA Project wizard" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<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="sthref369" name="sthref369"></a><a id="sthref370" name="sthref370"></a><a id="sthref371" name="sthref371"></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="sthref382" name="sthref382"></a><a id="sthref383" name="sthref383"></a><a id="sthref384" name="sthref384"></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 28f90979da..99f6613bf7 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
@@ -8,7 +8,7 @@
<title>General</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:28:0Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="General" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIACIFGJ" name="CIACIFGJ"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>General</h1>
-<p><a id="sthref559" name="sthref559"></a>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>
+<p><a id="sthref586" name="sthref586"></a>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="inftblhruleinformal">
<table class="HRuleInformal" summary="The following table lists properties available in the General page of the persistence.xml Editor." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="24%" />
@@ -29,128 +29,128 @@
<col width="24%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t49">Property</th>
-<th align="left" valign="bottom" id="r1c2-t49">Description</th>
-<th align="left" valign="bottom" id="r1c3-t49">Default</th>
+<th align="left" valign="bottom" id="r1c1-t52">Property</th>
+<th align="left" valign="bottom" id="r1c2-t52">Description</th>
+<th align="left" valign="bottom" id="r1c3-t52">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t49" headers="r1c1-t49">
+<td align="left" id="r2c1-t52" headers="r1c1-t52">
<p><span class="bold">General</span></p>
</td>
-<td align="left" headers="r2c1-t49 r1c2-t49"><br /></td>
-<td align="left" headers="r2c1-t49 r1c3-t49"><br /></td>
+<td align="left" headers="r2c1-t52 r1c2-t52"><br /></td>
+<td align="left" headers="r2c1-t52 r1c3-t52"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t49" headers="r1c1-t49">
+<td align="left" id="r3c1-t52" headers="r1c1-t52">
<p>Name</p>
</td>
-<td align="left" headers="r3c1-t49 r1c2-t49">
+<td align="left" headers="r3c1-t52 r1c2-t52">
<p>Enter the name of the persistence unit.</p>
<p>Defines the <code>&lt;persistence-unit name&gt;</code> element.</p>
</td>
-<td align="left" headers="r3c1-t49 r1c3-t49">
+<td align="left" headers="r3c1-t52 r1c3-t52">
<p>The project name</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t49" headers="r1c1-t49">
-<p><a id="sthref560" name="sthref560"></a>Persistence provider</p>
+<td align="left" id="r4c1-t52" headers="r1c1-t52">
+<p><a id="sthref587" name="sthref587"></a>Persistence provider</p>
</td>
-<td align="left" headers="r4c1-t49 r1c2-t49">
+<td align="left" headers="r4c1-t52 r1c2-t52">
<p>Enter the name of the persistence provider.</p>
<p>Defines the <code>&lt;provider&gt;</code> element.</p>
</td>
-<td align="left" headers="r4c1-t49 r1c3-t49">
+<td align="left" headers="r4c1-t52 r1c3-t52">
<p>Determined by the server</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t49" headers="r1c1-t49">
+<td align="left" id="r5c1-t52" headers="r1c1-t52">
<p>Description</p>
</td>
-<td align="left" headers="r5c1-t49 r1c2-t49">
+<td align="left" headers="r5c1-t52 r1c2-t52">
<p>Enter a description for this persistence unit. This is an optional property.</p>
<p>Defines the <code>&lt;description&gt;</code> element.</p>
</td>
-<td align="left" headers="r5c1-t49 r1c3-t49"><br /></td>
+<td align="left" headers="r5c1-t52 r1c3-t52"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t49" headers="r1c1-t49">
-<p><a id="sthref561" name="sthref561"></a><span class="bold">Managed Classes</span></p>
+<td align="left" id="r6c1-t52" headers="r1c1-t52">
+<p><a id="sthref588" name="sthref588"></a><span class="bold">Managed Classes</span></p>
</td>
-<td align="left" headers="r6c1-t49 r1c2-t49"><br /></td>
-<td align="left" headers="r6c1-t49 r1c3-t49"><br /></td>
+<td align="left" headers="r6c1-t52 r1c2-t52"><br /></td>
+<td align="left" headers="r6c1-t52 r1c3-t52"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t49" headers="r1c1-t49">
+<td align="left" id="r7c1-t52" headers="r1c1-t52">
<p>Classes</p>
</td>
-<td align="left" headers="r7c1-t49 r1c2-t49">
+<td align="left" headers="r7c1-t52 r1c2-t52">
<p>Click <span class="bold">Add</span> to add a new class, or select an existing class and click <span class="bold">Remove</span>, to add or remove the classes managed through the persistence unit.</p>
<p>Defines the <code>&lt;class&gt;</code> element.</p>
<p>Select a class and click <span class="bold">Open</span> to modify the class in the editor.</p>
</td>
-<td align="left" headers="r7c1-t49 r1c3-t49"><br /></td>
+<td align="left" headers="r7c1-t52 r1c3-t52"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t49" headers="r1c1-t49">
+<td align="left" id="r8c1-t52" headers="r1c1-t52">
<p>Exclude Unlisted Classes</p>
</td>
-<td align="left" headers="r8c1-t49 r1c2-t49">
+<td align="left" headers="r8c1-t52 r1c2-t52">
<p>Select to include all annotated entity classes in the root of the persistence unit.</p>
<p>Defines the <code>&lt;exclude-unlisted-classes&gt;</code> element.</p>
</td>
-<td align="left" headers="r8c1-t49 r1c3-t49">
+<td align="left" headers="r8c1-t52 r1c3-t52">
<p>False</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t49" headers="r1c1-t49">
-<p><a id="sthref562" name="sthref562"></a><span class="bold">XML Mapping Files</span></p>
+<td align="left" id="r9c1-t52" headers="r1c1-t52">
+<p><a id="sthref589" name="sthref589"></a><span class="bold">XML Mapping Files</span></p>
</td>
-<td align="left" headers="r9c1-t49 r1c2-t49"><br /></td>
-<td align="left" headers="r9c1-t49 r1c3-t49"><br /></td>
+<td align="left" headers="r9c1-t52 r1c2-t52"><br /></td>
+<td align="left" headers="r9c1-t52 r1c3-t52"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r10c1-t49" headers="r1c1-t49">
+<td align="left" id="r10c1-t52" headers="r1c1-t52">
<p>Files</p>
</td>
-<td align="left" headers="r10c1-t49 r1c2-t49">
+<td align="left" headers="r10c1-t52 r1c2-t52">
<p>Click <span class="bold">Add</span> to select an XML mapping file, or select an existing file and click <span class="bold">Remove</span>, to add or remove an object/relational mapping XML files that define the classes to be managed by the persistence unit.</p>
<p>Defines the <code>&lt;mapping-file&gt;</code> element.</p>
</td>
-<td align="left" headers="r10c1-t49 r1c3-t49">
+<td align="left" headers="r10c1-t52 r1c3-t52">
<p><code>Meta-INF\orm.xml</code></p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r11c1-t49" headers="r1c1-t49">
+<td align="left" id="r11c1-t52" headers="r1c1-t52">
<p>Exclude unlisted EclipseLink XML mapping file</p>
</td>
-<td align="left" headers="r11c1-t49 r1c2-t49">
+<td align="left" headers="r11c1-t52 r1c2-t52">
<p>Select to include all annotated EclipseLink mapping files. Defines the <code>eclipselink.exclude-eclipselink-orm property</code> element.<span class="bold">Note</span>: This field applies only when using EclipseLink JPA implementation</p>
</td>
-<td align="left" headers="r11c1-t49 r1c3-t49">
+<td align="left" headers="r11c1-t52 r1c3-t52">
<p>False</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r12c1-t49" headers="r1c1-t49">
+<td align="left" id="r12c1-t52" headers="r1c1-t52">
<p><span class="bold">JAR Files</span></p>
</td>
-<td align="left" headers="r12c1-t49 r1c2-t49"><br /></td>
-<td align="left" headers="r12c1-t49 r1c3-t49"><br /></td>
+<td align="left" headers="r12c1-t52 r1c2-t52"><br /></td>
+<td align="left" headers="r12c1-t52 r1c3-t52"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r13c1-t49" headers="r1c1-t49">
+<td align="left" id="r13c1-t52" headers="r1c1-t52">
<p>Files</p>
</td>
-<td align="left" headers="r13c1-t49 r1c2-t49">
+<td align="left" headers="r13c1-t52 r1c2-t52">
<p>Click <span class="bold">Add</span> to select a JAR file, or select an existing file and click <span class="bold">Remove</span>, to add or remove JAR files and libraries in the persistence unit.</p>
</td>
-<td align="left" headers="r13c1-t49 r1c3-t49"><br /></td>
+<td align="left" headers="r13c1-t52 r1c3-t52"><br /></td>
</tr>
</tbody>
</table>
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 8cd913dd2f..ee7c089eb1 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
@@ -8,7 +8,7 @@
<title>JPA Details view (for attributes)</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Details view (for attributes)" />
<meta name="relnum" content="Release 3.2" />
@@ -17,66 +17,66 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<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="sthref467" name="sthref467"></a><a id="sthref468" name="sthref468"></a><a id="sthref469" name="sthref469"></a><a id="sthref470" name="sthref470"></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>
-<a id="sthref471" name="sthref471"></a>
+<p><a id="sthref492" name="sthref492"></a><a id="sthref493" name="sthref493"></a><a id="sthref494" name="sthref494"></a><a id="sthref495" name="sthref495"></a><a id="sthref496" name="sthref496"></a><a id="sthref497" name="sthref497"></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>
+<a id="sthref498" name="sthref498"></a>
<p class="subhead2">Mapping Type</p>
<ul>
<li>
-<p><a href="reference025.htm#CACCGGCG">Basic Mapping</a></p>
+<p><a href="reference029.htm#CACCGGCG">Basic Mapping</a></p>
</li>
<li>
-<p><a href="reference026.htm#CACBCGDI">Element Collection Mapping</a></p>
+<p><a href="reference030.htm#CACBCGDI">Element Collection Mapping</a></p>
</li>
<li>
-<p><a href="reference027.htm#CACBJBFD">Embedded Mapping</a></p>
+<p><a href="reference031.htm#CACBJBFD">Embedded Mapping</a></p>
</li>
<li>
-<p><a href="reference028.htm#CACDIDIA">Embedded ID Mapping</a></p>
+<p><a href="reference032.htm#CACDIDIA">Embedded ID Mapping</a></p>
</li>
<li>
-<p><a href="reference029.htm#CACIAEFI">ID Mapping</a></p>
+<p><a href="reference033.htm#CACIAEFI">ID Mapping</a></p>
</li>
<li>
-<p><a href="reference030.htm#CACIHGCE">Many-to-Many Mapping</a></p>
+<p><a href="reference034.htm#CACIHGCE">Many-to-Many Mapping</a></p>
</li>
<li>
-<p><a href="reference031.htm#CACHAEDB">Many-to-One Mapping</a></p>
+<p><a href="reference035.htm#CACHAEDB">Many-to-One Mapping</a></p>
</li>
<li>
-<p><a href="reference032.htm#CACHGGHH">One-to-Many Mapping</a></p>
+<p><a href="reference036.htm#CACHGGHH">One-to-Many Mapping</a></p>
</li>
<li>
-<p><a href="reference033.htm#CACGGHDD">One-to-One Mapping</a></p>
+<p><a href="reference037.htm#CACGGHDD">One-to-One Mapping</a></p>
</li>
<li>
-<p><a href="reference034.htm#CACHAEBB">Version Mapping</a></p>
+<p><a href="reference038.htm#CACHAEBB">Version Mapping</a></p>
</li>
</ul>
-<a id="sthref472" name="sthref472"></a>
+<a id="sthref499" name="sthref499"></a>
<p class="subhead2">Additional Information</p>
<p>Depending on the mapping type, the following additional areas will be available:</p>
<ul>
<li>
-<p><a href="reference036.htm#CACJBFEA">Value</a></p>
+<p><a href="reference040.htm#CACJBFEA">Value</a></p>
</li>
<li>
-<p><a href="reference035.htm#CACIHAAF">Type information</a></p>
+<p><a href="reference039.htm#CACIHAAF">Type information</a></p>
</li>
<li>
-<p><a href="reference037.htm#CACJCHJB">Converters</a></p>
+<p><a href="reference041.htm#CACJCHJB">Converters</a></p>
</li>
<li>
-<p><a href="reference038.htm#CACBIJFD">Ordering</a></p>
+<p><a href="reference042.htm#CACBIJFD">Ordering</a></p>
</li>
<li>
-<p><a href="reference039.htm#CACIJEGI">Joining Strategy</a></p>
+<p><a href="reference043.htm#CACIJEGI">Joining Strategy</a></p>
</li>
<li>
-<p><a href="reference040.htm#CACGHHGB">Derived Identity</a></p>
+<p><a href="reference044.htm#CACGHHGB">Derived Identity</a></p>
</li>
<li>
<p><a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation 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 fd7e735c16..f4bd177765 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
@@ -8,7 +8,7 @@
<title>JPA Structure view</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:28:0Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Structure view" />
<meta name="relnum" content="Release 3.2" />
@@ -17,16 +17,16 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="BABEGGFE" name="BABEGGFE"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>JPA Structure view</h1>
-<p><a id="sthref554" name="sthref554"></a><a id="sthref555" name="sthref555"></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="sthref556" name="sthref556"></a>
+<p><a id="sthref581" name="sthref581"></a><a id="sthref582" name="sthref582"></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="sthref583" name="sthref583"></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" -->
-<a id="sthref557" name="sthref557"></a>
+<a id="sthref584" name="sthref584"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
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 1deec061ea..2ef7e5b3b4 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
@@ -8,7 +8,7 @@
<title>JPA Development perspective</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:43Z" />
+<meta name="date" content="2012-09-19T13:28:1Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Development perspective" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="BABIFBDB" name="BABIFBDB"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>JPA Development perspective</h1>
-<p><a id="sthref635" name="sthref635"></a><a id="sthref636" name="sthref636"></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="sthref683" name="sthref683"></a><a id="sthref684" name="sthref684"></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>
@@ -36,11 +36,11 @@
<p><a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
</li>
</ul>
-<div class="figure"><a id="sthref637" name="sthref637"></a>
+<div class="figure"><a id="sthref685" name="sthref685"></a>
<p class="titleinfigure">Sample JPA Development Perspective</p>
<img src="img/jpa_perspective.png" alt="JPA Development perspective with the JPA Structure and JPA Details views." title="JPA Development perspective with the JPA Structure and JPA Details views." /><br /></div>
<!-- class="figure" -->
-<a id="sthref638" name="sthref638"></a>
+<a id="sthref686" name="sthref686"></a>
<p class="subhead2">Related concepts</p>
<ul>
<li>
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 fc829e7d90..1972cdb891 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
@@ -8,7 +8,7 @@
<title>JPA Details view (for entities)</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Details view (for entities)" />
<meta name="relnum" content="Release 3.2" />
@@ -17,55 +17,55 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<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="sthref401" name="sthref401"></a><a id="sthref402" name="sthref402"></a><a id="sthref403" name="sthref403"></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>
-<a id="sthref404" name="sthref404"></a>
+<p><a id="sthref426" name="sthref426"></a><a id="sthref427" name="sthref427"></a><a id="sthref428" name="sthref428"></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>
+<a id="sthref429" name="sthref429"></a>
<p class="subhead2">Entity Type</p>
<p>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.</p>
<ul>
<li>
-<p><a href="reference013.htm#CACCAGGC">Entity</a></p>
+<p><a href="reference017.htm#CACCAGGC">Entity</a></p>
</li>
<li>
-<p><a href="reference014.htm#CACHJEJH">Embeddable</a></p>
+<p><a href="reference018.htm#CACHJEJH">Embeddable</a></p>
</li>
<li>
-<p><a href="reference015.htm#CACGIEFD">Mapped Superclass</a></p>
+<p><a href="reference019.htm#CACGIEFD">Mapped Superclass</a></p>
</li>
</ul>
-<a id="sthref405" name="sthref405"></a>
+<a id="sthref430" name="sthref430"></a>
<p class="subhead2">Additional Information</p>
<p>Depending on the entity type, the following additional areas will be available:</p>
<ul>
<li>
-<p><a href="reference016.htm#CACJBBCA">Caching</a></p>
+<p><a href="reference020.htm#CACJBBCA">Caching</a></p>
</li>
<li>
-<p><a href="reference017.htm#CACBICGJ">Queries</a></p>
+<p><a href="reference021.htm#CACBICGJ">Queries</a></p>
</li>
<li>
-<p><a href="reference018.htm#CACFHGHE">Inheritance</a></p>
+<p><a href="reference022.htm#CACFHGHE">Inheritance</a></p>
</li>
<li>
-<p><a href="reference019.htm#CACIJBGH">Attribute Overrides</a></p>
+<p><a href="reference023.htm#CACIJBGH">Attribute Overrides</a></p>
</li>
<li>
-<p><a href="reference020.htm#CACDIJEE">Multitenancy</a></p>
+<p><a href="reference024.htm#CACDIJEE">Multitenancy</a></p>
</li>
<li>
-<p><a href="reference021.htm#CACCJJDC">Primary Key Generation</a></p>
+<p><a href="reference025.htm#CACCJJDC">Primary Key Generation</a></p>
</li>
<li>
-<p><a href="reference023.htm#CACJGDAJ">Converters</a></p>
+<p><a href="reference027.htm#CACJGDAJ">Converters</a></p>
</li>
<li>
-<p><a href="reference022.htm#CACBHIDA">Secondary tables</a></p>
+<p><a href="reference026.htm#CACBHIDA">Secondary tables</a></p>
</li>
<li>
-<p><a href="reference024.htm#CACJEEDE">Advanced</a></p>
+<p><a href="reference028.htm#CACJEEDE">Advanced</a></p>
</li>
</ul>
<!-- Start Footer -->
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 284beddccc..1223498f8f 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
@@ -8,7 +8,7 @@
<title>persistence.xml Editor</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:28:0Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="persistence.xml Editor" />
<meta name="relnum" content="Release 3.2" />
@@ -17,38 +17,38 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIACCHID" name="CIACCHID"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>persistence.xml Editor</h1>
-<p><a id="sthref558" name="sthref558"></a>The persistence.xml Editor provides an interface that enables you to update the <code>persistence.xml</code> file. For projects using the EclipseLink platform, the <code>perisistence.xml</code> Editor consists of the following pages:</p>
+<p><a id="sthref585" name="sthref585"></a>The persistence.xml Editor provides an interface that enables you to update the <code>persistence.xml</code> file. For projects using the EclipseLink platform, the <code>perisistence.xml</code> Editor consists of the following pages:</p>
<ul>
<li>
<p><a href="ref_persistence_general.htm#CIACIFGJ">General</a></p>
</li>
<li>
-<p><a href="reference046.htm#CIAFFJIE">Connection</a></p>
+<p><a href="reference050.htm#CIAFFJIE">Connection</a></p>
</li>
<li>
-<p><a href="reference047.htm#CIAJAFEG">Customization</a></p>
+<p><a href="reference051.htm#CIAJAFEG">Customization</a></p>
</li>
<li>
-<p><a href="reference048.htm#CIABEDCH">Caching</a></p>
+<p><a href="reference052.htm#CIABEDCH">Caching</a></p>
</li>
<li>
-<p><a href="reference049.htm#CIABGHHI">Logging</a></p>
+<p><a href="reference053.htm#CIABGHHI">Logging</a></p>
</li>
<li>
-<p><a href="reference050.htm#CIAFJCHE">Options</a></p>
+<p><a href="reference054.htm#CIAFJCHE">Options</a></p>
</li>
<li>
-<p><a href="reference051.htm#CIACCFCB">Schema Generation</a></p>
+<p><a href="reference055.htm#CIACCFCB">Schema Generation</a></p>
</li>
<li>
-<p><a href="reference052.htm#CIAHJDFF">Properties</a></p>
+<p><a href="reference056.htm#CIAHJDFF">Properties</a></p>
</li>
<li>
-<p><a href="reference053.htm#CIAHCJAH">Source</a></p>
+<p><a href="reference057.htm#CIAHCJAH">Source</a></p>
</li>
</ul>
<p>For projects using the Generic platform, the following subset of these pages is available:</p>
@@ -57,13 +57,13 @@
<p><a href="ref_persistence_general.htm#CIACIFGJ">General</a></p>
</li>
<li>
-<p><a href="reference046.htm#CIAFFJIE">Connection</a></p>
+<p><a href="reference050.htm#CIAFFJIE">Connection</a></p>
</li>
<li>
-<p><a href="reference052.htm#CIAHJDFF">Properties</a></p>
+<p><a href="reference056.htm#CIAHJDFF">Properties</a></p>
</li>
<li>
-<p><a href="reference053.htm#CIAHCJAH">Source</a></p>
+<p><a href="reference057.htm#CIAHCJAH">Source</a></p>
</li>
</ul>
<!-- Start Footer -->
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 a97ad6fe62..d611b1b018 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
@@ -8,7 +8,7 @@
<title>Primary Key Generation information</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:28:0Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Primary Key Generation information" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CACFCCAB" name="CACFCCAB"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref524" name="sthref524"></a>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="tasks014.htm#BABGCBHG">ID mapping</a> types.</p>
+<h1><a id="sthref551" name="sthref551"></a>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="tasks015.htm#BABGCBHG">ID mapping</a> types.</p>
<div class="inftblhruleinformal">
<table class="HRuleInformal" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="26%" />
@@ -29,28 +29,28 @@
<col width="34%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t44">Property</th>
-<th align="left" valign="bottom" id="r1c2-t44">Description</th>
-<th align="left" valign="bottom" id="r1c3-t44">Default</th>
+<th align="left" valign="bottom" id="r1c1-t47">Property</th>
+<th align="left" valign="bottom" id="r1c2-t47">Description</th>
+<th align="left" valign="bottom" id="r1c3-t47">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t44" headers="r1c1-t44"><a id="CACBAJBC" name="CACBAJBC"></a>
+<td align="left" id="r2c1-t47" headers="r1c1-t47"><a id="CACBAJBC" name="CACBAJBC"></a>
<p><span class="bold">Primary Key Generation</span></p>
</td>
-<td align="left" headers="r2c1-t44 r1c2-t44">
-<p><a id="sthref525" name="sthref525"></a><a id="sthref526" name="sthref526"></a>These fields define how the primary key is generated. These fields correspond to the <code>@GeneratedValue</code> annotation.</p>
+<td align="left" headers="r2c1-t47 r1c2-t47">
+<p><a id="sthref552" name="sthref552"></a><a id="sthref553" name="sthref553"></a>These fields define how the primary key is generated. These fields correspond to the <code>@GeneratedValue</code> annotation.</p>
</td>
-<td align="left" headers="r2c1-t44 r1c3-t44">
+<td align="left" headers="r2c1-t47 r1c3-t47">
<p>Generated Value</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t44" headers="r1c1-t44"><a id="CACJEEEC" name="CACJEEEC"></a>
+<td align="left" id="r3c1-t47" headers="r1c1-t47"><a id="CACJEEEC" name="CACJEEEC"></a>
<p>Strategy</p>
</td>
-<td align="left" headers="r3c1-t44 r1c2-t44">
+<td align="left" headers="r3c1-t47 r1c2-t47">
<ul>
<li>
<p>Auto</p>
@@ -66,170 +66,170 @@
</li>
</ul>
</td>
-<td align="left" headers="r3c1-t44 r1c3-t44">
+<td align="left" headers="r3c1-t47 r1c3-t47">
<p>Auto</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t44" headers="r1c1-t44"><a id="BABEEAHJ" name="BABEEAHJ"></a>
+<td align="left" id="r4c1-t47" headers="r1c1-t47"><a id="BABEEAHJ" name="BABEEAHJ"></a>
<p>Generator Name</p>
</td>
-<td align="left" headers="r4c1-t44 r1c2-t44">
+<td align="left" headers="r4c1-t47 r1c2-t47">
<p>Unique name of the generated value.</p>
</td>
-<td align="left" headers="r4c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r4c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t44" headers="r1c1-t44"><a id="CACGFEAH" name="CACGFEAH"></a>
+<td align="left" id="r5c1-t47" headers="r1c1-t47"><a id="CACGFEAH" name="CACGFEAH"></a>
<p><span class="bold">Table Generator</span></p>
</td>
-<td align="left" headers="r5c1-t44 r1c2-t44">
+<td align="left" headers="r5c1-t47 r1c2-t47">
<p>These fields define the database table used for generating the primary key and correspond to the <code>@TableGenerator</code> annotation.</p>
<p>These fields apply only when <span class="bold">Strategy</span>&nbsp;=&nbsp;<span class="bold">Table</span>.</p>
</td>
-<td align="left" headers="r5c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r5c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t44" headers="r1c1-t44">
+<td align="left" id="r6c1-t47" headers="r1c1-t47">
<p>Name</p>
</td>
-<td align="left" headers="r6c1-t44 r1c2-t44">
+<td align="left" headers="r6c1-t47 r1c2-t47">
<p>Unique name of the generator.</p>
</td>
-<td align="left" headers="r6c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r6c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t44" headers="r1c1-t44">
+<td align="left" id="r7c1-t47" headers="r1c1-t47">
<p>Table</p>
</td>
-<td align="left" headers="r7c1-t44 r1c2-t44">
+<td align="left" headers="r7c1-t47 r1c2-t47">
<p>Database table that stores the generated ID values.</p>
</td>
-<td align="left" headers="r7c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r7c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t44" headers="r1c1-t44">
+<td align="left" id="r8c1-t47" headers="r1c1-t47">
<p>Schema</p>
</td>
-<td align="left" headers="r8c1-t44 r1c2-t44"><br /></td>
-<td align="left" headers="r8c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r8c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r8c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t44" headers="r1c1-t44">
+<td align="left" id="r9c1-t47" headers="r1c1-t47">
<p>Catalog</p>
</td>
-<td align="left" headers="r9c1-t44 r1c2-t44"><br /></td>
-<td align="left" headers="r9c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r9c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r9c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r10c1-t44" headers="r1c1-t44">
+<td align="left" id="r10c1-t47" headers="r1c1-t47">
<p>Primary Key Column</p>
</td>
-<td align="left" headers="r10c1-t44 r1c2-t44">
+<td align="left" headers="r10c1-t47 r1c2-t47">
<p>The column in the table generator's <span class="bold">Table</span> that contains the primary key.</p>
</td>
-<td align="left" headers="r10c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r10c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r11c1-t44" headers="r1c1-t44">
+<td align="left" id="r11c1-t47" headers="r1c1-t47">
<p>Value Column</p>
</td>
-<td align="left" headers="r11c1-t44 r1c2-t44">
+<td align="left" headers="r11c1-t47 r1c2-t47">
<p>The column that stores the generated ID values.</p>
</td>
-<td align="left" headers="r11c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r11c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r12c1-t44" headers="r1c1-t44">
+<td align="left" id="r12c1-t47" headers="r1c1-t47">
<p>Primary Key Column Value</p>
</td>
-<td align="left" headers="r12c1-t44 r1c2-t44">
+<td align="left" headers="r12c1-t47 r1c2-t47">
<p>The value for the <span class="bold">Primary Key Column</span> in the generator table.</p>
</td>
-<td align="left" headers="r12c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r12c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r13c1-t44" headers="r1c1-t44">
+<td align="left" id="r13c1-t47" headers="r1c1-t47">
<p>Allocation size</p>
</td>
-<td align="left" headers="r13c1-t44 r1c2-t44"><br /></td>
-<td align="left" headers="r13c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r13c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r13c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r14c1-t44" headers="r1c1-t44">
+<td align="left" id="r14c1-t47" headers="r1c1-t47">
<p>Initial value</p>
</td>
-<td align="left" headers="r14c1-t44 r1c2-t44"><br /></td>
-<td align="left" headers="r14c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r14c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r14c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r15c1-t44" headers="r1c1-t44"><a id="CACFFHEH" name="CACFFHEH"></a>
+<td align="left" id="r15c1-t47" headers="r1c1-t47"><a id="CACFFHEH" name="CACFFHEH"></a>
<p><span class="bold">Sequence&nbsp;Generator</span></p>
</td>
-<td align="left" headers="r15c1-t44 r1c2-t44">
-<p><a id="sthref527" name="sthref527"></a><a id="sthref528" name="sthref528"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.</p>
+<td align="left" headers="r15c1-t47 r1c2-t47">
+<p><a id="sthref554" name="sthref554"></a><a id="sthref555" name="sthref555"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.</p>
<p>These fields apply only when <span class="bold">Strategy</span> = <span class="bold">Sequence</span>.</p>
</td>
-<td align="left" headers="r15c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r15c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r16c1-t44" headers="r1c1-t44">
+<td align="left" id="r16c1-t47" headers="r1c1-t47">
<p>Name</p>
</td>
-<td align="left" headers="r16c1-t44 r1c2-t44">
+<td align="left" headers="r16c1-t47 r1c2-t47">
<p>Name of the sequence table to use for defining primary key values.</p>
</td>
-<td align="left" headers="r16c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r16c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r17c1-t44" headers="r1c1-t44">
+<td align="left" id="r17c1-t47" headers="r1c1-t47">
<p>Sequence</p>
</td>
-<td align="left" headers="r17c1-t44 r1c2-t44">
+<td align="left" headers="r17c1-t47 r1c2-t47">
<p>Unique name of the sequence.</p>
</td>
-<td align="left" headers="r17c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r17c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r18c1-t44" headers="r1c1-t44">
+<td align="left" id="r18c1-t47" headers="r1c1-t47">
<p>Schema</p>
</td>
-<td align="left" headers="r18c1-t44 r1c2-t44"><br /></td>
-<td align="left" headers="r18c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r18c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r18c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r19c1-t44" headers="r1c1-t44">
+<td align="left" id="r19c1-t47" headers="r1c1-t47">
<p>Catalog</p>
</td>
-<td align="left" headers="r19c1-t44 r1c2-t44"><br /></td>
-<td align="left" headers="r19c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r19c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r19c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r20c1-t44" headers="r1c1-t44">
+<td align="left" id="r20c1-t47" headers="r1c1-t47">
<p>Allocation size</p>
</td>
-<td align="left" headers="r20c1-t44 r1c2-t44"><br /></td>
-<td align="left" headers="r20c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r20c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r20c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r21c1-t44" headers="r1c1-t44">
+<td align="left" id="r21c1-t47" headers="r1c1-t47">
<p>Initial value</p>
</td>
-<td align="left" headers="r21c1-t44 r1c2-t44"><br /></td>
-<td align="left" headers="r21c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r21c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r21c1-t47 r1c3-t47"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref529" name="sthref529"></a>
+<a id="sthref556" name="sthref556"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p><a href="tasks014.htm#BABGCBHG">ID mapping</a></p>
+<p><a href="tasks015.htm#BABGCBHG">ID mapping</a></p>
</li>
</ul>
-<a id="sthref530" name="sthref530"></a>
+<a id="sthref557" name="sthref557"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
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 124c58452e..1a20bd503c 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
@@ -8,7 +8,7 @@
<title>Project Properties page &ndash; JPA Options</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:28:0Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Project Properties page &ndash; JPA Options" />
<meta name="relnum" content="Release 3.2" />
@@ -17,69 +17,69 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="BABJHBCI" name="BABJHBCI"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Project Properties page &ndash; JPA Options</h1>
-<p><a id="sthref591" name="sthref591"></a><a id="sthref592" name="sthref592"></a><a id="sthref593" name="sthref593"></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="sthref618" name="sthref618"></a><a id="sthref619" name="sthref619"></a><a id="sthref620" name="sthref620"></a>Use the <span class="gui-object-title">JPA</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 options preferences page</span>.</p>
<div class="inftblinformal">
<table class="Informal" title="Options on the Java Persistence Preferences page &gt; JPA Options" summary="Options on the Java Persistence Preferences page &gt; JPA Options" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
<col width="32%" />
<col width="*" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t63">Property</th>
-<th align="left" valign="bottom" id="r1c2-t63">Description</th>
+<th align="left" valign="bottom" id="r1c1-t66">Property</th>
+<th align="left" valign="bottom" id="r1c2-t66">Description</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t63" headers="r1c1-t63">
-<p><a id="sthref594" name="sthref594"></a><a id="sthref595" name="sthref595"></a><a id="sthref596" name="sthref596"></a><a id="sthref597" name="sthref597"></a><span class="bold">Platform</span></p>
+<td align="left" id="r2c1-t66" headers="r1c1-t66">
+<p><a id="sthref621" name="sthref621"></a><a id="sthref622" name="sthref622"></a><a id="sthref623" name="sthref623"></a><a id="sthref624" name="sthref624"></a><span class="bold">Platform</span></p>
</td>
-<td align="left" headers="r2c1-t63 r1c2-t63">
+<td align="left" headers="r2c1-t66 r1c2-t66">
<p>Select the vendor-specific platform.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t63" headers="r1c1-t63">
+<td align="left" id="r3c1-t66" headers="r1c1-t66">
<p><span class="bold">JPA Implementation</span></p>
</td>
-<td align="left" headers="r3c1-t63 r1c2-t63"><br /></td>
+<td align="left" headers="r3c1-t66 r1c2-t66"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t63" headers="r1c1-t63">
+<td align="left" id="r4c1-t66" headers="r1c1-t66">
<p>Type</p>
</td>
-<td align="left" headers="r4c1-t63 r1c2-t63">
+<td align="left" headers="r4c1-t66 r1c2-t66">
<p>Select <span class="bold">User Library</span> to select from the available user-defined or downloaded libraries.</p>
<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-t63" headers="r1c1-t63">
+<td align="left" id="r5c1-t66" headers="r1c1-t66">
<p>Library</p>
</td>
-<td align="left" headers="r5c1-t63 r1c2-t63">
+<td align="left" headers="r5c1-t66 r1c2-t66">
<p>Select a specific JPA library configuration.</p>
<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="r6c1-t63" headers="r1c1-t63">
+<td align="left" id="r6c1-t66" headers="r1c1-t66">
<p>Include&nbsp;libraries&nbsp;with&nbsp;this&nbsp;application</p>
</td>
-<td align="left" headers="r6c1-t63 r1c2-t63">
+<td align="left" headers="r6c1-t66 r1c2-t66">
<p>Specify if the selected libraries are included when deploying the application.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t63" headers="r1c1-t63">
-<p><a id="sthref598" name="sthref598"></a><a id="sthref599" name="sthref599"></a><a id="sthref600" name="sthref600"></a><span class="bold">Connection</span></p>
+<td align="left" id="r7c1-t66" headers="r1c1-t66">
+<p><a id="sthref625" name="sthref625"></a><a id="sthref626" name="sthref626"></a><a id="sthref627" name="sthref627"></a><span class="bold">Connection</span></p>
</td>
-<td align="left" headers="r7c1-t63 r1c2-t63">
+<td align="left" headers="r7c1-t66 r1c2-t66">
<p>The database connection used to map the persistent entities.</p>
<ul>
<li>
@@ -92,35 +92,35 @@
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t63" headers="r1c1-t63">
+<td align="left" id="r8c1-t66" headers="r1c1-t66">
<p>Override default catalog from connection</p>
</td>
-<td align="left" headers="r8c1-t63 r1c2-t63">
+<td align="left" headers="r8c1-t66 r1c2-t66">
<p>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.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t63" headers="r1c1-t63">
+<td align="left" id="r9c1-t66" headers="r1c1-t66">
<p>Override default schema from connection</p>
</td>
-<td align="left" headers="r9c1-t63 r1c2-t63">
+<td align="left" headers="r9c1-t66 r1c2-t66">
<p>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.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r10c1-t63" headers="r1c1-t63">
+<td align="left" id="r10c1-t66" headers="r1c1-t66">
<p><span class="bold">Persistent Class Management</span></p>
</td>
-<td align="left" headers="r10c1-t63 r1c2-t63">
+<td align="left" headers="r10c1-t66 r1c2-t66">
<p>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>
<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="r11c1-t63" headers="r1c1-t63">
-<p><a id="sthref601" name="sthref601"></a><a id="sthref602" name="sthref602"></a><span class="bold">Canonical Metamodel</span></p>
+<td align="left" id="r11c1-t66" headers="r1c1-t66">
+<p><a id="sthref628" name="sthref628"></a><a id="sthref629" name="sthref629"></a><span class="bold">Canonical Metamodel</span></p>
</td>
-<td align="left" headers="r11c1-t63 r1c2-t63">
+<td align="left" headers="r11c1-t66 r1c2-t66">
<p>Select the location of the metamodel source.</p>
</td>
</tr>
@@ -128,11 +128,11 @@
</table>
<br /></div>
<!-- class="inftblinformal" -->
-<a id="sthref603" name="sthref603"></a>
+<a id="sthref630" name="sthref630"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p><a href="tasks027.htm#BABDBCBI">Modifying persistent project properties</a></p>
+<p><a href="tasks028.htm#BABDBCBI">Modifying persistent project properties</a></p>
</li>
</ul>
</div>
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 cb70048987..a8f8e0906b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm
@@ -8,7 +8,7 @@
<title>Select Tables</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:40Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Select Tables" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIAHCGEE" name="CIAHCGEE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Select Tables</h1>
-<p><a id="sthref325" name="sthref325"></a><a id="sthref326" name="sthref326"></a><a id="sthref327" name="sthref327"></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="sthref338" name="sthref338"></a><a id="sthref339" name="sthref339"></a><a id="sthref340" name="sthref340"></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="inftblhruleinformal">
<table class="HRuleInformal" title="Options on the Select Tables page of the Generate Entities from Tables wizard" summary="Options on the Select Tables page of the Generate Entities from Tables wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="32%" />
@@ -69,17 +69,17 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref328" name="sthref328"></a>
+<a id="sthref341" name="sthref341"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
</li>
<li>
-<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+<p><a href="tasks022.htm#BABBAGFI">Generating entities from tables</a></p>
</li>
</ul>
-<a id="sthref329" name="sthref329"></a>
+<a id="sthref342" name="sthref342"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
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 62ba764ae9..5086c00cf1 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
@@ -8,7 +8,7 @@
<title>Select Cascade dialog</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:28:1Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Select Cascade dialog" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIAFDGIJ" name="CIAFDGIJ"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Select Cascade dialog</h1>
-<p><a id="sthref617" name="sthref617"></a>Specify which operations are propagated throughout the association: All, Persist, Merge, Remove, or Refresh.</p>
+<p><a id="sthref657" name="sthref657"></a>Specify which operations are propagated throughout the association: All, Persist, Merge, Remove, or Refresh.</p>
</div>
<!-- class="sect2" -->
<!-- Start Footer -->
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 e7153602c0..2d68d137d6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm
@@ -8,7 +8,7 @@
<title>Table Associations</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:40Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Table Associations" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIACDICB" name="CIACDICB"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Table Associations</h1>
-<p><a id="sthref330" name="sthref330"></a>Use this page to create or edit the association between the database table and entity.</p>
+<p><a id="sthref343" name="sthref343"></a>Use this page to create or edit the association between the database table and entity.</p>
<div class="inftblhruleinformal">
<table class="HRuleInformal" title="This table describes the options on the Generate Entities dialog." summary="Options on the Table Associations page of the Generate Entities from Tables wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="32%" />
@@ -62,20 +62,20 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref331" name="sthref331"></a>
+<a id="sthref344" name="sthref344"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
</li>
<li>
-<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+<p><a href="tasks022.htm#BABBAGFI">Generating entities from tables</a></p>
</li>
<li>
<p><a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association wizard</a></p>
</li>
</ul>
-<a id="sthref332" name="sthref332"></a>
+<a id="sthref345" name="sthref345"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
index eb56bbaa97..5f31b3a9ea 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
@@ -8,7 +8,7 @@
<title>Reference</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:40Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Reference" />
<meta name="relnum" content="Release 3.2" />
@@ -17,8 +17,8 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p><a id="sthref322" name="sthref322"></a></p>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p><a id="sthref335" name="sthref335"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</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>
@@ -26,22 +26,22 @@
<p><a href="reference001.htm#CACJJJJH">Wizards</a></p>
</li>
<li>
-<p><a href="reference012.htm#CACDJIIG">Property pages</a></p>
+<p><a href="reference016.htm#CACDJIIG">Property pages</a></p>
</li>
<li>
-<p><a href="reference054.htm#CACDEIEE">Preferences</a></p>
+<p><a href="reference058.htm#CACDEIEE">Preferences</a></p>
</li>
<li>
-<p><a href="reference060.htm#CACGEJDA">Dialogs</a></p>
+<p><a href="reference066.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="reference068.htm#CACDHCIA">Icons and buttons</a></p>
+<p><a href="reference076.htm#CACDHCIA">Icons and buttons</a></p>
</li>
<li>
-<p><a href="reference071.htm#CACBBDIB">Dali Developer Documentation</a></p>
+<p><a href="reference079.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 ee95577ab9..d35ab27c27 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm
@@ -8,7 +8,7 @@
<title>Wizards</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:40Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Wizards" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CACJJJJH" name="CACJJJJH"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>Wizards</h1>
-<p><a id="sthref323" name="sthref323"></a>This section includes information on the following wizards:</p>
+<p><a id="sthref336" name="sthref336"></a>This section includes information on the following wizards:</p>
<ul>
<li>
<p><a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables wizard</a></p>
@@ -39,7 +39,10 @@
<p><a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></p>
</li>
<li>
-<p><a href="reference010.htm#CIAGHCGA">Generate Tables from Entities wizard</a></p>
+<p><a href="reference010.htm#CACIEJDJ">Create New JAXB Project wizard</a></p>
+</li>
+<li>
+<p><a href="reference014.htm#CIAGHCGA">Generate Tables from Entities wizard</a></p>
</li>
<li>
<p><a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association wizard</a></p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
index 65eb5c8ceb..e1e220e5ab 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
@@ -8,7 +8,7 @@
<title>Generate Dynamic Entities from Tables wizard</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Generate Dynamic Entities from Tables wizard" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CACGDFDJ" name="CACGDFDJ"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Generate Dynamic Entities from Tables wizard</h1>
-<p><a id="sthref339" name="sthref339"></a>Use the Generate Dynamic Custom Entities wizard to create dynamic EclipseLink JPA entities from your database tables.</p>
+<p><a id="sthref352" name="sthref352"></a>Use the Generate Dynamic Custom Entities wizard to create dynamic EclipseLink JPA entities from your database tables.</p>
<p>The wizard consists of the following pages:</p>
<ul>
<li>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
index f964eabad9..2187ceed42 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
@@ -8,7 +8,7 @@
<title>Select Tables</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Select Tables" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CACFGHJF" name="CACFGHJF"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Select Tables</h1>
-<p><a id="sthref340" name="sthref340"></a><a id="sthref341" name="sthref341"></a><a id="sthref342" name="sthref342"></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="sthref353" name="sthref353"></a><a id="sthref354" name="sthref354"></a><a id="sthref355" name="sthref355"></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="inftblhruleinformal">
<table class="HRuleInformal" title="Options on the Select Tables page of the Generate Entities from Tables wizard" summary="Options on the Select Tables page of the Generate Entities from Tables wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="32%" />
@@ -69,17 +69,17 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref343" name="sthref343"></a>
+<a id="sthref356" name="sthref356"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
</li>
<li>
-<p><a href="tasks023.htm#CIHHFGIG">Generating dynamic entities from tables</a></p>
+<p><a href="tasks024.htm#CIHHFGIG">Generating dynamic entities from tables</a></p>
</li>
</ul>
-<a id="sthref344" name="sthref344"></a>
+<a id="sthref357" name="sthref357"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
index 38b2ef8d95..4209721e1d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
@@ -8,7 +8,7 @@
<title>Table Associations</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Table Associations" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CACBDJAC" name="CACBDJAC"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Table Associations</h1>
-<p><a id="sthref345" name="sthref345"></a>Use this page to create or edit the association between the database table and entity.</p>
+<p><a id="sthref358" name="sthref358"></a>Use this page to create or edit the association between the database table and entity.</p>
<div class="inftblhruleinformal">
<table class="HRuleInformal" title="Options on the Table Associations page of the Generate Entities from Tables wizard" summary="Options on the Table Associations page of the Generate Entities from Tables wizard." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="32%" />
@@ -62,20 +62,20 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref346" name="sthref346"></a>
+<a id="sthref359" name="sthref359"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
</li>
<li>
-<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+<p><a href="tasks022.htm#BABBAGFI">Generating entities from tables</a></p>
</li>
<li>
<p><a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association wizard</a></p>
</li>
</ul>
-<a id="sthref347" name="sthref347"></a>
+<a id="sthref360" name="sthref360"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
index f3489fe072..cf196e0379 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
@@ -8,7 +8,7 @@
<title>Customize Default Entity Generation</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Customize Default Entity Generation" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CACHHEEH" name="CACHHEEH"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Customize Default Entity Generation</h1>
-<p><a id="sthref348" name="sthref348"></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="sthref361" name="sthref361"></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="inftblhruleinformal">
<table class="HRuleInformal" title="ptions on the Customize Default Entity page of the Generate Entities from Tables wizard" summary="Options on the Customize Default Entity page of the Generate Entities from Tables wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="32%" />
@@ -85,20 +85,20 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref349" name="sthref349"></a>
+<a id="sthref362" name="sthref362"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
</li>
<li>
-<p><a href="tasks023.htm#CIHHFGIG">Generating dynamic entities from tables</a></p>
+<p><a href="tasks024.htm#CIHHFGIG">Generating dynamic entities from tables</a></p>
</li>
<li>
<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
</ul>
-<a id="sthref350" name="sthref350"></a>
+<a id="sthref363" name="sthref363"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
index f1ff3a7fa4..1503c27c83 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
@@ -8,7 +8,7 @@
<title>Customize Individual Entities</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Customize Individual Entities" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CACDGDIC" name="CACDGDIC"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Customize Individual Entities</h1>
-<p><a id="sthref351" name="sthref351"></a>Use this page to customize each generated entity. Select an item in the <span class="bold">Table and columns</span> area, then complete the following fields for each item.</p>
+<p><a id="sthref364" name="sthref364"></a>Use this page to customize each generated entity. Select an item in the <span class="bold">Table and columns</span> area, then complete the following fields for each item.</p>
<div class="inftblhruleinformal">
<table class="HRuleInformal" title="Options on the Individual Entities page of the Generate Entities from Tables wizard" summary="Options on the Individual Entities page of the Generate Entities from Tables wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="32%" />
@@ -84,20 +84,20 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref352" name="sthref352"></a>
+<a id="sthref365" name="sthref365"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
</li>
<li>
-<p><a href="tasks023.htm#CIHHFGIG">Generating dynamic entities from tables</a></p>
+<p><a href="tasks024.htm#CIHHFGIG">Generating dynamic entities from tables</a></p>
</li>
<li>
<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
</ul>
-<a id="sthref353" name="sthref353"></a>
+<a id="sthref366" name="sthref366"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
index cf4dddb39f..d3312222f3 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
@@ -8,7 +8,7 @@
<title>Create ORM Mapping File wizard</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Create ORM Mapping File wizard" />
<meta name="relnum" content="Release 3.2" />
@@ -17,11 +17,11 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIAIJCCE" name="CIAIJCCE"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Create ORM Mapping File wizard</h1>
-<p><a id="sthref362" name="sthref362"></a><a id="sthref363" name="sthref363"></a><a id="sthref364" name="sthref364"></a>The New Mapping File wizard enables you to add an <code>orm.xml</code> file to a JPA project if no object map exists at the location specified. For example, if you cleared the <span class="bold">Create orm.xml</span> option on the <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a>, you can later add the <code>orm.xml</code> file to the src file of the project using this wizard.</p>
+<p><a id="sthref375" name="sthref375"></a><a id="sthref376" name="sthref376"></a><a id="sthref377" name="sthref377"></a>The New Mapping File wizard enables you to add an <code>orm.xml</code> file to a JPA project if no object map exists at the location specified. For example, if you cleared the <span class="bold">Create orm.xml</span> option on the <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a>, you can later add the <code>orm.xml</code> file to the src file of the project using this wizard.</p>
<p>The <a href="#CIAIJCCE">Create ORM Mapping File wizard</a> consists of the following pages:</p>
<ul>
<li>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
index ae5cdf5a67..99e8a953ea 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
@@ -8,7 +8,7 @@
<title>Mapping File Location</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Mapping File Location" />
<meta name="relnum" content="Release 3.2" />
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CIAJEIDJ" name="CIAJEIDJ"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Mapping File Location</h1>
@@ -83,11 +83,11 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref365" name="sthref365"></a>
+<a id="sthref378" name="sthref378"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p><a href="tasks007.htm#CIHDEFCA">Creating an orm.xml file</a></p>
+<p><a href="tasks008.htm#CIHDEFCA">Creating an orm.xml file</a></p>
</li>
<li>
<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
@@ -96,7 +96,7 @@
<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
</li>
</ul>
-<a id="sthref366" name="sthref366"></a>
+<a id="sthref379" name="sthref379"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
index af2225c499..e44bd3f873 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
@@ -8,7 +8,7 @@
<title>Mapping File Options</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Mapping File Options" />
<meta name="relnum" content="Release 3.2" />
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
<p><a id="CACDFCDB" name="CACDFCDB"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Mapping File Options</h1>
@@ -72,11 +72,11 @@
</table>
<br /></div>
<!-- class="inftblinformal" -->
-<a id="sthref367" name="sthref367"></a>
+<a id="sthref380" name="sthref380"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p><a href="tasks007.htm#CIHDEFCA">Creating an orm.xml file</a></p>
+<p><a href="tasks008.htm#CIHDEFCA">Creating an orm.xml file</a></p>
</li>
<li>
<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
@@ -85,7 +85,7 @@
<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
</li>
</ul>
-<a id="sthref368" name="sthref368"></a>
+<a id="sthref381" name="sthref381"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
index bc7e80d3ba..f1bf68d540 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
@@ -5,38 +5,34 @@
<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>Generate Tables from Entities wizard</title>
+<title>Create New JAXB Project wizard</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Generate Tables from Entities wizard" />
+<meta name="doctitle" content="Create New JAXB Project wizard" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CIAGHCGA" name="CIAGHCGA"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACIEJDJ" name="CACIEJDJ"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Generate Tables from Entities wizard</h1>
-<p><a id="sthref382" name="sthref382"></a><a id="sthref383" name="sthref383"></a><a id="sthref384" name="sthref384"></a><a id="sthref385" name="sthref385"></a><a id="sthref386" name="sthref386"></a>Use the Generate Tables from Entities Wizard to quickly create DDL scripts from your persistent entities. Dali automatically creates the necessary primary and foreign keys, based on the entity mappings.</p>
-<div align="center">
-<div class="inftblnotewarn"><br />
-<table class="NoteWarn oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">WARNING:</p>
-<p class="warnsp">Generating tables will <code>DROP</code> any existing tables and <code>CREATE</code> new tables, based on the entities in your project.</p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnotewarn" --></div>
-<p>The <a href="#CIAGHCGA">Generate Tables from Entities wizard</a> consists of the <a href="reference011.htm#CACHAJEG">Schema Generation</a> page.</p>
+<h1>Create New JAXB Project wizard</h1>
+<p><a id="sthref395" name="sthref395"></a><a id="sthref396" name="sthref396"></a><a id="sthref397" name="sthref397"></a>The Create New JAXB Project wizard allows you to create a new Java project using JAXB. 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>
+</li>
+<li>
+<p><a href="ref_java_page.htm#CIAGEBAA">Java Page</a></p>
+</li>
+<li>
+<p><a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a></p>
+</li>
+</ul>
<!-- 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/reference011.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
index 3befcac9dc..3cac00ef5b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
@@ -5,82 +5,120 @@
<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>Schema Generation</title>
+<title>New JAXB Project page</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Schema Generation" />
+<meta name="doctitle" content="New JAXB Project page" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACHAJEG" name="CACHAJEG"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACHFJFI" name="CACHFJFI"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Schema Generation</h1>
-<p>This table lists the properties of the Schema Generation page of the <a href="reference010.htm#CIAGHCGA">Generate Tables from Entities wizard</a>.</p>
+<h1>New JAXB Project page</h1>
+<p>This table lists the properties available on the New JPA Project page of the <a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a>.</p>
<div class="inftblhruleinformal">
-<table class="HRuleInformal" summary="This table lists the properties of the Mapping File Wizard." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="23%" />
-<col width="*" />
+<table class="HRuleInformal" title="Options on the New JPA Project page of the New JPA Project wizard" summary="Options on the New JPA Project page of the New JPA Project wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="24%" />
+<col width="*" />
+<col width="25%" />
<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>
+<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-t18" headers="r1c1-t18">
-<p>Generation Output Mode</p>
+<td align="left" id="r2c1-t17" headers="r1c1-t17">
+<p>Project name</p>
</td>
-<td align="left" headers="r2c1-t18 r1c2-t18">
-<p>Specify how Dali should generate the DDL:</p>
-<ul>
-<li>
-<p>Database &ndash; DDL will be generated and written to the database only.</p>
-</li>
-<li>
-<p>SQL-script &ndash; DDL will be generated and written to a file only.</p>
-</li>
-<li>
-<p>Both &ndash; DDL will be generated and written to both the database and a file.</p>
-</li>
-</ul>
+<td align="left" headers="r2c1-t17 r1c2-t17">
+<p>Name of the Eclipse JPA project.</p>
+</td>
+<td align="left" headers="r2c1-t17 r1c3-t17"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t17" headers="r1c1-t17">
+<p>Project location</p>
+</td>
+<td align="left" headers="r3c1-t17 r1c2-t17">
+<p>Location of the workspace in which to save the project.</p>
+<p>Unselect the <span class="bold">Use default location</span> option and click <span class="bold">Browse</span> to select a new location.</p>
+</td>
+<td align="left" headers="r3c1-t17 r1c3-t17">
+<p>Current workspace</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t17" headers="r1c1-t17">
+<p>Target runtime</p>
+</td>
+<td align="left" headers="r4c1-t17 r1c2-t17">
+<p>Select a pre-defined target for the project.</p>
+<p>Click <span class="bold">New Runtime</span> to create a new environment with the New Server Runtime wizard.</p>
</td>
-<td align="left" headers="r2c1-t18 r1c3-t18">
-<p>Database</p>
+<td align="left" headers="r4c1-t17 r1c3-t17">
+<p>&lt;None&gt;</p>
</td>
</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t17" headers="r1c1-t17">
+<p>JAXB Version</p>
+</td>
+<td align="left" headers="r5c1-t17 r1c2-t17">
+<p>Select the Java Architecture for XML Binding (JAXB) version for the project.</p>
+</td>
+<td align="left" headers="r5c1-t17 r1c3-t17">
+<p>2.2</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t17" headers="r1c1-t17">
+<p>Configurations</p>
+</td>
+<td align="left" headers="r6c1-t17 r1c2-t17">
+<p>Select a project configuration with pre-defined facets.</p>
+<p>Select <span class="bold">Modify</span> to manually select the facets for this project.</p>
+</td>
+<td align="left" headers="r6c1-t17 r1c3-t17"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t17" headers="r1c1-t17">
+<p>Working sets</p>
+</td>
+<td align="left" headers="r7c1-t17 r1c2-t17">
+<p>Specify if this project should be included in an existing working set. The drop down field shows a list of previous selected working sets.</p>
+<p>Select <span class="bold">Add project to working sets</span>, then select a <span class="bold">Working set</span> in which to add this project.</p>
+</td>
+<td align="left" headers="r7c1-t17 r1c3-t17"><br /></td>
+</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref387" name="sthref387"></a>
+<a id="sthref398" name="sthref398"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
-</li>
-<li>
-<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
+<p><a href="tasks001.htm#CIHIBIJJ">Creating a new JAXB project</a></p>
</li>
</ul>
-<a id="sthref388" name="sthref388"></a>
+<a id="sthref399" name="sthref399"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
-<p><a href="reference007.htm#CIAIJCCE">Create ORM Mapping File wizard</a></p>
+<p><a href="reference010.htm#CACIEJDJ">Create New JAXB Project wizard</a></p>
</li>
</ul>
</div>
<!-- class="sect3" -->
-<!-- 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/reference012.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
index 8d18d92259..e35a0fa5b6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
@@ -5,40 +5,77 @@
<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>Property pages</title>
+<title>Java Page</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:58Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Property pages" />
+<meta name="doctitle" content="Java Page" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACDJIIG" name="CACDJIIG"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Property pages</h1>
-<p><a id="sthref400" name="sthref400"></a>This section includes information each property page in the following views:</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<div class="sect3"><!-- infolevel="all" infotype="General" --><a id="sthref400" name="sthref400"></a>
+<h1>Java Page</h1>
+<p>This table lists the properties available on the Java page of the <a href="reference010.htm#CACIEJDJ">Create New JAXB Project wizard</a>.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="Options on the Java page of the New JPA Project wizard" summary="Options on the Java page of the New JPA Project wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="24%" />
+<col width="*" />
+<col width="25%" />
+<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">
+<p>Source folders on build path</p>
+</td>
+<td align="left" headers="r2c1-t18 r1c2-t18">
+<p>Click <span class="bold">Add Folder</span> to select an existing Java source folder to add to this project.</p>
+</td>
+<td align="left" headers="r2c1-t18 r1c3-t18">
+<p><code>src</code></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t18" headers="r1c1-t18">
+<p>Default output folder</p>
+</td>
+<td align="left" headers="r3c1-t18 r1c2-t18">
+<p>Specify the location of the&nbsp;<code>.class</code> files.</p>
+</td>
+<td align="left" headers="r3c1-t18 r1c3-t18">
+<p><code>build\classes</code></p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref401" name="sthref401"></a>
+<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
-</li>
-<li>
-<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
-</li>
-<li>
-<p><a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
-</li>
-<li>
-<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
+<p><a href="tasks001.htm#CIHIBIJJ">Creating a new JAXB project</a></p>
</li>
+</ul>
+<a id="sthref402" name="sthref402"></a>
+<p class="subhead2">Related reference</p>
+<ul>
<li>
-<p><a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a></p>
+<p><a href="reference010.htm#CACIEJDJ">Create New JAXB Project wizard</a></p>
</li>
</ul>
+</div>
+<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
@@ -50,6 +87,6 @@
</tr>
</table>
</div>
-<!-- class="footer" --></div>
+<!-- class="footer" -->
</body>
</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
index e1b3733108..4465068e65 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
@@ -5,134 +5,103 @@
<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>Entity</title>
+<title>JAXB Facet page</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Entity" />
+<meta name="doctitle" content="JAXB Facet page" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACCAGGC" name="CACCAGGC"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACJGDEF" name="CACJGDEF"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Entity</h1>
-<p>This table lists the Entity information fields available in the <span class="gui-object-title">JPA Details</span> view for an <a href="tasks002.htm#BABGBIEE">Entity</a>.</p>
-<div class="inftblhruleinformalwide">
-<table class="HRuleInformalWide" title="JPA Details, Entity page" summary="JPA Details, Entity page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="20%" />
-<col width="*" />
+<h1>JAXB Facet page</h1>
+<p>This table lists the properties available on the JPA Facet page of the <a href="reference010.htm#CACIEJDJ">Create New JAXB Project wizard</a>.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="Options on the Java Facet page of the New JPA Project wizard" summary="Options on the Java Facet page of the New JPA Project wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="24%" />
+<col width="*" />
+<col width="25%" />
<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-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-t20" headers="r1c1-t20">
-<p><span class="bold">Table</span></p>
-</td>
-<td align="left" headers="r2c1-t20 r1c2-t20">
-<p>The default database table information for this entity. These fields can be overridden by the information in the <a href="reference019.htm#CACIJBGH">Attribute Overrides</a> area.</p>
+<td align="left" id="r2c1-t19" headers="r1c1-t19">
+<p><span class="bold">Platform</span></p>
</td>
-<td align="left" headers="r2c1-t20 r1c3-t20"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t20" headers="r1c1-t20">
-<p>Name</p>
+<td align="left" headers="r2c1-t19 r1c2-t19">
+<p>Vendor-specific JPA implementation.</p>
</td>
-<td align="left" headers="r3c1-t20 r1c2-t20">
-<p>The name of the primary database table associated with the entity.</p>
+<td align="left" headers="r2c1-t19 r1c3-t19">
+<p>Generic</p>
</td>
-<td align="left" headers="r3c1-t20 r1c3-t20"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t20" headers="r1c1-t20">
-<p>Catalog</p>
-</td>
-<td align="left" headers="r4c1-t20 r1c2-t20">
-<p>The database catalog that contains the <span class="bold">Table</span>.</p>
+<td align="left" id="r3c1-t19" headers="r1c1-t19">
+<p><a id="sthref403" name="sthref403"></a><a id="sthref404" name="sthref404"></a><span class="bold">JAXB Implementation</span></p>
</td>
-<td align="left" headers="r4c1-t20 r1c3-t20">
-<p>As defined in <code>orm.xml</code>.</p>
+<td align="left" headers="r3c1-t19 r1c2-t19">
+<p>Select a specific JPA library configuration.</p>
+<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>
+<p>Depending on your JPA implementation (for example, Generic or EclipseLink), different options may be available when working with JPA projects</p>
</td>
+<td align="left" headers="r3c1-t19 r1c3-t19"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t20" headers="r1c1-t20">
-<p>Schema</p>
+<td align="left" id="r4c1-t19" headers="r1c1-t19">
+<p>Type</p>
</td>
-<td align="left" headers="r5c1-t20 r1c2-t20">
-<p>The database schema that contains the <span class="bold">Table</span>.</p>
+<td align="left" headers="r4c1-t19 r1c2-t19">
+<p>Select <span class="bold">User Library</span> to select from the available user-defined or downloaded libraries.</p>
+<p>If you select <span class="bold">Disable</span>, you must manually include the JPA implementation library on the project classpath.</p>
</td>
-<td align="left" headers="r5c1-t20 r1c3-t20">
-<p>As defined in <code>orm.xml</code>.</p>
+<td align="left" headers="r4c1-t19 r1c3-t19">
+<p>User Library</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t20" headers="r1c1-t20">
-<p><span class="bold">Name</span></p>
-</td>
-<td align="left" headers="r6c1-t20 r1c2-t20">
-<p>The name of this entity. By default, the class name is used as the entity name.</p>
-</td>
-<td align="left" headers="r6c1-t20 r1c3-t20"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t20" headers="r1c1-t20">
-<p><span class="bold">Access</span></p>
-</td>
-<td align="left" headers="r7c1-t20 r1c2-t20">
-<p>Specify how the entity its access instance variables.</p>
-<ul>
-<li>
-<p>Property &ndash; Persistent state accessed through the property accessor methods. The property accessor methods must be <span class="bold">public</span> or <span class="bold">private</span>.</p>
-</li>
-<li>
-<p>Field &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
-</li>
-</ul>
-<p><span class="bold">Note</span>: This field is for display only, based on the properties in the <code>orm.xml</code>: If only the methods of the class are annotated, <span class="bold">property</span> access type is used. In all other cases, <span class="bold">field</span> access type is used.</p>
+<td align="left" id="r5c1-t19" headers="r1c1-t19">
+<p>Include libraries with this application</p>
</td>
-<td align="left" headers="r7c1-t20 r1c3-t20">
-<p>Field</p>
+<td align="left" headers="r5c1-t19 r1c2-t19">
+<p>Specify if the selected libraries are included when deploying the application.</p>
</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t20" headers="r1c1-t20">
-<p><span class="bold">ID class</span></p>
-</td>
-<td align="left" headers="r8c1-t20 r1c2-t20">
-<p>Click <span class="bold">Browse</span> and select the primary key for the entity. Clicking the field name, which is represented as a hyperlink, allows you to create a new class.</p>
+<td align="left" headers="r5c1-t19 r1c3-t19">
+<p>Selected</p>
</td>
-<td align="left" headers="r8c1-t20 r1c3-t20"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblhruleinformalwide" -->
-<a id="sthref406" name="sthref406"></a>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref405" name="sthref405"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+<p><a href="tasks001.htm#CIHIBIJJ">Creating a new JAXB project</a></p>
</li>
</ul>
-<a id="sthref407" name="sthref407"></a>
+<a id="sthref406" name="sthref406"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
-<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+<p><a href="reference010.htm#CACIEJDJ">Create New JAXB Project wizard</a></p>
</li>
</ul>
</div>
<!-- class="sect3" -->
+<!-- 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/reference014.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
index 0ae13b1a5e..c8f7c71194 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
@@ -5,76 +5,38 @@
<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>Embeddable</title>
+<title>Generate Tables from Entities wizard</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Embeddable" />
+<meta name="doctitle" content="Generate Tables from Entities wizard" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACHJEJH" name="CACHJEJH"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Embeddable</h1>
-<p><a id="sthref408" name="sthref408"></a>This table lists the Embeddable information fields available in the <span class="gui-object-title">JPA Details</span> view for <a href="tasks003.htm#BABFEICE">Embeddable</a> entity type.</p>
-<div class="inftblhruleinformalwide">
-<table class="HRuleInformalWide" summary="JPA Details view, Embeddable page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="19%" />
-<col width="*" />
-<col width="19%" />
-<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>
-</tr>
-</thead>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CIAGHCGA" name="CIAGHCGA"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Generate Tables from Entities wizard</h1>
+<p><a id="sthref407" name="sthref407"></a><a id="sthref408" name="sthref408"></a><a id="sthref409" name="sthref409"></a><a id="sthref410" name="sthref410"></a><a id="sthref411" name="sthref411"></a>Use the Generate Tables from Entities Wizard to quickly create DDL scripts from your persistent entities. Dali automatically creates the necessary primary and foreign keys, based on the entity mappings.</p>
+<div align="center">
+<div class="inftblnotewarn"><br />
+<table class="NoteWarn oac_no_warn" summary="" cellpadding="3" cellspacing="0">
<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t21" headers="r1c1-t21">
-<p>Access</p>
-</td>
-<td align="left" headers="r2c1-t21 r1c2-t21">
-<p>Specify how the entity its access instance variables.</p>
-<ul>
-<li>
-<p>Property &ndash; Persistent state accessed through the property accessor methods. The property accessor methods must be <span class="bold">public</span> or <span class="bold">private</span>.</p>
-</li>
-<li>
-<p>Field &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
-</li>
-</ul>
-<p><span class="bold">Note</span>: This field is for display only, based on the properties in the <code>orm.xml</code>: If only the methods of the class are annotated, <span class="bold">property</span> access type is used. In all other cases, <span class="bold">field</span> access type is used.</p>
-</td>
-<td align="left" headers="r2c1-t21 r1c3-t21">
-<p>Field</p>
+<tr>
+<td align="left">
+<p class="notep1">WARNING:</p>
+<p class="warnsp">Generating tables will <code>DROP</code> any existing tables and <code>CREATE</code> new tables, based on the entities in your project.</p>
</td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblhruleinformalwide" -->
-<a id="sthref409" name="sthref409"></a>
-<p class="subhead2">Related tasks</p>
-<ul>
-<li>
-<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
-</li>
-</ul>
-<a id="sthref410" name="sthref410"></a>
-<p class="subhead2">Related reference</p>
-<ul>
-<li>
-<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
-</li>
-</ul>
-</div>
-<!-- class="sect3" -->
+<!-- class="inftblnotewarn" --></div>
+<p>The <a href="#CIAGHCGA">Generate Tables from Entities wizard</a> consists of the <a href="reference015.htm#CACHAJEG">Schema Generation</a> page.</p>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
@@ -86,6 +48,6 @@
</tr>
</table>
</div>
-<!-- class="footer" -->
+<!-- class="footer" --></div>
</body>
</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
index b66d61b473..fb744da366 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
@@ -5,85 +5,82 @@
<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>Mapped Superclass</title>
+<title>Schema Generation</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Mapped Superclass" />
+<meta name="doctitle" content="Schema Generation" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACGIEFD" name="CACGIEFD"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACHAJEG" name="CACHAJEG"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Mapped Superclass</h1>
-<p><a id="sthref411" name="sthref411"></a>This table lists the Embeddable information fields available in the <span class="gui-object-title">JPA Details</span> view for <a href="tasks004.htm#BABDAGCI">Mapped superclass</a> entity type.</p>
-<div class="inftblhruleinformalwide">
-<table class="HRuleInformalWide" summary="JPA Details view, Mapped Superclass page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="19%" />
+<h1>Schema Generation</h1>
+<p>This table lists the properties of the Schema Generation page of the <a href="reference014.htm#CIAGHCGA">Generate Tables from Entities wizard</a>.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="This table lists the properties of the Mapping File Wizard." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="23%" />
<col width="*" />
-<col width="19%" />
+<col width="24%" />
<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-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-t22" headers="r1c1-t22">
-<p>Access</p>
+<td align="left" id="r2c1-t21" headers="r1c1-t21">
+<p>Generation Output Mode</p>
</td>
-<td align="left" headers="r2c1-t22 r1c2-t22">
-<p>Specify how the entity its access instance variables.</p>
+<td align="left" headers="r2c1-t21 r1c2-t21">
+<p>Specify how Dali should generate the DDL:</p>
<ul>
<li>
-<p>Property &ndash; Persistent state accessed through the property accessor methods. The property accessor methods must be <span class="bold">public</span> or <span class="bold">private</span>.</p>
+<p>Database &ndash; DDL will be generated and written to the database only.</p>
</li>
<li>
-<p>Field &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
+<p>SQL-script &ndash; DDL will be generated and written to a file only.</p>
+</li>
+<li>
+<p>Both &ndash; DDL will be generated and written to both the database and a file.</p>
</li>
</ul>
-<p><span class="bold">Note</span>: This field is for display only, based on the properties in the <code>orm.xml</code>: If only the methods of the class are annotated, <span class="bold">property</span> access type is used. In all other cases, <span class="bold">field</span> access type is used.</p>
-</td>
-<td align="left" headers="r2c1-t22 r1c3-t22">
-<p>Field</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t22" headers="r1c1-t22">
-<p>ID class</p>
</td>
-<td align="left" headers="r3c1-t22 r1c2-t22">
-<p>Click <span class="bold">Browse</span> and select the primary key for the entity. Clicking the field name, which is represented as a hyperlink, allows you to create a new class.</p>
+<td align="left" headers="r2c1-t21 r1c3-t21">
+<p>Database</p>
</td>
-<td align="left" headers="r3c1-t22 r1c3-t22"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblhruleinformalwide" -->
+<!-- class="inftblhruleinformal" -->
<a id="sthref412" name="sthref412"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+<p><a href="tasks022.htm#BABBAGFI">Generating entities from tables</a></p>
+</li>
+<li>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
</li>
</ul>
<a id="sthref413" name="sthref413"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
-<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+<p><a href="reference007.htm#CIAIJCCE">Create ORM Mapping File wizard</a></p>
</li>
</ul>
</div>
<!-- class="sect3" -->
+<!-- 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/reference016.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
index db69ffe003..2a196e0e71 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
@@ -5,252 +5,40 @@
<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>Caching</title>
+<title>Property pages</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Caching" />
+<meta name="doctitle" content="Property pages" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACJBBCA" name="CACJBBCA"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Caching</h1>
-<p><a id="sthref414" name="sthref414"></a>This table lists the Caching information fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
-<div class="inftblhruleinformalwide">
-<table class="HRuleInformalWide" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="16%" />
-<col width="*" />
-<col width="16%" />
-<col width="20%" />
-<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="r1c4-t23">Available for Entity&nbsp;Type</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t23" headers="r1c1-t23">
-<p><span class="bold">Cachable</span></p>
-</td>
-<td align="left" headers="r2c1-t23 r1c2-t23">
-<p>Specifies if the entity is cachable.</p>
-<p>This field corresponds to the <code>@Cachable</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t23 r1c3-t23">
-<p>True</p>
-</td>
-<td align="left" headers="r2c1-t23 r1c4-t23">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t23" headers="r1c1-t23">
-<p>Type</p>
-</td>
-<td align="left" headers="r3c1-t23 r1c2-t23">
-<p>Select one of the following as the Default Cache Type:</p>
-<ul>
-<li>
-<p><span class="bold">Weak with Soft Subcache</span>&ndash;This option is similar to <span class="bold">Weak with Hard Subcache</span> except that it maintains a most frequently used subcache that uses soft references. The size of the subcache is proportional to the size of the identity map. The subcache uses soft references to ensure that these objects are garbage-collected only if the system is low on memory.</p>
-<p>Use this identity map in most circumstances as a means to control memory used by the cache.</p>
-</li>
-<li>
-<p><span class="bold">Weak with Hard Subcache</span>&ndash;This option is similar to <span class="bold">Soft with Weak</span> subcache except that it maintains a most frequently used subcache that uses hard references. Use this identity map if soft references are not suitable for your platform.</p>
-</li>
-<li>
-<p><span class="bold">Weak</span>&ndash;This option is similar to <span class="bold">Full</span>, except that objects are referenced using weak references. This option uses less memory than <span class="bold">Full</span>, allows complete garbage collection and provides full caching and guaranteed identity.</p>
-<p>Use this identity map for transactions that, once started, stay on the server side.</p>
-</li>
-<li>
-<p><span class="bold">Soft</span>&ndash;This option is similar to <span class="bold">Weak</span> except that the map holds the objects using soft references. This identity map enables full garbage collection when memory is low. It provides full caching and guaranteed identity.</p>
-</li>
-<li>
-<p><span class="bold">Full</span>&ndash;This option provides full caching and guaranteed identity: all objects are cached and not removed.</p>
-<p>Note: This process may be memory-intensive when many objects are read.</p>
-</li>
-<li>
-<p><span class="bold">None</span>&ndash;This option does not preserve object identity and does not cache objects.This option is not recommended.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r3c1-t23 r1c3-t23">
-<p>Weak with Soft Subcache</p>
-</td>
-<td align="left" headers="r3c1-t23 r1c4-t23">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t23" headers="r1c1-t23">
-<p>Size</p>
-</td>
-<td align="left" headers="r4c1-t23 r1c2-t23">
-<p>Defines the size of cache to use (number of objects).</p>
-</td>
-<td align="left" headers="r4c1-t23 r1c3-t23">
-<p>100</p>
-</td>
-<td align="left" headers="r4c1-t23 r1c4-t23">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t23" headers="r1c1-t23">
-<p><span class="bold">Advanced</span></p>
-</td>
-<td align="left" headers="r5c1-t23 r1c2-t23"><br /></td>
-<td align="left" headers="r5c1-t23 r1c3-t23"><br /></td>
-<td align="left" headers="r5c1-t23 r1c4-t23">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t23" headers="r1c1-t23">
-<p>Expiry</p>
-</td>
-<td align="left" headers="r6c1-t23 r1c2-t23">
-<p>Enables the expiration of the cached instance after a fixed period of time (milliseconds). Queries executed against the cache after this will be forced back to the database for a refreshed copy.</p>
-</td>
-<td align="left" headers="r6c1-t23 r1c3-t23">
-<p>No expiry</p>
-</td>
-<td align="left" headers="r6c1-t23 r1c4-t23">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t23" headers="r1c1-t23">
-<p>Always refresh</p>
-</td>
-<td align="left" headers="r7c1-t23 r1c2-t23">
-<p>Specifies if all queries that go to the database should always refresh the cache.</p>
-</td>
-<td align="left" headers="r7c1-t23 r1c3-t23">
-<p>False</p>
-</td>
-<td align="left" headers="r7c1-t23 r1c4-t23">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t23" headers="r1c1-t23">
-<p>Refresh only if newer</p>
-</td>
-<td align="left" headers="r8c1-t23 r1c2-t23">
-<p>Specifies if all queries that go to the database should refresh the cache only if the data received from the database by a query is newer than the data in the cache (as determined by the optimistic locking field).</p>
-<p><span class="bold">Note</span>s:</p>
-<ul>
-<li>
-<p>This option only applies if one of the other refreshing options, such as alwaysRefresh, is already enabled.</p>
-</li>
-<li>
-<p>A version field is necessary to apply this feature.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r8c1-t23 r1c3-t23">
-<p>False</p>
-</td>
-<td align="left" headers="r8c1-t23 r1c4-t23">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r9c1-t23" headers="r1c1-t23">
-<p>Disable hits</p>
-</td>
-<td align="left" headers="r9c1-t23 r1c2-t23">
-<p>Specifies if all queries should bypass the cache for hits, but still resolve against the cache for identity. This forces all queries to hit the database.</p>
-</td>
-<td align="left" headers="r9c1-t23 r1c3-t23">
-<p>False</p>
-</td>
-<td align="left" headers="r9c1-t23 r1c4-t23">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r10c1-t23" headers="r1c1-t23">
-<p>Coordination type</p>
-</td>
-<td align="left" headers="r10c1-t23 r1c2-t23">
-<p>Specify the cache coordination mode:</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACDJIIG" name="CACDJIIG"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>Property pages</h1>
+<p><a id="sthref425" name="sthref425"></a>This section includes information each property page in the following views:</p>
<ul>
<li>
-<p>Send Object Changes</p>
-</li>
-<li>
-<p>Invalidate Changed Objects</p>
-</li>
-<li>
-<p>Send New Objects with Changes</p>
-</li>
-<li>
-<p>None</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r10c1-t23 r1c3-t23">
-<p>Send Object Changes</p>
-</td>
-<td align="left" headers="r10c1-t23 r1c4-t23">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r11c1-t23" headers="r1c1-t23">
-<p><span class="bold">Existence checking</span></p>
-</td>
-<td align="left" headers="r11c1-t23 r1c2-t23">
-<p>Specify how Dali should check to determine if an entity is new or exists.</p>
-<ul>
-<li>
-<p>Check Cache &ndash; If the object's primary key does not include null and it is in the cache, then it must exist.</p>
-</li>
-<li>
-<p>Check Cache then Database &ndash; Perform a "does exist check" on the database.</p>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
<li>
-<p>Assume Existence &ndash; If the object's primary key does not include null then it must exist. You may use this option if the application guarantees or does not care about the existence check.</p>
+<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
</li>
<li>
-<p>Assume Non-existence &ndash; Assume that the object does not exist. You may use this option if the application guarantees or does not care about the existence check. This will always force an INSERT operation.</p>
+<p><a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
</li>
-</ul>
-</td>
-<td align="left" headers="r11c1-t23 r1c3-t23">
-<p>Check Cache then Database</p>
-</td>
-<td align="left" headers="r11c1-t23 r1c4-t23">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblhruleinformalwide" -->
-<a id="sthref415" name="sthref415"></a>
-<p class="subhead2">Related reference</p>
-<ul>
<li>
-<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
</li>
<li>
-<p>"Cache" in <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span>&nbsp;<br />
-<code><a href="http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_cache.htm">http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_cache.htm</a></code></p>
+<p><a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a></p>
</li>
</ul>
-</div>
-<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
@@ -262,6 +50,6 @@
</tr>
</table>
</div>
-<!-- class="footer" -->
+<!-- class="footer" --></div>
</body>
</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
index f9bf0db111..9a12747880 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
@@ -5,188 +5,126 @@
<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>Queries</title>
+<title>Entity</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Queries" />
+<meta name="doctitle" content="Entity" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACBICGJ" name="CACBICGJ"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACCAGGC" name="CACCAGGC"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Queries</h1>
-<p><a id="sthref416" name="sthref416"></a><a id="sthref417" name="sthref417"></a><a id="sthref418" name="sthref418"></a>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 queries"</a> for additional information.</p>
+<h1>Entity</h1>
+<p>This table lists the Entity information fields available in the <span class="gui-object-title">JPA Details</span> view for an <a href="tasks003.htm#BABGBIEE">Entity</a>.</p>
<div class="inftblhruleinformalwide">
-<table class="HRuleInformalWide" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="16%" />
+<table class="HRuleInformalWide" title="JPA Details, Entity page" summary="JPA Details, Entity page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="20%" />
<col width="*" />
-<col width="16%" />
-<col width="19%" />
+<col width="24%" />
<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="r1c4-t24">Available for Entity&nbsp;Type</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-t24" headers="r1c1-t24">
-<p><span class="bold">Queries</span></p>
+<td align="left" id="r2c1-t23" headers="r1c1-t23">
+<p><span class="bold">Table</span></p>
</td>
-<td align="left" headers="r2c1-t24 r1c2-t24">
-<p>Displays the existing Named and Native queries.</p>
-<p>Click <span class="bold">Add</span> to add a named or named native query by using the <a href="reference066.htm#CACJIFEG">Add Query dialog</a>.</p>
+<td align="left" headers="r2c1-t23 r1c2-t23">
+<p>The default database table information for this entity. These fields can be overridden by the information in the <a href="reference023.htm#CACIJBGH">Attribute Overrides</a> area.</p>
</td>
-<td align="left" headers="r2c1-t24 r1c3-t24"><br /></td>
-<td align="left" headers="r2c1-t24 r1c4-t24">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+<td align="left" headers="r2c1-t23 r1c3-t23"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t23" headers="r1c1-t23">
+<p>Name</p>
</td>
+<td align="left" headers="r3c1-t23 r1c2-t23">
+<p>The name of the primary database table associated with the entity.</p>
+</td>
+<td align="left" headers="r3c1-t23 r1c3-t23"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t24" headers="r1c1-t24">
-<p><span class="bold">Named Queries</span></p>
+<td align="left" id="r4c1-t23" headers="r1c1-t23">
+<p>Catalog</p>
+</td>
+<td align="left" headers="r4c1-t23 r1c2-t23">
+<p>The database catalog that contains the <span class="bold">Table</span>.</p>
+</td>
+<td align="left" headers="r4c1-t23 r1c3-t23">
+<p>As defined in <code>orm.xml</code>.</p>
</td>
-<td align="left" headers="r3c1-t24 r1c2-t24"><br /></td>
-<td align="left" headers="r3c1-t24 r1c3-t24"><br /></td>
-<td align="left" headers="r3c1-t24 r1c4-t24"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t24" headers="r1c1-t24">
-<p>Name</p>
+<td align="left" id="r5c1-t23" headers="r1c1-t23">
+<p>Schema</p>
</td>
-<td align="left" headers="r4c1-t24 r1c2-t24">
-<p>Name of the query.</p>
+<td align="left" headers="r5c1-t23 r1c2-t23">
+<p>The database schema that contains the <span class="bold">Table</span>.</p>
</td>
-<td align="left" headers="r4c1-t24 r1c3-t24"><br /></td>
-<td align="left" headers="r4c1-t24 r1c4-t24">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+<td align="left" headers="r5c1-t23 r1c3-t23">
+<p>As defined in <code>orm.xml</code>.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t24" headers="r1c1-t24">
-<p>Query</p>
+<td align="left" id="r6c1-t23" headers="r1c1-t23">
+<p><span class="bold">Name</span></p>
</td>
-<td align="left" headers="r5c1-t24 r1c2-t24"><br /></td>
-<td align="left" headers="r5c1-t24 r1c3-t24"><br /></td>
-<td align="left" headers="r5c1-t24 r1c4-t24">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+<td align="left" headers="r6c1-t23 r1c2-t23">
+<p>The name of this entity. By default, the class name is used as the entity name.</p>
</td>
+<td align="left" headers="r6c1-t23 r1c3-t23"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t24" headers="r1c1-t24">
-<p>Lock mode</p>
+<td align="left" id="r7c1-t23" headers="r1c1-t23">
+<p><span class="bold">Access</span></p>
</td>
-<td align="left" headers="r6c1-t24 r1c2-t24">
+<td align="left" headers="r7c1-t23 r1c2-t23">
+<p>Specify how the entity its access instance variables.</p>
<ul>
<li>
-<p>None</p>
-</li>
-<li>
-<p>Optimistic</p>
-</li>
-<li>
-<p>Optimistic Force Increment</p>
-</li>
-<li>
-<p>Pessimistic Force Increment</p>
-</li>
-<li>
-<p>Pessimistic Read</p>
+<p>Property &ndash; Persistent state accessed through the property accessor methods. The property accessor methods must be <span class="bold">public</span> or <span class="bold">private</span>.</p>
</li>
<li>
-<p>Pessimistic Write</p>
-</li>
-<li>
-<p>Read</p>
-</li>
-<li>
-<p>Write</p>
+<p>Field &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
</li>
</ul>
+<p><span class="bold">Note</span>: This field is for display only, based on the properties in the <code>orm.xml</code>: If only the methods of the class are annotated, <span class="bold">property</span> access type is used. In all other cases, <span class="bold">field</span> access type is used.</p>
</td>
-<td align="left" headers="r6c1-t24 r1c3-t24">
-<p>None</p>
-</td>
-<td align="left" headers="r6c1-t24 r1c4-t24">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+<td align="left" headers="r7c1-t23 r1c3-t23">
+<p>Field</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t24" headers="r1c1-t24">
-<p><span class="bold">Native Queries</span></p>
-</td>
-<td align="left" headers="r7c1-t24 r1c2-t24"><br /></td>
-<td align="left" headers="r7c1-t24 r1c3-t24"><br /></td>
-<td align="left" headers="r7c1-t24 r1c4-t24"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t24" headers="r1c1-t24">
-<p>Name</p>
-</td>
-<td align="left" headers="r8c1-t24 r1c2-t24">
-<p>Name of the query.</p>
-</td>
-<td align="left" headers="r8c1-t24 r1c3-t24"><br /></td>
-<td align="left" headers="r8c1-t24 r1c4-t24">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r9c1-t24" headers="r1c1-t24">
-<p>Result class</p>
-</td>
-<td align="left" headers="r9c1-t24 r1c2-t24">
-<p>The class of the result.</p>
-<p><span class="bold">Note</span>: This field appears for Native Named Queries only.</p>
-</td>
-<td align="left" headers="r9c1-t24 r1c3-t24"><br /></td>
-<td align="left" headers="r9c1-t24 r1c4-t24">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r10c1-t24" headers="r1c1-t24">
-<p>Query</p>
-</td>
-<td align="left" headers="r10c1-t24 r1c2-t24"><br /></td>
-<td align="left" headers="r10c1-t24 r1c3-t24"><br /></td>
-<td align="left" headers="r10c1-t24 r1c4-t24">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r11c1-t24" headers="r1c1-t24">
-<p><span class="bold">Query hints</span></p>
-</td>
-<td align="left" headers="r11c1-t24 r1c2-t24">
-<p>Displays the existing query hints (Name and Value).</p>
-<p>Click Add to add a new query hint.</p>
+<td align="left" id="r8c1-t23" headers="r1c1-t23">
+<p><span class="bold">ID class</span></p>
</td>
-<td align="left" headers="r11c1-t24 r1c3-t24"><br /></td>
-<td align="left" headers="r11c1-t24 r1c4-t24">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+<td align="left" headers="r8c1-t23 r1c2-t23">
+<p>Click <span class="bold">Browse</span> and select the primary key for the entity. Clicking the field name, which is represented as a hyperlink, allows you to create a new class.</p>
</td>
+<td align="left" headers="r8c1-t23 r1c3-t23"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblhruleinformalwide" -->
-<a id="sthref419" name="sthref419"></a>
+<a id="sthref431" name="sthref431"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p><a href="tasks009.htm#BABIGBGG">Creating queries</a></p>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
</li>
</ul>
-<a id="sthref420" name="sthref420"></a>
+<a id="sthref432" name="sthref432"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
index 069e8a3102..0687c89e66 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
@@ -5,177 +5,73 @@
<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>Inheritance</title>
+<title>Embeddable</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Inheritance" />
+<meta name="doctitle" content="Embeddable" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACFHGHE" name="CACFHGHE"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACHJEJH" name="CACHJEJH"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Inheritance</h1>
-<p><a id="sthref421" name="sthref421"></a><a id="sthref422" name="sthref422"></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="inftblhruleinformal">
-<table class="HRuleInformal" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="16%" />
+<h1>Embeddable</h1>
+<p><a id="sthref433" name="sthref433"></a>This table lists the Embeddable information fields available in the <span class="gui-object-title">JPA Details</span> view for <a href="tasks004.htm#BABFEICE">Embeddable</a> entity type.</p>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" summary="JPA Details view, Embeddable page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="19%" />
<col width="*" />
-<col width="15%" />
-<col width="20%" />
+<col width="19%" />
<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="r1c4-t25">Available for Entity Type</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-t25" headers="r1c1-t25">
-<p>Strategy</p>
+<td align="left" id="r2c1-t24" headers="r1c1-t24">
+<p>Access</p>
</td>
-<td align="left" headers="r2c1-t25 r1c2-t25">
-<p>Specify the strategy to use when mapping a class or class hierarchy:</p>
+<td align="left" headers="r2c1-t24 r1c2-t24">
+<p>Specify how the entity its access instance variables.</p>
<ul>
<li>
-<p><span class="bold">Single table</span> &ndash; All classes in the hierarchy are mapped to a single table.</p>
+<p>Property &ndash; Persistent state accessed through the property accessor methods. The property accessor methods must be <span class="bold">public</span> or <span class="bold">private</span>.</p>
</li>
<li>
-<p><span class="bold">Joined</span> &ndash; The root of the hierarchy is mapped to a single table; each child maps to its own table.</p>
-</li>
-<li>
-<p><span class="bold">Table per class</span> &ndash; Each class is mapped to a separate table.</p>
+<p>Field &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
</li>
</ul>
-<p>This field corresponds to the <code>@Inheritance</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t25 r1c3-t25">
-<p>Single table</p>
-</td>
-<td align="left" headers="r2c1-t25 r1c4-t25">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t25" headers="r1c1-t25">
-<p><a id="sthref423" name="sthref423"></a><a id="sthref424" name="sthref424"></a>Discriminator Value</p>
-</td>
-<td align="left" headers="r3c1-t25 r1c2-t25">
-<p>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>
-</td>
-<td align="left" headers="r3c1-t25 r1c3-t25"><br /></td>
-<td align="left" headers="r3c1-t25 r1c4-t25">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t25" headers="r1c1-t25">
-<p><a id="sthref425" name="sthref425"></a><a id="sthref426" name="sthref426"></a><span class="bold">Discriminator Column</span></p>
-</td>
-<td align="left" headers="r4c1-t25 r1c2-t25">
-<p>These fields are available when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.</p>
-<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>
-</td>
-<td align="left" headers="r4c1-t25 r1c3-t25"><br /></td>
-<td align="left" headers="r4c1-t25 r1c4-t25"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t25" headers="r1c1-t25">
-<p>Name</p>
-</td>
-<td align="left" headers="r5c1-t25 r1c2-t25">
-<p>Name of the discriminator column</p>
-</td>
-<td align="left" headers="r5c1-t25 r1c3-t25"><br /></td>
-<td align="left" headers="r5c1-t25 r1c4-t25">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t25" headers="r1c1-t25">
-<p>Type</p>
+<p><span class="bold">Note</span>: This field is for display only, based on the properties in the <code>orm.xml</code>: If only the methods of the class are annotated, <span class="bold">property</span> access type is used. In all other cases, <span class="bold">field</span> access type is used.</p>
</td>
-<td align="left" headers="r6c1-t25 r1c2-t25">
-<p>Set this field to set the discriminator type to <code>Char</code> or <code>Integer</code> (instead of its default: <code>String</code>). The <span class="bold">Discriminator Value</span> must conform to this type.</p>
+<td align="left" headers="r2c1-t24 r1c3-t24">
+<p>Field</p>
</td>
-<td align="left" headers="r6c1-t25 r1c3-t25">
-<p>String</p>
-</td>
-<td align="left" headers="r6c1-t25 r1c4-t25">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t25" headers="r1c1-t25">
-<p>Length</p>
-</td>
-<td align="left" headers="r7c1-t25 r1c2-t25">
-<p>The column length for String-based discriminator types.</p>
-</td>
-<td align="left" headers="r7c1-t25 r1c3-t25">
-<p>0</p>
-</td>
-<td align="left" headers="r7c1-t25 r1c4-t25">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t25" headers="r1c1-t25">
-<p>Column definition</p>
-</td>
-<td align="left" headers="r8c1-t25 r1c2-t25">
-<p>The SQL fragment that is used when generating the DDL for the discriminator column.</p>
-</td>
-<td align="left" headers="r8c1-t25 r1c3-t25"><br /></td>
-<td align="left" headers="r8c1-t25 r1c4-t25">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r9c1-t25" headers="r1c1-t25">
-<p><span class="bold">Primary Key Join Columns</span></p>
-</td>
-<td align="left" headers="r9c1-t25 r1c2-t25">
-<p>Use to override the default primary key join columns. Select <span class="bold">Override Default</span>, then click <span class="bold">Add</span> to select new Join Column with the <a href="reference067.htm#CACDGGDB">Add Primary Key Join Column dialog</a>.</p>
-<p>This field corresponds with @<code>PrimaryKeyJoinColum</code>n annotation.</p>
-</td>
-<td align="left" headers="r9c1-t25 r1c3-t25"><br /></td>
-<td align="left" headers="r9c1-t25 r1c4-t25">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblhruleinformal" -->
-<p>Refer to <a href="task_inheritance.htm#CIHCCCJD">"Specifying entity inheritance"</a> for additional information.</p>
-<a id="sthref427" name="sthref427"></a>
+<!-- class="inftblhruleinformalwide" -->
+<a id="sthref434" name="sthref434"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></p>
-</li>
-<li>
<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
</li>
</ul>
-<a id="sthref428" name="sthref428"></a>
+<a id="sthref435" name="sthref435"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
-<li>
-<p><a href="reference067.htm#CACDGGDB">Add Primary Key Join Column dialog</a></p>
-</li>
</ul>
</div>
<!-- class="sect3" -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm
index 8e273348a8..a5c92c903c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm
@@ -5,76 +5,77 @@
<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>Attribute Overrides</title>
+<title>Mapped Superclass</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Attribute Overrides" />
+<meta name="doctitle" content="Mapped Superclass" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACIJBGH" name="CACIJBGH"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACGIEFD" name="CACGIEFD"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Attribute Overrides</h1>
-<p><a id="sthref429" name="sthref429"></a><a id="sthref430" name="sthref430"></a><a id="sthref431" name="sthref431"></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="reference013.htm#CACCAGGC">Entity</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>
+<h1>Mapped Superclass</h1>
+<p><a id="sthref436" name="sthref436"></a>This table lists the Embeddable information fields available in the <span class="gui-object-title">JPA Details</span> view for <a href="tasks005.htm#BABDAGCI">Mapped superclass</a> entity type.</p>
<div class="inftblhruleinformalwide">
-<table class="HRuleInformalWide" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="16%" />
+<table class="HRuleInformalWide" summary="JPA Details view, Mapped Superclass page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="19%" />
<col width="*" />
-<col width="17%" />
-<col width="25%" />
+<col width="19%" />
<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="r1c4-t26">Available for Entity&nbsp;Type</th>
+<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-t26" headers="r1c1-t26">
-<p>Attribute Overrides</p>
+<td align="left" id="r2c1-t25" headers="r1c1-t25">
+<p>Access</p>
</td>
-<td align="left" headers="r2c1-t26 r1c2-t26">
-<p>Specify a property or field to be overridden (from the default mappings). Select <span class="bold">Override Default</span>.</p>
+<td align="left" headers="r2c1-t25 r1c2-t25">
+<p>Specify how the entity its access instance variables.</p>
+<ul>
+<li>
+<p>Property &ndash; Persistent state accessed through the property accessor methods. The property accessor methods must be <span class="bold">public</span> or <span class="bold">private</span>.</p>
+</li>
+<li>
+<p>Field &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
+</li>
+</ul>
+<p><span class="bold">Note</span>: This field is for display only, based on the properties in the <code>orm.xml</code>: If only the methods of the class are annotated, <span class="bold">property</span> access type is used. In all other cases, <span class="bold">field</span> access type is used.</p>
+</td>
+<td align="left" headers="r2c1-t25 r1c3-t25">
+<p>Field</p>
</td>
-<td align="left" headers="r2c1-t26 r1c3-t26"><br /></td>
-<td align="left" headers="r2c1-t26 r1c4-t26">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t26" headers="r1c1-t26">
-<p>Join Columns</p>
+<td align="left" id="r3c1-t25" headers="r1c1-t25">
+<p>ID class</p>
+</td>
+<td align="left" headers="r3c1-t25 r1c2-t25">
+<p>Click <span class="bold">Browse</span> and select the primary key for the entity. Clicking the field name, which is represented as a hyperlink, allows you to create a new class.</p>
</td>
-<td align="left" headers="r3c1-t26 r1c2-t26"><br /></td>
-<td align="left" headers="r3c1-t26 r1c3-t26"><br /></td>
-<td align="left" headers="r3c1-t26 r1c4-t26">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
+<td align="left" headers="r3c1-t25 r1c3-t25"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblhruleinformalwide" -->
-<a id="sthref432" name="sthref432"></a>
+<a id="sthref437" name="sthref437"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></p>
-</li>
-<li>
<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
</li>
</ul>
-<a id="sthref433" name="sthref433"></a>
+<a id="sthref438" name="sthref438"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm
index 37ba5b32e3..ac45e81f60 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm
@@ -5,197 +5,248 @@
<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>Multitenancy</title>
+<title>Caching</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Multitenancy" />
+<meta name="doctitle" content="Caching" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACDIJEE" name="CACDIJEE"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACJBBCA" name="CACJBBCA"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Multitenancy</h1>
-<p><a id="sthref434" name="sthref434"></a>Use the <span class="gui-object-title">Multitenancy</span> area in the <span class="gui-object-title">JPA Details</span> view to specify that a given entity is shared among multiple tenants of an application.</p>
+<h1>Caching</h1>
+<p><a id="sthref439" name="sthref439"></a>This table lists the Caching information fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
<div class="inftblhruleinformalwide">
-<table class="HRuleInformalWide" title="JPA Details view, Multienancy page" summary="JPA Details view, Multienancy page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<table class="HRuleInformalWide" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="16%" />
<col width="*" />
-<col width="17%" />
-<col width="25%" />
+<col width="16%" />
+<col width="20%" />
<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>
-<th align="left" valign="bottom" id="r1c4-t27">Available for Entity&nbsp;Type</th>
+<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="r1c4-t26">Available for Entity&nbsp;Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t27" headers="r1c1-t27">
-<p>Multitenancy strategy</p>
+<td align="left" id="r2c1-t26" headers="r1c1-t26">
+<p><span class="bold">Cachable</span></p>
+</td>
+<td align="left" headers="r2c1-t26 r1c2-t26">
+<p>Specifies if the entity is cachable.</p>
+<p>This field corresponds to the <code>@Cachable</code> annotation.</p>
+</td>
+<td align="left" headers="r2c1-t26 r1c3-t26">
+<p>True</p>
</td>
-<td align="left" headers="r2c1-t27 r1c2-t27">
-<p>Specify the multitenant strategy to use:</p>
+<td align="left" headers="r2c1-t26 r1c4-t26">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t26" headers="r1c1-t26">
+<p>Type</p>
+</td>
+<td align="left" headers="r3c1-t26 r1c2-t26">
+<p>Select one of the following as the Default Cache Type:</p>
<ul>
<li>
-<p>Single table</p>
+<p><span class="bold">Weak with Soft Subcache</span>&ndash;This option is similar to <span class="bold">Weak with Hard Subcache</span> except that it maintains a most frequently used subcache that uses soft references. The size of the subcache is proportional to the size of the identity map. The subcache uses soft references to ensure that these objects are garbage-collected only if the system is low on memory.</p>
+<p>Use this identity map in most circumstances as a means to control memory used by the cache.</p>
+</li>
+<li>
+<p><span class="bold">Weak with Hard Subcache</span>&ndash;This option is similar to <span class="bold">Soft with Weak</span> subcache except that it maintains a most frequently used subcache that uses hard references. Use this identity map if soft references are not suitable for your platform.</p>
+</li>
+<li>
+<p><span class="bold">Weak</span>&ndash;This option is similar to <span class="bold">Full</span>, except that objects are referenced using weak references. This option uses less memory than <span class="bold">Full</span>, allows complete garbage collection and provides full caching and guaranteed identity.</p>
+<p>Use this identity map for transactions that, once started, stay on the server side.</p>
+</li>
+<li>
+<p><span class="bold">Soft</span>&ndash;This option is similar to <span class="bold">Weak</span> except that the map holds the objects using soft references. This identity map enables full garbage collection when memory is low. It provides full caching and guaranteed identity.</p>
</li>
<li>
-<p>Table per tenant</p>
+<p><span class="bold">Full</span>&ndash;This option provides full caching and guaranteed identity: all objects are cached and not removed.</p>
+<p>Note: This process may be memory-intensive when many objects are read.</p>
</li>
<li>
-<p>VPD</p>
+<p><span class="bold">None</span>&ndash;This option does not preserve object identity and does not cache objects.This option is not recommended.</p>
</li>
</ul>
</td>
-<td align="left" headers="r2c1-t27 r1c3-t27">
-<p>Single table</p>
+<td align="left" headers="r3c1-t26 r1c3-t26">
+<p>Weak with Soft Subcache</p>
</td>
-<td align="left" headers="r2c1-t27 r1c4-t27">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+<td align="left" headers="r3c1-t26 r1c4-t26">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t27" headers="r1c1-t27">
-<p>Include criteria</p>
+<td align="left" id="r4c1-t26" headers="r1c1-t26">
+<p>Size</p>
</td>
-<td align="left" headers="r3c1-t27 r1c2-t27">
-<p>Specify if the database requires the tenant criteria to be added to the <code>SELECT</code>, <code>UPDATE</code>, and <code>DELETE</code> queries.</p>
+<td align="left" headers="r4c1-t26 r1c2-t26">
+<p>Defines the size of cache to use (number of objects).</p>
</td>
-<td align="left" headers="r3c1-t27 r1c3-t27">
-<p>True</p>
+<td align="left" headers="r4c1-t26 r1c3-t26">
+<p>100</p>
</td>
-<td align="left" headers="r3c1-t27 r1c4-t27">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+<td align="left" headers="r4c1-t26 r1c4-t26">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t27" headers="r1c1-t27">
-<p><span class="bold">Tenant descriptor columns</span></p>
+<td align="left" id="r5c1-t26" headers="r1c1-t26">
+<p><span class="bold">Advanced</span></p>
</td>
-<td align="left" headers="r4c1-t27 r1c2-t27">
-<p>Use to limit what a persistence context can access in single-table mulitenancy</p>
-</td>
-<td align="left" headers="r4c1-t27 r1c3-t27"><br /></td>
-<td align="left" headers="r4c1-t27 r1c4-t27">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+<td align="left" headers="r5c1-t26 r1c2-t26"><br /></td>
+<td align="left" headers="r5c1-t26 r1c3-t26"><br /></td>
+<td align="left" headers="r5c1-t26 r1c4-t26">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t27" headers="r1c1-t27">
-<p>Override default</p>
+<td align="left" id="r6c1-t26" headers="r1c1-t26">
+<p>Expiry</p>
</td>
-<td align="left" headers="r5c1-t27 r1c2-t27"><br /></td>
-<td align="left" headers="r5c1-t27 r1c3-t27"><br /></td>
-<td align="left" headers="r5c1-t27 r1c4-t27"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t27" headers="r1c1-t27">
-<p>Name</p>
+<td align="left" headers="r6c1-t26 r1c2-t26">
+<p>Enables the expiration of the cached instance after a fixed period of time (milliseconds). Queries executed against the cache after this will be forced back to the database for a refreshed copy.</p>
</td>
-<td align="left" headers="r6c1-t27 r1c2-t27">
-<p>The name of column to be used for the tenant discriminator.</p>
+<td align="left" headers="r6c1-t26 r1c3-t26">
+<p>No expiry</p>
</td>
-<td align="left" headers="r6c1-t27 r1c3-t27">
-<p>eclipselink.tenant-id</p>
+<td align="left" headers="r6c1-t26 r1c4-t26">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r6c1-t27 r1c4-t27"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t27" headers="r1c1-t27">
-<p>Table</p>
+<td align="left" id="r7c1-t26" headers="r1c1-t26">
+<p>Always refresh</p>
</td>
-<td align="left" headers="r7c1-t27 r1c2-t27">
-<p>The name of the table that contains the column.</p>
+<td align="left" headers="r7c1-t26 r1c2-t26">
+<p>Specifies if all queries that go to the database should always refresh the cache.</p>
</td>
-<td align="left" headers="r7c1-t27 r1c3-t27"><br /></td>
-<td align="left" headers="r7c1-t27 r1c4-t27"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t27" headers="r1c1-t27">
-<p>Context property</p>
+<td align="left" headers="r7c1-t26 r1c3-t26">
+<p>False</p>
</td>
-<td align="left" headers="r8c1-t27 r1c2-t27">
-<p>The name of the context property to apply to the tenant discriminator column.</p>
+<td align="left" headers="r7c1-t26 r1c4-t26">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r8c1-t27 r1c3-t27"><br /></td>
-<td align="left" headers="r8c1-t27 r1c4-t27"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t27" headers="r1c1-t27">
-<p>Discriminator type</p>
+<td align="left" id="r8c1-t26" headers="r1c1-t26">
+<p>Refresh only if newer</p>
</td>
-<td align="left" headers="r9c1-t27 r1c2-t27">
-<p>The type of object/column to use as a class discriminator:</p>
+<td align="left" headers="r8c1-t26 r1c2-t26">
+<p>Specifies if all queries that go to the database should refresh the cache only if the data received from the database by a query is newer than the data in the cache (as determined by the optimistic locking field).</p>
+<p><span class="bold">Note</span>s:</p>
<ul>
<li>
-<p>Character</p>
-</li>
-<li>
-<p>Integer</p>
+<p>This option only applies if one of the other refreshing options, such as alwaysRefresh, is already enabled.</p>
</li>
<li>
-<p>String</p>
+<p>A version field is necessary to apply this feature.</p>
</li>
</ul>
</td>
-<td align="left" headers="r9c1-t27 r1c3-t27">
-<p>String</p>
+<td align="left" headers="r8c1-t26 r1c3-t26">
+<p>False</p>
+</td>
+<td align="left" headers="r8c1-t26 r1c4-t26">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r9c1-t27 r1c4-t27"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r10c1-t27" headers="r1c1-t27">
-<p>Length</p>
+<td align="left" id="r9c1-t26" headers="r1c1-t26">
+<p>Disable hits</p>
+</td>
+<td align="left" headers="r9c1-t26 r1c2-t26">
+<p>Specifies if all queries should bypass the cache for hits, but still resolve against the cache for identity. This forces all queries to hit the database.</p>
</td>
-<td align="left" headers="r10c1-t27 r1c2-t27">
-<p>The column length for String-based discriminator types.</p>
+<td align="left" headers="r9c1-t26 r1c3-t26">
+<p>False</p>
+</td>
+<td align="left" headers="r9c1-t26 r1c4-t26">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r10c1-t27 r1c3-t27"><br /></td>
-<td align="left" headers="r10c1-t27 r1c4-t27"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r11c1-t27" headers="r1c1-t27">
-<p>Column definition</p>
+<td align="left" id="r10c1-t26" headers="r1c1-t26">
+<p>Coordination type</p>
+</td>
+<td align="left" headers="r10c1-t26 r1c2-t26">
+<p>Specify the cache coordination mode:</p>
+<ul>
+<li>
+<p>Send Object Changes</p>
+</li>
+<li>
+<p>Invalidate Changed Objects</p>
+</li>
+<li>
+<p>Send New Objects with Changes</p>
+</li>
+<li>
+<p>None</p>
+</li>
+</ul>
</td>
-<td align="left" headers="r11c1-t27 r1c2-t27">
-<p>The SQL fragment that is used when generating the DDL for the discriminator column.</p>
+<td align="left" headers="r10c1-t26 r1c3-t26">
+<p>Send Object Changes</p>
+</td>
+<td align="left" headers="r10c1-t26 r1c4-t26">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r11c1-t27 r1c3-t27"><br /></td>
-<td align="left" headers="r11c1-t27 r1c4-t27"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r12c1-t27" headers="r1c1-t27">
-<p>Primary key</p>
+<td align="left" id="r11c1-t26" headers="r1c1-t26">
+<p><span class="bold">Existence checking</span></p>
</td>
-<td align="left" headers="r12c1-t27 r1c2-t27">
-<p>Specifies that the tenant discriminator column is part of the primary key of the tables.</p>
+<td align="left" headers="r11c1-t26 r1c2-t26">
+<p>Specify how Dali should check to determine if an entity is new or exists.</p>
+<ul>
+<li>
+<p>Check Cache &ndash; If the object's primary key does not include null and it is in the cache, then it must exist.</p>
+</li>
+<li>
+<p>Check Cache then Database &ndash; Perform a "does exist check" on the database.</p>
+</li>
+<li>
+<p>Assume Existence &ndash; If the object's primary key does not include null then it must exist. You may use this option if the application guarantees or does not care about the existence check.</p>
+</li>
+<li>
+<p>Assume Non-existence &ndash; Assume that the object does not exist. You may use this option if the application guarantees or does not care about the existence check. This will always force an INSERT operation.</p>
+</li>
+</ul>
</td>
-<td align="left" headers="r12c1-t27 r1c3-t27">
-<p>False</p>
+<td align="left" headers="r11c1-t26 r1c3-t26">
+<p>Check Cache then Database</p>
+</td>
+<td align="left" headers="r11c1-t26 r1c4-t26">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r12c1-t27 r1c4-t27"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblhruleinformalwide" -->
-<a id="sthref435" name="sthref435"></a>
+<a id="sthref440" name="sthref440"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
<li>
-<p>"Multitenant" in <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span>&nbsp;<br />
-<code><a href="http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_multitenant.htm">http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_multitenant.htm</a></code></p>
+<p>"Cache" in <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span>&nbsp;<br />
+<code><a href="http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_cache.htm">http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_cache.htm</a></code></p>
</li>
</ul>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm
index b7196347b5..20d5e6347f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm
@@ -5,232 +5,188 @@
<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>Primary Key Generation</title>
+<title>Queries</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Primary Key Generation" />
+<meta name="doctitle" content="Queries" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACCJJDC" name="CACCJJDC"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACBICGJ" name="CACBICGJ"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref436" name="sthref436"></a><a id="sthref437" name="sthref437"></a>Primary Key Generation</h1>
+<h1>Queries</h1>
+<p><a id="sthref441" name="sthref441"></a><a id="sthref442" name="sthref442"></a><a id="sthref443" name="sthref443"></a>Use the queries area of the JPA Details view to create named queries and named native queries. Refer to <a href="tasks010.htm#BABIGBGG">"Creating queries"</a> for additional information.</p>
<div class="inftblhruleinformalwide">
-<table class="HRuleInformalWide" title="JPA Details view, Primary key page" summary="JPA Details view, Primary key page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<table class="HRuleInformalWide" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="16%" />
<col width="*" />
-<col width="17%" />
-<col width="25%" />
+<col width="16%" />
+<col width="19%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t28">Property</th>
-<th align="left" valign="bottom" id="r1c2-t28">Description</th>
-<th align="left" valign="bottom" id="r1c3-t28">Default</th>
-<th align="left" valign="bottom" id="r1c4-t28">Available for Entity&nbsp;Type</th>
+<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>
+<th align="left" valign="bottom" id="r1c4-t27">Available for Entity&nbsp;Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t28" headers="r1c1-t28">
-<p><span class="bold">Table Generator</span></p>
-</td>
-<td align="left" headers="r2c1-t28 r1c2-t28">
-<p>These fields define the database table used for generating the primary key and correspond to the <code>@TableGenerator</code> annotation.</p>
+<td align="left" id="r2c1-t27" headers="r1c1-t27">
+<p><span class="bold">Queries</span></p>
</td>
-<td align="left" headers="r2c1-t28 r1c3-t28"><br /></td>
-<td align="left" headers="r2c1-t28 r1c4-t28">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t28" headers="r1c1-t28">
-<p>Name</p>
+<td align="left" headers="r2c1-t27 r1c2-t27">
+<p>Displays the existing Named and Native queries.</p>
+<p>Click <span class="bold">Add</span> to add a named or named native query by using the <a href="reference072.htm#CACJIFEG">Add Query dialog</a>.</p>
</td>
-<td align="left" headers="r3c1-t28 r1c2-t28">
-<p>Unique name of the generator.</p>
+<td align="left" headers="r2c1-t27 r1c3-t27"><br /></td>
+<td align="left" headers="r2c1-t27 r1c4-t27">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r3c1-t28 r1c3-t28"><br /></td>
-<td align="left" headers="r3c1-t28 r1c4-t28">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t28" headers="r1c1-t28">
-<p>Table</p>
-</td>
-<td align="left" headers="r4c1-t28 r1c2-t28">
-<p>Database table that stores the generated ID values.</p>
+<td align="left" id="r3c1-t27" headers="r1c1-t27">
+<p><span class="bold">Named Queries</span></p>
</td>
-<td align="left" headers="r4c1-t28 r1c3-t28"><br /></td>
-<td align="left" headers="r4c1-t28 r1c4-t28">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
+<td align="left" headers="r3c1-t27 r1c2-t27"><br /></td>
+<td align="left" headers="r3c1-t27 r1c3-t27"><br /></td>
+<td align="left" headers="r3c1-t27 r1c4-t27"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t28" headers="r1c1-t28">
-<p>Schema</p>
-</td>
-<td align="left" headers="r5c1-t28 r1c2-t28"><br /></td>
-<td align="left" headers="r5c1-t28 r1c3-t28"><br /></td>
-<td align="left" headers="r5c1-t28 r1c4-t28">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t28" headers="r1c1-t28">
-<p>Catalog</p>
-</td>
-<td align="left" headers="r6c1-t28 r1c2-t28"><br /></td>
-<td align="left" headers="r6c1-t28 r1c3-t28"><br /></td>
-<td align="left" headers="r6c1-t28 r1c4-t28">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t28" headers="r1c1-t28">
-<p>Primary key column</p>
+<td align="left" id="r4c1-t27" headers="r1c1-t27">
+<p>Name</p>
+</td>
+<td align="left" headers="r4c1-t27 r1c2-t27">
+<p>Name of the query.</p>
</td>
-<td align="left" headers="r7c1-t28 r1c2-t28">
-<p>The column in the table generator's <span class="bold">Table</span> that contains the primary key.</p>
+<td align="left" headers="r4c1-t27 r1c3-t27"><br /></td>
+<td align="left" headers="r4c1-t27 r1c4-t27">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r7c1-t28 r1c3-t28"><br /></td>
-<td align="left" headers="r7c1-t28 r1c4-t28">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t28" headers="r1c1-t28">
-<p>Value column</p>
+<td align="left" id="r5c1-t27" headers="r1c1-t27">
+<p>Query</p>
</td>
-<td align="left" headers="r8c1-t28 r1c2-t28">
-<p>The column that stores the generated ID values.</p>
+<td align="left" headers="r5c1-t27 r1c2-t27"><br /></td>
+<td align="left" headers="r5c1-t27 r1c3-t27"><br /></td>
+<td align="left" headers="r5c1-t27 r1c4-t27">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r8c1-t28 r1c3-t28"><br /></td>
-<td align="left" headers="r8c1-t28 r1c4-t28">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t28" headers="r1c1-t28">
-<p>Allocation size</p>
+<td align="left" id="r6c1-t27" headers="r1c1-t27">
+<p>Lock mode</p>
</td>
-<td align="left" headers="r9c1-t28 r1c2-t28">
-<p>The value for the <span class="bold">Primary Key Column</span> in the generator table.</p>
-</td>
-<td align="left" headers="r9c1-t28 r1c3-t28">
-<p>50</p>
+<td align="left" headers="r6c1-t27 r1c2-t27">
+<ul>
+<li>
+<p>None</p>
+</li>
+<li>
+<p>Optimistic</p>
+</li>
+<li>
+<p>Optimistic Force Increment</p>
+</li>
+<li>
+<p>Pessimistic Force Increment</p>
+</li>
+<li>
+<p>Pessimistic Read</p>
+</li>
+<li>
+<p>Pessimistic Write</p>
+</li>
+<li>
+<p>Read</p>
+</li>
+<li>
+<p>Write</p>
+</li>
+</ul>
</td>
-<td align="left" headers="r9c1-t28 r1c4-t28">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r10c1-t28" headers="r1c1-t28">
-<p>Initial value</p>
+<td align="left" headers="r6c1-t27 r1c3-t27">
+<p>None</p>
</td>
-<td align="left" headers="r10c1-t28 r1c2-t28"><br /></td>
-<td align="left" headers="r10c1-t28 r1c3-t28">
-<p>0</p>
+<td align="left" headers="r6c1-t27 r1c4-t27">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r10c1-t28 r1c4-t28">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r11c1-t28" headers="r1c1-t28">
-<p><span class="bold">Sequence Generator</span></p>
-</td>
-<td align="left" headers="r11c1-t28 r1c2-t28">
-<p><a id="sthref438" name="sthref438"></a><a id="sthref439" name="sthref439"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.</p>
-<p>These fields apply only when <span class="bold">Strategy</span> = <span class="bold">Sequence</span>.</p>
+<td align="left" id="r7c1-t27" headers="r1c1-t27">
+<p><span class="bold">Native Queries</span></p>
</td>
-<td align="left" headers="r11c1-t28 r1c3-t28"><br /></td>
-<td align="left" headers="r11c1-t28 r1c4-t28">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
+<td align="left" headers="r7c1-t27 r1c2-t27"><br /></td>
+<td align="left" headers="r7c1-t27 r1c3-t27"><br /></td>
+<td align="left" headers="r7c1-t27 r1c4-t27"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r12c1-t28" headers="r1c1-t28">
+<td align="left" id="r8c1-t27" headers="r1c1-t27">
<p>Name</p>
</td>
-<td align="left" headers="r12c1-t28 r1c2-t28">
-<p>Name of the sequence table to use for defining primary key values.</p>
+<td align="left" headers="r8c1-t27 r1c2-t27">
+<p>Name of the query.</p>
+</td>
+<td align="left" headers="r8c1-t27 r1c3-t27"><br /></td>
+<td align="left" headers="r8c1-t27 r1c4-t27">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r12c1-t28 r1c3-t28"><br /></td>
-<td align="left" headers="r12c1-t28 r1c4-t28">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r13c1-t28" headers="r1c1-t28">
-<p>Sequence</p>
+<td align="left" id="r9c1-t27" headers="r1c1-t27">
+<p>Result class</p>
</td>
-<td align="left" headers="r13c1-t28 r1c2-t28">
-<p>Unique name of the sequence.</p>
+<td align="left" headers="r9c1-t27 r1c2-t27">
+<p>The class of the result.</p>
+<p><span class="bold">Note</span>: This field appears for Native Named Queries only.</p>
+</td>
+<td align="left" headers="r9c1-t27 r1c3-t27"><br /></td>
+<td align="left" headers="r9c1-t27 r1c4-t27">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r13c1-t28 r1c3-t28"><br /></td>
-<td align="left" headers="r13c1-t28 r1c4-t28">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r14c1-t28" headers="r1c1-t28">
-<p>Schema</p>
-</td>
-<td align="left" headers="r14c1-t28 r1c2-t28"><br /></td>
-<td align="left" headers="r14c1-t28 r1c3-t28"><br /></td>
-<td align="left" headers="r14c1-t28 r1c4-t28">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r15c1-t28" headers="r1c1-t28">
-<p>Catalog</p>
-</td>
-<td align="left" headers="r15c1-t28 r1c2-t28"><br /></td>
-<td align="left" headers="r15c1-t28 r1c3-t28"><br /></td>
-<td align="left" headers="r15c1-t28 r1c4-t28">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r16c1-t28" headers="r1c1-t28">
-<p>Allocation size</p>
-</td>
-<td align="left" headers="r16c1-t28 r1c2-t28">
-<p><a id="sthref440" name="sthref440"></a><a id="sthref441" name="sthref441"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.</p>
-<p>These fields apply only when <span class="bold">Strategy</span> = <span class="bold">Sequence</span>.</p>
+<td align="left" id="r10c1-t27" headers="r1c1-t27">
+<p>Query</p>
</td>
-<td align="left" headers="r16c1-t28 r1c3-t28">
-<p>50</p>
+<td align="left" headers="r10c1-t27 r1c2-t27"><br /></td>
+<td align="left" headers="r10c1-t27 r1c3-t27"><br /></td>
+<td align="left" headers="r10c1-t27 r1c4-t27">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r16c1-t28 r1c4-t28">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r17c1-t28" headers="r1c1-t28">
-<p>Initial value</p>
+<td align="left" id="r11c1-t27" headers="r1c1-t27">
+<p><span class="bold">Query hints</span></p>
</td>
-<td align="left" headers="r17c1-t28 r1c2-t28"><br /></td>
-<td align="left" headers="r17c1-t28 r1c3-t28">
-<p>1</p>
+<td align="left" headers="r11c1-t27 r1c2-t27">
+<p>Displays the existing query hints (Name and Value).</p>
+<p>Click Add to add a new query hint.</p>
+</td>
+<td align="left" headers="r11c1-t27 r1c3-t27"><br /></td>
+<td align="left" headers="r11c1-t27 r1c4-t27">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r17c1-t28 r1c4-t28">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
-<br /></td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblhruleinformalwide" -->
-<a id="sthref442" name="sthref442"></a>
+<a id="sthref444" name="sthref444"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="tasks010.htm#BABIGBGG">Creating queries</a></p>
+</li>
+</ul>
+<a id="sthref445" name="sthref445"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm
index 39d8abaec4..a774d3657f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm
@@ -5,40 +5,177 @@
<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>Secondary tables</title>
+<title>Inheritance</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Secondary tables" />
+<meta name="doctitle" content="Inheritance" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACBHIDA" name="CACBHIDA"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACFHGHE" name="CACFHGHE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Secondary tables</h1>
-<p><a id="sthref443" name="sthref443"></a><a id="sthref444" name="sthref444"></a><a id="sthref445" name="sthref445"></a><a id="sthref446" name="sthref446"></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>Refer to <a href="task_additonal_tables.htm#CIHGBIEI">"Specifying additional tables"</a> for additional information.</p>
-<a id="sthref447" name="sthref447"></a>
+<h1>Inheritance</h1>
+<p><a id="sthref446" name="sthref446"></a><a id="sthref447" name="sthref447"></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="inftblhruleinformal">
+<table class="HRuleInformal" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="16%" />
+<col width="*" />
+<col width="15%" />
+<col width="20%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t28">Property</th>
+<th align="left" valign="bottom" id="r1c2-t28">Description</th>
+<th align="left" valign="bottom" id="r1c3-t28">Default</th>
+<th align="left" valign="bottom" id="r1c4-t28">Available for Entity Type</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t28" headers="r1c1-t28">
+<p>Strategy</p>
+</td>
+<td align="left" headers="r2c1-t28 r1c2-t28">
+<p>Specify the strategy to use when mapping a class or class hierarchy:</p>
+<ul>
+<li>
+<p><span class="bold">Single table</span> &ndash; All classes in the hierarchy are mapped to a single table.</p>
+</li>
+<li>
+<p><span class="bold">Joined</span> &ndash; The root of the hierarchy is mapped to a single table; each child maps to its own table.</p>
+</li>
+<li>
+<p><span class="bold">Table per class</span> &ndash; Each class is mapped to a separate table.</p>
+</li>
+</ul>
+<p>This field corresponds to the <code>@Inheritance</code> annotation.</p>
+</td>
+<td align="left" headers="r2c1-t28 r1c3-t28">
+<p>Single table</p>
+</td>
+<td align="left" headers="r2c1-t28 r1c4-t28">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t28" headers="r1c1-t28">
+<p><a id="sthref448" name="sthref448"></a><a id="sthref449" name="sthref449"></a>Discriminator Value</p>
+</td>
+<td align="left" headers="r3c1-t28 r1c2-t28">
+<p>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>
+</td>
+<td align="left" headers="r3c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r3c1-t28 r1c4-t28">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t28" headers="r1c1-t28">
+<p><a id="sthref450" name="sthref450"></a><a id="sthref451" name="sthref451"></a><span class="bold">Discriminator Column</span></p>
+</td>
+<td align="left" headers="r4c1-t28 r1c2-t28">
+<p>These fields are available when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.</p>
+<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>
+</td>
+<td align="left" headers="r4c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r4c1-t28 r1c4-t28"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t28" headers="r1c1-t28">
+<p>Name</p>
+</td>
+<td align="left" headers="r5c1-t28 r1c2-t28">
+<p>Name of the discriminator column</p>
+</td>
+<td align="left" headers="r5c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r5c1-t28 r1c4-t28">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t28" headers="r1c1-t28">
+<p>Type</p>
+</td>
+<td align="left" headers="r6c1-t28 r1c2-t28">
+<p>Set this field to set the discriminator type to <code>Char</code> or <code>Integer</code> (instead of its default: <code>String</code>). The <span class="bold">Discriminator Value</span> must conform to this type.</p>
+</td>
+<td align="left" headers="r6c1-t28 r1c3-t28">
+<p>String</p>
+</td>
+<td align="left" headers="r6c1-t28 r1c4-t28">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t28" headers="r1c1-t28">
+<p>Length</p>
+</td>
+<td align="left" headers="r7c1-t28 r1c2-t28">
+<p>The column length for String-based discriminator types.</p>
+</td>
+<td align="left" headers="r7c1-t28 r1c3-t28">
+<p>0</p>
+</td>
+<td align="left" headers="r7c1-t28 r1c4-t28">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t28" headers="r1c1-t28">
+<p>Column definition</p>
+</td>
+<td align="left" headers="r8c1-t28 r1c2-t28">
+<p>The SQL fragment that is used when generating the DDL for the discriminator column.</p>
+</td>
+<td align="left" headers="r8c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r8c1-t28 r1c4-t28">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t28" headers="r1c1-t28">
+<p><span class="bold">Primary Key Join Columns</span></p>
+</td>
+<td align="left" headers="r9c1-t28 r1c2-t28">
+<p>Use to override the default primary key join columns. Select <span class="bold">Override Default</span>, then click <span class="bold">Add</span> to select new Join Column with the <a href="reference073.htm#CACDGGDB">Add Primary Key Join Column dialog</a>.</p>
+<p>This field corresponds with @<code>PrimaryKeyJoinColum</code>n annotation.</p>
+</td>
+<td align="left" headers="r9c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r9c1-t28 r1c4-t28">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<p>Refer to <a href="task_inheritance.htm#CIHCCCJD">"Specifying entity inheritance"</a> for additional information.</p>
+<a id="sthref452" name="sthref452"></a>
<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p><a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a></p>
+<p><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></p>
</li>
<li>
<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
</li>
</ul>
-<a id="sthref448" name="sthref448"></a>
+<a id="sthref453" name="sthref453"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
+<li>
+<p><a href="reference073.htm#CACDGGDB">Add Primary Key Join Column dialog</a></p>
+</li>
</ul>
</div>
<!-- class="sect3" -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm
index e805c0c45a..87cd97c265 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm
@@ -5,25 +5,26 @@
<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>Converters</title>
+<title>Attribute Overrides</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Converters" />
+<meta name="doctitle" content="Attribute Overrides" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACJGDAJ" name="CACJGDAJ"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACIJBGH" name="CACIJBGH"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Converters</h1>
-<p><a id="sthref449" name="sthref449"></a><a id="sthref450" name="sthref450"></a><a id="sthref451" name="sthref451"></a><a id="sthref452" name="sthref452"></a><a id="sthref453" name="sthref453"></a><a id="sthref454" name="sthref454"></a><a id="sthref455" name="sthref455"></a>Use the Converter area in the <span class="gui-object-title">JPA Details</span> view to specify a way to modify data value(s) during the reading and writing of a mapped attribute.</p>
+<h1>Attribute Overrides</h1>
+<p><a id="sthref454" name="sthref454"></a><a id="sthref455" name="sthref455"></a><a id="sthref456" name="sthref456"></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="reference017.htm#CACCAGGC">Entity</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="inftblhruleinformalwide">
-<table class="HRuleInformalWide" title="JPA Details view, Advanced page" summary="JPA Details view, Advanced page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<table class="HRuleInformalWide" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="16%" />
<col width="*" />
<col width="17%" />
@@ -39,117 +40,45 @@
<tbody>
<tr align="left" valign="top">
<td align="left" id="r2c1-t29" headers="r1c1-t29">
-<p>Converters</p>
+<p>Attribute Overrides</p>
</td>
<td align="left" headers="r2c1-t29 r1c2-t29">
-<p>Click Add and use the <a href="ref_add_converter.htm#CIAGCGIJ">Add Converter dialog</a> to create a new converter.</p>
-<ul>
-<li>
-<p>Object Type &ndash; converts a fixed number of database data value(s) to Java object value(s)</p>
-</li>
-<li>
-<p>Type &ndash; modifies data values</p>
-</li>
-<li>
-<p>Struct &ndash; Enable custom processing of <code>java.sql.Struct</code> types</p>
-</li>
-<li>
-<p>Custom</p>
-</li>
-</ul>
+<p>Specify a property or field to be overridden (from the default mappings). Select <span class="bold">Override Default</span>.</p>
</td>
<td align="left" headers="r2c1-t29 r1c3-t29"><br /></td>
<td align="left" headers="r2c1-t29 r1c4-t29">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r3c1-t29" headers="r1c1-t29">
-<p>Name</p>
-</td>
-<td align="left" headers="r3c1-t29 r1c2-t29">
-<p>The <code>String</code> name for your converter, must be unique across the persistence unit</p>
+<p>Join Columns</p>
</td>
+<td align="left" headers="r3c1-t29 r1c2-t29"><br /></td>
<td align="left" headers="r3c1-t29 r1c3-t29"><br /></td>
<td align="left" headers="r3c1-t29 r1c4-t29">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t29" headers="r1c1-t29">
-<p>Class</p>
-</td>
-<td align="left" headers="r4c1-t29 r1c2-t29">
-<p>The class of your converter. This class must implement the <code>org.eclipse.persistence.mappings.converters.Converter</code> interface.</p>
-<p>Appears for <span class="bold">Custom</span> and <span class="bold">Struct</span> converters only.</p>
-</td>
-<td align="left" headers="r4c1-t29 r1c3-t29"><br /></td>
-<td align="left" headers="r4c1-t29 r1c4-t29">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t29" headers="r1c1-t29">
-<p>Data type</p>
-</td>
-<td align="left" headers="r5c1-t29 r1c2-t29">
-<p>The type stored in the database.</p>
-<p>Appears for <span class="bold">Object Type</span> and <span class="bold">Type</span> converters only.</p>
-</td>
-<td align="left" headers="r5c1-t29 r1c3-t29"><br /></td>
-<td align="left" headers="r5c1-t29 r1c4-t29">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t29" headers="r1c1-t29">
-<p>Object type</p>
-</td>
-<td align="left" headers="r6c1-t29 r1c2-t29">
-<p>The type stored on the entity.</p>
-<p>Appears for <span class="bold">Object Type</span> and <span class="bold">Type</span> converters only.</p>
-</td>
-<td align="left" headers="r6c1-t29 r1c3-t29"><br /></td>
-<td align="left" headers="r6c1-t29 r1c4-t29">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t29" headers="r1c1-t29">
-<p>Conversion values</p>
-</td>
-<td align="left" headers="r7c1-t29 r1c2-t29">
-<p>The array of conversion values (instances of <code>ConversionValue</code>: <code>String</code> <code>objectValue</code> and <code>String</code> <code>dataValue</code>).</p>
-<p>Appears for <span class="bold">Object Type</span> converters only.</p>
-</td>
-<td align="left" headers="r7c1-t29 r1c3-t29"><br /></td>
-<td align="left" headers="r7c1-t29 r1c4-t29">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t29" headers="r1c1-t29">
-<p>Default object value</p>
-</td>
-<td align="left" headers="r8c1-t29 r1c2-t29">
-<p>Set the value of this attribute to the default object value. Note that this argument is for dealing with legacy data if the data value is missing.</p>
-<p>Appears for <span class="bold">Object Type</span> converters only.</p>
-</td>
-<td align="left" headers="r8c1-t29 r1c3-t29"><br /></td>
-<td align="left" headers="r8c1-t29 r1c4-t29">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
-</td>
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblhruleinformalwide" -->
-<a id="sthref456" name="sthref456"></a>
+<a id="sthref457" name="sthref457"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></p>
+</li>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+</ul>
+<a id="sthref458" name="sthref458"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
-<p>"Converter" in <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span><br />
-<code><a href="http://eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_converter.htm">http://eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_converter.htm</a></code></p>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
</ul>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm
index b2145a0c43..115950daf4 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm
@@ -5,25 +5,25 @@
<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>Advanced</title>
+<title>Multitenancy</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Advanced" />
+<meta name="doctitle" content="Multitenancy" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACJEEDE" name="CACJEEDE"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACDIJEE" name="CACDIJEE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Advanced</h1>
-<p><a id="sthref457" name="sthref457"></a><a id="sthref458" name="sthref458"></a><a id="sthref459" name="sthref459"></a><a id="sthref460" name="sthref460"></a><a id="sthref461" name="sthref461"></a><a id="sthref462" name="sthref462"></a><a id="sthref463" name="sthref463"></a><a id="sthref464" name="sthref464"></a><a id="sthref465" name="sthref465"></a>Use the <span class="gui-object-title">Advanced</span> area in the <span class="gui-object-title">JPA Details</span> view to configure additional settings for an entity.</p>
+<h1>Multitenancy</h1>
+<p><a id="sthref459" name="sthref459"></a>Use the <span class="gui-object-title">Multitenancy</span> area in the <span class="gui-object-title">JPA Details</span> view to specify that a given entity is shared among multiple tenants of an application.</p>
<div class="inftblhruleinformalwide">
-<table class="HRuleInformalWide" title="JPA Details view, Advanced page" summary="JPA Details view, Advanced page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<table class="HRuleInformalWide" title="JPA Details view, Multienancy page" summary="JPA Details view, Multienancy page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="16%" />
<col width="*" />
<col width="17%" />
@@ -39,78 +39,167 @@
<tbody>
<tr align="left" valign="top">
<td align="left" id="r2c1-t30" headers="r1c1-t30">
-<p>Read-only</p>
+<p>Multitenancy strategy</p>
</td>
<td align="left" headers="r2c1-t30 r1c2-t30">
-<p>Specifies if a class is read-only.</p>
+<p>Specify the multitenant strategy to use:</p>
+<ul>
+<li>
+<p>Single table</p>
+</li>
+<li>
+<p>Table per tenant</p>
+</li>
+<li>
+<p>VPD</p>
+</li>
+</ul>
</td>
<td align="left" headers="r2c1-t30 r1c3-t30">
-<p>False</p>
+<p>Single table</p>
</td>
<td align="left" headers="r2c1-t30 r1c4-t30">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r3c1-t30" headers="r1c1-t30">
-<p>Customizer class</p>
+<p>Include criteria</p>
</td>
<td align="left" headers="r3c1-t30 r1c2-t30">
-<p>Specifies a class that implements <code>DescriptorCustomizer</code> and is to run against an entity's class descriptor after all metadata processing has been completed.</p>
+<p>Specify if the database requires the tenant criteria to be added to the <code>SELECT</code>, <code>UPDATE</code>, and <code>DELETE</code> queries.</p>
</td>
<td align="left" headers="r3c1-t30 r1c3-t30">
<p>True</p>
</td>
<td align="left" headers="r3c1-t30 r1c4-t30">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
</td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r4c1-t30" headers="r1c1-t30">
-<p>Change tracking</p>
+<p><span class="bold">Tenant descriptor columns</span></p>
</td>
<td align="left" headers="r4c1-t30 r1c2-t30">
-<p>Specifies the <code>ObjectChangePolicy</code> to use:</p>
+<p>Use to limit what a persistence context can access in single-table mulitenancy</p>
+</td>
+<td align="left" headers="r4c1-t30 r1c3-t30"><br /></td>
+<td align="left" headers="r4c1-t30 r1c4-t30">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t30" headers="r1c1-t30">
+<p>Override default</p>
+</td>
+<td align="left" headers="r5c1-t30 r1c2-t30"><br /></td>
+<td align="left" headers="r5c1-t30 r1c3-t30"><br /></td>
+<td align="left" headers="r5c1-t30 r1c4-t30"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t30" headers="r1c1-t30">
+<p>Name</p>
+</td>
+<td align="left" headers="r6c1-t30 r1c2-t30">
+<p>The name of column to be used for the tenant discriminator.</p>
+</td>
+<td align="left" headers="r6c1-t30 r1c3-t30">
+<p>eclipselink.tenant-id</p>
+</td>
+<td align="left" headers="r6c1-t30 r1c4-t30"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t30" headers="r1c1-t30">
+<p>Table</p>
+</td>
+<td align="left" headers="r7c1-t30 r1c2-t30">
+<p>The name of the table that contains the column.</p>
+</td>
+<td align="left" headers="r7c1-t30 r1c3-t30"><br /></td>
+<td align="left" headers="r7c1-t30 r1c4-t30"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t30" headers="r1c1-t30">
+<p>Context property</p>
+</td>
+<td align="left" headers="r8c1-t30 r1c2-t30">
+<p>The name of the context property to apply to the tenant discriminator column.</p>
+</td>
+<td align="left" headers="r8c1-t30 r1c3-t30"><br /></td>
+<td align="left" headers="r8c1-t30 r1c4-t30"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t30" headers="r1c1-t30">
+<p>Discriminator type</p>
+</td>
+<td align="left" headers="r9c1-t30 r1c2-t30">
+<p>The type of object/column to use as a class discriminator:</p>
<ul>
<li>
-<p><span class="bold">Attribute</span> &ndash; Objects with changed attributes will be processed in the commit process to include any changes in the results of the commit. Unchanged objects will be ignored.</p>
-</li>
-<li>
-<p><span class="bold">Object</span> &ndash; Changed objects will be processed in the commit process to include any changes in the results of the commit. Unchanged objects will be ignored.</p>
+<p>Character</p>
</li>
<li>
-<p><span class="bold">Deferred</span> &ndash; Defers all change detection to the UnitOfWork's change detection process.</p>
+<p>Integer</p>
</li>
<li>
-<p><span class="bold">Auto</span> &ndash; Does not set any change tracking policy; change tracking will be determined at runtime.</p>
+<p>String</p>
</li>
</ul>
</td>
-<td align="left" headers="r4c1-t30 r1c3-t30">
-<p>Auto</p>
+<td align="left" headers="r9c1-t30 r1c3-t30">
+<p>String</p>
</td>
-<td align="left" headers="r4c1-t30 r1c4-t30">
-<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+<td align="left" headers="r9c1-t30 r1c4-t30"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t30" headers="r1c1-t30">
+<p>Length</p>
+</td>
+<td align="left" headers="r10c1-t30 r1c2-t30">
+<p>The column length for String-based discriminator types.</p>
+</td>
+<td align="left" headers="r10c1-t30 r1c3-t30"><br /></td>
+<td align="left" headers="r10c1-t30 r1c4-t30"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t30" headers="r1c1-t30">
+<p>Column definition</p>
+</td>
+<td align="left" headers="r11c1-t30 r1c2-t30">
+<p>The SQL fragment that is used when generating the DDL for the discriminator column.</p>
+</td>
+<td align="left" headers="r11c1-t30 r1c3-t30"><br /></td>
+<td align="left" headers="r11c1-t30 r1c4-t30"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t30" headers="r1c1-t30">
+<p>Primary key</p>
+</td>
+<td align="left" headers="r12c1-t30 r1c2-t30">
+<p>Specifies that the tenant discriminator column is part of the primary key of the tables.</p>
+</td>
+<td align="left" headers="r12c1-t30 r1c3-t30">
+<p>False</p>
</td>
+<td align="left" headers="r12c1-t30 r1c4-t30"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblhruleinformalwide" -->
-<a id="sthref466" name="sthref466"></a>
+<a id="sthref460" name="sthref460"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
<li>
-<p>"Read Only" and "ChangeTracking" in <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span><br />
-<code><a href="http://eclipse.org/eclipselink/documentation/2.4/jpa/">http://eclipse.org/eclipselink/documentation/2.4/jpa/</a></code></p>
+<p>"Multitenant" in <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span>&nbsp;<br />
+<code><a href="http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_multitenant.htm">http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_multitenant.htm</a></code></p>
</li>
</ul>
</div>
<!-- class="sect3" -->
-<!-- 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/reference025.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm
index 3cbd92c04c..8e30134813 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm
@@ -5,209 +5,236 @@
<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>Basic Mapping</title>
+<title>Primary Key Generation</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Basic Mapping" />
+<meta name="doctitle" content="Primary Key Generation" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACCGGCG" name="CACCGGCG"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACCJJDC" name="CACCJJDC"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref473" name="sthref473"></a><a id="sthref474" name="sthref474"></a><a id="sthref475" name="sthref475"></a>Basic Mapping</h1>
-<div class="inftblhruleinformal">
-<table class="HRuleInformal" summary="JPA Details view, Version page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="22%" />
+<h1><a id="sthref461" name="sthref461"></a><a id="sthref462" name="sthref462"></a>Primary Key Generation</h1>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" title="JPA Details view, Primary key page" summary="JPA Details view, Primary key page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="16%" />
<col width="*" />
-<col width="31%" />
+<col width="17%" />
+<col width="25%" />
<thead>
<tr align="left" valign="top">
<th align="left" valign="bottom" id="r1c1-t31">Property</th>
<th align="left" valign="bottom" id="r1c2-t31">Description</th>
<th align="left" valign="bottom" id="r1c3-t31">Default</th>
+<th align="left" valign="bottom" id="r1c4-t31">Available for Entity&nbsp;Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
<td align="left" id="r2c1-t31" headers="r1c1-t31">
-<p><span class="bold">Column</span></p>
+<p><span class="bold">Table Generator</span></p>
</td>
<td align="left" headers="r2c1-t31 r1c2-t31">
-<p><a id="sthref476" name="sthref476"></a><a id="sthref477" name="sthref477"></a>The database column that contains the value for the attribute. This field corresponds to the <code>@Column</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t31 r1c3-t31">
-<p>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.</p>
+<p>These fields define the database table used for generating the primary key and correspond to the <code>@TableGenerator</code> annotation.</p>
</td>
+<td align="left" headers="r2c1-t31 r1c3-t31"><br /></td>
+<td align="left" headers="r2c1-t31 r1c4-t31">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r3c1-t31" headers="r1c1-t31">
<p>Name</p>
</td>
<td align="left" headers="r3c1-t31 r1c2-t31">
-<p>The database column that contains the value for the attribute.</p>
+<p>Unique name of the generator.</p>
</td>
<td align="left" headers="r3c1-t31 r1c3-t31"><br /></td>
+<td align="left" headers="r3c1-t31 r1c4-t31">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r4c1-t31" headers="r1c1-t31">
<p>Table</p>
</td>
<td align="left" headers="r4c1-t31 r1c2-t31">
-<p>Name of the database table that contains the selected column.</p>
+<p>Database table that stores the generated ID values.</p>
</td>
<td align="left" headers="r4c1-t31 r1c3-t31"><br /></td>
+<td align="left" headers="r4c1-t31 r1c4-t31">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r5c1-t31" headers="r1c1-t31">
-<p><span class="bold">Details</span></p>
+<p>Schema</p>
</td>
<td align="left" headers="r5c1-t31 r1c2-t31"><br /></td>
<td align="left" headers="r5c1-t31 r1c3-t31"><br /></td>
+<td align="left" headers="r5c1-t31 r1c4-t31">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r6c1-t31" headers="r1c1-t31">
-<p>Insertable</p>
-</td>
-<td align="left" headers="r6c1-t31 r1c2-t31">
-<p>Specifies if the column is always included in <code>SQL INSERT</code> statements.</p>
-</td>
-<td align="left" headers="r6c1-t31 r1c3-t31">
-<p>True</p>
+<p>Catalog</p>
</td>
+<td align="left" headers="r6c1-t31 r1c2-t31"><br /></td>
+<td align="left" headers="r6c1-t31 r1c3-t31"><br /></td>
+<td align="left" headers="r6c1-t31 r1c4-t31">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r7c1-t31" headers="r1c1-t31">
-<p>Updatable</p>
+<p>Primary key column</p>
</td>
<td align="left" headers="r7c1-t31 r1c2-t31">
-<p>Specifies if this column is always included in <code>SQL UPDATE</code> statements.</p>
-</td>
-<td align="left" headers="r7c1-t31 r1c3-t31">
-<p>True</p>
+<p>The column in the table generator's <span class="bold">Table</span> that contains the primary key.</p>
</td>
+<td align="left" headers="r7c1-t31 r1c3-t31"><br /></td>
+<td align="left" headers="r7c1-t31 r1c4-t31">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r8c1-t31" headers="r1c1-t31">
-<p>Unique</p>
+<p>Value column</p>
</td>
<td align="left" headers="r8c1-t31 r1c2-t31">
-<p>Sets the <code>UNIQUE</code> constraint for the column.</p>
-</td>
-<td align="left" headers="r8c1-t31 r1c3-t31">
-<p>False</p>
+<p>The column that stores the generated ID values.</p>
</td>
+<td align="left" headers="r8c1-t31 r1c3-t31"><br /></td>
+<td align="left" headers="r8c1-t31 r1c4-t31">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r9c1-t31" headers="r1c1-t31">
-<p>Nullable</p>
+<p>Allocation size</p>
</td>
<td align="left" headers="r9c1-t31 r1c2-t31">
-<p>Specifies if the column allows null values.</p>
+<p>The value for the <span class="bold">Primary Key Column</span> in the generator table.</p>
</td>
<td align="left" headers="r9c1-t31 r1c3-t31">
-<p>True</p>
+<p>50</p>
</td>
+<td align="left" headers="r9c1-t31 r1c4-t31">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r10c1-t31" headers="r1c1-t31">
-<p>Length</p>
-</td>
-<td align="left" headers="r10c1-t31 r1c2-t31">
-<p>Sets the column length.</p>
+<p>Initial value</p>
</td>
+<td align="left" headers="r10c1-t31 r1c2-t31"><br /></td>
<td align="left" headers="r10c1-t31 r1c3-t31">
-<p>255</p>
+<p>0</p>
</td>
+<td align="left" headers="r10c1-t31 r1c4-t31">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r11c1-t31" headers="r1c1-t31">
-<p>Precision</p>
+<p><span class="bold">Sequence Generator</span></p>
</td>
<td align="left" headers="r11c1-t31 r1c2-t31">
-<p>Sets the precision for the column values.</p>
-</td>
-<td align="left" headers="r11c1-t31 r1c3-t31">
-<p>0</p>
+<p><a id="sthref463" name="sthref463"></a><a id="sthref464" name="sthref464"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.</p>
+<p>These fields apply only when <span class="bold">Strategy</span> = <span class="bold">Sequence</span>.</p>
</td>
+<td align="left" headers="r11c1-t31 r1c3-t31"><br /></td>
+<td align="left" headers="r11c1-t31 r1c4-t31">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r12c1-t31" headers="r1c1-t31">
-<p>Scale</p>
+<p>Name</p>
</td>
<td align="left" headers="r12c1-t31 r1c2-t31">
-<p>Sets the number of digits that appear to the right of the decimal point.</p>
-</td>
-<td align="left" headers="r12c1-t31 r1c3-t31">
-<p>0</p>
+<p>Name of the sequence table to use for defining primary key values.</p>
</td>
+<td align="left" headers="r12c1-t31 r1c3-t31"><br /></td>
+<td align="left" headers="r12c1-t31 r1c4-t31">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r13c1-t31" headers="r1c1-t31">
-<p>Column definition</p>
+<p>Sequence</p>
</td>
<td align="left" headers="r13c1-t31 r1c2-t31">
-<p>The SQL fragment that is used when generating the DDL for the column.</p>
+<p>Unique name of the sequence.</p>
</td>
<td align="left" headers="r13c1-t31 r1c3-t31"><br /></td>
+<td align="left" headers="r13c1-t31 r1c4-t31">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r14c1-t31" headers="r1c1-t31">
-<p><a id="sthref478" name="sthref478"></a><a id="sthref479" name="sthref479"></a><a id="sthref480" name="sthref480"></a><span class="bold">Fetch</span></p>
-</td>
-<td align="left" headers="r14c1-t31 r1c2-t31">
-<p>Defines how data is loaded from the database:</p>
-<ul>
-<li>
-<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
-</li>
-<li>
-<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r14c1-t31 r1c3-t31">
-<p>Eager</p>
+<p>Schema</p>
</td>
+<td align="left" headers="r14c1-t31 r1c2-t31"><br /></td>
+<td align="left" headers="r14c1-t31 r1c3-t31"><br /></td>
+<td align="left" headers="r14c1-t31 r1c4-t31">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r15c1-t31" headers="r1c1-t31">
-<p><span class="bold">Optional</span></p>
-</td>
-<td align="left" headers="r15c1-t31 r1c2-t31">
-<p>Specifies if this field is can be null.</p>
-</td>
-<td align="left" headers="r15c1-t31 r1c3-t31">
-<p>True</p>
+<p>Catalog</p>
</td>
+<td align="left" headers="r15c1-t31 r1c2-t31"><br /></td>
+<td align="left" headers="r15c1-t31 r1c3-t31"><br /></td>
+<td align="left" headers="r15c1-t31 r1c4-t31">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r16c1-t31" headers="r1c1-t31">
-<p><span class="bold">Mutable</span></p>
+<p>Allocation size</p>
</td>
<td align="left" headers="r16c1-t31 r1c2-t31">
-<p>Specify if the value of a complex field type can be changed (or not changed) instead of being replaced.</p>
+<p><a id="sthref465" name="sthref465"></a><a id="sthref466" name="sthref466"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.</p>
+<p>These fields apply only when <span class="bold">Strategy</span> = <span class="bold">Sequence</span>.</p>
</td>
<td align="left" headers="r16c1-t31 r1c3-t31">
-<p>True</p>
+<p>50</p>
</td>
+<td align="left" headers="r16c1-t31 r1c4-t31">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r17c1-t31" headers="r1c1-t31">
+<p>Initial value</p>
+</td>
+<td align="left" headers="r17c1-t31 r1c2-t31"><br /></td>
+<td align="left" headers="r17c1-t31 r1c3-t31">
+<p>1</p>
+</td>
+<td align="left" headers="r17c1-t31 r1c4-t31">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblhruleinformal" -->
-<p>Basic mappings also include the following areas:</p>
+<!-- class="inftblhruleinformalwide" -->
+<a id="sthref467" name="sthref467"></a>
+<p class="subhead2">Related reference</p>
<ul>
<li>
-<p><a href="reference035.htm#CACIHAAF">Type information</a></p>
-</li>
-<li>
-<p><a href="reference037.htm#CACJCHJB">Converters</a></p>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
</ul>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm
index ebab1cd521..3ee82405b1 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm
@@ -5,146 +5,39 @@
<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>Element Collection Mapping</title>
+<title>Secondary tables</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Element Collection Mapping" />
+<meta name="doctitle" content="Secondary tables" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACBCGDI" name="CACBCGDI"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACBHIDA" name="CACBHIDA"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref481" name="sthref481"></a><a id="sthref482" name="sthref482"></a>Element Collection Mapping</h1>
-<div class="inftblhruleinformal">
-<table class="HRuleInformal" summary="JPA Details view, Version page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="29%" />
-<col width="*" />
-<col width="24%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t32">Property</th>
-<th align="left" valign="bottom" id="r1c2-t32">Description</th>
-<th align="left" valign="bottom" id="r1c3-t32">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t32" headers="r1c1-t32">
-<p>Target class</p>
-</td>
-<td align="left" headers="r2c1-t32 r1c2-t32">
-<p>The class (basic or embeddable) that is the element type of the collection.</p>
-</td>
-<td align="left" headers="r2c1-t32 r1c3-t32"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t32" headers="r1c1-t32">
-<p>Fetch</p>
-</td>
-<td align="left" headers="r3c1-t32 r1c2-t32">
-<p>Defines how data is loaded from the database:</p>
+<h1>Secondary tables</h1>
+<p><a id="sthref468" name="sthref468"></a><a id="sthref469" name="sthref469"></a><a id="sthref470" name="sthref470"></a><a id="sthref471" name="sthref471"></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>Refer to <a href="task_additonal_tables.htm#CIHGBIEI">"Specifying additional tables"</a> for additional information.</p>
+<a id="sthref472" name="sthref472"></a>
+<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
+<p><a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a></p>
</li>
<li>
-<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
</li>
</ul>
-</td>
-<td align="left" headers="r3c1-t32 r1c3-t32">
-<p>Lazy</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t32" headers="r1c1-t32">
-<p>Join fetch</p>
-</td>
-<td align="left" headers="r4c1-t32 r1c2-t32">
-<p>The type of fetch to use:</p>
-<ul>
-<li>
-<p>Inner &ndash; Provides the inner join fetching of the related object.</p>
-<p><span class="bold">Note</span>: Inner joining does not allow for null or empty values</p>
-</li>
-<li>
-<p>Outer &ndash; Provides the outer join fetching of the related object</p>
-<p><span class="bold">Note</span>: Outer joining allows for null or empty values.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r4c1-t32 r1c3-t32">
-<p>None</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t32" headers="r1c1-t32">
-<p><span class="bold">Collection Table</span></p>
-</td>
-<td align="left" headers="r5c1-t32 r1c2-t32"><br /></td>
-<td align="left" headers="r5c1-t32 r1c3-t32"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t32" headers="r1c1-t32">
-<p>Name</p>
-</td>
-<td align="left" headers="r6c1-t32 r1c2-t32"><br /></td>
-<td align="left" headers="r6c1-t32 r1c3-t32"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t32" headers="r1c1-t32">
-<p>Schema</p>
-</td>
-<td align="left" headers="r7c1-t32 r1c2-t32"><br /></td>
-<td align="left" headers="r7c1-t32 r1c3-t32"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t32" headers="r1c1-t32">
-<p>Catalog</p>
-</td>
-<td align="left" headers="r8c1-t32 r1c2-t32"><br /></td>
-<td align="left" headers="r8c1-t32 r1c3-t32"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r9c1-t32" headers="r1c1-t32">
-<p><span class="bold">Join Columns</span></p>
-</td>
-<td align="left" headers="r9c1-t32 r1c2-t32"><br /></td>
-<td align="left" headers="r9c1-t32 r1c3-t32">
-<p>0</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r10c1-t32" headers="r1c1-t32">
-<p>Override default</p>
-</td>
-<td align="left" headers="r10c1-t32 r1c2-t32">
-<p>Click <span class="bold">Add</span> to create a new join column, by using the <a href="reference062.htm#CACJJBAD">Add Join Column dialog</a>.</p>
-</td>
-<td align="left" headers="r10c1-t32 r1c3-t32">
-<p>0</p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblhruleinformal" -->
-<p>Element collection mappings also include the following areas:</p>
+<a id="sthref473" name="sthref473"></a>
+<p class="subhead2">Related reference</p>
<ul>
<li>
-<p><a href="reference036.htm#CACJBFEA">Value</a></p>
-</li>
-<li>
-<p><a href="reference037.htm#CACJCHJB">Converters</a></p>
-</li>
-<li>
-<p><a href="reference038.htm#CACBIJFD">Ordering</a></p>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
</ul>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm
index 117bde58ce..de74984a49 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm
@@ -5,22 +5,153 @@
<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>Embedded Mapping</title>
+<title>Converters</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Embedded Mapping" />
+<meta name="doctitle" content="Converters" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACBJBFD" name="CACBJBFD"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACJGDAJ" name="CACJGDAJ"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Embedded Mapping</h1>
+<h1>Converters</h1>
+<p><a id="sthref474" name="sthref474"></a><a id="sthref475" name="sthref475"></a><a id="sthref476" name="sthref476"></a><a id="sthref477" name="sthref477"></a><a id="sthref478" name="sthref478"></a><a id="sthref479" name="sthref479"></a><a id="sthref480" name="sthref480"></a>Use the Converter area in the <span class="gui-object-title">JPA Details</span> view to specify a way to modify data value(s) during the reading and writing of a mapped attribute.</p>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" title="JPA Details view, Advanced page" summary="JPA Details view, Advanced page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="16%" />
+<col width="*" />
+<col width="17%" />
+<col width="25%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t32">Property</th>
+<th align="left" valign="bottom" id="r1c2-t32">Description</th>
+<th align="left" valign="bottom" id="r1c3-t32">Default</th>
+<th align="left" valign="bottom" id="r1c4-t32">Available for Entity&nbsp;Type</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t32" headers="r1c1-t32">
+<p>Converters</p>
+</td>
+<td align="left" headers="r2c1-t32 r1c2-t32">
+<p>Click Add and use the <a href="ref_add_converter.htm#CIAGCGIJ">Add Converter dialog</a> to create a new converter.</p>
+<ul>
+<li>
+<p>Object Type &ndash; converts a fixed number of database data value(s) to Java object value(s)</p>
+</li>
+<li>
+<p>Type &ndash; modifies data values</p>
+</li>
+<li>
+<p>Struct &ndash; Enable custom processing of <code>java.sql.Struct</code> types</p>
+</li>
+<li>
+<p>Custom</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r2c1-t32 r1c3-t32"><br /></td>
+<td align="left" headers="r2c1-t32 r1c4-t32">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a>, <a href="tasks004.htm#BABFEICE">Embeddable</a>, and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t32" headers="r1c1-t32">
+<p>Name</p>
+</td>
+<td align="left" headers="r3c1-t32 r1c2-t32">
+<p>The <code>String</code> name for your converter, must be unique across the persistence unit</p>
+</td>
+<td align="left" headers="r3c1-t32 r1c3-t32"><br /></td>
+<td align="left" headers="r3c1-t32 r1c4-t32">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a>, <a href="tasks004.htm#BABFEICE">Embeddable</a>, and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t32" headers="r1c1-t32">
+<p>Class</p>
+</td>
+<td align="left" headers="r4c1-t32 r1c2-t32">
+<p>The class of your converter. This class must implement the <code>org.eclipse.persistence.mappings.converters.Converter</code> interface.</p>
+<p>Appears for <span class="bold">Custom</span> and <span class="bold">Struct</span> converters only.</p>
+</td>
+<td align="left" headers="r4c1-t32 r1c3-t32"><br /></td>
+<td align="left" headers="r4c1-t32 r1c4-t32">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a>, <a href="tasks004.htm#BABFEICE">Embeddable</a>, and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t32" headers="r1c1-t32">
+<p>Data type</p>
+</td>
+<td align="left" headers="r5c1-t32 r1c2-t32">
+<p>The type stored in the database.</p>
+<p>Appears for <span class="bold">Object Type</span> and <span class="bold">Type</span> converters only.</p>
+</td>
+<td align="left" headers="r5c1-t32 r1c3-t32"><br /></td>
+<td align="left" headers="r5c1-t32 r1c4-t32">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a>, <a href="tasks004.htm#BABFEICE">Embeddable</a>, and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t32" headers="r1c1-t32">
+<p>Object type</p>
+</td>
+<td align="left" headers="r6c1-t32 r1c2-t32">
+<p>The type stored on the entity.</p>
+<p>Appears for <span class="bold">Object Type</span> and <span class="bold">Type</span> converters only.</p>
+</td>
+<td align="left" headers="r6c1-t32 r1c3-t32"><br /></td>
+<td align="left" headers="r6c1-t32 r1c4-t32">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a>, <a href="tasks004.htm#BABFEICE">Embeddable</a>, and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t32" headers="r1c1-t32">
+<p>Conversion values</p>
+</td>
+<td align="left" headers="r7c1-t32 r1c2-t32">
+<p>The array of conversion values (instances of <code>ConversionValue</code>: <code>String</code> <code>objectValue</code> and <code>String</code> <code>dataValue</code>).</p>
+<p>Appears for <span class="bold">Object Type</span> converters only.</p>
+</td>
+<td align="left" headers="r7c1-t32 r1c3-t32"><br /></td>
+<td align="left" headers="r7c1-t32 r1c4-t32">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a>, <a href="tasks004.htm#BABFEICE">Embeddable</a>, and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t32" headers="r1c1-t32">
+<p>Default object value</p>
+</td>
+<td align="left" headers="r8c1-t32 r1c2-t32">
+<p>Set the value of this attribute to the default object value. Note that this argument is for dealing with legacy data if the data value is missing.</p>
+<p>Appears for <span class="bold">Object Type</span> converters only.</p>
+</td>
+<td align="left" headers="r8c1-t32 r1c3-t32"><br /></td>
+<td align="left" headers="r8c1-t32 r1c4-t32">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a>, <a href="tasks004.htm#BABFEICE">Embeddable</a>, and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformalwide" -->
+<a id="sthref481" name="sthref481"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p>"Converter" in <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span><br />
+<code><a href="http://eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_converter.htm">http://eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_converter.htm</a></code></p>
+</li>
+</ul>
</div>
<!-- class="sect3" -->
<!-- Start Footer -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm
index e10aa159aa..04965f8c96 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm
@@ -5,24 +5,112 @@
<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>Embedded ID Mapping</title>
+<title>Advanced</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Embedded ID Mapping" />
+<meta name="doctitle" content="Advanced" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACDIDIA" name="CACDIDIA"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACJEEDE" name="CACJEEDE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Embedded ID Mapping</h1>
+<h1>Advanced</h1>
+<p><a id="sthref482" name="sthref482"></a><a id="sthref483" name="sthref483"></a><a id="sthref484" name="sthref484"></a><a id="sthref485" name="sthref485"></a><a id="sthref486" name="sthref486"></a><a id="sthref487" name="sthref487"></a><a id="sthref488" name="sthref488"></a><a id="sthref489" name="sthref489"></a><a id="sthref490" name="sthref490"></a>Use the <span class="gui-object-title">Advanced</span> area in the <span class="gui-object-title">JPA Details</span> view to configure additional settings for an entity.</p>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" title="JPA Details view, Advanced page" summary="JPA Details view, Advanced page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="16%" />
+<col width="*" />
+<col width="17%" />
+<col width="25%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t33">Property</th>
+<th align="left" valign="bottom" id="r1c2-t33">Description</th>
+<th align="left" valign="bottom" id="r1c3-t33">Default</th>
+<th align="left" valign="bottom" id="r1c4-t33">Available for Entity&nbsp;Type</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t33" headers="r1c1-t33">
+<p>Read-only</p>
+</td>
+<td align="left" headers="r2c1-t33 r1c2-t33">
+<p>Specifies if a class is read-only.</p>
+</td>
+<td align="left" headers="r2c1-t33 r1c3-t33">
+<p>False</p>
+</td>
+<td align="left" headers="r2c1-t33 r1c4-t33">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a> and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t33" headers="r1c1-t33">
+<p>Customizer class</p>
+</td>
+<td align="left" headers="r3c1-t33 r1c2-t33">
+<p>Specifies a class that implements <code>DescriptorCustomizer</code> and is to run against an entity's class descriptor after all metadata processing has been completed.</p>
+</td>
+<td align="left" headers="r3c1-t33 r1c3-t33">
+<p>True</p>
+</td>
+<td align="left" headers="r3c1-t33 r1c4-t33">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a>, <a href="tasks004.htm#BABFEICE">Embeddable</a>, and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t33" headers="r1c1-t33">
+<p>Change tracking</p>
+</td>
+<td align="left" headers="r4c1-t33 r1c2-t33">
+<p>Specifies the <code>ObjectChangePolicy</code> to use:</p>
+<ul>
+<li>
+<p><span class="bold">Attribute</span> &ndash; Objects with changed attributes will be processed in the commit process to include any changes in the results of the commit. Unchanged objects will be ignored.</p>
+</li>
+<li>
+<p><span class="bold">Object</span> &ndash; Changed objects will be processed in the commit process to include any changes in the results of the commit. Unchanged objects will be ignored.</p>
+</li>
+<li>
+<p><span class="bold">Deferred</span> &ndash; Defers all change detection to the UnitOfWork's change detection process.</p>
+</li>
+<li>
+<p><span class="bold">Auto</span> &ndash; Does not set any change tracking policy; change tracking will be determined at runtime.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r4c1-t33 r1c3-t33">
+<p>Auto</p>
+</td>
+<td align="left" headers="r4c1-t33 r1c4-t33">
+<p><a href="tasks003.htm#BABGBIEE">Entity</a>, <a href="tasks004.htm#BABFEICE">Embeddable</a>, and <a href="tasks005.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformalwide" -->
+<a id="sthref491" name="sthref491"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+<li>
+<p>"Read Only" and "ChangeTracking" in <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span><br />
+<code><a href="http://eclipse.org/eclipselink/documentation/2.4/jpa/">http://eclipse.org/eclipselink/documentation/2.4/jpa/</a></code></p>
+</li>
+</ul>
</div>
<!-- class="sect3" -->
+<!-- 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/reference029.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm
index eb9d3a6524..a201dca08b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm
@@ -5,165 +5,195 @@
<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>ID Mapping</title>
+<title>Basic Mapping</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="ID Mapping" />
+<meta name="doctitle" content="Basic Mapping" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACIAEFI" name="CACIAEFI"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACCGGCG" name="CACCGGCG"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref483" name="sthref483"></a><a id="sthref484" name="sthref484"></a><a id="sthref485" name="sthref485"></a>ID Mapping</h1>
+<h1><a id="sthref500" name="sthref500"></a><a id="sthref501" name="sthref501"></a><a id="sthref502" name="sthref502"></a>Basic Mapping</h1>
<div class="inftblhruleinformal">
<table class="HRuleInformal" summary="JPA Details view, Version page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="29%" />
+<col width="22%" />
<col width="*" />
-<col width="24%" />
+<col width="31%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t33">Property</th>
-<th align="left" valign="bottom" id="r1c2-t33">Description</th>
-<th align="left" valign="bottom" id="r1c3-t33">Default</th>
+<th align="left" valign="bottom" id="r1c1-t34">Property</th>
+<th align="left" valign="bottom" id="r1c2-t34">Description</th>
+<th align="left" valign="bottom" id="r1c3-t34">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t33" headers="r1c1-t33">
+<td align="left" id="r2c1-t34" headers="r1c1-t34">
<p><span class="bold">Column</span></p>
</td>
-<td align="left" headers="r2c1-t33 r1c2-t33">
-<p><a id="sthref486" name="sthref486"></a><a id="sthref487" name="sthref487"></a>The database column that contains the value for the attribute. This field corresponds to the <code>@Column</code> annotation.</p>
+<td align="left" headers="r2c1-t34 r1c2-t34">
+<p><a id="sthref503" name="sthref503"></a><a id="sthref504" name="sthref504"></a>The database column that contains the value for the attribute. This field corresponds to the <code>@Column</code> annotation.</p>
</td>
-<td align="left" headers="r2c1-t33 r1c3-t33">
-<p>By default, the Column is assumed to be named identically to the attribute.</p>
+<td align="left" headers="r2c1-t34 r1c3-t34">
+<p>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.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t33" headers="r1c1-t33">
+<td align="left" id="r3c1-t34" headers="r1c1-t34">
<p>Name</p>
</td>
-<td align="left" headers="r3c1-t33 r1c2-t33">
+<td align="left" headers="r3c1-t34 r1c2-t34">
<p>The database column that contains the value for the attribute.</p>
</td>
-<td align="left" headers="r3c1-t33 r1c3-t33"><br /></td>
+<td align="left" headers="r3c1-t34 r1c3-t34"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t33" headers="r1c1-t33">
+<td align="left" id="r4c1-t34" headers="r1c1-t34">
<p>Table</p>
</td>
-<td align="left" headers="r4c1-t33 r1c2-t33">
+<td align="left" headers="r4c1-t34 r1c2-t34">
<p>Name of the database table that contains the selected column.</p>
</td>
-<td align="left" headers="r4c1-t33 r1c3-t33"><br /></td>
+<td align="left" headers="r4c1-t34 r1c3-t34"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t33" headers="r1c1-t33">
+<td align="left" id="r5c1-t34" headers="r1c1-t34">
<p><span class="bold">Details</span></p>
</td>
-<td align="left" headers="r5c1-t33 r1c2-t33"><br /></td>
-<td align="left" headers="r5c1-t33 r1c3-t33"><br /></td>
+<td align="left" headers="r5c1-t34 r1c2-t34"><br /></td>
+<td align="left" headers="r5c1-t34 r1c3-t34"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t33" headers="r1c1-t33">
+<td align="left" id="r6c1-t34" headers="r1c1-t34">
<p>Insertable</p>
</td>
-<td align="left" headers="r6c1-t33 r1c2-t33">
+<td align="left" headers="r6c1-t34 r1c2-t34">
<p>Specifies if the column is always included in <code>SQL INSERT</code> statements.</p>
</td>
-<td align="left" headers="r6c1-t33 r1c3-t33">
+<td align="left" headers="r6c1-t34 r1c3-t34">
<p>True</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t33" headers="r1c1-t33">
+<td align="left" id="r7c1-t34" headers="r1c1-t34">
<p>Updatable</p>
</td>
-<td align="left" headers="r7c1-t33 r1c2-t33">
+<td align="left" headers="r7c1-t34 r1c2-t34">
<p>Specifies if this column is always included in <code>SQL UPDATE</code> statements.</p>
</td>
-<td align="left" headers="r7c1-t33 r1c3-t33">
+<td align="left" headers="r7c1-t34 r1c3-t34">
<p>True</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t33" headers="r1c1-t33">
+<td align="left" id="r8c1-t34" headers="r1c1-t34">
<p>Unique</p>
</td>
-<td align="left" headers="r8c1-t33 r1c2-t33">
+<td align="left" headers="r8c1-t34 r1c2-t34">
<p>Sets the <code>UNIQUE</code> constraint for the column.</p>
</td>
-<td align="left" headers="r8c1-t33 r1c3-t33">
+<td align="left" headers="r8c1-t34 r1c3-t34">
<p>False</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t33" headers="r1c1-t33">
+<td align="left" id="r9c1-t34" headers="r1c1-t34">
<p>Nullable</p>
</td>
-<td align="left" headers="r9c1-t33 r1c2-t33">
+<td align="left" headers="r9c1-t34 r1c2-t34">
<p>Specifies if the column allows null values.</p>
</td>
-<td align="left" headers="r9c1-t33 r1c3-t33">
+<td align="left" headers="r9c1-t34 r1c3-t34">
<p>True</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r10c1-t33" headers="r1c1-t33">
+<td align="left" id="r10c1-t34" headers="r1c1-t34">
<p>Length</p>
</td>
-<td align="left" headers="r10c1-t33 r1c2-t33">
+<td align="left" headers="r10c1-t34 r1c2-t34">
<p>Sets the column length.</p>
</td>
-<td align="left" headers="r10c1-t33 r1c3-t33">
+<td align="left" headers="r10c1-t34 r1c3-t34">
<p>255</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r11c1-t33" headers="r1c1-t33">
+<td align="left" id="r11c1-t34" headers="r1c1-t34">
<p>Precision</p>
</td>
-<td align="left" headers="r11c1-t33 r1c2-t33">
+<td align="left" headers="r11c1-t34 r1c2-t34">
<p>Sets the precision for the column values.</p>
</td>
-<td align="left" headers="r11c1-t33 r1c3-t33">
+<td align="left" headers="r11c1-t34 r1c3-t34">
<p>0</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r12c1-t33" headers="r1c1-t33">
+<td align="left" id="r12c1-t34" headers="r1c1-t34">
<p>Scale</p>
</td>
-<td align="left" headers="r12c1-t33 r1c2-t33">
+<td align="left" headers="r12c1-t34 r1c2-t34">
<p>Sets the number of digits that appear to the right of the decimal point.</p>
</td>
-<td align="left" headers="r12c1-t33 r1c3-t33">
+<td align="left" headers="r12c1-t34 r1c3-t34">
<p>0</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r13c1-t33" headers="r1c1-t33">
+<td align="left" id="r13c1-t34" headers="r1c1-t34">
<p>Column definition</p>
</td>
-<td align="left" headers="r13c1-t33 r1c2-t33">
+<td align="left" headers="r13c1-t34 r1c2-t34">
<p>The SQL fragment that is used when generating the DDL for the column.</p>
</td>
-<td align="left" headers="r13c1-t33 r1c3-t33"><br /></td>
+<td align="left" headers="r13c1-t34 r1c3-t34"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r14c1-t33" headers="r1c1-t33">
+<td align="left" id="r14c1-t34" headers="r1c1-t34">
+<p><a id="sthref505" name="sthref505"></a><a id="sthref506" name="sthref506"></a><a id="sthref507" name="sthref507"></a><span class="bold">Fetch</span></p>
+</td>
+<td align="left" headers="r14c1-t34 r1c2-t34">
+<p>Defines how data is loaded from the database:</p>
+<ul>
+<li>
+<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
+</li>
+<li>
+<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r14c1-t34 r1c3-t34">
+<p>Eager</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r15c1-t34" headers="r1c1-t34">
+<p><span class="bold">Optional</span></p>
+</td>
+<td align="left" headers="r15c1-t34 r1c2-t34">
+<p>Specifies if this field is can be null.</p>
+</td>
+<td align="left" headers="r15c1-t34 r1c3-t34">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r16c1-t34" headers="r1c1-t34">
<p><span class="bold">Mutable</span></p>
</td>
-<td align="left" headers="r14c1-t33 r1c2-t33">
+<td align="left" headers="r16c1-t34 r1c2-t34">
<p>Specify if the value of a complex field type can be changed (or not changed) instead of being replaced.</p>
</td>
-<td align="left" headers="r14c1-t33 r1c3-t33">
+<td align="left" headers="r16c1-t34 r1c3-t34">
<p>True</p>
</td>
</tr>
@@ -171,16 +201,13 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<p>ID mappings also include the following areas:</p>
+<p>Basic mappings also include the following areas:</p>
<ul>
<li>
-<p><a href="reference035.htm#CACIHAAF">Type information</a></p>
-</li>
-<li>
-<p><a href="reference037.htm#CACJCHJB">Converters</a></p>
+<p><a href="reference039.htm#CACIHAAF">Type information</a></p>
</li>
<li>
-<p><a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a></p>
+<p><a href="reference041.htm#CACJCHJB">Converters</a></p>
</li>
</ul>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm
index cc510a61c3..6e447373f3 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm
@@ -5,49 +5,49 @@
<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>Many-to-Many Mapping</title>
+<title>Element Collection Mapping</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Many-to-Many Mapping" />
+<meta name="doctitle" content="Element Collection Mapping" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACIHGCE" name="CACIHGCE"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACBCGDI" name="CACBCGDI"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref488" name="sthref488"></a><a id="sthref489" name="sthref489"></a><a id="sthref490" name="sthref490"></a>Many-to-Many Mapping</h1>
+<h1><a id="sthref508" name="sthref508"></a><a id="sthref509" name="sthref509"></a>Element Collection Mapping</h1>
<div class="inftblhruleinformal">
-<table class="HRuleInformal" summary="JPA Details view, One-to-one page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<table class="HRuleInformal" summary="JPA Details view, Version page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="29%" />
<col width="*" />
<col width="24%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t34">Property</th>
-<th align="left" valign="bottom" id="r1c2-t34">Description</th>
-<th align="left" valign="bottom" id="r1c3-t34">Default</th>
+<th align="left" valign="bottom" id="r1c1-t35">Property</th>
+<th align="left" valign="bottom" id="r1c2-t35">Description</th>
+<th align="left" valign="bottom" id="r1c3-t35">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t34" headers="r1c1-t34">
-<p>Target entity</p>
+<td align="left" id="r2c1-t35" headers="r1c1-t35">
+<p>Target class</p>
</td>
-<td align="left" headers="r2c1-t34 r1c2-t34">
-<p>The persistent entity to which the attribute is mapped.</p>
+<td align="left" headers="r2c1-t35 r1c2-t35">
+<p>The class (basic or embeddable) that is the element type of the collection.</p>
</td>
-<td align="left" headers="r2c1-t34 r1c3-t34"><br /></td>
+<td align="left" headers="r2c1-t35 r1c3-t35"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t34" headers="r1c1-t34">
+<td align="left" id="r3c1-t35" headers="r1c1-t35">
<p>Fetch</p>
</td>
-<td align="left" headers="r3c1-t34 r1c2-t34">
+<td align="left" headers="r3c1-t35 r1c2-t35">
<p>Defines how data is loaded from the database:</p>
<ul>
<li>
@@ -58,15 +58,15 @@
</li>
</ul>
</td>
-<td align="left" headers="r3c1-t34 r1c3-t34">
+<td align="left" headers="r3c1-t35 r1c3-t35">
<p>Lazy</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t34" headers="r1c1-t34">
+<td align="left" id="r4c1-t35" headers="r1c1-t35">
<p>Join fetch</p>
</td>
-<td align="left" headers="r4c1-t34 r1c2-t34">
+<td align="left" headers="r4c1-t35 r1c2-t35">
<p>The type of fetch to use:</p>
<ul>
<li>
@@ -79,55 +79,72 @@
</li>
</ul>
</td>
-<td align="left" headers="r4c1-t34 r1c3-t34">
+<td align="left" headers="r4c1-t35 r1c3-t35">
<p>None</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t34" headers="r1c1-t34">
-<p>Cascade</p>
+<td align="left" id="r5c1-t35" headers="r1c1-t35">
+<p><span class="bold">Collection Table</span></p>
</td>
-<td align="left" headers="r5c1-t34 r1c2-t34">
-<p>Specify which operations are propagated throughout the entity.</p>
-<ul>
-<li>
-<p>All &ndash; All operations</p>
-</li>
-<li>
-<p>Persist</p>
-</li>
-<li>
-<p>Merge</p>
-</li>
-<li>
-<p>Move</p>
-</li>
-<li>
-<p>Remove</p>
-</li>
-<li>
-<p>Refresh</p>
-</li>
-</ul>
+<td align="left" headers="r5c1-t35 r1c2-t35"><br /></td>
+<td align="left" headers="r5c1-t35 r1c3-t35"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t35" headers="r1c1-t35">
+<p>Name</p>
+</td>
+<td align="left" headers="r6c1-t35 r1c2-t35"><br /></td>
+<td align="left" headers="r6c1-t35 r1c3-t35"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t35" headers="r1c1-t35">
+<p>Schema</p>
+</td>
+<td align="left" headers="r7c1-t35 r1c2-t35"><br /></td>
+<td align="left" headers="r7c1-t35 r1c3-t35"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t35" headers="r1c1-t35">
+<p>Catalog</p>
+</td>
+<td align="left" headers="r8c1-t35 r1c2-t35"><br /></td>
+<td align="left" headers="r8c1-t35 r1c3-t35"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t35" headers="r1c1-t35">
+<p><span class="bold">Join Columns</span></p>
+</td>
+<td align="left" headers="r9c1-t35 r1c2-t35"><br /></td>
+<td align="left" headers="r9c1-t35 r1c3-t35">
+<p>0</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t35" headers="r1c1-t35">
+<p>Override default</p>
+</td>
+<td align="left" headers="r10c1-t35 r1c2-t35">
+<p>Click <span class="bold">Add</span> to create a new join column, by using the <a href="reference068.htm#CACJJBAD">Add Join Column dialog</a>.</p>
</td>
-<td align="left" headers="r5c1-t34 r1c3-t34">
-<p>True</p>
+<td align="left" headers="r10c1-t35 r1c3-t35">
+<p>0</p>
</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<p>One-to-many mappings also include the following areas:</p>
+<p>Element collection mappings also include the following areas:</p>
<ul>
<li>
-<p><a href="reference039.htm#CACIJEGI">Joining Strategy</a></p>
+<p><a href="reference040.htm#CACJBFEA">Value</a></p>
</li>
<li>
-<p><a href="reference037.htm#CACJCHJB">Converters</a></p>
+<p><a href="reference041.htm#CACJCHJB">Converters</a></p>
</li>
<li>
-<p><a href="reference038.htm#CACBIJFD">Ordering</a></p>
+<p><a href="reference042.htm#CACBIJFD">Ordering</a></p>
</li>
</ul>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm
index 3af72e5211..79b728096f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm
@@ -5,140 +5,22 @@
<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>Many-to-One Mapping</title>
+<title>Embedded Mapping</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Many-to-One Mapping" />
+<meta name="doctitle" content="Embedded Mapping" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACHAEDB" name="CACHAEDB"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACBJBFD" name="CACBJBFD"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref491" name="sthref491"></a><a id="sthref492" name="sthref492"></a><a id="sthref493" name="sthref493"></a>Many-to-One Mapping</h1>
-<div class="inftblhruleinformal">
-<table class="HRuleInformal" summary="JPA Details view, One-to-one page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="29%" />
-<col width="*" />
-<col width="24%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t35">Property</th>
-<th align="left" valign="bottom" id="r1c2-t35">Description</th>
-<th align="left" valign="bottom" id="r1c3-t35">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t35" headers="r1c1-t35">
-<p>Target entity</p>
-</td>
-<td align="left" headers="r2c1-t35 r1c2-t35">
-<p>The persistent entity to which the attribute is mapped.</p>
-<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>
-<td align="left" headers="r2c1-t35 r1c3-t35">
-<p>null</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t35" headers="r1c1-t35">
-<p>Fetch</p>
-</td>
-<td align="left" headers="r3c1-t35 r1c2-t35">
-<p>Defines how data is loaded from the database:</p>
-<ul>
-<li>
-<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
-</li>
-<li>
-<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r3c1-t35 r1c3-t35">
-<p>Lazy</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t35" headers="r1c1-t35">
-<p>Join fetch</p>
-</td>
-<td align="left" headers="r4c1-t35 r1c2-t35">
-<p>The type of fetch to use:</p>
-<ul>
-<li>
-<p>Inner &ndash; Provides the inner join fetching of the related object.</p>
-<p><span class="bold">Note</span>: Inner joining does not allow for null or empty values</p>
-</li>
-<li>
-<p>Outer &ndash; Provides the outer join fetching of the related object</p>
-<p><span class="bold">Note</span>: Outer joining allows for null or empty values.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r4c1-t35 r1c3-t35"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t35" headers="r1c1-t35">
-<p>Optional</p>
-</td>
-<td align="left" headers="r5c1-t35 r1c2-t35">
-<p>Specifies if this field is can be null.</p>
-</td>
-<td align="left" headers="r5c1-t35 r1c3-t35">
-<p>True</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t35" headers="r1c1-t35">
-<p>Cascade</p>
-</td>
-<td align="left" headers="r6c1-t35 r1c2-t35">
-<p>Specify which operations are propagated throughout the entity.</p>
-<ul>
-<li>
-<p>All &ndash; All operations</p>
-</li>
-<li>
-<p>Persist</p>
-</li>
-<li>
-<p>Merge</p>
-</li>
-<li>
-<p>Move</p>
-</li>
-<li>
-<p>Remove</p>
-</li>
-<li>
-<p>Refresh</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r6c1-t35 r1c3-t35">
-<p>True</p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblhruleinformal" -->
-<p>Many-to-one mappings also include the following areas:</p>
-<ul>
-<li>
-<p><a href="reference039.htm#CACIJEGI">Joining Strategy</a></p>
-</li>
-<li>
-<p><a href="reference040.htm#CACGHHGB">Derived Identity</a></p>
-</li>
-</ul>
+<h1>Embedded Mapping</h1>
</div>
<!-- class="sect3" -->
<!-- Start Footer -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm
index c7b7bfc920..18040607b6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm
@@ -5,147 +5,22 @@
<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>One-to-Many Mapping</title>
+<title>Embedded ID Mapping</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="One-to-Many Mapping" />
+<meta name="doctitle" content="Embedded ID Mapping" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACHGGHH" name="CACHGGHH"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACDIDIA" name="CACDIDIA"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref494" name="sthref494"></a><a id="sthref495" name="sthref495"></a><a id="sthref496" name="sthref496"></a>One-to-Many Mapping</h1>
-<div class="inftblhruleinformal">
-<table class="HRuleInformal" summary="JPA Details view, One-to-one page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="29%" />
-<col width="*" />
-<col width="24%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t36">Property</th>
-<th align="left" valign="bottom" id="r1c2-t36">Description</th>
-<th align="left" valign="bottom" id="r1c3-t36">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t36" headers="r1c1-t36">
-<p>Target entity</p>
-</td>
-<td align="left" headers="r2c1-t36 r1c2-t36">
-<p>The persistent entity to which the attribute is mapped.</p>
-</td>
-<td align="left" headers="r2c1-t36 r1c3-t36"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t36" headers="r1c1-t36">
-<p>Fetch</p>
-</td>
-<td align="left" headers="r3c1-t36 r1c2-t36">
-<p>Defines how data is loaded from the database:</p>
-<ul>
-<li>
-<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
-</li>
-<li>
-<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r3c1-t36 r1c3-t36">
-<p>Lazy</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t36" headers="r1c1-t36">
-<p>Join fetch</p>
-</td>
-<td align="left" headers="r4c1-t36 r1c2-t36">
-<p>The type of fetch to use:</p>
-<ul>
-<li>
-<p>Inner &ndash; Provides the inner join fetching of the related object.</p>
-<p><span class="bold">Note</span>: Inner joining does not allow for null or empty values</p>
-</li>
-<li>
-<p>Outer &ndash; Provides the outer join fetching of the related object</p>
-<p><span class="bold">Note</span>: Outer joining allows for null or empty values.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r4c1-t36 r1c3-t36"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t36" headers="r1c1-t36">
-<p>Private owned</p>
-</td>
-<td align="left" headers="r5c1-t36 r1c2-t36">
-<p>Specify that a relationship is privately owned; target object is a dependent part of the source object and is not referenced by any other object and cannot exist on its own.</p>
-</td>
-<td align="left" headers="r5c1-t36 r1c3-t36"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t36" headers="r1c1-t36">
-<p>Orphan removal</p>
-</td>
-<td align="left" headers="r6c1-t36 r1c2-t36"><br /></td>
-<td align="left" headers="r6c1-t36 r1c3-t36">
-<p>False</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t36" headers="r1c1-t36">
-<p>Cascade</p>
-</td>
-<td align="left" headers="r7c1-t36 r1c2-t36">
-<p>Specify which operations are propagated throughout the entity.</p>
-<ul>
-<li>
-<p>All &ndash; All operations</p>
-</li>
-<li>
-<p>Persist</p>
-</li>
-<li>
-<p>Merge</p>
-</li>
-<li>
-<p>Move</p>
-</li>
-<li>
-<p>Remove</p>
-</li>
-<li>
-<p>Refresh</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r7c1-t36 r1c3-t36">
-<p>True</p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblhruleinformal" -->
-<p>One-to-many mappings also include the following areas:</p>
-<ul>
-<li>
-<p><a href="reference039.htm#CACIJEGI">Joining Strategy</a></p>
-</li>
-<li>
-<p><a href="reference037.htm#CACJCHJB">Converters</a></p>
-</li>
-<li>
-<p><a href="reference038.htm#CACBIJFD">Ordering</a></p>
-</li>
-</ul>
+<h1>Embedded ID Mapping</h1>
</div>
<!-- class="sect3" -->
<!-- Start Footer -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm
index c51a871d7e..0159bb88d6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm
@@ -5,141 +5,165 @@
<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>One-to-One Mapping</title>
+<title>ID Mapping</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="One-to-One Mapping" />
+<meta name="doctitle" content="ID Mapping" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACGGHDD" name="CACGGHDD"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACIAEFI" name="CACIAEFI"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref497" name="sthref497"></a><a id="sthref498" name="sthref498"></a><a id="sthref499" name="sthref499"></a>One-to-One Mapping</h1>
+<h1><a id="sthref510" name="sthref510"></a><a id="sthref511" name="sthref511"></a><a id="sthref512" name="sthref512"></a>ID Mapping</h1>
<div class="inftblhruleinformal">
-<table class="HRuleInformal" summary="JPA Details view, One-to-one page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<table class="HRuleInformal" summary="JPA Details view, Version page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="29%" />
<col width="*" />
<col width="24%" />
<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>
-<th align="left" valign="bottom" id="r1c3-t37">Default</th>
+<th align="left" valign="bottom" id="r1c1-t36">Property</th>
+<th align="left" valign="bottom" id="r1c2-t36">Description</th>
+<th align="left" valign="bottom" id="r1c3-t36">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t37" headers="r1c1-t37">
-<p>Target entity</p>
+<td align="left" id="r2c1-t36" headers="r1c1-t36">
+<p><span class="bold">Column</span></p>
</td>
-<td align="left" headers="r2c1-t37 r1c2-t37">
-<p>The persistent entity to which the attribute is mapped.</p>
+<td align="left" headers="r2c1-t36 r1c2-t36">
+<p><a id="sthref513" name="sthref513"></a><a id="sthref514" name="sthref514"></a>The database column that contains the value for the attribute. This field corresponds to the <code>@Column</code> annotation.</p>
+</td>
+<td align="left" headers="r2c1-t36 r1c3-t36">
+<p>By default, the Column is assumed to be named identically to the attribute.</p>
</td>
-<td align="left" headers="r2c1-t37 r1c3-t37"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t37" headers="r1c1-t37">
-<p>Fetch</p>
+<td align="left" id="r3c1-t36" headers="r1c1-t36">
+<p>Name</p>
</td>
-<td align="left" headers="r3c1-t37 r1c2-t37">
-<p>Defines how data is loaded from the database:</p>
-<ul>
-<li>
-<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
-</li>
-<li>
-<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
-</li>
-</ul>
+<td align="left" headers="r3c1-t36 r1c2-t36">
+<p>The database column that contains the value for the attribute.</p>
</td>
-<td align="left" headers="r3c1-t37 r1c3-t37">
-<p>Eager</p>
+<td align="left" headers="r3c1-t36 r1c3-t36"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t36" headers="r1c1-t36">
+<p>Table</p>
+</td>
+<td align="left" headers="r4c1-t36 r1c2-t36">
+<p>Name of the database table that contains the selected column.</p>
</td>
+<td align="left" headers="r4c1-t36 r1c3-t36"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t37" headers="r1c1-t37">
-<p>Join fetch</p>
+<td align="left" id="r5c1-t36" headers="r1c1-t36">
+<p><span class="bold">Details</span></p>
</td>
-<td align="left" headers="r4c1-t37 r1c2-t37">
-<p>The type of fetch to use:</p>
-<ul>
-<li>
-<p>Inner &ndash; Provides the inner join fetching of the related object.</p>
-<p><span class="bold">Note</span>: Inner joining does not allow for null or empty values</p>
-</li>
-<li>
-<p>Outer &ndash; Provides the outer join fetching of the related object</p>
-<p><span class="bold">Note</span>: Outer joining allows for null or empty values.</p>
-</li>
-</ul>
+<td align="left" headers="r5c1-t36 r1c2-t36"><br /></td>
+<td align="left" headers="r5c1-t36 r1c3-t36"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t36" headers="r1c1-t36">
+<p>Insertable</p>
+</td>
+<td align="left" headers="r6c1-t36 r1c2-t36">
+<p>Specifies if the column is always included in <code>SQL INSERT</code> statements.</p>
+</td>
+<td align="left" headers="r6c1-t36 r1c3-t36">
+<p>True</p>
</td>
-<td align="left" headers="r4c1-t37 r1c3-t37"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t37" headers="r1c1-t37">
-<p>Optional</p>
+<td align="left" id="r7c1-t36" headers="r1c1-t36">
+<p>Updatable</p>
</td>
-<td align="left" headers="r5c1-t37 r1c2-t37">
-<p>Specifies if this field is can be null.</p>
+<td align="left" headers="r7c1-t36 r1c2-t36">
+<p>Specifies if this column is always included in <code>SQL UPDATE</code> statements.</p>
</td>
-<td align="left" headers="r5c1-t37 r1c3-t37">
+<td align="left" headers="r7c1-t36 r1c3-t36">
<p>True</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t37" headers="r1c1-t37">
-<p>Private owned</p>
+<td align="left" id="r8c1-t36" headers="r1c1-t36">
+<p>Unique</p>
</td>
-<td align="left" headers="r6c1-t37 r1c2-t37">
-<p>Specify that a relationship is privately owned; target object is a dependent part of the source object and is not referenced by any other object and cannot exist on its own.</p>
+<td align="left" headers="r8c1-t36 r1c2-t36">
+<p>Sets the <code>UNIQUE</code> constraint for the column.</p>
</td>
-<td align="left" headers="r6c1-t37 r1c3-t37">
+<td align="left" headers="r8c1-t36 r1c3-t36">
<p>False</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t37" headers="r1c1-t37">
-<p>Orphan removal</p>
+<td align="left" id="r9c1-t36" headers="r1c1-t36">
+<p>Nullable</p>
</td>
-<td align="left" headers="r7c1-t37 r1c2-t37"><br /></td>
-<td align="left" headers="r7c1-t37 r1c3-t37">
-<p>False</p>
+<td align="left" headers="r9c1-t36 r1c2-t36">
+<p>Specifies if the column allows null values.</p>
+</td>
+<td align="left" headers="r9c1-t36 r1c3-t36">
+<p>True</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t37" headers="r1c1-t37">
-<p>Cascade</p>
+<td align="left" id="r10c1-t36" headers="r1c1-t36">
+<p>Length</p>
</td>
-<td align="left" headers="r8c1-t37 r1c2-t37">
-<p>Specify which operations are propagated throughout the entity.</p>
-<ul>
-<li>
-<p>All &ndash; All operations</p>
-</li>
-<li>
-<p>Persist</p>
-</li>
-<li>
-<p>Merge</p>
-</li>
-<li>
-<p>Move</p>
-</li>
-<li>
-<p>Remove</p>
-</li>
-<li>
-<p>Refresh</p>
-</li>
-</ul>
+<td align="left" headers="r10c1-t36 r1c2-t36">
+<p>Sets the column length.</p>
</td>
-<td align="left" headers="r8c1-t37 r1c3-t37">
+<td align="left" headers="r10c1-t36 r1c3-t36">
+<p>255</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t36" headers="r1c1-t36">
+<p>Precision</p>
+</td>
+<td align="left" headers="r11c1-t36 r1c2-t36">
+<p>Sets the precision for the column values.</p>
+</td>
+<td align="left" headers="r11c1-t36 r1c3-t36">
+<p>0</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t36" headers="r1c1-t36">
+<p>Scale</p>
+</td>
+<td align="left" headers="r12c1-t36 r1c2-t36">
+<p>Sets the number of digits that appear to the right of the decimal point.</p>
+</td>
+<td align="left" headers="r12c1-t36 r1c3-t36">
+<p>0</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r13c1-t36" headers="r1c1-t36">
+<p>Column definition</p>
+</td>
+<td align="left" headers="r13c1-t36 r1c2-t36">
+<p>The SQL fragment that is used when generating the DDL for the column.</p>
+</td>
+<td align="left" headers="r13c1-t36 r1c3-t36"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r14c1-t36" headers="r1c1-t36">
+<p><span class="bold">Mutable</span></p>
+</td>
+<td align="left" headers="r14c1-t36 r1c2-t36">
+<p>Specify if the value of a complex field type can be changed (or not changed) instead of being replaced.</p>
+</td>
+<td align="left" headers="r14c1-t36 r1c3-t36">
<p>True</p>
</td>
</tr>
@@ -147,13 +171,16 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<p>One-to-one mappings also include the following areas:</p>
+<p>ID mappings also include the following areas:</p>
<ul>
<li>
-<p><a href="reference040.htm#CACGHHGB">Derived Identity</a></p>
+<p><a href="reference039.htm#CACIHAAF">Type information</a></p>
+</li>
+<li>
+<p><a href="reference041.htm#CACJCHJB">Converters</a></p>
</li>
<li>
-<p><a href="reference039.htm#CACIJEGI">Joining Strategy</a></p>
+<p><a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a></p>
</li>
</ul>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm
index 6e1f750eb8..50901cc6a6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm
@@ -5,166 +5,112 @@
<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>Version Mapping</title>
+<title>Many-to-Many Mapping</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:41Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Version Mapping" />
+<meta name="doctitle" content="Many-to-Many Mapping" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACHAEBB" name="CACHAEBB"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACIHGCE" name="CACIHGCE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref500" name="sthref500"></a><a id="sthref501" name="sthref501"></a><a id="sthref502" name="sthref502"></a>Version Mapping</h1>
+<h1><a id="sthref515" name="sthref515"></a><a id="sthref516" name="sthref516"></a><a id="sthref517" name="sthref517"></a>Many-to-Many Mapping</h1>
<div class="inftblhruleinformal">
-<table class="HRuleInformal" summary="JPA Details view, Version page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<table class="HRuleInformal" summary="JPA Details view, One-to-one page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="29%" />
<col width="*" />
<col width="24%" />
<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="r1c3-t38">Default</th>
+<th align="left" valign="bottom" id="r1c1-t37">Property</th>
+<th align="left" valign="bottom" id="r1c2-t37">Description</th>
+<th align="left" valign="bottom" id="r1c3-t37">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t38" headers="r1c1-t38">
-<p><span class="bold">Column</span></p>
+<td align="left" id="r2c1-t37" headers="r1c1-t37">
+<p>Target entity</p>
</td>
-<td align="left" headers="r2c1-t38 r1c2-t38">
-<p><a id="sthref503" name="sthref503"></a><a id="sthref504" name="sthref504"></a>The database column that contains the value for the attribute. This field corresponds to the <code>@Column</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t38 r1c3-t38">
-<p>By default, the Column is assumed to be named identically to the attribute.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t38" headers="r1c1-t38">
-<p>Name</p>
-</td>
-<td align="left" headers="r3c1-t38 r1c2-t38">
-<p>The database column mapped to the entity attribute.</p>
-<p>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.</p>
-</td>
-<td align="left" headers="r3c1-t38 r1c3-t38"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t38" headers="r1c1-t38">
-<p>Table</p>
-</td>
-<td align="left" headers="r4c1-t38 r1c2-t38">
-<p>Name of the database table that contains the selected column.</p>
-</td>
-<td align="left" headers="r4c1-t38 r1c3-t38"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t38" headers="r1c1-t38">
-<p><span class="bold">Details</span></p>
-</td>
-<td align="left" headers="r5c1-t38 r1c2-t38"><br /></td>
-<td align="left" headers="r5c1-t38 r1c3-t38"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t38" headers="r1c1-t38">
-<p>Insertable</p>
-</td>
-<td align="left" headers="r6c1-t38 r1c2-t38">
-<p>Specifies if the column is always included in <code>SQL INSERT</code> statements.</p>
-</td>
-<td align="left" headers="r6c1-t38 r1c3-t38">
-<p>True</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t38" headers="r1c1-t38">
-<p>Updatable</p>
-</td>
-<td align="left" headers="r7c1-t38 r1c2-t38">
-<p>Specifies if this column is always included in <code>SQL UPDATE</code> statements.</p>
-</td>
-<td align="left" headers="r7c1-t38 r1c3-t38">
-<p>True</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t38" headers="r1c1-t38">
-<p>Unique</p>
-</td>
-<td align="left" headers="r8c1-t38 r1c2-t38">
-<p>Sets the <code>UNIQUE</code> constraint for the column.</p>
-</td>
-<td align="left" headers="r8c1-t38 r1c3-t38">
-<p>False</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r9c1-t38" headers="r1c1-t38">
-<p>Nullable</p>
-</td>
-<td align="left" headers="r9c1-t38 r1c2-t38">
-<p>Specifies if the column allows null values.</p>
-</td>
-<td align="left" headers="r9c1-t38 r1c3-t38">
-<p>True</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r10c1-t38" headers="r1c1-t38">
-<p>Length</p>
-</td>
-<td align="left" headers="r10c1-t38 r1c2-t38">
-<p>Sets the column length.</p>
-</td>
-<td align="left" headers="r10c1-t38 r1c3-t38">
-<p>255</p>
+<td align="left" headers="r2c1-t37 r1c2-t37">
+<p>The persistent entity to which the attribute is mapped.</p>
</td>
+<td align="left" headers="r2c1-t37 r1c3-t37"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r11c1-t38" headers="r1c1-t38">
-<p>Precision</p>
+<td align="left" id="r3c1-t37" headers="r1c1-t37">
+<p>Fetch</p>
</td>
-<td align="left" headers="r11c1-t38 r1c2-t38">
-<p>Sets the precision for the column values.</p>
+<td align="left" headers="r3c1-t37 r1c2-t37">
+<p>Defines how data is loaded from the database:</p>
+<ul>
+<li>
+<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
+</li>
+<li>
+<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
+</li>
+</ul>
</td>
-<td align="left" headers="r11c1-t38 r1c3-t38">
-<p>0</p>
+<td align="left" headers="r3c1-t37 r1c3-t37">
+<p>Lazy</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r12c1-t38" headers="r1c1-t38">
-<p>Scale</p>
-</td>
-<td align="left" headers="r12c1-t38 r1c2-t38">
-<p>Sets the number of digits that appear to the right of the decimal point.</p>
-</td>
-<td align="left" headers="r12c1-t38 r1c3-t38">
-<p>0</p>
+<td align="left" id="r4c1-t37" headers="r1c1-t37">
+<p>Join fetch</p>
</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r13c1-t38" headers="r1c1-t38">
-<p>Column definition</p>
+<td align="left" headers="r4c1-t37 r1c2-t37">
+<p>The type of fetch to use:</p>
+<ul>
+<li>
+<p>Inner &ndash; Provides the inner join fetching of the related object.</p>
+<p><span class="bold">Note</span>: Inner joining does not allow for null or empty values</p>
+</li>
+<li>
+<p>Outer &ndash; Provides the outer join fetching of the related object</p>
+<p><span class="bold">Note</span>: Outer joining allows for null or empty values.</p>
+</li>
+</ul>
</td>
-<td align="left" headers="r13c1-t38 r1c2-t38">
-<p>The SQL fragment that is used when generating the DDL for the column.</p>
+<td align="left" headers="r4c1-t37 r1c3-t37">
+<p>None</p>
</td>
-<td align="left" headers="r13c1-t38 r1c3-t38"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r14c1-t38" headers="r1c1-t38">
-<p><span class="bold">Mutable</span></p>
+<td align="left" id="r5c1-t37" headers="r1c1-t37">
+<p>Cascade</p>
</td>
-<td align="left" headers="r14c1-t38 r1c2-t38">
-<p>Specify if the value of a complex field type can be changed (or not changed) instead of being replaced.</p>
+<td align="left" headers="r5c1-t37 r1c2-t37">
+<p>Specify which operations are propagated throughout the entity.</p>
+<ul>
+<li>
+<p>All &ndash; All operations</p>
+</li>
+<li>
+<p>Persist</p>
+</li>
+<li>
+<p>Merge</p>
+</li>
+<li>
+<p>Move</p>
+</li>
+<li>
+<p>Remove</p>
+</li>
+<li>
+<p>Refresh</p>
+</li>
+</ul>
</td>
-<td align="left" headers="r14c1-t38 r1c3-t38">
+<td align="left" headers="r5c1-t37 r1c3-t37">
<p>True</p>
</td>
</tr>
@@ -172,13 +118,16 @@
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<p>Version mappings also include the following areas:</p>
+<p>One-to-many mappings also include the following areas:</p>
<ul>
<li>
-<p><a href="reference035.htm#CACIHAAF">Type information</a></p>
+<p><a href="reference043.htm#CACIJEGI">Joining Strategy</a></p>
+</li>
+<li>
+<p><a href="reference041.htm#CACJCHJB">Converters</a></p>
</li>
<li>
-<p><a href="reference037.htm#CACJCHJB">Converters</a></p>
+<p><a href="reference042.htm#CACBIJFD">Ordering</a></p>
</li>
</ul>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference035.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference035.htm
index 2b9f4bd3c5..35179eda7b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference035.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference035.htm
@@ -5,125 +5,141 @@
<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>Type information</title>
+<title>Many-to-One Mapping</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Type information" />
+<meta name="doctitle" content="Many-to-One Mapping" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACIHAAF" name="CACIHAAF"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACHAEDB" name="CACHAEDB"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref505" name="sthref505"></a>Type information</h1>
+<h1><a id="sthref518" name="sthref518"></a><a id="sthref519" name="sthref519"></a><a id="sthref520" name="sthref520"></a>Many-to-One Mapping</h1>
<div class="inftblhruleinformal">
-<table class="HRuleInformal" summary="JPA Details view, Type page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<table class="HRuleInformal" summary="JPA Details view, One-to-one page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="29%" />
<col width="*" />
<col width="24%" />
<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="r1c3-t39">Available for Mapping Type</th>
+<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="r1c3-t38">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t39" headers="r1c1-t39">
-<p>Default</p>
+<td align="left" id="r2c1-t38" headers="r1c1-t38">
+<p>Target entity</p>
</td>
-<td align="left" headers="r2c1-t39 r1c2-t39"><br /></td>
-<td align="left" headers="r2c1-t39 r1c3-t39">
-<p><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks014.htm#BABGCBHG">ID mapping</a>, and <a href="tasks020.htm#BABHIBII">Version mapping</a></p>
+<td align="left" headers="r2c1-t38 r1c2-t38">
+<p>The persistent entity to which the attribute is mapped.</p>
+<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="r3c1-t39" headers="r1c1-t39">
-<p><a id="sthref506" name="sthref506"></a>LOB</p>
-</td>
-<td align="left" headers="r3c1-t39 r1c2-t39">
-<p>Specify if the field is mapped to <code>java.sql.Clob</code> or <code>java.sql.Blob</code>.</p>
-<p>This field corresponds to the <code>@Lob</code> annotation.</p>
+<td align="left" headers="r2c1-t38 r1c3-t38">
+<p>null</p>
</td>
-<td align="left" headers="r3c1-t39 r1c3-t39">
-<p><a href="tasks010.htm#BABBABCE">Basic mapping</a></p>
-<br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t39" headers="r1c1-t39">
-<p><a id="sthref507" name="sthref507"></a><a id="sthref508" name="sthref508"></a><a id="sthref509" name="sthref509"></a>Temporal</p>
+<td align="left" id="r3c1-t38" headers="r1c1-t38">
+<p>Fetch</p>
</td>
-<td align="left" headers="r4c1-t39 r1c2-t39">
-<p>Specifies if this field is one of the following:</p>
+<td align="left" headers="r3c1-t38 r1c2-t38">
+<p>Defines how data is loaded from the database:</p>
<ul>
<li>
-<p>Date &ndash; <code>java.sql.Date</code></p>
+<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
</li>
<li>
-<p>Time &ndash; <code>java.sql.Time</code></p>
-</li>
-<li>
-<p>Timestamp &ndash; <code>java.sql.Timestamp</code></p>
+<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
</li>
</ul>
-<p>This field corresponds to the <code>@Temporal</code> annotation.</p>
</td>
-<td align="left" headers="r4c1-t39 r1c3-t39">
-<p><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks014.htm#BABGCBHG">ID mapping</a>, and <a href="tasks020.htm#BABHIBII">Version mapping</a></p>
+<td align="left" headers="r3c1-t38 r1c3-t38">
+<p>Lazy</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t39" headers="r1c1-t39">
-<p><a id="sthref510" name="sthref510"></a><a id="sthref511" name="sthref511"></a>Enumerated</p>
+<td align="left" id="r4c1-t38" headers="r1c1-t38">
+<p>Join fetch</p>
</td>
-<td align="left" headers="r5c1-t39 r1c2-t39">
-<p>Specify how to persist enumerated constraints if the <code>String</code> value suits your application requirements or to match an existing database schema.</p>
+<td align="left" headers="r4c1-t38 r1c2-t38">
+<p>The type of fetch to use:</p>
<ul>
<li>
-<p><code>ordinal</code></p>
+<p>Inner &ndash; Provides the inner join fetching of the related object.</p>
+<p><span class="bold">Note</span>: Inner joining does not allow for null or empty values</p>
</li>
<li>
-<p><code>String</code></p>
+<p>Outer &ndash; Provides the outer join fetching of the related object</p>
+<p><span class="bold">Note</span>: Outer joining allows for null or empty values.</p>
</li>
</ul>
-<p>This field corresponds to the <code>@Enumerated</code> annotation.</p>
</td>
-<td align="left" headers="r5c1-t39 r1c3-t39">
-<p><a href="tasks010.htm#BABBABCE">Basic mapping</a></p>
-<br /></td>
+<td align="left" headers="r4c1-t38 r1c3-t38"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t38" headers="r1c1-t38">
+<p>Optional</p>
+</td>
+<td align="left" headers="r5c1-t38 r1c2-t38">
+<p>Specifies if this field is can be null.</p>
+</td>
+<td align="left" headers="r5c1-t38 r1c3-t38">
+<p>True</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t39" headers="r1c1-t39">
-<p>Converted</p>
+<td align="left" id="r6c1-t38" headers="r1c1-t38">
+<p>Cascade</p>
</td>
-<td align="left" headers="r6c1-t39 r1c2-t39">
-<p>Converter name:</p>
+<td align="left" headers="r6c1-t38 r1c2-t38">
+<p>Specify which operations are propagated throughout the entity.</p>
<ul>
<li>
-<p>None (default) &ndash;</p>
+<p>All &ndash; All operations</p>
+</li>
+<li>
+<p>Persist</p>
</li>
<li>
-<p>class-instance &ndash;</p>
+<p>Merge</p>
</li>
<li>
-<p>serialized &ndash;</p>
+<p>Move</p>
+</li>
+<li>
+<p>Remove</p>
+</li>
+<li>
+<p>Refresh</p>
</li>
</ul>
</td>
-<td align="left" headers="r6c1-t39 r1c3-t39">
-<p><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks014.htm#BABGCBHG">ID mapping</a>, and <a href="tasks020.htm#BABHIBII">Version mapping</a></p>
+<td align="left" headers="r6c1-t38 r1c3-t38">
+<p>True</p>
</td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblhruleinformal" --></div>
+<!-- class="inftblhruleinformal" -->
+<p>Many-to-one mappings also include the following areas:</p>
+<ul>
+<li>
+<p><a href="reference043.htm#CACIJEGI">Joining Strategy</a></p>
+</li>
+<li>
+<p><a href="reference044.htm#CACGHHGB">Derived Identity</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference036.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference036.htm
index 120c78eb3d..fb3eb59ef2 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference036.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference036.htm
@@ -5,22 +5,147 @@
<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>Value</title>
+<title>One-to-Many Mapping</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Value" />
+<meta name="doctitle" content="One-to-Many Mapping" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACJBFEA" name="CACJBFEA"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACHGGHH" name="CACHGGHH"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Value</h1>
+<h1><a id="sthref521" name="sthref521"></a><a id="sthref522" name="sthref522"></a><a id="sthref523" name="sthref523"></a>One-to-Many Mapping</h1>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="JPA Details view, One-to-one page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="29%" />
+<col width="*" />
+<col width="24%" />
+<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="r1c3-t39">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t39" headers="r1c1-t39">
+<p>Target entity</p>
+</td>
+<td align="left" headers="r2c1-t39 r1c2-t39">
+<p>The persistent entity to which the attribute is mapped.</p>
+</td>
+<td align="left" headers="r2c1-t39 r1c3-t39"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t39" headers="r1c1-t39">
+<p>Fetch</p>
+</td>
+<td align="left" headers="r3c1-t39 r1c2-t39">
+<p>Defines how data is loaded from the database:</p>
+<ul>
+<li>
+<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
+</li>
+<li>
+<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r3c1-t39 r1c3-t39">
+<p>Lazy</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t39" headers="r1c1-t39">
+<p>Join fetch</p>
+</td>
+<td align="left" headers="r4c1-t39 r1c2-t39">
+<p>The type of fetch to use:</p>
+<ul>
+<li>
+<p>Inner &ndash; Provides the inner join fetching of the related object.</p>
+<p><span class="bold">Note</span>: Inner joining does not allow for null or empty values</p>
+</li>
+<li>
+<p>Outer &ndash; Provides the outer join fetching of the related object</p>
+<p><span class="bold">Note</span>: Outer joining allows for null or empty values.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r4c1-t39 r1c3-t39"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t39" headers="r1c1-t39">
+<p>Private owned</p>
+</td>
+<td align="left" headers="r5c1-t39 r1c2-t39">
+<p>Specify that a relationship is privately owned; target object is a dependent part of the source object and is not referenced by any other object and cannot exist on its own.</p>
+</td>
+<td align="left" headers="r5c1-t39 r1c3-t39"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t39" headers="r1c1-t39">
+<p>Orphan removal</p>
+</td>
+<td align="left" headers="r6c1-t39 r1c2-t39"><br /></td>
+<td align="left" headers="r6c1-t39 r1c3-t39">
+<p>False</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t39" headers="r1c1-t39">
+<p>Cascade</p>
+</td>
+<td align="left" headers="r7c1-t39 r1c2-t39">
+<p>Specify which operations are propagated throughout the entity.</p>
+<ul>
+<li>
+<p>All &ndash; All operations</p>
+</li>
+<li>
+<p>Persist</p>
+</li>
+<li>
+<p>Merge</p>
+</li>
+<li>
+<p>Move</p>
+</li>
+<li>
+<p>Remove</p>
+</li>
+<li>
+<p>Refresh</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r7c1-t39 r1c3-t39">
+<p>True</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<p>One-to-many mappings also include the following areas:</p>
+<ul>
+<li>
+<p><a href="reference043.htm#CACIJEGI">Joining Strategy</a></p>
+</li>
+<li>
+<p><a href="reference041.htm#CACJCHJB">Converters</a></p>
+</li>
+<li>
+<p><a href="reference042.htm#CACBIJFD">Ordering</a></p>
+</li>
+</ul>
</div>
<!-- class="sect3" -->
<!-- Start Footer -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference037.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference037.htm
index 4054c59481..830438ed6f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference037.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference037.htm
@@ -5,133 +5,155 @@
<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>Converters</title>
+<title>One-to-One Mapping</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Converters" />
+<meta name="doctitle" content="One-to-One Mapping" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACJCHJB" name="CACJCHJB"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACGGHDD" name="CACGGHDD"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref512" name="sthref512"></a><a id="sthref513" name="sthref513"></a>Converters</h1>
-<div class="inftblhruleinformalwide">
-<table class="HRuleInformalWide" title="JPA Details view, Advanced page" summary="JPA Details view, Advanced page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="16%" />
+<h1><a id="sthref524" name="sthref524"></a><a id="sthref525" name="sthref525"></a><a id="sthref526" name="sthref526"></a>One-to-One Mapping</h1>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="JPA Details view, One-to-one page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="29%" />
<col width="*" />
-<col width="17%" />
-<col width="25%" />
+<col width="24%" />
<thead>
<tr align="left" valign="top">
<th align="left" valign="bottom" id="r1c1-t40">Property</th>
<th align="left" valign="bottom" id="r1c2-t40">Description</th>
<th align="left" valign="bottom" id="r1c3-t40">Default</th>
-<th align="left" valign="bottom" id="r1c4-t40">Available for Entity&nbsp;Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
<td align="left" id="r2c1-t40" headers="r1c1-t40">
-<p>Converters</p>
+<p>Target entity</p>
</td>
<td align="left" headers="r2c1-t40 r1c2-t40">
-<p>Click Add and use the <a href="ref_add_converter.htm#CIAGCGIJ">Add Converter dialog</a> to create a new converter.</p>
-<ul>
-<li>
-<p>Object Type</p>
-</li>
-<li>
-<p>Type</p>
-</li>
-<li>
-<p>Struct</p>
-</li>
-<li>
-<p>Custom</p>
-</li>
-</ul>
+<p>The persistent entity to which the attribute is mapped.</p>
</td>
<td align="left" headers="r2c1-t40 r1c3-t40"><br /></td>
-<td align="left" headers="r2c1-t40 r1c4-t40">
-<p><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#CIHHJEBJ">Element collection mapping</a>, <a href="tasks014.htm#BABGCBHG">ID mapping</a>, <a href="tasks015.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks017.htm#BABHGEBD">One-to-many mapping</a>, and <a href="tasks020.htm#BABHIBII">Version mapping</a></p>
-</td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r3c1-t40" headers="r1c1-t40">
-<p>Name</p>
+<p>Fetch</p>
</td>
<td align="left" headers="r3c1-t40 r1c2-t40">
-<p>Name of the converter.</p>
+<p>Defines how data is loaded from the database:</p>
+<ul>
+<li>
+<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
+</li>
+<li>
+<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r3c1-t40 r1c3-t40">
+<p>Eager</p>
</td>
-<td align="left" headers="r3c1-t40 r1c3-t40"><br /></td>
-<td align="left" headers="r3c1-t40 r1c4-t40"><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r4c1-t40" headers="r1c1-t40">
-<p>Class</p>
+<p>Join fetch</p>
</td>
<td align="left" headers="r4c1-t40 r1c2-t40">
-<p>Appears for <span class="bold">Custom</span> and <span class="bold">Struct</span> converters only.</p>
+<p>The type of fetch to use:</p>
+<ul>
+<li>
+<p>Inner &ndash; Provides the inner join fetching of the related object.</p>
+<p><span class="bold">Note</span>: Inner joining does not allow for null or empty values</p>
+</li>
+<li>
+<p>Outer &ndash; Provides the outer join fetching of the related object</p>
+<p><span class="bold">Note</span>: Outer joining allows for null or empty values.</p>
+</li>
+</ul>
</td>
<td align="left" headers="r4c1-t40 r1c3-t40"><br /></td>
-<td align="left" headers="r4c1-t40 r1c4-t40"><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r5c1-t40" headers="r1c1-t40">
-<p>Data type</p>
+<p>Optional</p>
</td>
<td align="left" headers="r5c1-t40 r1c2-t40">
-<p>Appears for <span class="bold">Object Type</span> and <span class="bold">Type</span> converters only.</p>
+<p>Specifies if this field is can be null.</p>
+</td>
+<td align="left" headers="r5c1-t40 r1c3-t40">
+<p>True</p>
</td>
-<td align="left" headers="r5c1-t40 r1c3-t40"><br /></td>
-<td align="left" headers="r5c1-t40 r1c4-t40"><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r6c1-t40" headers="r1c1-t40">
-<p>Object type</p>
+<p>Private owned</p>
</td>
<td align="left" headers="r6c1-t40 r1c2-t40">
-<p>Appears for <span class="bold">Object Type</span> and <span class="bold">Type</span> converters only.</p>
+<p>Specify that a relationship is privately owned; target object is a dependent part of the source object and is not referenced by any other object and cannot exist on its own.</p>
+</td>
+<td align="left" headers="r6c1-t40 r1c3-t40">
+<p>False</p>
</td>
-<td align="left" headers="r6c1-t40 r1c3-t40"><br /></td>
-<td align="left" headers="r6c1-t40 r1c4-t40"><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r7c1-t40" headers="r1c1-t40">
-<p>Conversion values</p>
+<p>Orphan removal</p>
</td>
-<td align="left" headers="r7c1-t40 r1c2-t40">
-<p>Appears for <span class="bold">Object Type</span> converters only.</p>
+<td align="left" headers="r7c1-t40 r1c2-t40"><br /></td>
+<td align="left" headers="r7c1-t40 r1c3-t40">
+<p>False</p>
</td>
-<td align="left" headers="r7c1-t40 r1c3-t40"><br /></td>
-<td align="left" headers="r7c1-t40 r1c4-t40"><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r8c1-t40" headers="r1c1-t40">
-<p>Default object value</p>
+<p>Cascade</p>
</td>
<td align="left" headers="r8c1-t40 r1c2-t40">
-<p>Appears for <span class="bold">Object Type</span> converters only.</p>
+<p>Specify which operations are propagated throughout the entity.</p>
+<ul>
+<li>
+<p>All &ndash; All operations</p>
+</li>
+<li>
+<p>Persist</p>
+</li>
+<li>
+<p>Merge</p>
+</li>
+<li>
+<p>Move</p>
+</li>
+<li>
+<p>Remove</p>
+</li>
+<li>
+<p>Refresh</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r8c1-t40 r1c3-t40">
+<p>True</p>
</td>
-<td align="left" headers="r8c1-t40 r1c3-t40"><br /></td>
-<td align="left" headers="r8c1-t40 r1c4-t40"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblhruleinformalwide" -->
-<a id="sthref514" name="sthref514"></a>
-<p class="subhead2">Related reference</p>
+<!-- class="inftblhruleinformal" -->
+<p>One-to-one mappings also include the following areas:</p>
<ul>
<li>
-<p>"Converter" in <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span><br />
-<code><a href="http://eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_converter.htm">http://eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_converter.htm</a></code></p>
+<p><a href="reference044.htm#CACGHHGB">Derived Identity</a></p>
+</li>
+<li>
+<p><a href="reference043.htm#CACIJEGI">Joining Strategy</a></p>
</li>
</ul>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference038.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference038.htm
index bb3f476239..7c3cb21bce 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference038.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference038.htm
@@ -5,114 +5,183 @@
<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>Ordering</title>
+<title>Version Mapping</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Ordering" />
+<meta name="doctitle" content="Version Mapping" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACBIJFD" name="CACBIJFD"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACHAEBB" name="CACHAEBB"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Ordering</h1>
-<p><a id="sthref515" name="sthref515"></a><a id="sthref516" name="sthref516"></a><a id="sthref517" name="sthref517"></a>Specify the default order for objects returned from a query. These options correspond to the <code>@OrderBy</code> annotation.</p>
-<div class="inftblhruleinformalwide">
-<table class="HRuleInformalWide" title="JPA Details view, Advanced page" summary="JPA Details view, Advanced page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="16%" />
+<h1><a id="sthref527" name="sthref527"></a><a id="sthref528" name="sthref528"></a><a id="sthref529" name="sthref529"></a>Version Mapping</h1>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="JPA Details view, Version page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="29%" />
<col width="*" />
-<col width="17%" />
-<col width="25%" />
+<col width="24%" />
<thead>
<tr align="left" valign="top">
<th align="left" valign="bottom" id="r1c1-t41">Property</th>
<th align="left" valign="bottom" id="r1c2-t41">Description</th>
<th align="left" valign="bottom" id="r1c3-t41">Default</th>
-<th align="left" valign="bottom" id="r1c4-t41">Available for Entity&nbsp;Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
<td align="left" id="r2c1-t41" headers="r1c1-t41">
-<p><span class="bold">None</span></p>
+<p><span class="bold">Column</span></p>
</td>
-<td align="left" headers="r2c1-t41 r1c2-t41"><br /></td>
-<td align="left" headers="r2c1-t41 r1c3-t41"><br /></td>
-<td align="left" headers="r2c1-t41 r1c4-t41">
-<p><a href="tasks011.htm#CIHHJEBJ">Element collection mapping</a>, <a href="tasks015.htm#BABEIEGD">Many-to-many mapping</a>, and <a href="tasks017.htm#BABHGEBD">One-to-many mapping</a></p>
+<td align="left" headers="r2c1-t41 r1c2-t41">
+<p><a id="sthref530" name="sthref530"></a><a id="sthref531" name="sthref531"></a>The database column that contains the value for the attribute. This field corresponds to the <code>@Column</code> annotation.</p>
+</td>
+<td align="left" headers="r2c1-t41 r1c3-t41">
+<p>By default, the Column is assumed to be named identically to the attribute.</p>
</td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r3c1-t41" headers="r1c1-t41">
-<p><span class="bold">Primary key</span></p>
+<p>Name</p>
+</td>
+<td align="left" headers="r3c1-t41 r1c2-t41">
+<p>The database column mapped to the entity attribute.</p>
+<p>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.</p>
</td>
-<td align="left" headers="r3c1-t41 r1c2-t41"><br /></td>
<td align="left" headers="r3c1-t41 r1c3-t41"><br /></td>
-<td align="left" headers="r3c1-t41 r1c4-t41"><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r4c1-t41" headers="r1c1-t41">
-<p><span class="bold">Custom</span></p>
+<p>Table</p>
+</td>
+<td align="left" headers="r4c1-t41 r1c2-t41">
+<p>Name of the database table that contains the selected column.</p>
</td>
-<td align="left" headers="r4c1-t41 r1c2-t41"><br /></td>
<td align="left" headers="r4c1-t41 r1c3-t41"><br /></td>
-<td align="left" headers="r4c1-t41 r1c4-t41"><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r5c1-t41" headers="r1c1-t41">
-<p><span class="bold">Order column</span></p>
+<p><span class="bold">Details</span></p>
</td>
<td align="left" headers="r5c1-t41 r1c2-t41"><br /></td>
<td align="left" headers="r5c1-t41 r1c3-t41"><br /></td>
-<td align="left" headers="r5c1-t41 r1c4-t41"><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r6c1-t41" headers="r1c1-t41">
<p>Insertable</p>
</td>
-<td align="left" headers="r6c1-t41 r1c2-t41"><br /></td>
+<td align="left" headers="r6c1-t41 r1c2-t41">
+<p>Specifies if the column is always included in <code>SQL INSERT</code> statements.</p>
+</td>
<td align="left" headers="r6c1-t41 r1c3-t41">
<p>True</p>
</td>
-<td align="left" headers="r6c1-t41 r1c4-t41"><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r7c1-t41" headers="r1c1-t41">
<p>Updatable</p>
</td>
-<td align="left" headers="r7c1-t41 r1c2-t41"><br /></td>
+<td align="left" headers="r7c1-t41 r1c2-t41">
+<p>Specifies if this column is always included in <code>SQL UPDATE</code> statements.</p>
+</td>
<td align="left" headers="r7c1-t41 r1c3-t41">
<p>True</p>
</td>
-<td align="left" headers="r7c1-t41 r1c4-t41"><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r8c1-t41" headers="r1c1-t41">
-<p>Nullable</p>
+<p>Unique</p>
+</td>
+<td align="left" headers="r8c1-t41 r1c2-t41">
+<p>Sets the <code>UNIQUE</code> constraint for the column.</p>
</td>
-<td align="left" headers="r8c1-t41 r1c2-t41"><br /></td>
<td align="left" headers="r8c1-t41 r1c3-t41">
-<p>True</p>
+<p>False</p>
</td>
-<td align="left" headers="r8c1-t41 r1c4-t41"><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r9c1-t41" headers="r1c1-t41">
+<p>Nullable</p>
+</td>
+<td align="left" headers="r9c1-t41 r1c2-t41">
+<p>Specifies if the column allows null values.</p>
+</td>
+<td align="left" headers="r9c1-t41 r1c3-t41">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t41" headers="r1c1-t41">
+<p>Length</p>
+</td>
+<td align="left" headers="r10c1-t41 r1c2-t41">
+<p>Sets the column length.</p>
+</td>
+<td align="left" headers="r10c1-t41 r1c3-t41">
+<p>255</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t41" headers="r1c1-t41">
+<p>Precision</p>
+</td>
+<td align="left" headers="r11c1-t41 r1c2-t41">
+<p>Sets the precision for the column values.</p>
+</td>
+<td align="left" headers="r11c1-t41 r1c3-t41">
+<p>0</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t41" headers="r1c1-t41">
+<p>Scale</p>
+</td>
+<td align="left" headers="r12c1-t41 r1c2-t41">
+<p>Sets the number of digits that appear to the right of the decimal point.</p>
+</td>
+<td align="left" headers="r12c1-t41 r1c3-t41">
+<p>0</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r13c1-t41" headers="r1c1-t41">
<p>Column definition</p>
</td>
-<td align="left" headers="r9c1-t41 r1c2-t41"><br /></td>
-<td align="left" headers="r9c1-t41 r1c3-t41"><br /></td>
-<td align="left" headers="r9c1-t41 r1c4-t41"><br /></td>
+<td align="left" headers="r13c1-t41 r1c2-t41">
+<p>The SQL fragment that is used when generating the DDL for the column.</p>
+</td>
+<td align="left" headers="r13c1-t41 r1c3-t41"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r14c1-t41" headers="r1c1-t41">
+<p><span class="bold">Mutable</span></p>
+</td>
+<td align="left" headers="r14c1-t41 r1c2-t41">
+<p>Specify if the value of a complex field type can be changed (or not changed) instead of being replaced.</p>
+</td>
+<td align="left" headers="r14c1-t41 r1c3-t41">
+<p>True</p>
+</td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblhruleinformalwide" --></div>
+<!-- class="inftblhruleinformal" -->
+<p>Version mappings also include the following areas:</p>
+<ul>
+<li>
+<p><a href="reference039.htm#CACIHAAF">Type information</a></p>
+</li>
+<li>
+<p><a href="reference041.htm#CACJCHJB">Converters</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference039.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference039.htm
index ee5fa7b162..ea626bbd98 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference039.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference039.htm
@@ -5,23 +5,22 @@
<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>Joining Strategy</title>
+<title>Type information</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Joining Strategy" />
+<meta name="doctitle" content="Type information" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACIJEGI" name="CACIJEGI"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACIHAAF" name="CACIHAAF"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref518" name="sthref518"></a><a id="sthref519" name="sthref519"></a>Joining Strategy</h1>
-<p>Use this area to specify a mapped column for joining an entity association. By default, the mapping is assumed to have a single join.</p>
+<h1><a id="sthref532" name="sthref532"></a>Type information</h1>
<div class="inftblhruleinformal">
<table class="HRuleInformal" summary="JPA Details view, Type page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="29%" />
@@ -37,93 +36,89 @@
<tbody>
<tr align="left" valign="top">
<td align="left" id="r2c1-t42" headers="r1c1-t42">
-<p><span class="bold">Mapped by</span></p>
-</td>
-<td align="left" headers="r2c1-t42 r1c2-t42">
-<p>The field in the database table that "owns" the relationship. This field is required only on the non-owning side of the relationship.</p>
+<p>Default</p>
</td>
+<td align="left" headers="r2c1-t42 r1c2-t42"><br /></td>
<td align="left" headers="r2c1-t42 r1c3-t42">
-<p><a href="tasks015.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks017.htm#BABHGEBD">One-to-many mapping</a>, and <a href="tasks018.htm#BABFHBCJ">One-to-one mapping</a></p>
+<p><a href="tasks011.htm#BABBABCE">Basic mapping</a>, <a href="tasks015.htm#BABGCBHG">ID mapping</a>, and <a href="tasks021.htm#BABHIBII">Version mapping</a></p>
</td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r3c1-t42" headers="r1c1-t42">
-<p>Attribute</p>
+<p><a id="sthref533" name="sthref533"></a>LOB</p>
+</td>
+<td align="left" headers="r3c1-t42 r1c2-t42">
+<p>Specify if the field is mapped to <code>java.sql.Clob</code> or <code>java.sql.Blob</code>.</p>
+<p>This field corresponds to the <code>@Lob</code> annotation.</p>
</td>
-<td align="left" headers="r3c1-t42 r1c2-t42"><br /></td>
-<td align="left" headers="r3c1-t42 r1c3-t42"><br /></td>
+<td align="left" headers="r3c1-t42 r1c3-t42">
+<p><a href="tasks011.htm#BABBABCE">Basic mapping</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r4c1-t42" headers="r1c1-t42">
-<p><span class="bold">Primary key join columns</span></p>
+<p><a id="sthref534" name="sthref534"></a><a id="sthref535" name="sthref535"></a><a id="sthref536" name="sthref536"></a>Temporal</p>
+</td>
+<td align="left" headers="r4c1-t42 r1c2-t42">
+<p>Specifies if this field is one of the following:</p>
+<ul>
+<li>
+<p>Date &ndash; <code>java.sql.Date</code></p>
+</li>
+<li>
+<p>Time &ndash; <code>java.sql.Time</code></p>
+</li>
+<li>
+<p>Timestamp &ndash; <code>java.sql.Timestamp</code></p>
+</li>
+</ul>
+<p>This field corresponds to the <code>@Temporal</code> annotation.</p>
</td>
-<td align="left" headers="r4c1-t42 r1c2-t42"><br /></td>
<td align="left" headers="r4c1-t42 r1c3-t42">
-<p><a href="tasks018.htm#BABFHBCJ">One-to-one mapping</a></p>
-<br /></td>
+<p><a href="tasks011.htm#BABBABCE">Basic mapping</a>, <a href="tasks015.htm#BABGCBHG">ID mapping</a>, and <a href="tasks021.htm#BABHIBII">Version mapping</a></p>
+</td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r5c1-t42" headers="r1c1-t42">
-<p><span class="bold">Join columns</span></p>
+<p><a id="sthref537" name="sthref537"></a><a id="sthref538" name="sthref538"></a>Enumerated</p>
</td>
<td align="left" headers="r5c1-t42 r1c2-t42">
-<p><a id="sthref520" name="sthref520"></a><a id="sthref521" name="sthref521"></a>By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</p>
-<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
+<p>Specify how to persist enumerated constraints if the <code>String</code> value suits your application requirements or to match an existing database schema.</p>
+<ul>
+<li>
+<p><code>ordinal</code></p>
+</li>
+<li>
+<p><code>String</code></p>
+</li>
+</ul>
+<p>This field corresponds to the <code>@Enumerated</code> annotation.</p>
</td>
<td align="left" headers="r5c1-t42 r1c3-t42">
-<p><a href="tasks016.htm#BABHFAFJ">Many-to-one mapping</a>, <a href="tasks017.htm#BABHGEBD">One-to-many mapping</a>, and <a href="tasks018.htm#BABFHBCJ">One-to-one mapping</a></p>
-</td>
+<p><a href="tasks011.htm#BABBABCE">Basic mapping</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r6c1-t42" headers="r1c1-t42">
-<p><span class="bold">Join table</span></p>
+<p>Converted</p>
</td>
<td align="left" headers="r6c1-t42 r1c2-t42">
-<p>Name of the join table that contains the foreign key column.You must specify the join table on the owning side.</p>
-<p>By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</p>
+<p>Converter name:</p>
+<ul>
+<li>
+<p>None (default) &ndash;</p>
+</li>
+<li>
+<p>class-instance &ndash;</p>
+</li>
+<li>
+<p>serialized &ndash;</p>
+</li>
+</ul>
</td>
<td align="left" headers="r6c1-t42 r1c3-t42">
-<p><a href="tasks015.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks016.htm#BABHFAFJ">Many-to-one mapping</a>, <a href="tasks017.htm#BABHGEBD">One-to-many mapping</a>, and <a href="tasks018.htm#BABFHBCJ">One-to-one mapping</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t42" headers="r1c1-t42">
-<p>Name</p>
-</td>
-<td align="left" headers="r7c1-t42 r1c2-t42"><br /></td>
-<td align="left" headers="r7c1-t42 r1c3-t42"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t42" headers="r1c1-t42">
-<p>Schema</p>
-</td>
-<td align="left" headers="r8c1-t42 r1c2-t42"><br /></td>
-<td align="left" headers="r8c1-t42 r1c3-t42"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r9c1-t42" headers="r1c1-t42">
-<p>Catalog</p>
-</td>
-<td align="left" headers="r9c1-t42 r1c2-t42"><br /></td>
-<td align="left" headers="r9c1-t42 r1c3-t42"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r10c1-t42" headers="r1c1-t42">
-<p>Join columns</p>
-</td>
-<td align="left" headers="r10c1-t42 r1c2-t42">
-<p>Mapped by</p>
-</td>
-<td align="left" headers="r10c1-t42 r1c3-t42"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r11c1-t42" headers="r1c1-t42">
-<p>Inverse join columns</p>
-</td>
-<td align="left" headers="r11c1-t42 r1c2-t42">
-<p>Mapped by</p>
+<p><a href="tasks011.htm#BABBABCE">Basic mapping</a>, <a href="tasks015.htm#BABGCBHG">ID mapping</a>, and <a href="tasks021.htm#BABHIBII">Version mapping</a></p>
</td>
-<td align="left" headers="r11c1-t42 r1c3-t42"><br /></td>
</tr>
</tbody>
</table>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference040.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference040.htm
index 0b05a239ce..b427b5ed9c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference040.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference040.htm
@@ -5,66 +5,23 @@
<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>Derived Identity</title>
+<title>Value</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Derived Identity" />
+<meta name="doctitle" content="Value" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACGHHGB" name="CACGHHGB"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACJBFEA" name="CACJBFEA"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref522" name="sthref522"></a><a id="sthref523" name="sthref523"></a>Derived Identity</h1>
-<div class="inftblhruleinformal">
-<table class="HRuleInformal" summary="JPA Details view, Type page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="29%" />
-<col width="*" />
-<col width="24%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t43">Property</th>
-<th align="left" valign="bottom" id="r1c2-t43">Description</th>
-<th align="left" valign="bottom" id="r1c3-t43">Available for Mapping Type</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t43" headers="r1c1-t43">
-<p>None</p>
-</td>
-<td align="left" headers="r2c1-t43 r1c2-t43"><br /></td>
-<td align="left" headers="r2c1-t43 r1c3-t43">
-<p><a href="tasks016.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks018.htm#BABFHBCJ">One-to-one mapping</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t43" headers="r1c1-t43">
-<p>ID</p>
-</td>
-<td align="left" headers="r3c1-t43 r1c2-t43"><br /></td>
-<td align="left" headers="r3c1-t43 r1c3-t43">
-<p><a href="tasks016.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks018.htm#BABFHBCJ">One-to-one mapping</a></p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t43" headers="r1c1-t43">
-<p>Maps ID</p>
-</td>
-<td align="left" headers="r4c1-t43 r1c2-t43"><br /></td>
-<td align="left" headers="r4c1-t43 r1c3-t43">
-<p><a href="tasks016.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks018.htm#BABFHBCJ">One-to-one mapping</a></p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblhruleinformal" --></div>
+<h1>Value</h1>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference041.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference041.htm
index 57a215ee48..5ca042c287 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference041.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference041.htm
@@ -5,99 +5,133 @@
<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>Entity Mappings</title>
+<title>Converters</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Entity Mappings" />
+<meta name="doctitle" content="Converters" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACCACGH" name="CACCACGH"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACJCHJB" name="CACJCHJB"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Entity Mappings</h1>
-<p>This table lists the Entity Mappings fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
-<div class="inftblhruleinformal">
-<table class="HRuleInformal" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="21%" />
+<h1><a id="sthref539" name="sthref539"></a><a id="sthref540" name="sthref540"></a>Converters</h1>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" title="JPA Details view, Advanced page" summary="JPA Details view, Advanced page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="16%" />
<col width="*" />
-<col width="22%" />
+<col width="17%" />
+<col width="25%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t45">Property</th>
-<th align="left" valign="bottom" id="r1c2-t45">Description</th>
-<th align="left" valign="bottom" id="r1c3-t45">Default</th>
+<th align="left" valign="bottom" id="r1c1-t43">Property</th>
+<th align="left" valign="bottom" id="r1c2-t43">Description</th>
+<th align="left" valign="bottom" id="r1c3-t43">Default</th>
+<th align="left" valign="bottom" id="r1c4-t43">Available for Entity&nbsp;Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t45" headers="r1c1-t45">
-<p>Package</p>
+<td align="left" id="r2c1-t43" headers="r1c1-t43">
+<p>Converters</p>
</td>
-<td align="left" headers="r2c1-t45 r1c2-t45">
-<p>The Java package that contains the persistent entities. Click <span class="bold">Browse</span> and select the package</p>
+<td align="left" headers="r2c1-t43 r1c2-t43">
+<p>Click Add and use the <a href="ref_add_converter.htm#CIAGCGIJ">Add Converter dialog</a> to create a new converter.</p>
+<ul>
+<li>
+<p>Object Type</p>
+</li>
+<li>
+<p>Type</p>
+</li>
+<li>
+<p>Struct</p>
+</li>
+<li>
+<p>Custom</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r2c1-t43 r1c3-t43"><br /></td>
+<td align="left" headers="r2c1-t43 r1c4-t43">
+<p><a href="tasks011.htm#BABBABCE">Basic mapping</a>, <a href="tasks012.htm#CIHHJEBJ">Element collection mapping</a>, <a href="tasks015.htm#BABGCBHG">ID mapping</a>, <a href="tasks016.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks018.htm#BABHGEBD">One-to-many mapping</a>, and <a href="tasks021.htm#BABHIBII">Version mapping</a></p>
</td>
-<td align="left" headers="r2c1-t45 r1c3-t45"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t45" headers="r1c1-t45">
-<p>Schema</p>
+<td align="left" id="r3c1-t43" headers="r1c1-t43">
+<p>Name</p>
</td>
-<td align="left" headers="r3c1-t45 r1c2-t45">
-<p>The database schema that contains the <span class="bold">Table</span>.</p>
-<p>This field corresponds to the <code>&lt;schema&gt;</code> element in the <code>orm.xml</code> file.</p>
+<td align="left" headers="r3c1-t43 r1c2-t43">
+<p>Name of the converter.</p>
</td>
-<td align="left" headers="r3c1-t45 r1c3-t45"><br /></td>
+<td align="left" headers="r3c1-t43 r1c3-t43"><br /></td>
+<td align="left" headers="r3c1-t43 r1c4-t43"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t45" headers="r1c1-t45">
-<p>Catalog</p>
+<td align="left" id="r4c1-t43" headers="r1c1-t43">
+<p>Class</p>
</td>
-<td align="left" headers="r4c1-t45 r1c2-t45">
-<p>The database catalog that contains the <span class="bold">Table</span>.</p>
-<p>This field corresponds to the <code>&lt;catalog&gt;</code> element in the <code>orm.xml</code> file.</p>
+<td align="left" headers="r4c1-t43 r1c2-t43">
+<p>Appears for <span class="bold">Custom</span> and <span class="bold">Struct</span> converters only.</p>
</td>
-<td align="left" headers="r4c1-t45 r1c3-t45"><br /></td>
+<td align="left" headers="r4c1-t43 r1c3-t43"><br /></td>
+<td align="left" headers="r4c1-t43 r1c4-t43"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t45" headers="r1c1-t45">
-<p>Access</p>
+<td align="left" id="r5c1-t43" headers="r1c1-t43">
+<p>Data type</p>
</td>
-<td align="left" headers="r5c1-t45 r1c2-t45">
-<p>Specify the default access method for the variables in the project:</p>
-<ul>
-<li>
-<p>Property</p>
-</li>
-<li>
-<p>Field</p>
-</li>
-</ul>
-<p>This field corresponds to the <code>&lt;access&gt;</code> element in the <code>orm.xml</code> file.</p>
+<td align="left" headers="r5c1-t43 r1c2-t43">
+<p>Appears for <span class="bold">Object Type</span> and <span class="bold">Type</span> converters only.</p>
</td>
-<td align="left" headers="r5c1-t45 r1c3-t45"><br /></td>
+<td align="left" headers="r5c1-t43 r1c3-t43"><br /></td>
+<td align="left" headers="r5c1-t43 r1c4-t43"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t43" headers="r1c1-t43">
+<p>Object type</p>
+</td>
+<td align="left" headers="r6c1-t43 r1c2-t43">
+<p>Appears for <span class="bold">Object Type</span> and <span class="bold">Type</span> converters only.</p>
+</td>
+<td align="left" headers="r6c1-t43 r1c3-t43"><br /></td>
+<td align="left" headers="r6c1-t43 r1c4-t43"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t43" headers="r1c1-t43">
+<p>Conversion values</p>
+</td>
+<td align="left" headers="r7c1-t43 r1c2-t43">
+<p>Appears for <span class="bold">Object Type</span> converters only.</p>
+</td>
+<td align="left" headers="r7c1-t43 r1c3-t43"><br /></td>
+<td align="left" headers="r7c1-t43 r1c4-t43"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t43" headers="r1c1-t43">
+<p>Default object value</p>
+</td>
+<td align="left" headers="r8c1-t43 r1c2-t43">
+<p>Appears for <span class="bold">Object Type</span> converters only.</p>
+</td>
+<td align="left" headers="r8c1-t43 r1c3-t43"><br /></td>
+<td align="left" headers="r8c1-t43 r1c4-t43"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblhruleinformal" -->
-<a id="sthref533" name="sthref533"></a>
-<p class="subhead2">Related tasks</p>
-<ul>
-<li>
-<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
-</li>
-</ul>
-<a id="sthref534" name="sthref534"></a>
+<!-- class="inftblhruleinformalwide" -->
+<a id="sthref541" name="sthref541"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
-<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+<p>"Converter" in <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span><br />
+<code><a href="http://eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_converter.htm">http://eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_converter.htm</a></code></p>
</li>
</ul>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference042.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference042.htm
index b5213266f1..28a8f456c6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference042.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference042.htm
@@ -5,119 +5,114 @@
<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>Persistence Unit</title>
+<title>Ordering</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Persistence Unit" />
+<meta name="doctitle" content="Ordering" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CACEAGBG" name="CACEAGBG"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACBIJFD" name="CACBIJFD"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref535" name="sthref535"></a><a id="sthref536" name="sthref536"></a>Persistence Unit</h1>
-<p>This table lists the Persistence Unit information fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type. These fields are contained in the <code>&lt;persistence-unit-metadata&gt;</code> element in the <code>orm.xml</code> file.</p>
-<div class="inftblhruleinformal">
-<table class="HRuleInformal" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="21%" />
+<h1>Ordering</h1>
+<p><a id="sthref542" name="sthref542"></a><a id="sthref543" name="sthref543"></a><a id="sthref544" name="sthref544"></a>Specify the default order for objects returned from a query. These options correspond to the <code>@OrderBy</code> annotation.</p>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" title="JPA Details view, Advanced page" summary="JPA Details view, Advanced page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="16%" />
<col width="*" />
-<col width="22%" />
+<col width="17%" />
+<col width="25%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t46">Property</th>
-<th align="left" valign="bottom" id="r1c2-t46">Description</th>
-<th align="left" valign="bottom" id="r1c3-t46">Default</th>
+<th align="left" valign="bottom" id="r1c1-t44">Property</th>
+<th align="left" valign="bottom" id="r1c2-t44">Description</th>
+<th align="left" valign="bottom" id="r1c3-t44">Default</th>
+<th align="left" valign="bottom" id="r1c4-t44">Available for Entity&nbsp;Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t46" headers="r1c1-t46">
-<p>XML Mapping Data Complete</p>
+<td align="left" id="r2c1-t44" headers="r1c1-t44">
+<p><span class="bold">None</span></p>
</td>
-<td align="left" headers="r2c1-t46 r1c2-t46">
-<p>Specifies that the Java classes in this persistence unit are fully specified by their metadata. Any annotations will be ignored.</p>
-<p>This field corresponds to the <code>&lt;xml-mapping-metadata-complete&gt;</code> element in the <code>orm.xml</code> file.</p>
+<td align="left" headers="r2c1-t44 r1c2-t44"><br /></td>
+<td align="left" headers="r2c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r2c1-t44 r1c4-t44">
+<p><a href="tasks012.htm#CIHHJEBJ">Element collection mapping</a>, <a href="tasks016.htm#BABEIEGD">Many-to-many mapping</a>, and <a href="tasks018.htm#BABHGEBD">One-to-many mapping</a></p>
</td>
-<td align="left" headers="r2c1-t46 r1c3-t46"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t46" headers="r1c1-t46">
-<p>Cascade Persist</p>
+<td align="left" id="r3c1-t44" headers="r1c1-t44">
+<p><span class="bold">Primary key</span></p>
</td>
-<td align="left" headers="r3c1-t46 r1c2-t46">
-<p>Adds cascade-persist to the set of cascade options in entity relationships of the persistence unit.</p>
-<p>This field corresponds to the <code>&lt;cascade-persist&gt;</code> element in the <code>orm.xml</code> file.</p>
+<td align="left" headers="r3c1-t44 r1c2-t44"><br /></td>
+<td align="left" headers="r3c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r3c1-t44 r1c4-t44"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t44" headers="r1c1-t44">
+<p><span class="bold">Custom</span></p>
+</td>
+<td align="left" headers="r4c1-t44 r1c2-t44"><br /></td>
+<td align="left" headers="r4c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r4c1-t44 r1c4-t44"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t44" headers="r1c1-t44">
+<p><span class="bold">Order column</span></p>
</td>
-<td align="left" headers="r3c1-t46 r1c3-t46"><br /></td>
+<td align="left" headers="r5c1-t44 r1c2-t44"><br /></td>
+<td align="left" headers="r5c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r5c1-t44 r1c4-t44"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t46" headers="r1c1-t46">
-<p>Schema</p>
+<td align="left" id="r6c1-t44" headers="r1c1-t44">
+<p>Insertable</p>
</td>
-<td align="left" headers="r4c1-t46 r1c2-t46">
-<p>The database schema that contains the <span class="bold">Table</span>.</p>
-<p>This field corresponds to the <code>&lt;schema&gt;</code> element in the <code>orm.xml</code> file.</p>
+<td align="left" headers="r6c1-t44 r1c2-t44"><br /></td>
+<td align="left" headers="r6c1-t44 r1c3-t44">
+<p>True</p>
</td>
-<td align="left" headers="r4c1-t46 r1c3-t46"><br /></td>
+<td align="left" headers="r6c1-t44 r1c4-t44"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t46" headers="r1c1-t46">
-<p>Catalog</p>
+<td align="left" id="r7c1-t44" headers="r1c1-t44">
+<p>Updatable</p>
</td>
-<td align="left" headers="r5c1-t46 r1c2-t46">
-<p>The database catalog that contains the <span class="bold">Table</span>.</p>
-<p>This field corresponds to the <code>&lt;catalog&gt;</code> element in the <code>orm.xml</code> file.</p>
+<td align="left" headers="r7c1-t44 r1c2-t44"><br /></td>
+<td align="left" headers="r7c1-t44 r1c3-t44">
+<p>True</p>
</td>
-<td align="left" headers="r5c1-t46 r1c3-t46"><br /></td>
+<td align="left" headers="r7c1-t44 r1c4-t44"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t46" headers="r1c1-t46">
-<p>Access</p>
+<td align="left" id="r8c1-t44" headers="r1c1-t44">
+<p>Nullable</p>
</td>
-<td align="left" headers="r6c1-t46 r1c2-t46">
-<p>Specify how the entity its access instance variables.</p>
-<ul>
-<li>
-<p>Property &ndash; Persistent state accessed through the property accessor methods. The property accessor methods must be <span class="bold">public</span> or <span class="bold">private</span>.</p>
-</li>
-<li>
-<p>Field &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
-</li>
-</ul>
+<td align="left" headers="r8c1-t44 r1c2-t44"><br /></td>
+<td align="left" headers="r8c1-t44 r1c3-t44">
+<p>True</p>
</td>
-<td align="left" headers="r6c1-t46 r1c3-t46"><br /></td>
+<td align="left" headers="r8c1-t44 r1c4-t44"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t46" headers="r1c1-t46">
-<p>Deliminated identifiers</p>
+<td align="left" id="r9c1-t44" headers="r1c1-t44">
+<p>Column definition</p>
</td>
-<td align="left" headers="r7c1-t46 r1c2-t46"><br /></td>
-<td align="left" headers="r7c1-t46 r1c3-t46"><br /></td>
+<td align="left" headers="r9c1-t44 r1c2-t44"><br /></td>
+<td align="left" headers="r9c1-t44 r1c3-t44"><br /></td>
+<td align="left" headers="r9c1-t44 r1c4-t44"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblhruleinformal" -->
-<a id="sthref537" name="sthref537"></a>
-<p class="subhead2">Related tasks</p>
-<ul>
-<li>
-<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
-</li>
-</ul>
-<a id="sthref538" name="sthref538"></a>
-<p class="subhead2">Related reference</p>
-<ul>
-<li>
-<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
-</li>
-</ul>
-</div>
+<!-- class="inftblhruleinformalwide" --></div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference043.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference043.htm
index 8f8e4e148d..2e1c923897 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference043.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference043.htm
@@ -5,177 +5,130 @@
<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>Generators</title>
+<title>Joining Strategy</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Generators" />
+<meta name="doctitle" content="Joining Strategy" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CIAFGAIJ" name="CIAFGAIJ"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACIJEGI" name="CACIJEGI"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref539" name="sthref539"></a><a id="sthref540" name="sthref540"></a>Generators</h1>
-<p>This table lists the Generator fields available in the <span class="gui-object-title">JPA Details</span> view for the <code>orm.xml</code> file.</p>
+<h1><a id="sthref545" name="sthref545"></a><a id="sthref546" name="sthref546"></a>Joining Strategy</h1>
+<p>Use this area to specify a mapped column for joining an entity association. By default, the mapping is assumed to have a single join.</p>
<div class="inftblhruleinformal">
-<table class="HRuleInformal" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="21%" />
+<table class="HRuleInformal" summary="JPA Details view, Type page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="29%" />
<col width="*" />
<col width="24%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t47">Property</th>
-<th align="left" valign="bottom" id="r1c2-t47">Description</th>
-<th align="left" valign="bottom" id="r1c3-t47">Default</th>
+<th align="left" valign="bottom" id="r1c1-t45">Property</th>
+<th align="left" valign="bottom" id="r1c2-t45">Description</th>
+<th align="left" valign="bottom" id="r1c3-t45">Available for Mapping Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t47" headers="r1c1-t47">
-<p><span class="bold">Generators</span></p>
+<td align="left" id="r2c1-t45" headers="r1c1-t45">
+<p><span class="bold">Mapped by</span></p>
</td>
-<td align="left" headers="r2c1-t47 r1c2-t47">
-<p>Click <span class="bold">Add</span> to create a new table or sequence generator, or select an existing generator and click <span class="bold">Remove</span>, to add or remove a generator.</p>
+<td align="left" headers="r2c1-t45 r1c2-t45">
+<p>The field in the database table that "owns" the relationship. This field is required only on the non-owning side of the relationship.</p>
</td>
-<td align="left" headers="r2c1-t47 r1c3-t47"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t47" headers="r1c1-t47">
-<p><span class="bold">Sequence Generators</span></p>
-</td>
-<td align="left" headers="r3c1-t47 r1c2-t47"><br /></td>
-<td align="left" headers="r3c1-t47 r1c3-t47"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t47" headers="r1c1-t47">
-<p>Name</p>
+<td align="left" headers="r2c1-t45 r1c3-t45">
+<p><a href="tasks016.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks018.htm#BABHGEBD">One-to-many mapping</a>, and <a href="tasks019.htm#BABFHBCJ">One-to-one mapping</a></p>
</td>
-<td align="left" headers="r4c1-t47 r1c2-t47"><br /></td>
-<td align="left" headers="r4c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t47" headers="r1c1-t47">
-<p>Sequence</p>
+<td align="left" id="r3c1-t45" headers="r1c1-t45">
+<p>Attribute</p>
</td>
-<td align="left" headers="r5c1-t47 r1c2-t47"><br /></td>
-<td align="left" headers="r5c1-t47 r1c3-t47"><br /></td>
+<td align="left" headers="r3c1-t45 r1c2-t45"><br /></td>
+<td align="left" headers="r3c1-t45 r1c3-t45"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t47" headers="r1c1-t47">
-<p>Schema</p>
+<td align="left" id="r4c1-t45" headers="r1c1-t45">
+<p><span class="bold">Primary key join columns</span></p>
</td>
-<td align="left" headers="r6c1-t47 r1c2-t47"><br /></td>
-<td align="left" headers="r6c1-t47 r1c3-t47"><br /></td>
+<td align="left" headers="r4c1-t45 r1c2-t45"><br /></td>
+<td align="left" headers="r4c1-t45 r1c3-t45">
+<p><a href="tasks019.htm#BABFHBCJ">One-to-one mapping</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t47" headers="r1c1-t47">
-<p>Catalog</p>
+<td align="left" id="r5c1-t45" headers="r1c1-t45">
+<p><span class="bold">Join columns</span></p>
</td>
-<td align="left" headers="r7c1-t47 r1c2-t47"><br /></td>
-<td align="left" headers="r7c1-t47 r1c3-t47"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t47" headers="r1c1-t47">
-<p>Allocation size</p>
+<td align="left" headers="r5c1-t45 r1c2-t45">
+<p><a id="sthref547" name="sthref547"></a><a id="sthref548" name="sthref548"></a>By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</p>
+<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
</td>
-<td align="left" headers="r8c1-t47 r1c2-t47"><br /></td>
-<td align="left" headers="r8c1-t47 r1c3-t47">
-<p>50</p>
+<td align="left" headers="r5c1-t45 r1c3-t45">
+<p><a href="tasks017.htm#BABHFAFJ">Many-to-one mapping</a>, <a href="tasks018.htm#BABHGEBD">One-to-many mapping</a>, and <a href="tasks019.htm#BABFHBCJ">One-to-one mapping</a></p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t47" headers="r1c1-t47">
-<p>Initial value</p>
+<td align="left" id="r6c1-t45" headers="r1c1-t45">
+<p><span class="bold">Join table</span></p>
</td>
-<td align="left" headers="r9c1-t47 r1c2-t47"><br /></td>
-<td align="left" headers="r9c1-t47 r1c3-t47">
-<p>1</p>
+<td align="left" headers="r6c1-t45 r1c2-t45">
+<p>Name of the join table that contains the foreign key column.You must specify the join table on the owning side.</p>
+<p>By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</p>
</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r10c1-t47" headers="r1c1-t47">
-<p><span class="bold">Table Generators</span></p>
+<td align="left" headers="r6c1-t45 r1c3-t45">
+<p><a href="tasks016.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks017.htm#BABHFAFJ">Many-to-one mapping</a>, <a href="tasks018.htm#BABHGEBD">One-to-many mapping</a>, and <a href="tasks019.htm#BABFHBCJ">One-to-one mapping</a></p>
</td>
-<td align="left" headers="r10c1-t47 r1c2-t47"><br /></td>
-<td align="left" headers="r10c1-t47 r1c3-t47"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r11c1-t47" headers="r1c1-t47">
+<td align="left" id="r7c1-t45" headers="r1c1-t45">
<p>Name</p>
</td>
-<td align="left" headers="r11c1-t47 r1c2-t47"><br /></td>
-<td align="left" headers="r11c1-t47 r1c3-t47"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r12c1-t47" headers="r1c1-t47">
-<p>Table</p>
-</td>
-<td align="left" headers="r12c1-t47 r1c2-t47"><br /></td>
-<td align="left" headers="r12c1-t47 r1c3-t47"><br /></td>
+<td align="left" headers="r7c1-t45 r1c2-t45"><br /></td>
+<td align="left" headers="r7c1-t45 r1c3-t45"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r13c1-t47" headers="r1c1-t47">
+<td align="left" id="r8c1-t45" headers="r1c1-t45">
<p>Schema</p>
</td>
-<td align="left" headers="r13c1-t47 r1c2-t47"><br /></td>
-<td align="left" headers="r13c1-t47 r1c3-t47"><br /></td>
+<td align="left" headers="r8c1-t45 r1c2-t45"><br /></td>
+<td align="left" headers="r8c1-t45 r1c3-t45"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r14c1-t47" headers="r1c1-t47">
+<td align="left" id="r9c1-t45" headers="r1c1-t45">
<p>Catalog</p>
</td>
-<td align="left" headers="r14c1-t47 r1c2-t47"><br /></td>
-<td align="left" headers="r14c1-t47 r1c3-t47"><br /></td>
+<td align="left" headers="r9c1-t45 r1c2-t45"><br /></td>
+<td align="left" headers="r9c1-t45 r1c3-t45"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r15c1-t47" headers="r1c1-t47">
-<p>Primary key column value</p>
+<td align="left" id="r10c1-t45" headers="r1c1-t45">
+<p>Join columns</p>
</td>
-<td align="left" headers="r15c1-t47 r1c2-t47"><br /></td>
-<td align="left" headers="r15c1-t47 r1c3-t47"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r16c1-t47" headers="r1c1-t47">
-<p>Allocation size</p>
-</td>
-<td align="left" headers="r16c1-t47 r1c2-t47"><br /></td>
-<td align="left" headers="r16c1-t47 r1c3-t47">
-<p>50</p>
+<td align="left" headers="r10c1-t45 r1c2-t45">
+<p>Mapped by</p>
</td>
+<td align="left" headers="r10c1-t45 r1c3-t45"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r17c1-t47" headers="r1c1-t47">
-<p>Initial value</p>
+<td align="left" id="r11c1-t45" headers="r1c1-t45">
+<p>Inverse join columns</p>
</td>
-<td align="left" headers="r17c1-t47 r1c2-t47"><br /></td>
-<td align="left" headers="r17c1-t47 r1c3-t47">
-<p>1</p>
+<td align="left" headers="r11c1-t45 r1c2-t45">
+<p>Mapped by</p>
</td>
+<td align="left" headers="r11c1-t45 r1c3-t45"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblhruleinformal" -->
-<a id="sthref541" name="sthref541"></a>
-<p class="subhead2">Related tasks</p>
-<ul>
-<li>
-<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
-</li>
-</ul>
-<a id="sthref542" name="sthref542"></a>
-<p class="subhead2">Related reference</p>
-<ul>
-<li>
-<p><a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
-</li>
-</ul>
-</div>
+<!-- class="inftblhruleinformal" --></div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference044.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference044.htm
index 4109728065..d9fd996109 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference044.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference044.htm
@@ -5,135 +5,66 @@
<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>Queries</title>
+<title>Derived Identity</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:27:59Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Queries" />
+<meta name="doctitle" content="Derived Identity" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CIAIBAAJ" name="CIAIBAAJ"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACGHHGB" name="CACGHHGB"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref543" name="sthref543"></a><a id="sthref544" name="sthref544"></a><a id="sthref545" name="sthref545"></a><a id="sthref546" name="sthref546"></a><a id="sthref547" name="sthref547"></a><a id="sthref548" name="sthref548"></a><a id="sthref549" name="sthref549"></a>Queries</h1>
-<p>This table lists the Query information fields available in the <span class="gui-object-title">JPA Details</span> view for the <code>orm.xml</code> file.</p>
+<h1><a id="sthref549" name="sthref549"></a><a id="sthref550" name="sthref550"></a>Derived Identity</h1>
<div class="inftblhruleinformal">
-<table class="HRuleInformal" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="21%" />
+<table class="HRuleInformal" summary="JPA Details view, Type page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="29%" />
<col width="*" />
-<col width="23%" />
+<col width="24%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t48">Property</th>
-<th align="left" valign="bottom" id="r1c2-t48">Description</th>
-<th align="left" valign="bottom" id="r1c3-t48">Default</th>
+<th align="left" valign="bottom" id="r1c1-t46">Property</th>
+<th align="left" valign="bottom" id="r1c2-t46">Description</th>
+<th align="left" valign="bottom" id="r1c3-t46">Available for Mapping Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t48" headers="r1c1-t48">
-<p><span class="bold">Queries</span></p>
-</td>
-<td align="left" headers="r2c1-t48 r1c2-t48">
-<p>Displays the existing Named and Native queries.</p>
-<p>Click <span class="bold">Add</span> to add a named query, or <span class="bold">Add Native</span> for a native query.</p>
-<p>For named queries, enter the query in the Query field.</p>
-<p>For native queries, select a result class, then enter the query in the Query field.</p>
-</td>
-<td align="left" headers="r2c1-t48 r1c3-t48"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t48" headers="r1c1-t48">
-<p><span class="bold">Named Queries</span></p>
-</td>
-<td align="left" headers="r3c1-t48 r1c2-t48"><br /></td>
-<td align="left" headers="r3c1-t48 r1c3-t48"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t48" headers="r1c1-t48">
-<p>Name</p>
-</td>
-<td align="left" headers="r4c1-t48 r1c2-t48"><br /></td>
-<td align="left" headers="r4c1-t48 r1c3-t48"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t48" headers="r1c1-t48">
-<p>Query</p>
-</td>
-<td align="left" headers="r5c1-t48 r1c2-t48"><br /></td>
-<td align="left" headers="r5c1-t48 r1c3-t48"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t48" headers="r1c1-t48">
-<p>Lock mode</p>
-</td>
-<td align="left" headers="r6c1-t48 r1c2-t48"><br /></td>
-<td align="left" headers="r6c1-t48 r1c3-t48">
+<td align="left" id="r2c1-t46" headers="r1c1-t46">
<p>None</p>
</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t48" headers="r1c1-t48">
-<p><span class="bold">Native Queries</span></p>
+<td align="left" headers="r2c1-t46 r1c2-t46"><br /></td>
+<td align="left" headers="r2c1-t46 r1c3-t46">
+<p><a href="tasks017.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks019.htm#BABFHBCJ">One-to-one mapping</a></p>
</td>
-<td align="left" headers="r7c1-t48 r1c2-t48"><br /></td>
-<td align="left" headers="r7c1-t48 r1c3-t48"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t48" headers="r1c1-t48">
-<p>Name</p>
+<td align="left" id="r3c1-t46" headers="r1c1-t46">
+<p>ID</p>
</td>
-<td align="left" headers="r8c1-t48 r1c2-t48"><br /></td>
-<td align="left" headers="r8c1-t48 r1c3-t48"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r9c1-t48" headers="r1c1-t48">
-<p>Result class</p>
+<td align="left" headers="r3c1-t46 r1c2-t46"><br /></td>
+<td align="left" headers="r3c1-t46 r1c3-t46">
+<p><a href="tasks017.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks019.htm#BABFHBCJ">One-to-one mapping</a></p>
</td>
-<td align="left" headers="r9c1-t48 r1c2-t48"><br /></td>
-<td align="left" headers="r9c1-t48 r1c3-t48"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r10c1-t48" headers="r1c1-t48">
-<p>Query</p>
+<td align="left" id="r4c1-t46" headers="r1c1-t46">
+<p>Maps ID</p>
</td>
-<td align="left" headers="r10c1-t48 r1c2-t48"><br /></td>
-<td align="left" headers="r10c1-t48 r1c3-t48"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r11c1-t48" headers="r1c1-t48">
-<p><span class="bold">Query Hints</span></p>
+<td align="left" headers="r4c1-t46 r1c2-t46"><br /></td>
+<td align="left" headers="r4c1-t46 r1c3-t46">
+<p><a href="tasks017.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks019.htm#BABFHBCJ">One-to-one mapping</a></p>
</td>
-<td align="left" headers="r11c1-t48 r1c2-t48">
-<p>Displays the existing query hints (Name and Value).</p>
-<p>Click <span class="bold">Add</span> to add a new query hint.</p>
-</td>
-<td align="left" headers="r11c1-t48 r1c3-t48"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblhruleinformal" -->
-<a id="sthref550" name="sthref550"></a>
-<p class="subhead2">Related tasks</p>
-<ul>
-<li>
-<p><a href="tasks009.htm#BABIGBGG">Creating queries</a></p>
-</li>
-</ul>
-<a id="sthref551" name="sthref551"></a>
-<p class="subhead2">Related reference</p>
-<ul>
-<li>
-<p><a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
-</li>
-</ul>
-</div>
+<!-- class="inftblhruleinformal" --></div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference045.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference045.htm
index 18ae5ae3f7..e0dbf9e54c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference045.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference045.htm
@@ -5,34 +5,103 @@
<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>Converters</title>
+<title>Entity Mappings</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:28:0Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Converters" />
+<meta name="doctitle" content="Entity Mappings" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CIADGCID" name="CIADGCID"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACCACGH" name="CACCACGH"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Converters</h1>
-<p><a id="sthref552" name="sthref552"></a>The Converters information in the JPA Details view applies only when using EclipseLink.</p>
-<p>Click <span class="bold">Add</span> to create a new converter, using the <a href="ref_add_converter.htm#CIAGCGIJ">Add Converter dialog</a>.</p>
-<a id="sthref553" name="sthref553"></a>
+<h1>Entity Mappings</h1>
+<p>This table lists the Entity Mappings fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="21%" />
+<col width="*" />
+<col width="22%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t48">Property</th>
+<th align="left" valign="bottom" id="r1c2-t48">Description</th>
+<th align="left" valign="bottom" id="r1c3-t48">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t48" headers="r1c1-t48">
+<p>Package</p>
+</td>
+<td align="left" headers="r2c1-t48 r1c2-t48">
+<p>The Java package that contains the persistent entities. Click <span class="bold">Browse</span> and select the package</p>
+</td>
+<td align="left" headers="r2c1-t48 r1c3-t48"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t48" headers="r1c1-t48">
+<p>Schema</p>
+</td>
+<td align="left" headers="r3c1-t48 r1c2-t48">
+<p>The database schema that contains the <span class="bold">Table</span>.</p>
+<p>This field corresponds to the <code>&lt;schema&gt;</code> element in the <code>orm.xml</code> file.</p>
+</td>
+<td align="left" headers="r3c1-t48 r1c3-t48"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t48" headers="r1c1-t48">
+<p>Catalog</p>
+</td>
+<td align="left" headers="r4c1-t48 r1c2-t48">
+<p>The database catalog that contains the <span class="bold">Table</span>.</p>
+<p>This field corresponds to the <code>&lt;catalog&gt;</code> element in the <code>orm.xml</code> file.</p>
+</td>
+<td align="left" headers="r4c1-t48 r1c3-t48"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t48" headers="r1c1-t48">
+<p>Access</p>
+</td>
+<td align="left" headers="r5c1-t48 r1c2-t48">
+<p>Specify the default access method for the variables in the project:</p>
+<ul>
+<li>
+<p>Property</p>
+</li>
+<li>
+<p>Field</p>
+</li>
+</ul>
+<p>This field corresponds to the <code>&lt;access&gt;</code> element in the <code>orm.xml</code> file.</p>
+</td>
+<td align="left" headers="r5c1-t48 r1c3-t48"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref560" name="sthref560"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+</ul>
+<a id="sthref561" name="sthref561"></a>
<p class="subhead2">Related reference</p>
<ul>
<li>
-<p><a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
</ul>
</div>
<!-- class="sect3" -->
-<!-- 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/reference046.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference046.htm
index 081dde8587..87195f704f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference046.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference046.htm
@@ -5,238 +5,116 @@
<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>Connection</title>
+<title>Persistence Unit</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:28:0Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Connection" />
+<meta name="doctitle" content="Persistence Unit" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
-<meta name="topic-id" content="ref_persistence_connection" />
<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" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-09-13</p>
-<p><a id="CIAFFJIE" name="CIAFFJIE"></a><a id="ref_persistence_connection" name="ref_persistence_connection"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-19</p>
+<p><a id="CACEAGBG" name="CACEAGBG"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Connection</h1>
-<p><a id="sthref563" name="sthref563"></a>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>
+<h1><a id="sthref562" name="sthref562"></a><a id="sthref563" name="sthref563"></a>Persistence Unit</h1>
+<p>This table lists the Persistence Unit information fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type. These fields are contained in the <code>&lt;persistence-unit-metadata&gt;</code> element in the <code>orm.xml</code> file.</p>
<div class="inftblhruleinformal">
-<table class="HRuleInformal" summary="The following table lists the properties available in the Connection page of the persistence.xml Editor." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="25%" />
+<table class="HRuleInformal" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="21%" />
<col width="*" />
-<col width="24%" />
+<col width="22%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t50">Property</th>
-<th align="left" valign="bottom" id="r1c2-t50">Description</th>
-<th align="left" valign="bottom" id="r1c3-t50">Default</th>
+<th align="left" valign="bottom" id="r1c1-t49">Property</th>
+<th align="left" valign="bottom" id="r1c2-t49">Description</th>
+<th align="left" valign="bottom" id="r1c3-t49">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t50" headers="r1c1-t50">
-<p>Transaction type<a id="sthref564" name="sthref564"></a></p>
+<td align="left" id="r2c1-t49" headers="r1c1-t49">
+<p>XML Mapping Data Complete</p>
</td>
-<td align="left" headers="r2c1-t50 r1c2-t50">
-<p>Specify if the connection for this persistence unit uses one of the following transaction types:</p>
-<ul>
-<li>
-<p><span class="bold">Default</span> -- Select to use the container used by the container.</p>
-</li>
-<li>
-<p><span class="bold">JTA</span> (Java Transaction API) -- Transactions of the Java EE server.</p>
-</li>
-<li>
-<p><span class="bold">Resource Local</span> -- Native actions of a JDBC driver that are referenced by a persistence unit.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r2c1-t50 r1c3-t50">
-<p>JTA</p>
+<td align="left" headers="r2c1-t49 r1c2-t49">
+<p>Specifies that the Java classes in this persistence unit are fully specified by their metadata. Any annotations will be ignored.</p>
+<p>This field corresponds to the <code>&lt;xml-mapping-metadata-complete&gt;</code> element in the <code>orm.xml</code> file.</p>
</td>
+<td align="left" headers="r2c1-t49 r1c3-t49"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t50" headers="r1c1-t50">
-<p>Batch writing<a id="sthref565" name="sthref565"></a></p>
+<td align="left" id="r3c1-t49" headers="r1c1-t49">
+<p>Cascade Persist</p>
</td>
-<td align="left" headers="r3c1-t50 r1c2-t50">
-<p>Specify the use of batch writing to optimize transactions with multiple write operations.</p>
-<p>Set the value of this property into the session at deployment time.</p>
-<p><span class="bold">Note</span>: This property applies when used both in a Java SE and Java EE environment.</p>
-<p>The following are the valid values for oracle.toplink.config.BatchWriting:</p>
-<ul>
-<li>
-<p><span class="bold">JDBC</span>&ndash;Use JDBC batch writing.</p>
-</li>
-<li>
-<p><span class="bold">Buffered</span>&ndash;Do not use either JDBC batch writing nor native platform batch writing.</p>
-</li>
-<li>
-<p><span class="bold">OracleJDBC</span>&ndash;Use both JDBC batch writing and Oracle native platform batch writing.</p>
-</li>
-<li>
-<p><span class="bold">None</span>&ndash;Do not use batch writing (turn it off).</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r3c1-t50 r1c3-t50">
-<p>None</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t50" headers="r1c1-t50">
-<p>Statement caching</p>
-</td>
-<td align="left" headers="r4c1-t50 r1c2-t50">
-<p>Specify if the query caches its JDBC statement. If enabled, you can also set the number of statements to cache.</p>
-</td>
-<td align="left" headers="r4c1-t50 r1c3-t50">
-<p>50</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t50" headers="r1c1-t50">
-<p>Native SQL</p>
-</td>
-<td align="left" headers="r5c1-t50 r1c2-t50">
-<p>Specify if Dali includes platform-specific (that is, "native") SQL statements. If false, Dali uses generic SLQ.</p>
-</td>
-<td align="left" headers="r5c1-t50 r1c3-t50">
-<p>False</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t50" headers="r1c1-t50">
-<p><span class="bold">Database</span></p>
+<td align="left" headers="r3c1-t49 r1c2-t49">
+<p>Adds cascade-persist to the set of cascade options in entity relationships of the persistence unit.</p>
+<p>This field corresponds to the <code>&lt;cascade-persist&gt;</code> element in the <code>orm.xml</code> file.</p>
</td>
-<td align="left" headers="r6c1-t50 r1c2-t50"><br /></td>
-<td align="left" headers="r6c1-t50 r1c3-t50"><br /></td>
+<td align="left" headers="r3c1-t49 r1c3-t49"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t50" headers="r1c1-t50">
-<p>JTA Data Source Name</p>
+<td align="left" id="r4c1-t49" headers="r1c1-t49">
+<p>Schema</p>
</td>
-<td align="left" headers="r7c1-t50 r1c2-t50">
-<p>If you selected <span class="bold">JTA</span> as the transaction type, then enter the name of the default JTA data source for the persistence unit.</p>
+<td align="left" headers="r4c1-t49 r1c2-t49">
+<p>The database schema that contains the <span class="bold">Table</span>.</p>
+<p>This field corresponds to the <code>&lt;schema&gt;</code> element in the <code>orm.xml</code> file.</p>
</td>
-<td align="left" headers="r7c1-t50 r1c3-t50"><br /></td>
+<td align="left" headers="r4c1-t49 r1c3-t49"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t50" headers="r1c1-t50">
-<p>Non-JTA Data Source Name</p>
+<td align="left" id="r5c1-t49" headers="r1c1-t49">
+<p>Catalog</p>
</td>
-<td align="left" headers="r8c1-t50 r1c2-t50">
-<p>If you selected <span class="bold">Resource Local</span> as the transaction type, then enter the name of the non-JTA data source.</p>
-<p>This property is not available for projects using the <span class="bold">Generic</span> platform.</p>
+<td align="left" headers="r5c1-t49 r1c2-t49">
+<p>The database catalog that contains the <span class="bold">Table</span>.</p>
+<p>This field corresponds to the <code>&lt;catalog&gt;</code> element in the <code>orm.xml</code> file.</p>
</td>
-<td align="left" headers="r8c1-t50 r1c3-t50"><br /></td>
+<td align="left" headers="r5c1-t49 r1c3-t49"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t50" headers="r1c1-t50">
-<p><span class="bold">EclipseLink connection pool</span></p>
+<td align="left" id="r6c1-t49" headers="r1c1-t49">
+<p>Access</p>
</td>
-<td align="left" headers="r9c1-t50 r1c2-t50">
-<p>Define the connection pool driver, URL, user name and password.</p>
-<p>These properties are note available for projects using the Generic platform.</p>
-</td>
-<td align="left" headers="r9c1-t50 r1c3-t50"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r10c1-t50" headers="r1c1-t50">
-<p>Bind parameters</p>
-</td>
-<td align="left" headers="r10c1-t50 r1c2-t50">
-<p>Control whether or not the query uses parameter binding.</p>
-<p>Note: This property applies when used in a Java SE environment.</p>
-<p>This property is not available for projects using the Generic platform.</p>
-</td>
-<td align="left" headers="r10c1-t50 r1c3-t50">
-<p>True</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r11c1-t50" headers="r1c1-t50">
-<p>Read Connection</p>
-</td>
-<td align="left" headers="r11c1-t50 r1c2-t50">
-<p>The maximum and minimum number of connections allowed in the JDBC read connection pool.</p>
-<p><span class="bold">Note</span>: These property apply when used in a Java SE environment.</p>
-<p>These properties are not available for projects using the Generic platform</p>
-</td>
-<td align="left" headers="r11c1-t50 r1c3-t50">
-<p>Minimum: 2</p>
-<p>Maximum 2</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r12c1-t50" headers="r1c1-t50">
-<p>Write Connection</p>
-</td>
-<td align="left" headers="r12c1-t50 r1c2-t50">
-<p>The maximum and minimum number of connections allowed in the JDBC read connection pool.</p>
-<p><span class="bold">Note</span>: These property apply when used in a Java SE environment.</p>
-<p>These properties are not available for projects using the Generic platform</p>
-</td>
-<td align="left" headers="r12c1-t50 r1c3-t50">
-<p>Minimum: 5</p>
-<p>Maximum 10</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r13c1-t50" headers="r1c1-t50">
-<p><span class="bold">Exclusive connections</span></p>
-</td>
-<td align="left" headers="r13c1-t50 r1c2-t50">
-<p>These fields are available only when <span class="bold">Transaction Type</span> is <span class="bold">Local Resource</span>.</p>
-</td>
-<td align="left" headers="r13c1-t50 r1c3-t50"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r14c1-t50" headers="r1c1-t50">
-<p>Exclusive connection mode</p>
-</td>
-<td align="left" headers="r14c1-t50 r1c2-t50">
-<p>Specify when Dali performs reads through the write connection.</p>
+<td align="left" headers="r6c1-t49 r1c2-t49">
+<p>Specify how the entity its access instance variables.</p>
<ul>
<li>
-<p>Always &ndash; Create an exclusive isolated client session if reading an isolated entity, otherwise create an exclusive client session.</p>
-</li>
-<li>
-<p>Isolated &ndash; Create an exclusive isolated client session if reading an isolated entity, otherwise raise an error.</p>
+<p>Property &ndash; Persistent state accessed through the property accessor methods. The property accessor methods must be <span class="bold">public</span> or <span class="bold">private</span>.</p>
</li>
<li>
-<p>Transactional &ndash; Create an isolated client session if some or all entities require isolated cache, otherwise create a client session.</p>
+<p>Field &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
</li>
</ul>
</td>
-<td align="left" headers="r14c1-t50 r1c3-t50">
-<p>Transactional</p>
-</td>
+<td align="left" headers="r6c1-t49 r1c3-t49"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r15c1-t50" headers="r1c1-t50">
-<p>Lazy connection acquisition</p>
-</td>
-<td align="left" headers="r15c1-t50 r1c2-t50">
-<p>Specify if Dali acquires write connections lazily.</p>
-</td>
-<td align="left" headers="r15c1-t50 r1c3-t50">
-<p>True</p>
+<td align="left" id="r7c1-t49" headers="r1c1-t49">
+<p>Deliminated identifiers</p>
</td>
+<td align="left" headers="r7c1-t49 r1c2-t49"><br /></td>
+<td align="left" headers="r7c1-t49 r1c3-t49"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblhruleinformal" -->
-<a id="sthref566" name="sthref566"></a>
-<p class="subhead2">Related references</p>
+<a id="sthref564" name="sthref564"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+</ul>
+<a id="sthref565" name="sthref565"></a>
+<p class="subhead2">Related reference</p>
<ul>
<li>
-<p><span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span><br />
-<code><a href="http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/toc.htm">http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/toc.htm</a></code></p>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
</ul>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference047.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference047.htm
index 16d8f50f5f..49e51d0689 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference047.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference047.htm
@@ -5,219 +5,174 @@
<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>Customization</title>
+<title>Generators</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 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" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-09-13T10:27:42Z" />
+<meta name="date" content="2012-09-19T13:28:0Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Customization" />
+<meta name="doctitle" content="Generators" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
-<meta name="topic-id" content="ref_persistence_customization" />