Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornhauge2009-05-01 16:46:16 +0000
committernhauge2009-05-01 16:46:16 +0000
commit90f3473eab3ed00defabb45147d9b8f2c1dbeb9d (patch)
tree8d7f7268303fcfa830a027f05cccfbbc61cb32bf /jpa/plugins
parent97b0550847a242f73d11c3bcfeb8edec8939d9b8 (diff)
downloadwebtools.dali-90f3473eab3ed00defabb45147d9b8f2c1dbeb9d.tar.gz
webtools.dali-90f3473eab3ed00defabb45147d9b8f2c1dbeb9d.tar.xz
webtools.dali-90f3473eab3ed00defabb45147d9b8f2c1dbeb9d.zip
261107 - Update docs for 2.2 release.
Diffstat (limited to 'jpa/plugins')
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/about.htm21
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/build.properties22
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm17
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm19
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm20
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm15
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm19
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm32
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml195
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm15
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm30
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm17
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm28
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm46
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/address.java_jpa_details.pngbin11748 -> 13804 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/change_connection_profile.pngbin27031 -> 0 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/column_support_new.pngbin12713 -> 0 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/convert_java_project_new.pngbin16438 -> 0 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_new.pngbin23710 -> 0 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_wizard.pngbin23711 -> 21428 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_fields.pngbin21704 -> 21454 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/customize_default_entity_generation.pngbin0 -> 27589 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/customize_individual_entities.pngbin0 -> 24998 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/entering_query_new.pngbin6361 -> 0 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/generate_entities.pngbin6223 -> 11583 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/icon_basicmapmappings.pngbin0 -> 361 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/inheritance_tab.pngbin4236 -> 8101 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/java_editor_address.pngbin7823 -> 8380 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/mapped_entity_type_link.pngbin11725 -> 14896 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/modify_faceted_project.pngbin0 -> 29455 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_facet_task.pngbin26085 -> 27810 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_task.pngbin25449 -> 26097 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/open_persistence_editor.pngbin12520 -> 0 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_new.pngbin14334 -> 0 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_xml_editor.pngbin2899 -> 0 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/project_properties_tasks.pngbin22916 -> 27611 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/quickstart_project.pngbin9094 -> 9676 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/secondary_tables.pngbin1750 -> 4408 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_mapping.pngbin20509 -> 22231 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/select_tables.pngbin0 -> 21639 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/synchornize_classes.pngbin16378 -> 10643 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/table_associations.pngbin0 -> 26207 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/task_entering_query.pngbin6361 -> 8657 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/index.xml661
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/legal.htm19
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm115
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm117
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_add_converter.htm78
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_association_cardinality.htm65
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_association_table.htm74
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_create_custom_entities_wizard.htm53
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_create_jpa_entity_wizard.htm46
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_create_new_association_wizard.htm (renamed from jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm)38
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_customizIndividualEntities.htm89
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm96
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm28
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_eclipselink_mapping_file.htm81
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_java_page.htm74
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_join_columns.htm50
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm91
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm205
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project.htm35
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project_wizard.htm20
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_general.htm119
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm21
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_outline.htm19
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm17
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_prop_view.htm25
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_xmll_editor.htm82
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_primary_key.htm100
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_project_properties.htm66
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm79
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_select_cascade_dialog.htm (renamed from jpa/plugins/org.eclipse.jpt.doc.user/whats_new008.htm)33
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm78
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference.htm27
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm26
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm32
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm131
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm100
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm40
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm133
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm69
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm51
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm100
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm56
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm65
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm81
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm78
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm86
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm72
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm70
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm85
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm180
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm210
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm192
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm242
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm217
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm194
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm111
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm131
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm34
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm46
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm61
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm27
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm112
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm59
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm107
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm59
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm23
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm38
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_create_jpa_entity.htm160
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm53
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_generate_entities.htm72
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm66
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm24
-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.htm36
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm28
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm139
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm66
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm72
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm75
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm86
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm81
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm69
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm70
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm176
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm134
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm62
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm125
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm154
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm129
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm151
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm150
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm107
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm104
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm142
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm65
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm51
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks022.htm93
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm81
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm58
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm87
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tips_and_tricks.htm19
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/toc.xml195
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm37
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm45
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm42
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm40
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm40
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm40
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new006.htm41
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new007.htm48
155 files changed, 5762 insertions, 4346 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF
index 7f327f0c93..7ebc2cb9f4 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.doc.user;singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.help;bundle-version="[3.3.100,4.0.0)",
org.eclipse.ui.cheatsheets;bundle-version="[3.3.100,4.0.0)"
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/about.htm b/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
index 6c3af6e2fe..6f6a7fb93e 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
@@ -2,28 +2,26 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:55 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>About this content</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>About this content</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:54Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="About this content" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref257" name="sthref257"></a>
+<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref288" name="sthref288"></a>
<h1>About this content</h1>
-<p>January, 2008</p>
-<a id="sthref258" name="sthref258"></a>
+<p>December, 2008</p>
+<a id="sthref289" name="sthref289"></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>
@@ -32,8 +30,11 @@
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/build.properties b/jpa/plugins/org.eclipse.jpt.doc.user/build.properties
index 4ecd752108..a6040bc733 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/build.properties
@@ -111,5 +111,25 @@ bin.includes = cheatsheets/,\
whats_new005.htm,\
whats_new006.htm,\
whats_new007.htm,\
- whats_new008.htm
+ whats_new008.htm,\
+ ref_persistence_xmll_editor.htm,\
+ reference035.htm,\
+ ref_EntityClassPage.htm,\
+ ref_EntityPropertiesPage.htm,\
+ ref_add_converter.htm,\
+ ref_association_cardinality.htm,\
+ ref_association_table.htm,\
+ ref_create_custom_entities_wizard.htm,\
+ ref_create_jpa_entity_wizard.htm,\
+ ref_create_new_association_wizard.htm,\
+ ref_customizIndividualEntities.htm,\
+ ref_customizeDefaultEntityGeneration.htm,\
+ ref_eclipselink_mapping_file.htm,\
+ ref_java_page.htm,\
+ ref_join_columns.htm,\
+ ref_persistence_general.htm,\
+ ref_selectTables.htm,\
+ ref_select_cascade_dialog.htm,\
+ ref_tableAssociations.htm,\
+ task_create_jpa_entity.htm
generateSourceBundle=false
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 4063527779..845216db68 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm
@@ -2,28 +2,26 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Understanding OR mappings</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Understanding OR mappings</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Understanding OR mappings" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<p><a id="BABBDJFI" name="BABBDJFI"></a></p>
<div class="sect1">
<h1>Understanding OR mappings</h1>
-<p><a id="sthref20" name="sthref20"></a><a id="sthref21" name="sthref21"></a>The Dali OR (object-relational) Mapping Tool allows you to describe how your entity objects <span class="italic">map</span> to the data source (or other objects). This approach isolates persistence information from the object model&ndash;developers are free to design their ideal object model, and DBAs are free to design their ideal schema.</p>
+<p><a id="sthref21" name="sthref21"></a><a id="sthref22" name="sthref22"></a>The Dali OR (object-relational) Mapping Tool allows you to describe how your entity objects <span class="italic">map</span> to the data source (or other objects). This approach isolates persistence information from the object model&ndash;developers are free to design their ideal object model, and DBAs are free to design their ideal schema.</p>
<p>These mappings transform an object data member type to a corresponding relational database data source representation. These OR mappings can also transform object data members that reference other domain objects stored in other tables in the database and are related through foreign keys.</p>
<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>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
@@ -35,8 +33,11 @@
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
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 d1fc4cdf05..ccc22cb40d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm
@@ -2,36 +2,37 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Understanding Java persistence</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Understanding Java persistence</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Understanding Java persistence" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<p><a id="BABCAHIC" name="BABCAHIC"></a></p>
<div class="sect1">
<h1>Understanding Java persistence</h1>
-<p><a id="sthref18" name="sthref18"></a><span class="italic">Persistence</span> refers to the ability to store objects in a database and use those objects with transactional integrity. In a J2EE application, data is typically stored and persisted in the data tier, in a relational database.</p>
-<p><a id="sthref19" name="sthref19"></a><span class="italic">Entity beans</span> are enterprise beans that contain persistent data and that can be saved in various persistent data stores. The entity beans represent data from a database; each entity bean carries its own identity. Entity beans can be deployed using <span class="italic">application-managed persistence</span> or <span class="italic">container-managed persistence</span>.</p>
+<p><a id="sthref19" name="sthref19"></a><span class="italic">Persistence</span> refers to the ability to store objects in a database and use those objects with transactional integrity. In a J2EE application, data is typically stored and persisted in the data tier, in a relational database.</p>
+<p><a id="sthref20" name="sthref20"></a><span class="italic">Entity beans</span> are enterprise beans that contain persistent data and that can be saved in various persistent data stores. The entity beans represent data from a database; each entity bean carries its own identity. Entity beans can be deployed using <span class="italic">application-managed persistence</span> or <span class="italic">container-managed persistence</span>.</p>
</div>
<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
index 3663d63540..00475a3b48 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
@@ -2,25 +2,23 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Concepts</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Concepts</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content=" Concepts" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="sthref17" name="sthref17"></a></p>
+<p><a id="sthref18" name="sthref18"></a></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>
@@ -45,12 +43,18 @@
<li>
<p>JSR 220 EJB 3.0 specification: <code><a href="http://www.jcp.org/en/jsr/detail?id=220">http://www.jcp.org/en/jsr/detail?id=220</a></code></p>
</li>
+<li>
+<p>EclipseLink project: <code><a href="http://www.eclipse.org/eclipselink">http://www.eclipse.org/eclipselink</a></code></p>
+</li>
</ul>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
index 6a411500ce..57e25c00ec 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
@@ -2,21 +2,19 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Understanding EJB 3.0 Java Persistence API</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Understanding EJB 3.0 Java Persistence API</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Understanding EJB 3.0 Java Persistence API" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
@@ -32,8 +30,11 @@
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
index f4751603c3..e47e3cdf1f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
@@ -2,28 +2,26 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>The persistence.xml file</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>The persistence.xml file</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="The persistence.xml file" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<p><a id="CHDHAGIH" name="CHDHAGIH"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref22" name="sthref22"></a>The persistence.xml file</h1>
-<p>The JPA specification requires the use of a <code>persistence.xml</code> file for deployment. This file defines the database and entity manager options, and may contain more than one persistence unit. To enable you to easily edit this information, Dali provides the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>. Alternatively, you can use the Eclipse XML Editor to create and maintain this information. See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for more information.</p>
+<h1><a id="sthref23" name="sthref23"></a>The persistence.xml file</h1>
+<p>The JPA specification requires the use of a <code>persistence.xml</code> file for deployment. This file defines the database and entity manager options, and may contain more than one persistence unit. To enable you to easily edit this information, Dali provides the <a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>. Alternatively, you can use the Eclipse XML Editor to create and maintain this information. See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for more information.</p>
<div align="center">
<div class="inftblnotealso"><br />
<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0">
@@ -47,8 +45,11 @@ To work with multiple persistence units, comment out all but one persistence uni
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
index 43fff9a255..115447116b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
@@ -2,28 +2,26 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:42 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>The orm.xml file</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>The orm.xml file</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:42Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="The orm.xml file" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<p><a id="CHDBIJAC" name="CHDBIJAC"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref23" name="sthref23"></a>The orm.xml file</h1>
-<p>Although the JPA specification emphasizes the use of annotations to specify persistence, you can also use the <code>orm.xml</code> file to store this metadata. Dali enables you to create a stub <code>orm.xml</code> file for a JPA project using the <a href="reference005.htm#CIAIJCCE">Mapping File Wizard</a>. See <a href="task_manage_orm.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
+<h1><a id="sthref24" name="sthref24"></a>The orm.xml file</h1>
+<p>Although the JPA specification emphasizes the use of annotations to specify persistence, you can also use the <code>orm.xml</code> file to store this metadata. Dali enables you to create a stub <code>orm.xml</code> file for a JPA project using the <a href="reference002.htm#CIAIJCCE">Mapping File Wizard</a>. See <a href="task_manage_orm.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
<div align="center">
<div class="inftblnote"><br />
<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
@@ -38,19 +36,6 @@ The metadata must match the XSD specification of your selected JPA implementatio
<br /></div>
<!-- class="inftblnote" --></div>
<p>Dali provides comprehensive support for configuring XML mapping files through the <a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a> that is nearly identical to the annotation-based configuration in the Java source. Alternatively, you can also use the Eclipse XML Editor to create and maintain the metadata information in <code>orm.xml</code>.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-Dali works exclusively with XML mapping files named <code>orm.xml</code>.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
<a href="task_manage_orm.htm#CIHDGDCD">Managing the orm.xml file</a><br />
@@ -62,8 +47,11 @@ Dali works exclusively with XML mapping files named <code>orm.xml</code>.</td>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml b/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml
index 34de0ef6d1..2bfc301dc8 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml
@@ -416,7 +416,198 @@
<topic label="JPA Facet page" href="ref_jpa_facet.htm"/>
</context>
+ <context id="caching_defaultType">
+ <description>Select the default caching strategy for the project. The default is Weak with hard subcache.</description>
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="caching_defaultSize">
+ <description>Select the default size of the cache. The default is 100 items.</description>
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="caching_defaultShared">
+ <description>Specify if cached instances should be in the shared cache or in a client isolated cache.</description>
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="logging_level">
+ <description>Specifies the amount and detail of log output by selecting the log level. Default is Info level.</description>
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="logging_timeStamp">
+ <description>Control whether the timestamp is logged in each log entry. Default is True.</description>
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="logging_thread">
+ <description>Control whether a thread identifier is logged in each log entry. Default is True.</description>
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="logging_session">
+ <description>Control whether an EclipseLink session identifier is logged in each log entry. Default is True.</description>
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="logging_exceptions">
+ <description>Control whether the exceptions thrown from within the code are logged prior to returning the exception to the calling application. Ensures that all exceptions are logged and not masked by the application code.. Default is False.</description>
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="options_sessionName">
+ <description>Specify the name by which the EclipseLink session is stored in the static session manager.</description>
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="options_sessionsXml">
+ <description>Specify persistence information loaded from the EclipseLink session configuration file. You can use this option as an alternative to annotations and deployment XML.</description>
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="options_targetDatabase">
+ <description></description>
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="options_targetServer">
+ <description> </description>
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="dialog_newJPAProjectJava">
+ <description>Use this dialog to include existing Java source files in this project.</description>
+ <topic label="Java page" href="ref_java_page.htm" />
+ <topic label="New JPA Project wizard" href="ref_new_jpa_project_wizard" />
+ <topic label="Creating a new JPA project" href="task_create_new_project.htm" />
+ </context>
+ <context id="dialog_newJPAProjectFacet">
+ <description>Use this dialog to specify your vender-specific platform, JPA implementation library, and database connection.</description>
+ <topic label="JPA Facet page" href="ref_jpa_facet.htm" />
+ <topic label="New JPA Project wizard" href="ref_new_jpa_project_wizard" />
+ <topic label="Creating a new JPA project" href="task_create_new_project.htm" />
+ </context>
+ <context id="dialog_entityClassPage">
+ <description>Use this dialog to specify package, class name, and inheritance properties of the entity to create.</description>
+ <topic label="Entity Class page" href="ref_EntityClassPage.htm" />
+ <topic label="New JPA Entity wizard" href="ref_create_jpa_entity_wizard.htm" />
+ <topic label="Creating a new JPA entity" href="task_create_jpa_entity.htm" />
+ </context>
+ <context id="dialog_entityPropertiesPage">
+ <description>Use this dialog to specify the entity name, associated table, and mapped fields.</description>
+ <topic label="Entity Properties page" href="ref_EntityPropertiesPage.htm" />
+ <topic label="New JPA Entity wizard" href="ref_create_jpa_entity_wizard.htm" />
+ <topic label="Creating a new JPA entity" href="task_create_jpa_entity.htm" />
+ </context>
+ <context id="dialog_selectTablesPage">
+ <description>Use this dialog to specify the database tables from which to generate entities.</description>
+ <topic label="Select Tables page" href="ref_selectTables.htm" />
+ <topic label="Generate Custom Entities wizard" href="ref_create_custom_entities_wizard.htm" />
+ </context>
+ <context id="dialog_tableAssociationsPage">
+ <description>Use this dialog to create or edit the association between the database table and entity.</description>
+ <topic label="Table Associations page" href="ref_tableAssociations.htm" />
+ <topic label="Generate Custom Entities wizard" href="ref_create_custom_entities_wizard.htm" />
+ </context>
+ <context id="dialog_customizeDefaultEntityGeneration">
+ <description>Use this dialog to specify the table mapping and domain class information for the generated entity.</description>
+ <topic label="Customize Default Entity Generation page" href="ref_customizeDefaultEntityGeneration.htm" />
+ <topic label="Generate Custom Entities wizard" href="ref_create_custom_entities_wizard.htm" />
+ </context>
+ <context id="alog_customizeIndividualEntities">
+ <description>Use this dialog to specify the table mapping and domain class information for the generated entity.</description>
+ <topic label="Customize Individual Entities page" href="ref_customizIndividualEntities.htm" />
+ <topic label="Generate Custom Entities wizard" href="ref_create_custom_entities_wizard.htm" />
+ </context>
-
-
+ <context id="dialog_associationTablesPage">
+ <description>Use this dialog to specify the association tables for an entity.</description>
+ <topic label="Association Tables page" href="ref_association_tables.htm" />
+ <topic label="Create New Association wizard" href="ref_create_new_association_wizard.htm" />
+ </context>
+ <context id="dialog_joinColumnsPage">
+ <description>Use this dialog to specify the join columns of an association table.</description>
+ <topic label="Join Columns page" href="ref_join_columns.htm" />
+ <topic label="Create New Association wizard" href="ref_create_new_association_wizard.htm" />
+ </context>
+ <context id="dialog_associationCardinalityPage">
+ <description>Use this dialog to specify cardinality of an association table.</description>
+ <topic label="Association Cardinality page" href="ref_association_cardinality.htm" />
+ <topic label="Create New Association wizard" href="ref_create_new_association_wizard.htm" />
+ </context>
+ <context id="dialog_selectCascade">
+ <description>Specify which operations are propagated throughout the association: All, Persist, Merge, Remove, or Refresh.</description>
+ <topic label="Select Cascade page" href="ref_select_cascade_dialog.htm"/>
+ <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ <topic label="Understanding OR mappings" href="concept_mapping.htm"/>
+ </context>
+ <context id="persistence_general">
+ <description>Specify the general persistence options.</description>
+ <topic label="General page" href="ref_persistence_general" />
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="persistence_connection">
+ <description>Specify the data source or JDBC connection properties.</description>
+ <topic label="Connection page" href="ref_persistence_connection" />
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="persistence_customization">
+ <description>Specify the default or entity specific EclipseLink customization and validation properties.</description>
+ <topic label="Customization page" href="ref_persistence_connection" />
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="persistence_caching">
+ <description>Configure the session or entity specific EclipseLink caching properties.</description>
+ <topic label="Caching page" href="ref_persistence_caching" />
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="persistence_logging">
+ <description>Configure the EclipseLink logging properties.</description>
+ <topic label="Logging page" href="ref_persistence_logging" />
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="persistence_options">
+ <description>Configure the EclipseLink session and miscellanous options.</description>
+ <topic label="Options page" href="ref_persistence_options" />
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="persistence_schemaGeneration">
+ <description>Configure the schema generation properties.</description>
+ <topic label="Schema Generation page" href="ref_persistence_schemaGeneration" />
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="persistence_properties">
+ <description>Configure the properties defined for the persistence unit.</description>
+ <topic label="Properties page" href="ref_persistence_properties" />
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="persistence_source">
+ <description>Configure the properties defined for the persistence unit.</description>
+ <topic label="Properties page" href="ref_persistence_properties" />
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence" />
+ </context>
+ <context id="dialog_eclipselink_mapping_file">
+ <description>Configure the properties defined for the persistence unit.</description>
+ <topic label="New EclipseLink Mapping File page" href="ref_eclipselink_mapping_file" />
+ <topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
+ <topic label="Managing the orm.xml file" href="task_manage_orm" />
+ </context>
+ <context id="dialog_create_new_converters">
+ <description>Use this dialog to create a new EclipseLink conveter.</description>
+ <topic label="Add Converter dialog" href="ref_add_converter" />
+ <topic label="Managing the orm.xml file" href="task_manage_orm" />
+ </context>
+
+
</contexts>
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 c56c8c0a06..feced4c2a7 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm
@@ -2,21 +2,19 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Getting started</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Getting started</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content=" Getting started" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
@@ -36,8 +34,11 @@
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
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 0236f26b15..0862190dab 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm
@@ -2,21 +2,19 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Requirements and installation</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Requirements and installation</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Requirements and installation" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
@@ -26,24 +24,21 @@
<p>Before installing Dali, ensure that your environment meets the following <span class="italic">minimum</span> requirements:</p>
<ul>
<li>
-<p>Eclipse 3.4 (<code><a href="http://www.eclipse.org/downloads">http://www.eclipse.org/downloads</a></code>)</p>
+<p>Eclipse 3.5 (<code><a href="http://www.eclipse.org/downloads">http://www.eclipse.org/downloads</a></code>)</p>
</li>
<li>
<p>Java Runtime Environment (JRE) 1.5 (<code><a href="http://java.com">http://java.com</a></code>)</p>
</li>
<li>
-<p>Eclipse Web Tools Platform (WTP) 3.0 (<code><a href="http://www.eclipse.org/webtools">http://www.eclipse.org/webtools</a></code>)</p>
+<p>Eclipse Web Tools Platform (WTP) 3.1 (<code><a href="http://www.eclipse.org/webtools">http://www.eclipse.org/webtools</a></code>)</p>
</li>
<li>
-<p>Java Persistence API (JPA) for Java EE 5. The reference implementation can be obtained from:</p>
+<p>Java Persistence API (JPA) for Java EE 5. For example, the EclipseLink implementation for JPA can be obtained from: <code><a href="http://www.eclipse.org/eclipselink/">http://www.eclipse.org/eclipselink/</a></code></p>
</li>
</ul>
-<pre xml:space="preserve" class="oac_no_warn">
-<code><a href="https://glassfish.dev.java.net/downloads/persistence/JavaPersistence.html">https://glassfish.dev.java.net/downloads/persistence/JavaPersistence.html</a></code>
-</pre>
<p>Refer to <code><a href="http://www.eclipse.org/webtools/dali/gettingstarted_main.html">http://www.eclipse.org/webtools/dali/gettingstarted_main.html</a></code> for additional installation information.</p>
-<p>Dali is included as part of WTP 2.0. No additional installation or configuration is required.</p>
-<a id="sthref5" name="sthref5"></a>
+<p><a id="sthref5" name="sthref5"></a>Dali is included as part of WTP 3.1. No additional installation or configuration is required.</p>
+<a id="sthref6" name="sthref6"></a>
<p class="subhead2">Accessibility Features</p>
<p>Dali supports the standard accessibility features in Eclipse, including the following:</p>
<ul>
@@ -55,7 +50,7 @@
</li>
</ul>
<p>See <a href="../org.eclipse.platform.doc.user/concepts/accessibility/accessmain.htm">Accessibility Features in Eclipse</a> in the <span class="italic">Workbench User Guide</span> for details.</p>
-<a id="sthref6" name="sthref6"></a>
+<a id="sthref7" name="sthref7"></a>
<p class="subhead2">Help Accessibility</p>
<p>The documentation and help contains markup to facilitate access by the disabled community. See <a href="../org.eclipse.platform.doc.user/tasks/help_accessibility.htm">Help Accessibility</a> in the <span class="italic">Workbench User Guide</span> for details.</p>
<p>When using the help, be aware of the following:</p>
@@ -72,8 +67,11 @@
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
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 9d7f54c7cd..4d49797eac 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm
@@ -2,28 +2,26 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Dali quick start</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Dali quick start</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Dali quick start" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<p><a id="BABIGCJA" name="BABIGCJA"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>Dali quick start</h1>
-<p><a id="sthref7" name="sthref7"></a>This section includes information to help you quickly start using Dali to create relational mappings between Java persistent entities and database tables.</p>
+<p><a id="sthref8" name="sthref8"></a>This section includes information to help you quickly start using Dali to create relational mappings between Java persistent entities and database tables.</p>
<ul>
<li>
<p><a href="getting_started003.htm#BABDFHDA">Creating a new JPA project</a></p>
@@ -38,8 +36,11 @@
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
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 41907c16c9..4d9aa084a6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm
@@ -2,29 +2,27 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Creating a new JPA project</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Creating a new JPA project</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Creating a new JPA project" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<p><a id="BABDFHDA" name="BABDFHDA"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Creating a new JPA project</h1>
-<p><a id="sthref8" name="sthref8"></a>This quick start shows how to create a new JPA project.</p>
-<ol start="1">
+<p><a id="sthref9" name="sthref9"></a>This quick start shows how to create a new JPA project.</p>
+<ol>
<li>
<p><span class="bold">Select File &gt; New &gt; Project</span>. The Select a Wizard dialog appears.</p>
<div align="center">
@@ -48,7 +46,7 @@ You can also select the JPA perspective and then select <span class="bold">File
<p>Enter a <span class="gui-object-action">Project name</span> (such as <code>QuickStart</code>).</p>
</li>
<li>
-<p>If needed, select the <span class="bold">Target Runtime</span> (such as <code>Apache Tomcat</code>) and configuration, such as <span class="bold">Utility JPA Project with Java 5.0</span> and then click <span class="bold">Next</span>. The <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a> appears.</p>
+<p>If needed, select the <span class="bold">Target Runtime</span> (such as <code>Apache Tomcat</code>) and configuration, such as <span class="bold">Utility JPA Project with Java 5.0</span> and then click <span class="bold">Next</span>. The Java source page appears.</p>
<div align="center">
<div class="inftblnote"><br />
<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
@@ -64,6 +62,9 @@ The Target Runtime is not required for Java SE development.</td>
<!-- class="inftblnote" --></div>
</li>
<li>
+<p>If you have existing Java source files, add them to your classpath and then click <span class="bold">Next</span>. The <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a> appears.</p>
+</li>
+<li>
<p>On the JPA Facet dialog, select your vendor-specific JPA platform (or select <span class="bold">Generic</span>), database connection (or create a new connection), JPA implementation library (such as EclipseLink), define how Dali should manage persistent classes, and then click <span class="bold">Finish</span>.</p>
<div align="center">
<div class="inftblnotealso"><br />
@@ -81,8 +82,8 @@ Select <span class="bold">Override the Default Schema for Connection</span> if y
</li>
</ol>
<p>Eclipse adds the project to the workbench and opens the JPA perspective.</p>
-<div class="figure"><a id="sthref9" name="sthref9"></a>
-<p class="titleinfigure">Project in Package Explorer</p>
+<div class="figure"><a id="sthref10" name="sthref10"></a>
+<p class="titleinfigure">JPA Project in Project Explorer</p>
<img src="img/quickstart_project.png" alt="Package Explorer showing the JPA project." title="Package Explorer showing the JPA project." /><br /></div>
<!-- class="figure" -->
<p>Now that you have created a project with persistence, you can continue with <a href="getting_started004.htm#BABFGDDG">Creating a Java persistent entity with persistent fields</a>.</p>
@@ -91,8 +92,11 @@ Select <span class="bold">Override the Default Schema for Connection</span> if y
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
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 e5c2f19db4..e12cb631b3 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm
@@ -2,40 +2,38 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:41 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Creating a Java persistent entity with persistent fields</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Creating a Java persistent entity with persistent fields</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:41Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Creating a Java persistent entity with persistent fields" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<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>
-<p><a id="sthref10" name="sthref10"></a>This quick start shows how to create a new persistent Java entity. We will create an entity to associate with a database table. You will also need to add the ADDRESS table to your database.</p>
-<ol start="1">
+<p><a id="sthref11" name="sthref11"></a>This quick start shows how to create a new persistent Java entity. We will create an entity to associate with a database table. You will also need to add the ADDRESS table to your database.</p>
+<ol>
<li>
-<p>Select the JPA project in the Navigator or Package Explorer and then click <span class="bold">New &gt; Other</span>. The Select a Wizard dialog appears.</p>
+<p>Select the JPA project in the Navigator or Project Explorer and then click <span class="bold">New &gt; Other</span>. The Select a Wizard dialog appears.</p>
</li>
<li>
-<p>Select <span class="bold">Entity</span> and then click <span class="bold">Next</span>. The Entity Class page appears.</p>
+<p>Select <span class="bold">JPA &gt; Entity</span> and then click <span class="bold">Next</span>. The <a href="ref_EntityClassPage.htm#CIAFEIGF">Entity Class page</a> appears.</p>
</li>
<li>
-<p>Enter the package name (such as <code>quickstart.demo.model</code>), the class name (such as <code>Address</code>) and then click <span class="bold">Next</span>. The <a href="reference004.htm#CIADECIA">Entity Properties page</a> appears, which enables you to define the persistence fields, which you will map to the columns of a database table.</p>
+<p>Enter the package name (such as <code>quickstart.demo.model</code>), the class name (such as <code>Address</code>) and then click <span class="bold">Next</span>. The <a href="ref_EntityPropertiesPage.htm#CIADECIA">Entity Properties page</a> appears, which enables you to define the persistence fields, which you will map to the columns of a database table.</p>
</li>
<li>
-<p><a id="sthref11" name="sthref11"></a><a id="sthref12" name="sthref12"></a>Use the Entity Fields dialog (invoked by clicking <span class="bold">Add</span>) to add persistence fields to the Address class:</p>
+<p><a id="sthref12" name="sthref12"></a><a id="sthref13" name="sthref13"></a>Use the Entity Fields dialog (invoked by clicking <span class="bold">Add</span>) to add persistence fields to the Address class:</p>
<pre xml:space="preserve" class="oac_no_warn">
private Long id;
private String city;
@@ -73,18 +71,18 @@ VARCHAR2(80) CITY
<p>Address.java includes the <code>@Entity</code> annotation, the persistence fields, as well as <code>getter</code> and <code>setter</code> methods for each of the fields.</p>
</li>
</ol>
-<div class="figure"><a id="sthref13" name="sthref13"></a>
+<div class="figure"><a id="sthref14" name="sthref14"></a>
<p class="titleinfigure">Address Entity in Address.java</p>
<img src="img/java_editor_address.png" alt="Java editor with the Address entity." title="Java editor with the Address entity." /><br /></div>
<!-- class="figure" -->
<p>Eclipse also displays the <span class="bold">Address</span> entity in the JPA Structure view:</p>
-<div class="figure"><a id="sthref14" name="sthref14"></a>
+<div class="figure"><a id="sthref15" name="sthref15"></a>
<p class="titleinfigure">Address Entity in the JPA Structure View</p>
<img src="img/address_java_JPA_structure_quickstart.png" alt="Address.java in the JPA Structure View." title="Address.java in the JPA Structure View." /><br /></div>
<!-- class="figure" -->
-<ol start="1">
+<ol>
<li>
-<p>Select the <span class="gui-object-action">Address</span> class in the Package Explorer view.</p>
+<p>Select the <span class="gui-object-action">Address</span> class in the Project Explorer view.</p>
</li>
<li>
<p>In the <span class="gui-object-title">JPA Details</span> view, notice that Dali has automatically associated the ADDRESS database table with the entity because they are named identically.</p>
@@ -101,7 +99,7 @@ Depending on your database connection type, you may need to specify the <span cl
</table>
<br /></div>
<!-- class="inftblnote" --></div>
-<div class="figure"><a id="sthref15" name="sthref15"></a>
+<div class="figure"><a id="sthref16" name="sthref16"></a>
<p class="titleinfigure">JPA Details View for Address Entity</p>
<img src="img/address.java_jpa_details.png" alt="Address.java in the JPA Details view." title="Address.java in the JPA Details view." /><br /></div>
<!-- class="figure" --></li>
@@ -114,7 +112,7 @@ Depending on your database connection type, you may need to specify the <span cl
<td align="left">
<p class="notep1">Tip:</p>
After associating the entity with the database table, you should update the <code>persistence.xml</code> file to include this JPA entity.
-<p>Right-click the <code>persistence.xml</code> file in the Package Explorer and select <span class="bold">JPA Tools &gt; Synchronize Classes</span>. Dali adds the following to the <code>persistence.xml</code> file:</p>
+<p>Right-click the <code>persistence.xml</code> file in the Project Explorer and select <span class="bold">JPA Tools &gt; Synchronize Classes</span>. Dali adds the following to the <code>persistence.xml</code> file:</p>
<p><code>&lt;class&gt;quickstart.demo.model.Address&lt;/class&gt;</code></p>
</td>
</tr>
@@ -123,7 +121,7 @@ After associating the entity with the database table, you should update the <cod
<br /></div>
<!-- class="inftblnotealso" --></div>
<p>Now we are ready to map each fields in the Address class to a column in the database table.</p>
-<ol start="1">
+<ol>
<li>
<p>Select the <span class="gui-object-action">id</span> field in the JPA Details view.</p>
</li>
@@ -132,7 +130,7 @@ After associating the entity with the database table, you should update the <cod
</li>
<li>
<p>In the JPA Details view, select <span class="bold">ADDRESS_ID</span> in the Name field:</p>
-<div class="figure"><a id="sthref16" name="sthref16"></a>
+<div class="figure"><a id="sthref17" name="sthref17"></a>
<p class="titleinfigure">JPA Details View for the addressId Field</p>
<img src="img/address_id_details_quickstart.png" alt="The JPA Details view for the Address entity&rsquo;s id attribute." title="The JPA Details view for the Address entity&rsquo;s id attribute." /><br /></div>
<!-- class="figure" -->
@@ -145,6 +143,9 @@ After associating the entity with the database table, you should update the <cod
<p>Map each of the following fields (as <span class="bold">Basic</span> mappings) to the appropriate database column:</p>
<div class="inftblhruleinformal">
<table class="HRuleInformal" title="This table describes the mappings for each of the fields in the Address entity." summary="This table describes the mappings for each of the fields in the Address entity." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="*" />
+<col width="33%" />
+<col width="33%" />
<thead>
<tr align="left" valign="top">
<th align="left" valign="bottom" id="r1c1-t8">Field</th>
@@ -190,8 +191,11 @@ After associating the entity with the database table, you should update the <cod
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/address.java_jpa_details.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/address.java_jpa_details.png
index ed27a5ce29..77ce80ae3a 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/address.java_jpa_details.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/address.java_jpa_details.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/change_connection_profile.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/change_connection_profile.png
deleted file mode 100644
index 46ab05e0aa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/change_connection_profile.png
+++ /dev/null
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/column_support_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/column_support_new.png
deleted file mode 100644
index 8716e8b33c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/column_support_new.png
+++ /dev/null
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/convert_java_project_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/convert_java_project_new.png
deleted file mode 100644
index 91cda6e6a4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/convert_java_project_new.png
+++ /dev/null
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_new.png
deleted file mode 100644
index 69c78a5ffb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_new.png
+++ /dev/null
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_wizard.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_wizard.png
index f2c0a6c6ea..0360e0a86c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_wizard.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_wizard.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_fields.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_fields.png
index 52a7fab8db..69797a803c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_fields.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_fields.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/customize_default_entity_generation.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/customize_default_entity_generation.png
new file mode 100644
index 0000000000..9567616b7c
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/customize_default_entity_generation.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/customize_individual_entities.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/customize_individual_entities.png
new file mode 100644
index 0000000000..237bdee290
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/customize_individual_entities.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/entering_query_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/entering_query_new.png
deleted file mode 100644
index 98ec0ac5b0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/entering_query_new.png
+++ /dev/null
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_entities.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_entities.png
index e3cb22b69a..4daa25c7c5 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_entities.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_entities.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_basicmapmappings.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_basicmapmappings.png
new file mode 100644
index 0000000000..86eef3abe4
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_basicmapmappings.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/inheritance_tab.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/inheritance_tab.png
index a9d721fcc4..b76dd9faf3 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/inheritance_tab.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/inheritance_tab.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/java_editor_address.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/java_editor_address.png
index ff7eaa63b0..47428906e8 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/java_editor_address.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/java_editor_address.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/mapped_entity_type_link.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapped_entity_type_link.png
index d264d09639..2b616033dd 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/mapped_entity_type_link.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapped_entity_type_link.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/modify_faceted_project.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/modify_faceted_project.png
new file mode 100644
index 0000000000..ad494d545a
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/modify_faceted_project.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_facet_task.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_facet_task.png
index d7ffcdcad9..7607808317 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_facet_task.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_facet_task.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_task.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_task.png
index 61e71bdac8..572f91d64f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_task.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_task.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/open_persistence_editor.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/open_persistence_editor.png
deleted file mode 100644
index 56911fe5a5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/open_persistence_editor.png
+++ /dev/null
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_new.png
deleted file mode 100644
index 6aefae4bab..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_new.png
+++ /dev/null
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_xml_editor.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_xml_editor.png
deleted file mode 100644
index b14dc15936..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_xml_editor.png
+++ /dev/null
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/project_properties_tasks.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/project_properties_tasks.png
index 8f6310c59f..d40a88855f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/project_properties_tasks.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/project_properties_tasks.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/quickstart_project.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/quickstart_project.png
index c7c066427e..48ca05099b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/quickstart_project.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/quickstart_project.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/secondary_tables.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/secondary_tables.png
index e6a9159fd8..a41f9f53ed 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/secondary_tables.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/secondary_tables.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_mapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_mapping.png
index 8862770ac0..049c9d15b5 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_mapping.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_mapping.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/select_tables.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_tables.png
new file mode 100644
index 0000000000..a57c9314c7
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_tables.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/synchornize_classes.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/synchornize_classes.png
index bede63b968..a359f64651 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/synchornize_classes.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/synchornize_classes.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/table_associations.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/table_associations.png
new file mode 100644
index 0000000000..b5b40be797
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/table_associations.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/task_entering_query.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/task_entering_query.png
index 98ec0ac5b0..f07bfb00ad 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/task_entering_query.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/task_entering_query.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 023c49b07f..86b7d103e3 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/index.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/index.xml
@@ -1,544 +1,315 @@
<?xml version='1.0' encoding='iso-8859-1'?>
<index version="1.0">
- <entry keyword="@Basic">
- <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref99" /></entry>
- </entry>
- <entry keyword="@Column">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref193" /></entry>
- </entry>
+<entry keyword="@Basic, Basic mapping"><topic href="tasks009.htm#sthref115" /></entry>
+<entry keyword="@Column, General information"><topic href="ref_mapping_general.htm#sthref230" /></entry>
<entry keyword="@DiscriminatorColumn">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref83" /></entry>
+<entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref95" /></entry>
+<entry keyword="Inheritance information"><topic href="reference009.htm#sthref224" /></entry>
</entry>
<entry keyword="@DiscriminatorValue">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref85" /></entry>
- </entry>
- <entry keyword="@Embeddable">
- <entry keyword="Embeddable"><topic href="tasks007.htm#sthref68" /></entry>
- </entry>
- <entry keyword="@Embedded">
- <entry keyword="Embedded mapping"><topic href="tasks011.htm#sthref103" /></entry>
- </entry>
- <entry keyword="@EmbeddedId">
- <entry keyword="Embedded ID mapping"><topic href="tasks012.htm#sthref107" /></entry>
- </entry>
- <entry keyword="@Entity">
- <entry keyword="Entity"><topic href="tasks006.htm#sthref61" /></entry>
- </entry>
- <entry keyword="@Enumerated">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref203" /></entry>
- </entry>
- <entry keyword="@GeneratedValue">
- <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref211" /></entry>
- </entry>
- <entry keyword="@Id">
- <entry keyword="ID mapping"><topic href="tasks013.htm#sthref111" /></entry>
- </entry>
- <entry keyword="@Inheritance">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref81" /></entry>
- </entry>
+<entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref97" /></entry>
+<entry keyword="Inheritance information"><topic href="reference009.htm#sthref222" /></entry>
+ </entry>
+<entry keyword="@Embeddable, Embeddable"><topic href="tasks006.htm#sthref80" /></entry>
+<entry keyword="@Embedded, Embedded mapping"><topic href="tasks010.htm#sthref119" /></entry>
+<entry keyword="@EmbeddedId, Embedded ID mapping"><topic href="tasks011.htm#sthref123" /></entry>
+<entry keyword="@Entity, Entity"><topic href="tasks005.htm#sthref73" /></entry>
+<entry keyword="@Enumerated, General information"><topic href="ref_mapping_general.htm#sthref240" /></entry>
+<entry keyword="@GeneratedValue, Primary Key Generation information"><topic href="ref_primary_key.htm#sthref249" /></entry>
+<entry keyword="@Id, ID mapping"><topic href="tasks012.htm#sthref127" /></entry>
+<entry keyword="@Inheritance, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref93" /></entry>
<entry keyword="@JoinColumn">
- <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref122" /></entry>
- <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref132" /></entry>
- <entry keyword="Join Table Information"><topic href="reference014.htm#sthref208" /></entry>
- <entry keyword="Join Columns Information"><topic href="reference015.htm#sthref210" /></entry>
- </entry>
- <entry keyword="@Lob">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref198" /></entry>
- </entry>
- <entry keyword="@ManyToMany">
- <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref115" /></entry>
- </entry>
- <entry keyword="@ManyToOne">
- <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref120" /></entry>
- </entry>
- <entry keyword="@MappedSuperclass">
- <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref75" /></entry>
- </entry>
- <entry keyword="@NamedQuery">
- <entry keyword="Creating Named Queries"><topic href="tasks009.htm#sthref95" /></entry>
- </entry>
- <entry keyword="@OneToMany">
- <entry keyword="One-to-many mapping"><topic href="tasks016.htm#sthref125" /></entry>
- </entry>
- <entry keyword="@OneToOne">
- <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref129" /></entry>
- </entry>
- <entry keyword="@OrderBy">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref206" /></entry>
- </entry>
- <entry keyword="@SequenceGenerator">
- <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref213" /></entry>
- </entry>
- <entry keyword="@Temporal">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref200" /></entry>
- </entry>
- <entry keyword="@Transient">
- <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref135" /></entry>
- </entry>
- <entry keyword="@Version">
- <entry keyword="Version mapping"><topic href="tasks019.htm#sthref139" /></entry>
- </entry>
- <entry keyword="architecture of Dali feature">
- <entry keyword="Dali Developer Documentation"><topic href="reference034.htm#sthref247" /></entry>
- </entry>
- <entry keyword="attribute overrides">
- <entry keyword="Attribute overrides"><topic href="reference010.htm#sthref180" /></entry>
- </entry>
- <entry keyword="Attribute Overrides - in Java Details view">
- <entry keyword="Attribute overrides"><topic href="reference010.htm#sthref182" /></entry>
- </entry>
+<entry keyword="Many-to-one mapping"><topic href="tasks014.htm#sthref138" /></entry>
+<entry keyword="One-to-one mapping"><topic href="tasks016.htm#sthref148" /></entry>
+<entry keyword="Join Table Information"><topic href="reference011.htm#sthref245" /></entry>
+<entry keyword="Join Columns Information"><topic href="reference012.htm#sthref248" /></entry>
+ </entry>
+<entry keyword="@Lob, General information"><topic href="ref_mapping_general.htm#sthref235" /></entry>
+<entry keyword="@ManyToMany, Many-to-many mapping"><topic href="tasks013.htm#sthref131" /></entry>
+<entry keyword="@ManyToOne, Many-to-one mapping"><topic href="tasks014.htm#sthref136" /></entry>
+<entry keyword="@MappedSuperclass, Mapped superclass"><topic href="tasks007.htm#sthref87" /></entry>
+<entry keyword="@NamedQuery, Creating Named Queries"><topic href="tasks008.htm#sthref107" /></entry>
+<entry keyword="@OneToMany, One-to-many mapping"><topic href="tasks015.htm#sthref141" /></entry>
+<entry keyword="@OneToOne, One-to-one mapping"><topic href="tasks016.htm#sthref145" /></entry>
+<entry keyword="@OrderBy, General information"><topic href="ref_mapping_general.htm#sthref243" /></entry>
+<entry keyword="@SequenceGenerator, Primary Key Generation information"><topic href="ref_primary_key.htm#sthref251" /></entry>
+<entry keyword="@Temporal, General information"><topic href="ref_mapping_general.htm#sthref237" /></entry>
+<entry keyword="@Transient, Transient mapping"><topic href="tasks017.htm#sthref151" /></entry>
+<entry keyword="@Version, Version mapping"><topic href="tasks018.htm#sthref155" /></entry>
+<entry keyword="architecture of Dali feature, Dali Developer Documentation"><topic href="reference032.htm#sthref283" /></entry>
+<entry keyword="association tables, Create New Association"><topic href="ref_create_new_association_wizard.htm#sthref206" /></entry>
+<entry keyword="attribute overrides, Attribute overrides"><topic href="reference007.htm#sthref213" /></entry>
+<entry keyword="Attribute Overrides - in Java Details view, Attribute overrides"><topic href="reference007.htm#sthref215" /></entry>
<entry keyword="attributes">
- <entry keyword="JPA Details view">
- <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref192" /></entry>
- </entry>
- <entry keyword="mapping">
- <entry keyword="Understanding OR mappings"><topic href="concept_mapping.htm#sthref20" /></entry>
- </entry>
+<entry keyword="JPA Details view, JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref229" /></entry>
+<entry keyword="mapping, Understanding OR mappings"><topic href="concept_mapping.htm#sthref21" /></entry>
</entry>
<entry keyword="basic mapping">
- <entry keyword="@Basic">
- <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref100" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref98" /></entry>
- </entry>
+<entry keyword="@Basic, Basic mapping"><topic href="tasks009.htm#sthref116" /></entry>
+<entry keyword="about, Basic mapping"><topic href="tasks009.htm#sthref114" /></entry>
<entry keyword="(See also mappings)"></entry>
</entry>
+<entry keyword="caching, Caching"><topic href="reference020.htm#sthref262" /></entry>
+<entry keyword="cardinality - association tables, Association Cardinality"><topic href="ref_association_cardinality.htm#sthref209" /></entry>
<entry keyword="classes">
- <entry keyword="adding persistence to">
- <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref56" /></entry>
- </entry>
- <entry keyword="embeddable">
- <entry keyword="Embeddable"><topic href="tasks007.htm#sthref67" /></entry>
- </entry>
- <entry keyword="entity">
- <entry keyword="Entity"><topic href="tasks006.htm#sthref59" /></entry>
- </entry>
- <entry keyword="mapped superclass">
- <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref73" /></entry>
- </entry>
- <entry keyword="synchronizing">
- <entry keyword="Synchronizing classes"><topic href="tasks003.htm#sthref43" /></entry>
- </entry>
+<entry keyword="adding persistence to, Adding persistence to a class"><topic href="task_add_persistence.htm#sthref68" /></entry>
+<entry keyword="embeddable, Embeddable"><topic href="tasks006.htm#sthref79" /></entry>
+<entry keyword="entity, Entity"><topic href="tasks005.htm#sthref71" /></entry>
+<entry keyword="managed, Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref50" /></entry>
+<entry keyword="managing persistent classes, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref192" /></entry>
+<entry keyword="mapped superclass, Mapped superclass"><topic href="tasks007.htm#sthref85" /></entry>
+<entry keyword="synchronizing, Synchronizing classes"><topic href="tasks002.htm#sthref53" /></entry>
</entry>
<entry keyword="columns">
<entry keyword="discriminator">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref84" /></entry>
+<entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref96" /></entry>
+<entry keyword="Inheritance information"><topic href="reference009.htm#sthref225" /></entry>
</entry>
<entry keyword="join">
- <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref121" /></entry>
- <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref131" /></entry>
- <entry keyword="Join Table Information"><topic href="reference014.htm#sthref207" /></entry>
- <entry keyword="Join Columns Information"><topic href="reference015.htm#sthref209" /></entry>
- </entry>
- <entry keyword="mapping to">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref194" /></entry>
+<entry keyword="Many-to-one mapping"><topic href="tasks014.htm#sthref137" /></entry>
+<entry keyword="One-to-one mapping"><topic href="tasks016.htm#sthref147" /></entry>
+<entry keyword="Join Table Information"><topic href="reference011.htm#sthref244" /></entry>
+<entry keyword="Join Columns Information"><topic href="reference012.htm#sthref247" /></entry>
</entry>
+<entry keyword="mapping to, General information"><topic href="ref_mapping_general.htm#sthref231" /></entry>
<entry keyword="value">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref86" /></entry>
+<entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref98" /></entry>
+<entry keyword="Inheritance information"><topic href="reference009.htm#sthref223" /></entry>
</entry>
</entry>
+<entry keyword="connection pool, Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref52" /></entry>
+<entry keyword="converting Java project to JPA, Converting a Java Project to a JPA Project"><topic href="tasks001.htm#sthref37" /></entry>
+<entry keyword="Create a JPA Project Wizard, Creating a new JPA project"><topic href="task_create_new_project.htm#sthref29" /></entry>
+<entry keyword="Create New JPA Project wizard, Create New JPA Project wizard"><topic href="ref_new_jpa_project_wizard.htm#sthref189" /></entry>
<entry keyword="database tables">
- <entry keyword="generating entities from">
- <entry keyword="Generating entities from tables"><topic href="tasks020.htm#sthref145" /></entry>
- </entry>
+<entry keyword="generating entities from, Generating entities from tables"><topic href="tasks019.htm#sthref160" /></entry>
</entry>
<entry keyword="database - persistence">
- <entry keyword="connection">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref236" /></entry>
- </entry>
- <entry keyword="schema">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref238" /></entry>
- </entry>
- </entry>
- <entry keyword="developer documentation - Dali">
- <entry keyword="Dali Developer Documentation"><topic href="reference034.htm#sthref246" /></entry>
- </entry>
- <entry keyword="eager fetch">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref196" /></entry>
+<entry keyword="connection, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref275" /></entry>
+<entry keyword="schema, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref277" /></entry>
</entry>
+<entry keyword="developer documentation - Dali, Dali Developer Documentation"><topic href="reference032.htm#sthref282" /></entry>
+<entry keyword="eager fetch, General information"><topic href="ref_mapping_general.htm#sthref233" /></entry>
+<entry keyword="EclipseLink XML mapping file, Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref51" /></entry>
<entry keyword="embeddable class">
- <entry keyword="@Embeddable">
- <entry keyword="Embeddable"><topic href="tasks007.htm#sthref69" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Embeddable"><topic href="tasks007.htm#sthref66" /></entry>
- </entry>
+<entry keyword="@Embeddable, Embeddable"><topic href="tasks006.htm#sthref81" /></entry>
+<entry keyword="about, Embeddable"><topic href="tasks006.htm#sthref78" /></entry>
</entry>
<entry keyword="embedded ID mapping">
- <entry keyword="@EmbeddedId">
- <entry keyword="Embedded ID mapping"><topic href="tasks012.htm#sthref108" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Embedded ID mapping"><topic href="tasks012.htm#sthref106" /></entry>
- </entry>
+<entry keyword="@EmbeddedId, Embedded ID mapping"><topic href="tasks011.htm#sthref124" /></entry>
+<entry keyword="about, Embedded ID mapping"><topic href="tasks011.htm#sthref122" /></entry>
</entry>
<entry keyword="embedded mapping">
- <entry keyword="@Embedded">
- <entry keyword="Embedded mapping"><topic href="tasks011.htm#sthref104" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Embedded mapping"><topic href="tasks011.htm#sthref102" /></entry>
- </entry>
+<entry keyword="@Embedded, Embedded mapping"><topic href="tasks010.htm#sthref120" /></entry>
+<entry keyword="about, Embedded mapping"><topic href="tasks010.htm#sthref118" /></entry>
</entry>
<entry keyword="entities">
- <entry keyword="@Entity annotation">
- <entry keyword="Entity"><topic href="tasks006.htm#sthref62" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Understanding Java persistence"><topic href="concept_persistence.htm#sthref19" /></entry>
- </entry>
- <entry keyword="creating">
- <entry keyword="Creating a JPA Entity"><topic href="tasks001.htm#sthref30" /></entry>
- </entry>
- <entry keyword="embeddable">
- <entry keyword="Embeddable"><topic href="tasks007.htm#sthref70" /></entry>
- </entry>
+<entry keyword="@Entity annotation, Entity"><topic href="tasks005.htm#sthref74" /></entry>
+<entry keyword="about, Understanding Java persistence"><topic href="concept_persistence.htm#sthref20" /></entry>
+<entry keyword="creating, Creating a JPA Entity"><topic href="task_create_jpa_entity.htm#sthref40" /></entry>
+<entry keyword="customizing, Customize Individual Entities"><topic href="ref_customizIndividualEntities.htm#sthref205" /></entry>
+<entry keyword="embeddable, Embeddable"><topic href="tasks006.htm#sthref82" /></entry>
<entry keyword="from tables">
- <entry keyword="Generating entities from tables"><topic href="tasks020.htm#sthref141" /></entry>
- <entry keyword="Generate Entities from Tables dialog"><topic href="task_generate_entities.htm#sthref242" /></entry>
- </entry>
- <entry keyword="JPA Details view">
- <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref179" /></entry>
- </entry>
- <entry keyword="mapped superclass">
- <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref76" /></entry>
- </entry>
- <entry keyword="mapping">
- <entry keyword="Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref12" /></entry>
- </entry>
- <entry keyword="persistence">
- <entry keyword="Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref10" /></entry>
- </entry>
+<entry keyword="Generating entities from tables"><topic href="tasks019.htm#sthref157" /></entry>
+<entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref201" /></entry>
+ </entry>
+<entry keyword="generating, Customize Default Entity Generation"><topic href="ref_customizeDefaultEntityGeneration.htm#sthref204" /></entry>
+<entry keyword="JPA Details view, JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref212" /></entry>
+<entry keyword="mapped superclass, Mapped superclass"><topic href="tasks007.htm#sthref88" /></entry>
+<entry keyword="mapping, Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref13" /></entry>
+<entry keyword="persistence, Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref11" /></entry>
<entry keyword="persistent">
- <entry keyword="Entity"><topic href="tasks006.htm#sthref57" /></entry>
- <entry keyword="Entity"><topic href="tasks006.htm#sthref63" /></entry>
- </entry>
- <entry keyword="secondary tables">
- <entry keyword="Secondary table information"><topic href="reference011.htm#sthref185" /></entry>
+<entry keyword="Entity"><topic href="tasks005.htm#sthref69" /></entry>
+<entry keyword="Entity"><topic href="tasks005.htm#sthref75" /></entry>
</entry>
+<entry keyword="secondary tables, Secondary table information"><topic href="reference008.htm#sthref218" /></entry>
</entry>
+<entry keyword="Entity Class page, Selecting the Create a JPA Entity Wizard"><topic href="task_create_jpa_entity.htm#sthref43" /></entry>
+<entry keyword="Entity Properties page, &lt;a id=&quot;sthref43&quot; name=&quot;sthref43&quot;&gt;&lt;/a&gt;The Entity Class Page"><topic href="task_create_jpa_entity.htm#sthref45" /></entry>
<entry keyword="enumerated">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref202" /></entry>
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref204" /></entry>
+<entry keyword="General information"><topic href="ref_mapping_general.htm#sthref239" /></entry>
+<entry keyword="General information"><topic href="ref_mapping_general.htm#sthref241" /></entry>
</entry>
<entry keyword="error messages - Dali">
- <entry keyword="Validating mappings and reporting problems"><topic href="tasks022.htm#sthref146" /></entry>
- <entry keyword="Error messages"><topic href="tasks023.htm#sthref151" /></entry>
- </entry>
- <entry keyword="extension points - Dali feature">
- <entry keyword="Dali Developer Documentation"><topic href="reference034.htm#sthref248" /></entry>
- </entry>
- <entry keyword="fetch type">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref195" /></entry>
+<entry keyword="Validating mappings and reporting problems"><topic href="tasks021.htm#sthref166" /></entry>
+<entry keyword="Error messages"><topic href="tasks022.htm#sthref171" /></entry>
</entry>
+<entry keyword="extension points - Dali feature, Dali Developer Documentation"><topic href="reference032.htm#sthref284" /></entry>
+<entry keyword="fetch type, General information"><topic href="ref_mapping_general.htm#sthref232" /></entry>
<entry keyword="Generate Entities from Tables dialog">
- <entry keyword="Generating entities from tables"><topic href="tasks020.htm#sthref144" /></entry>
- <entry keyword="Generate Entities from Tables dialog"><topic href="task_generate_entities.htm#sthref241" /></entry>
+<entry keyword="Generating entities from tables"><topic href="tasks019.htm#sthref159" /></entry>
+<entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref200" /></entry>
</entry>
<entry keyword="generated values">
- <entry keyword="ID mappings">
- <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref212" /></entry>
- </entry>
- <entry keyword="sequence">
- <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref214" /></entry>
- </entry>
+<entry keyword="ID mappings, Primary Key Generation information"><topic href="ref_primary_key.htm#sthref250" /></entry>
+<entry keyword="sequence, Primary Key Generation information"><topic href="ref_primary_key.htm#sthref252" /></entry>
</entry>
+<entry keyword="hints - query, Creating Named Queries"><topic href="tasks008.htm#sthref109" /></entry>
<entry keyword="ID mapping">
- <entry keyword="@Id">
- <entry keyword="ID mapping"><topic href="tasks013.htm#sthref112" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="ID mapping"><topic href="tasks013.htm#sthref110" /></entry>
- </entry>
+<entry keyword="@Id, ID mapping"><topic href="tasks012.htm#sthref128" /></entry>
+<entry keyword="about, ID mapping"><topic href="tasks012.htm#sthref126" /></entry>
</entry>
<entry keyword="inheritance">
<entry keyword="entity">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref80" /></entry>
- <entry keyword="Inheritance information"><topic href="reference012.htm#sthref188" /></entry>
- </entry>
- <entry keyword="joined tables">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref92" /></entry>
- </entry>
- <entry keyword="single table">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref87" /></entry>
+<entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref92" /></entry>
+<entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref194" /></entry>
+<entry keyword="Inheritance information"><topic href="reference009.htm#sthref221" /></entry>
</entry>
+<entry keyword="joined tables, Single Table Inheritance"><topic href="task_inheritance.htm#sthref104" /></entry>
+<entry keyword="single table, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref99" /></entry>
</entry>
- <entry keyword="Inheritance - in Java Details view">
- <entry keyword="Inheritance information"><topic href="reference012.htm#sthref187" /></entry>
- </entry>
- <entry keyword="installation - Dali">
- <entry keyword="Requirements and installation"><topic href="getting_started001.htm#sthref3" /></entry>
- </entry>
- <entry keyword="joined tables - inheritance">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref93" /></entry>
+<entry keyword="Inheritance - in Java Details view, Inheritance information"><topic href="reference009.htm#sthref220" /></entry>
+<entry keyword="installation - Dali, Requirements and installation"><topic href="getting_started001.htm#sthref3" /></entry>
+<entry keyword="Java project - converting to JPA, Converting a Java Project to a JPA Project"><topic href="tasks001.htm#sthref35" /></entry>
+ <entry keyword="join columns">
+<entry keyword="Join Columns"><topic href="ref_join_columns.htm#sthref208" /></entry>
+<entry keyword="Join Columns Information"><topic href="reference012.htm#sthref246" /></entry>
</entry>
+<entry keyword="joined tables - inheritance, Single Table Inheritance"><topic href="task_inheritance.htm#sthref105" /></entry>
<entry keyword="JPA Details view">
- <entry keyword="attributes">
- <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref190" /></entry>
- </entry>
- <entry keyword="entities">
- <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref177" /></entry>
- </entry>
- </entry>
- <entry keyword="JPA Development perspective">
- <entry keyword="JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref244" /></entry>
+<entry keyword="attributes, JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref227" /></entry>
+<entry keyword="entities, JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref210" /></entry>
</entry>
+<entry keyword="JPA Development perspective, JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref280" /></entry>
+<entry keyword="JPA Facet page, The Java Source Page"><topic href="task_create_new_project.htm#sthref34" /></entry>
<entry keyword="JPA project">
- <entry keyword="creating new">
- <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref26" /></entry>
- </entry>
- <entry keyword="platform">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref235" /></entry>
- </entry>
- </entry>
- <entry keyword="JPA Structure view">
- <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref216" /></entry>
- </entry>
- <entry keyword="lazy fetch">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref197" /></entry>
- </entry>
+<entry keyword="converting from Java, Converting a Java Project to a JPA Project"><topic href="tasks001.htm#sthref36" /></entry>
+<entry keyword="creating new, Creating a new JPA project"><topic href="task_create_new_project.htm#sthref27" /></entry>
+<entry keyword="implementation, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref190" /></entry>
+<entry keyword="page, &lt;a id=&quot;sthref29&quot; name=&quot;sthref29&quot;&gt;&lt;/a&gt;Selecting the Create a JPA Project wizard"><topic href="task_create_new_project.htm#sthref31" /></entry>
+<entry keyword="platform, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref274" /></entry>
+ </entry>
+<entry keyword="JPA Structure view, JPA Structure view"><topic href="ref_persistence_outline.htm#sthref254" /></entry>
+<entry keyword="lazy fetch, General information"><topic href="ref_mapping_general.htm#sthref234" /></entry>
+<entry keyword="library - JPA, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref191" /></entry>
<entry keyword="many-to-many mapping">
- <entry keyword="@ManyToMany">
- <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref116" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref114" /></entry>
- </entry>
+<entry keyword="@ManyToMany, Many-to-many mapping"><topic href="tasks013.htm#sthref132" /></entry>
+<entry keyword="about, Many-to-many mapping"><topic href="tasks013.htm#sthref130" /></entry>
</entry>
<entry keyword="many-to-one mapping">
- <entry keyword="@ManyToOne">
- <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref119" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref118" /></entry>
- </entry>
+<entry keyword="@ManyToOne, Many-to-one mapping"><topic href="tasks014.htm#sthref135" /></entry>
+<entry keyword="about, Many-to-one mapping"><topic href="tasks014.htm#sthref134" /></entry>
</entry>
<entry keyword="mapped superclass">
- <entry keyword="@MappedSuperclass">
- <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref74" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref72" /></entry>
- </entry>
+<entry keyword="@MappedSuperclass, Mapped superclass"><topic href="tasks007.htm#sthref86" /></entry>
+<entry keyword="about, Mapped superclass"><topic href="tasks007.htm#sthref84" /></entry>
</entry>
- <entry keyword="mapping entities">
- <entry keyword="Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref11" /></entry>
+<entry keyword="mapping entities, Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref12" /></entry>
+ <entry keyword="mapping file">
+<entry keyword="&lt;a id=&quot;sthref57&quot; name=&quot;sthref57&quot;&gt;&lt;/a&gt;Managing the orm.xml file"><topic href="tasks003.htm#sthref60" /></entry>
+<entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref195" /></entry>
</entry>
<entry keyword="mappings">
- <entry keyword="about">
- <entry keyword="Understanding OR mappings"><topic href="concept_mapping.htm#sthref21" /></entry>
- </entry>
- <entry keyword="basic">
- <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref97" /></entry>
- </entry>
- <entry keyword="embedded">
- <entry keyword="Embedded mapping"><topic href="tasks011.htm#sthref101" /></entry>
- </entry>
- <entry keyword="embedded ID">
- <entry keyword="Embedded ID mapping"><topic href="tasks012.htm#sthref105" /></entry>
- </entry>
- <entry keyword="ID">
- <entry keyword="ID mapping"><topic href="tasks013.htm#sthref109" /></entry>
- </entry>
- <entry keyword="many-to-many">
- <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref113" /></entry>
- </entry>
- <entry keyword="many-to-one">
- <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref117" /></entry>
- </entry>
- <entry keyword="one-to-many">
- <entry keyword="One-to-many mapping"><topic href="tasks016.htm#sthref123" /></entry>
- </entry>
- <entry keyword="one-to-one">
- <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref127" /></entry>
- </entry>
- <entry keyword="problems">
- <entry keyword="Validating mappings and reporting problems"><topic href="tasks022.htm#sthref149" /></entry>
- </entry>
- <entry keyword="transient">
- <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref133" /></entry>
- </entry>
- <entry keyword="version">
- <entry keyword="Version mapping"><topic href="tasks019.htm#sthref137" /></entry>
- </entry>
+<entry keyword="about, Understanding OR mappings"><topic href="concept_mapping.htm#sthref22" /></entry>
+<entry keyword="basic, Basic mapping"><topic href="tasks009.htm#sthref113" /></entry>
+<entry keyword="embedded, Embedded mapping"><topic href="tasks010.htm#sthref117" /></entry>
+<entry keyword="embedded ID, Embedded ID mapping"><topic href="tasks011.htm#sthref121" /></entry>
+<entry keyword="ID, ID mapping"><topic href="tasks012.htm#sthref125" /></entry>
+<entry keyword="many-to-many, Many-to-many mapping"><topic href="tasks013.htm#sthref129" /></entry>
+<entry keyword="many-to-one, Many-to-one mapping"><topic href="tasks014.htm#sthref133" /></entry>
+<entry keyword="one-to-many, One-to-many mapping"><topic href="tasks015.htm#sthref139" /></entry>
+<entry keyword="one-to-one, One-to-one mapping"><topic href="tasks016.htm#sthref143" /></entry>
+<entry keyword="problems, Validating mappings and reporting problems"><topic href="tasks021.htm#sthref169" /></entry>
+<entry keyword="transient, Transient mapping"><topic href="tasks017.htm#sthref149" /></entry>
+<entry keyword="version, Version mapping"><topic href="tasks018.htm#sthref153" /></entry>
</entry>
<entry keyword="named queries">
- <entry keyword="entity">
- <entry keyword="Creating Named Queries"><topic href="tasks009.htm#sthref94" /></entry>
- </entry>
+<entry keyword="entity, Creating Named Queries"><topic href="tasks008.htm#sthref106" /></entry>
+<entry keyword="hints, Creating Named Queries"><topic href="tasks008.htm#sthref110" /></entry>
</entry>
+<entry keyword="native queries, Creating Named Queries"><topic href="tasks008.htm#sthref111" /></entry>
<entry keyword="nonpersistent">
- <entry keyword="classes">
- <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref55" /></entry>
- </entry>
+<entry keyword="classes, Adding persistence to a class"><topic href="task_add_persistence.htm#sthref67" /></entry>
<entry keyword="fields. See transient"></entry>
</entry>
<entry keyword="one-to-many mapping">
- <entry keyword="@OneToMany">
- <entry keyword="One-to-many mapping"><topic href="tasks016.htm#sthref126" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="One-to-many mapping"><topic href="tasks016.htm#sthref124" /></entry>
- </entry>
+<entry keyword="@OneToMany, One-to-many mapping"><topic href="tasks015.htm#sthref142" /></entry>
+<entry keyword="about, One-to-many mapping"><topic href="tasks015.htm#sthref140" /></entry>
</entry>
<entry keyword="one-to-one mapping">
- <entry keyword="@OneToOne">
- <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref130" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref128" /></entry>
- </entry>
- </entry>
- <entry keyword="ordering">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref205" /></entry>
+<entry keyword="@OneToOne, One-to-one mapping"><topic href="tasks016.htm#sthref146" /></entry>
+<entry keyword="about, One-to-one mapping"><topic href="tasks016.htm#sthref144" /></entry>
</entry>
+<entry keyword="ordering, General information"><topic href="ref_mapping_general.htm#sthref242" /></entry>
<entry keyword="orm.xml file">
- <entry keyword="about">
- <entry keyword="The orm.xml file"><topic href="concepts003.htm#sthref23" /></entry>
- </entry>
- <entry keyword="managing">
- <entry keyword="Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref46" /></entry>
- </entry>
- <entry keyword="sample">
- <entry keyword="Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref47" /></entry>
- </entry>
- </entry>
- <entry keyword="overrides - JPA attributes">
- <entry keyword="Attribute overrides"><topic href="reference010.htm#sthref181" /></entry>
+<entry keyword="about, The orm.xml file"><topic href="concepts003.htm#sthref24" /></entry>
+<entry keyword="creating, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref193" /></entry>
+<entry keyword="managing, Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref57" /></entry>
+<entry keyword="sample, Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref58" /></entry>
</entry>
+<entry keyword="overrides - JPA attributes, Attribute overrides"><topic href="reference007.htm#sthref214" /></entry>
<entry keyword="persistence">
- <entry keyword="about">
- <entry keyword="Understanding Java persistence"><topic href="concept_persistence.htm#sthref18" /></entry>
- </entry>
- <entry keyword="database connection">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref237" /></entry>
- </entry>
- <entry keyword="database schema">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref240" /></entry>
- </entry>
- <entry keyword="entity class">
- <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref54" /></entry>
- </entry>
- <entry keyword="options">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref232" /></entry>
- </entry>
- </entry>
- <entry keyword="Persistence XML Editor">
- <entry keyword="Using the XML Editor to edit the persistence.xml file"><topic href="tasks002.htm#sthref40" /></entry>
+<entry keyword="about, Understanding Java persistence"><topic href="concept_persistence.htm#sthref19" /></entry>
+<entry keyword="database connection, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref276" /></entry>
+<entry keyword="database schema, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref279" /></entry>
+<entry keyword="entity class, Adding persistence to a class"><topic href="task_add_persistence.htm#sthref66" /></entry>
+<entry keyword="options, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref271" /></entry>
+<entry keyword="provider, Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref49" /></entry>
</entry>
<entry keyword="persistence.xml file">
- <entry keyword="about">
- <entry keyword="The persistence.xml file"><topic href="concepts002.htm#sthref22" /></entry>
- </entry>
- <entry keyword="editor">
- <entry keyword="Using the XML Editor to edit the persistence.xml file"><topic href="tasks002.htm#sthref41" /></entry>
- </entry>
+<entry keyword="about, The persistence.xml file"><topic href="concepts002.htm#sthref23" /></entry>
<entry keyword="managing">
- <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref35" /></entry>
- <entry keyword="Using the XML Editor to edit the persistence.xml file"><topic href="tasks002.htm#sthref38" /></entry>
- <entry keyword="Working with orm.xml file"><topic href="tasks005.htm#sthref52" /></entry>
- </entry>
- <entry keyword="sample">
- <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref36" /></entry>
- </entry>
- <entry keyword="synchronizing with classes">
- <entry keyword="Synchronizing classes"><topic href="tasks003.htm#sthref44" /></entry>
+<entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref47" /></entry>
+<entry keyword="Working with orm.xml file"><topic href="tasks004.htm#sthref64" /></entry>
</entry>
+<entry keyword="sample, Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref48" /></entry>
+<entry keyword="synchronizing with classes, Synchronizing classes"><topic href="tasks002.htm#sthref54" /></entry>
</entry>
- <entry keyword="persistent entity">
- <entry keyword="Entity"><topic href="tasks006.htm#sthref58" /></entry>
- </entry>
- <entry keyword="perspective - JPA Development">
- <entry keyword="JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref245" /></entry>
- </entry>
- <entry keyword="platform - JPA">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref234" /></entry>
- </entry>
- <entry keyword="problems">
- <entry keyword="Validating mappings and reporting problems"><topic href="tasks022.htm#sthref148" /></entry>
- </entry>
+<entry keyword="persistent entity, Entity"><topic href="tasks005.htm#sthref70" /></entry>
+<entry keyword="perspective - JPA Development, JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref281" /></entry>
+<entry keyword="platform - JPA, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref273" /></entry>
+<entry keyword="problems, Validating mappings and reporting problems"><topic href="tasks021.htm#sthref168" /></entry>
<entry keyword="projects - JPA">
<entry keyword="creating new">
- <entry keyword="Creating a new JPA project"><topic href="getting_started003.htm#sthref8" /></entry>
- <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref25" /></entry>
+<entry keyword="Creating a new JPA project"><topic href="getting_started003.htm#sthref9" /></entry>
+<entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref26" /></entry>
</entry>
- <entry keyword="options">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref233" /></entry>
- </entry>
- </entry>
- <entry keyword="quick start - Dali">
- <entry keyword="Dali quick start"><topic href="getting_started002.htm#sthref7" /></entry>
+<entry keyword="options, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref272" /></entry>
</entry>
+<entry keyword="query hints, Creating Named Queries"><topic href="tasks008.htm#sthref108" /></entry>
+<entry keyword="quick start - Dali, Dali quick start"><topic href="getting_started002.htm#sthref8" /></entry>
<entry keyword="requirements">
- <entry keyword="Dali Java Persistence Tools">
- <entry keyword="Requirements and installation"><topic href="getting_started001.htm#sthref4" /></entry>
- </entry>
- <entry keyword="persistent entities">
- <entry keyword="Entity"><topic href="tasks006.htm#sthref60" /></entry>
- </entry>
- </entry>
- <entry keyword="schema - database">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref239" /></entry>
- </entry>
- <entry keyword="secondary tables">
- <entry keyword="Secondary table information"><topic href="reference011.htm#sthref183" /></entry>
- </entry>
- <entry keyword="Secondary Tables - in Java Details view">
- <entry keyword="Secondary table information"><topic href="reference011.htm#sthref186" /></entry>
- </entry>
- <entry keyword="single table inheritance">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref88" /></entry>
- </entry>
- <entry keyword="superclass">
- <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref77" /></entry>
- </entry>
+<entry keyword="Dali Java Persistence Tools, Requirements and installation"><topic href="getting_started001.htm#sthref4" /></entry>
+<entry keyword="persistent entities, Entity"><topic href="tasks005.htm#sthref72" /></entry>
+ </entry>
+<entry keyword="schema - database, Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref278" /></entry>
+<entry keyword="secondary tables, Secondary table information"><topic href="reference008.htm#sthref216" /></entry>
+<entry keyword="Secondary Tables - in Java Details view, Secondary table information"><topic href="reference008.htm#sthref219" /></entry>
+<entry keyword="single table inheritance, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref100" /></entry>
+<entry keyword="superclass, Mapped superclass"><topic href="tasks007.htm#sthref89" /></entry>
+<entry keyword="synchronizing classes with persistence.xml file, Synchronizing classes"><topic href="tasks002.htm#sthref55" /></entry>
<entry keyword="tables">
- <entry keyword="creating entities from">
- <entry keyword="Generating entities from tables"><topic href="tasks020.htm#sthref142" /></entry>
- <entry keyword="Generate Entities from Tables dialog"><topic href="task_generate_entities.htm#sthref243" /></entry>
+ <entry keyword="associations">
+<entry keyword="Table Associations"><topic href="ref_tableAssociations.htm#sthref203" /></entry>
+<entry keyword="Create New Association"><topic href="ref_create_new_association_wizard.htm#sthref207" /></entry>
</entry>
- <entry keyword="inheritance">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref89" /></entry>
- </entry>
- <entry keyword="secondary">
- <entry keyword="Secondary table information"><topic href="reference011.htm#sthref184" /></entry>
+ <entry keyword="creating entities from">
+<entry keyword="Generating entities from tables"><topic href="tasks019.htm#sthref158" /></entry>
+<entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref202" /></entry>
</entry>
+<entry keyword="inheritance, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref101" /></entry>
+<entry keyword="secondary, Secondary table information"><topic href="reference008.htm#sthref217" /></entry>
</entry>
<entry keyword="temporal">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref199" /></entry>
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref201" /></entry>
+<entry keyword="General information"><topic href="ref_mapping_general.htm#sthref236" /></entry>
+<entry keyword="General information"><topic href="ref_mapping_general.htm#sthref238" /></entry>
</entry>
<entry keyword="transient mapping">
- <entry keyword="@Transient">
- <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref136" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref134" /></entry>
- </entry>
+<entry keyword="@Transient, Transient mapping"><topic href="tasks017.htm#sthref152" /></entry>
+<entry keyword="about, Transient mapping"><topic href="tasks017.htm#sthref150" /></entry>
</entry>
<entry keyword="version mapping">
- <entry keyword="@Version">
- <entry keyword="Version mapping"><topic href="tasks019.htm#sthref140" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Version mapping"><topic href="tasks019.htm#sthref138" /></entry>
- </entry>
+<entry keyword="@Version, Version mapping"><topic href="tasks018.htm#sthref156" /></entry>
+<entry keyword="about, Version mapping"><topic href="tasks018.htm#sthref154" /></entry>
</entry>
<entry keyword="views">
<entry keyword="JPA Details view">
- <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref178" /></entry>
- <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref191" /></entry>
- </entry>
- <entry keyword="JPA Structure view">
- <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref215" /></entry>
+<entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref211" /></entry>
+<entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref228" /></entry>
</entry>
+<entry keyword="JPA Structure view, JPA Structure view"><topic href="ref_persistence_outline.htm#sthref253" /></entry>
</entry>
- <entry keyword="warning messages - Dali">
- <entry keyword="Validating mappings and reporting problems"><topic href="tasks022.htm#sthref147" /></entry>
- </entry>
- <entry keyword="XML editor">
- <entry keyword="Using the XML Editor to edit the persistence.xml file"><topic href="tasks002.htm#sthref37" /></entry>
- <entry keyword="Working with orm.xml file"><topic href="tasks005.htm#sthref51" /></entry>
- </entry>
-</index>
+<entry keyword="warning messages - Dali, Validating mappings and reporting problems"><topic href="tasks021.htm#sthref167" /></entry>
+<entry keyword="Web Tools Platform (WTP), Requirements and installation"><topic href="getting_started001.htm#sthref5" /></entry>
+<entry keyword="XML editor, Working with orm.xml file"><topic href="tasks004.htm#sthref63" /></entry>
+</index> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm b/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm
index 25a99e40e9..0ebdba1a70 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm
@@ -2,35 +2,36 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:55 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Legal</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Legal</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:54Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content=" Legal" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="sthref256" name="sthref256"></a></p>
+<p><a id="sthref287" name="sthref287"></a></p>
<h1>Legal</h1>
-<p>Copyright &copy; 2006, 2008, Oracle. All rights reserved.</p>
+<p>Copyright &copy; 2006, 2009, 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>
<p><code><a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></code></p>
<p><a href="about.htm">Terms and conditions regarding the use of this guide.</a></p>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml b/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
index 2f308f3991..516d3e1a71 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
-<plugin name="JPA Documentation Plug-in" id="org.eclipse.jpt.doc.user" version="2.0.0" provider-name="Oracle">
+<plugin>
<!-- =========== -->
<!-- Define TOC -->
<!-- =========== -->
@@ -23,7 +23,7 @@
<!-- Cheatsheets -->
<!-- =========== -->
<extension point="org.eclipse.ui.cheatsheets.cheatSheetContent">
- <category name="%jpaDevelopment" id="com.jpa.category"/>
+ <category name="JPA Development" id="com.jpa.category"/>
<cheatsheet name="%createAJpaProject" category="com.jpa.category" contentFile="$nl$/cheatsheets/add_persistence.xml" id="org.eclipse.jpa.cheatsheet.createproject1">
<description>%createAJpaProjectDescription</description>
</cheatsheet>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm
new file mode 100644
index 0000000000..a1a22ceca2
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm
@@ -0,0 +1,115 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Entity Class page</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:49Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Entity Class page" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIAFEIGF" name="CIAFEIGF"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Entity Class page</h1>
+<p>This table lists the properties of the Entity Class page of the <a href="ref_create_jpa_entity_wizard.htm#CIAGGGDF">Create JPA Entity wizard</a>.</p>
+<div class="inftblruleinformal">
+<table class="RuleInformal" summary="This table lists the properties of the Entity Class page of the Create JPA Entity wizard." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="22%" />
+<col width="*" />
+<col width="17%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t5">Property</th>
+<th align="left" valign="bottom" id="r1c2-t5">Description</th>
+<th align="left" valign="bottom" id="r1c3-t5">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t5" headers="r1c1-t5">Project</td>
+<td align="left" headers="r2c1-t5 r1c2-t5">The name of the JPA project.</td>
+<td align="left" headers="r2c1-t5 r1c3-t5"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t5" headers="r1c1-t5">Source Folder</td>
+<td align="left" headers="r3c1-t5 r1c2-t5">The location of the JPA project's src folder.</td>
+<td align="left" headers="r3c1-t5 r1c3-t5"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t5" headers="r1c1-t5">Java Package</td>
+<td align="left" headers="r4c1-t5 r1c2-t5">The name of the class package.</td>
+<td align="left" headers="r4c1-t5 r1c3-t5"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t5" headers="r1c1-t5">Class name</td>
+<td align="left" headers="r5c1-t5 r1c2-t5">The name of the Java class.</td>
+<td align="left" headers="r5c1-t5 r1c3-t5"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t5" headers="r1c1-t5">Superclass</td>
+<td align="left" headers="r6c1-t5 r1c2-t5">Select the superclass.</td>
+<td align="left" headers="r6c1-t5 r1c3-t5"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t5" headers="r1c1-t5"><a id="sthref194" name="sthref194"></a>Inheritance</td>
+<td align="left" headers="r7c1-t5 r1c2-t5">Because the wizard creates a Java class with an <code>@Entity</code> notation, the <span class="bold">Entity</span> option is selected by default.
+<p>Select <span class="bold">Mapped Superclass</span> if you defined a superclass.</p>
+<p>To add an <code>@Inheritance</code> notation to the entity, select <span class="bold">Inheritance</span> and then select one of the inheritance mapping strategies (described in JSR 220):</p>
+<ul>
+<li>
+<p>SINGLE_TABLE -- All classes in a hierarchy as mapped to a single table. This annotation is without an attribute for the inheritance strategy.</p>
+</li>
+<li>
+<p>TABLE_PER_CLASS -- Each class is mapped to a separate table.</p>
+</li>
+<li>
+<p>JOINED -- The root of the class hierarchy is represented by a single table. Each subclass is represented by a separate table that contains those fields that are specific to the subclass (not inherited from its superclass), as well as the column(s) that represent its primary key. The primary key column(s) of the subclass table serves as a foreign key to the primary key of the superclass table.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r7c1-t5 r1c3-t5">Entity</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t5" headers="r1c1-t5"><a id="sthref195" name="sthref195"></a>XML Entity Mappings</td>
+<td align="left" headers="r8c1-t5 r1c2-t5">Select <span class="bold">Add to entity mappings in XML</span> to create XML mappings in <code>orm.xml</code>, rather than annotations.
+<p>Use the <span class="bold">Mapping file</span> field to specify the file to use. By default, mappings are stored in the <code>META-INF/orm.xml</code> file.</p>
+</td>
+<td align="left" headers="r8c1-t5 r1c3-t5"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblruleinformal" -->
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="ref_create_jpa_entity_wizard.htm#CIAGGGDF">Create JPA Entity wizard</a></div>
+<!-- class="sect3" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm
new file mode 100644
index 0000000000..ffaccaf059
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm
@@ -0,0 +1,117 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Entity Properties page</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:49Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Entity Properties page" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIADECIA" name="CIADECIA"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Entity Properties page</h1>
+<p>This table lists the properties of the Entity Properties page of the <a href="ref_create_jpa_entity_wizard.htm#CIAGGGDF">Create JPA Entity wizard</a>.</p>
+<div class="tblformal"><a id="sthref196" name="sthref196"></a><a id="sthref197" name="sthref197"></a>
+<p class="titleintable">&nbsp;</p>
+<table class="Formal" title="" summary="This table to be converted to informal." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<col width="24%" />
+<col width="*" />
+<col width="24%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t6">Property</th>
+<th align="left" valign="bottom" id="r1c2-t6">Description</th>
+<th align="left" valign="bottom" id="r1c3-t6">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t6" headers="r1c1-t6">
+<p>Entity Name</p>
+</td>
+<td align="left" headers="r2c1-t6 r1c2-t6">
+<p>The name of the entity. By default, this value is the same as the one entered as the class name. If the entity name differs from the class name, then the entity name is added as an attribute. For example: <code>@Entity(name="EntityName")</code>.</p>
+</td>
+<td align="left" headers="r2c1-t6 r1c3-t6">
+<p>Determined by server.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t6" headers="r1c1-t6">
+<p>Table Name</p>
+</td>
+<td align="left" headers="r3c1-t6 r1c2-t6">
+<p>Select <span class="bold">Use default</span> to match the name of the mapped table name to the entity name. Otherwise, clear the <span class="bold">Use default</span> option and enter the name in the <span class="italic">Table Name</span> field. These options result in the addition of the <code>@Table</code> option to the Java class file.</p>
+</td>
+<td align="left" headers="r3c1-t6 r1c3-t6">
+<p>Use default.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t6" headers="r1c1-t6">
+<p>Entity Fields</p>
+</td>
+<td align="left" headers="r4c1-t6 r1c2-t6">
+<p>Click the <span class="bold">Add</span> button to add persistence fields using the Entity Fields dialog. This dialog enable you to build a field by entering a field name and selecting among persistence types. The <span class="bold">Key</span> option enables you to mark a field as a primary key. The dialog's <span class="bold">Browse</span> function enables you to add other persistence types described in the JPA specification. The <span class="bold">Edit</span> button enables you to change the name or type set for a persistent field.</p>
+</td>
+<td align="left" headers="r4c1-t6 r1c3-t6"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t6" headers="r1c1-t6">
+<p>Access Type</p>
+</td>
+<td align="left" headers="r5c1-t6 r1c2-t6">
+<p>Select whether the entity's access to instance variables is field-based or property-based, as defined in the JPA specification.</p>
+<ul>
+<li>
+<p><span class="bold">Field</span> &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
+</li>
+<li>
+<p><span class="bold">Property</span> &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>
+</ul>
+</td>
+<td align="left" headers="r5c1-t6 r1c3-t6">
+<p>Field</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="tblformal" -->
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a><br />
+<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
+<!-- class="sect3" -->
+<!-- class="sect2" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_add_converter.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_add_converter.htm
new file mode 100644
index 0000000000..b848fed9b5
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_add_converter.htm
@@ -0,0 +1,78 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Add Converter dialog</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Add Converter dialog" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIAGCGIJ" name="CIAGCGIJ"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Add Converter dialog</h1>
+<p>Use this dialog to create a new EclipseLink converter.</p>
+<div class="inftblhruleinformalmax">
+<table class="HRuleInformalMax" 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-t39">Property</th>
+<th align="left" valign="bottom" id="r1c2-t39">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t39" headers="r1c1-t39">Name</td>
+<td align="left" headers="r2c1-t39 r1c2-t39">Enter the name for this converter</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t39" headers="r1c1-t39">Type</td>
+<td align="left" headers="r3c1-t39 r1c2-t39">Select the converter type:
+<ul>
+<li>
+<p>Custom</p>
+</li>
+<li>
+<p>Object type</p>
+</li>
+<li>
+<p>Struct</p>
+</li>
+<li>
+<p>Type</p>
+</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformalmax" --></div>
+<!-- class="sect2" -->
+<!-- class="sect1" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_cardinality.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_cardinality.htm
new file mode 100644
index 0000000000..fda639c152
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_cardinality.htm
@@ -0,0 +1,65 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Association Cardinality</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:50Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Association Cardinality" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIAFIIFH" name="CIAFIIFH"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Association Cardinality</h1>
+<p><a id="sthref209" name="sthref209"></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>
+</li>
+<li>
+<p>One to many</p>
+</li>
+<li>
+<p>One to one</p>
+</li>
+<li>
+<p>Many to many</p>
+</li>
+</ul>
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association</a><br />
+<a href="tasks019.htm#BABBAGFI">Generating entities from tables</a><br />
+<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables Wizard</a></div>
+<!-- class="sect3" -->
+<!-- class="sect2" -->
+<!-- class="sect1" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_table.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_table.htm
new file mode 100644
index 0000000000..888c998447
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_table.htm
@@ -0,0 +1,74 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Association Tables</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:50Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Association Tables" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIAGJHDC" name="CIAGJHDC"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Association Tables</h1>
+<p>Use this page to specify the association tables for an entity.</p>
+<div class="inftblinformal">
+<table class="Informal" title="This table describes the options on the Association Tables dialog." summary="This table describes the options on the Association Tables dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t12">Property</th>
+<th align="left" valign="bottom" id="r1c2-t12">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t12" headers="r1c1-t12">Association kind</td>
+<td align="left" headers="r2c1-t12 r1c2-t12">Specify if the association is <span class="bold">Simple</span> (1:M) or <span class="bold">Many to Many</span> (M:M).</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t12" headers="r1c1-t12">Association tables</td>
+<td align="left" headers="r3c1-t12 r1c2-t12">Click <span class="bold">Table Selection</span>, then select the two tables to associate.
+<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>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblinformal" -->
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association</a><br />
+<a href="tasks019.htm#BABBAGFI">Generating entities from tables</a><br />
+<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables Wizard</a></div>
+<!-- class="sect3" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_custom_entities_wizard.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_custom_entities_wizard.htm
new file mode 100644
index 0000000000..176e819a10
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_custom_entities_wizard.htm
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Generate Entities from Tables Wizard</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:50Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Generate Entities from Tables Wizard" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIAGBFJE" name="CIAGBFJE"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Generate Entities from Tables Wizard</h1>
+<p>Use the Generate Custom Entities Wizard to create entities from your database tables.</p>
+<p>The wizard consists of the following pages:</p>
+<ul>
+<li>
+<p><a href="ref_selectTables.htm#CIAHCGEE">Select Tables</a></p>
+</li>
+<li>
+<p><a href="ref_tableAssociations.htm#CIACDICB">Table Associations</a></p>
+</li>
+<li>
+<p><a href="ref_customizeDefaultEntityGeneration.htm#CIAEJDBE">Customize Default Entity Generation</a></p>
+</li>
+<li>
+<p><a href="ref_customizIndividualEntities.htm#CIACIGEE">Customize Individual Entities</a></p>
+</li>
+</ul>
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" --></div>
+</body>
+</html>
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
new file mode 100644
index 0000000000..ec5befdba0
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_jpa_entity_wizard.htm
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Create JPA Entity wizard</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:49Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Create JPA Entity wizard" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIAGGGDF" name="CIAGGGDF"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Create JPA Entity wizard</h1>
+<p>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>
+</li>
+<li>
+<p><a href="ref_EntityPropertiesPage.htm#CIADECIA">Entity Properties page</a></p>
+</li>
+</ul>
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" --></div>
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_new_association_wizard.htm
index cf677e30bd..b01d116f39 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_new_association_wizard.htm
@@ -2,51 +2,49 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:53 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Dali Developer Documentation</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Create New Association</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:50Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Dali Developer Documentation" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Create New Association" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CACBBDIB" name="CACBBDIB"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Dali Developer Documentation</h1>
-<p><a id="sthref246" name="sthref246"></a><a id="sthref247" name="sthref247"></a><a id="sthref248" name="sthref248"></a>Additional Dali documentation is available online at:</p>
-<p><code><a href="http://wiki.eclipse.org/index.php/Dali_Developer_Documentation">http://wiki.eclipse.org/index.php/Dali_Developer_Documentation</a></code></p>
-<p>This developer documentation includes information about:</p>
+<p><a id="CIAFGHIF" name="CIAFGHIF"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Create New Association</h1>
+<p><a id="sthref206" name="sthref206"></a><a id="sthref207" name="sthref207"></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>
-<p>Dali architecture</p>
+<p><a href="ref_association_table.htm#CIAGJHDC">Association Tables</a></p>
</li>
<li>
-<p>Plugins that comprise the Dali JPA Eclipse feature</p>
+<p><a href="ref_join_columns.htm#CIAEGEEG">Join Columns</a></p>
</li>
<li>
-<p>Extension points</p>
+<p><a href="ref_association_cardinality.htm#CIAFIIFH">Association Cardinality</a></p>
</li>
</ul>
-</div>
-<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
-<!-- class="footer" -->
+<!-- class="footer" --></div>
</body>
</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizIndividualEntities.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizIndividualEntities.htm
new file mode 100644
index 0000000000..1970e429b1
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizIndividualEntities.htm
@@ -0,0 +1,89 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Customize Individual Entities</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:50Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Customize Individual Entities" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIACIGEE" name="CIACIGEE"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Customize Individual Entities</h1>
+<p><a id="sthref205" name="sthref205"></a>Use this page to customize each generated entity. Select an item in the Table and columns area, then complete the following fields for each item.</p>
+<div class="inftblinformal">
+<table class="Informal" title="This table describes the options on the Individual Entities dialog." summary="This table describes the options on the Individual Entities dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t11">Property</th>
+<th align="left" valign="bottom" id="r1c2-t11">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t11" headers="r1c1-t11">Table Mapping</td>
+<td align="left" headers="r2c1-t11 r1c2-t11">Use these options to define the table mapping information for the entity.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t11" headers="r1c1-t11">&nbsp;&nbsp;Key&nbsp;generator</td>
+<td align="left" headers="r3c1-t11 r1c2-t11">Select the generator used for this mapping.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t11" headers="r1c1-t11">&nbsp;&nbsp;Sequence&nbsp;name</td>
+<td align="left" headers="r4c1-t11 r1c2-t11">Enter a name for the sequence.
+<p>You can use <span class="bold">$table</span> and <span class="bold">$pk</span> as variables in the name. These will be replaced by the table name and primary key column name (respectively) when Dali generates a table mapping.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t11" headers="r1c1-t11">&nbsp;&nbsp;Entity&nbsp;access</td>
+<td align="left" headers="r5c1-t11 r1c2-t11">Specify the default entity access method: <span class="bold">Field</span> (default) or <span class="bold">Property</span>.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t11" headers="r1c1-t11">Domain Java Class</td>
+<td align="left" headers="r6c1-t11 r1c2-t11">Use these options to define the class information (<span class="bold">Superclass</span> and <span class="bold">Interfaces</span>) for the entity.</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblinformal" -->
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a><br />
+<a href="tasks019.htm#BABBAGFI">Generating entities from tables</a><br />
+<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables Wizard</a>
+<p>&nbsp;</p>
+</div>
+<!-- class="sect3" -->
+<!-- class="sect2" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm
new file mode 100644
index 0000000000..a3164669da
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm
@@ -0,0 +1,96 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Customize Default Entity Generation</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:50Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Customize Default Entity Generation" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIAEJDBE" name="CIAEJDBE"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Customize Default Entity Generation</h1>
+<p><a id="sthref204" name="sthref204"></a>Use this page to specify the default information Dali will use when generating the entities from the database tables. You will be able to override this information for specific entities.</p>
+<div class="inftblinformal">
+<table class="Informal" title="This table describes the options on the Generate Entities dialog." summary="This table describes the options on the Custom Default Entity Generation dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t10">Property</th>
+<th align="left" valign="bottom" id="r1c2-t10">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t10" headers="r1c1-t10">Table Mapping</td>
+<td align="left" headers="r2c1-t10 r1c2-t10">Use these options to define the table mapping information for the entity.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Key&nbsp;generator</td>
+<td align="left" headers="r3c1-t10 r1c2-t10">Select the generator used for this mapping.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Sequence&nbsp;name</td>
+<td align="left" headers="r4c1-t10 r1c2-t10">Enter a name for the sequence.
+<p>You can use <span class="bold">$table</span> and <span class="bold">$pk</span> as variables in the name. These will be replaced by the table name and primary key column name (respectively) when Dali generates a table mapping.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Entity&nbsp;access</td>
+<td align="left" headers="r5c1-t10 r1c2-t10">Specify the default entity access method: <span class="bold">Field</span> (default) or <span class="bold">Property</span>.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Associations&nbsp;fetch</td>
+<td align="left" headers="r6c1-t10 r1c2-t10">Specify the default fetch mode for associations: <span class="bold">Default</span>, as defined by the application (default), or <span class="bold">Lazy</span>.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Collection&nbsp;type</td>
+<td align="left" headers="r7c1-t10 r1c2-t10">Specify if the collection properties are a <span class="bold">Set</span> or <span class="bold">List</span>.
+<p>Enable the <span class="bold">Always generate optional JPA annotations and DDL parameters</span> option to have Dali include this information in the entity.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t10" headers="r1c1-t10">Domain Java Class</td>
+<td align="left" headers="r8c1-t10 r1c2-t10">Use these options to define the class information (<span class="bold">Package</span>, <span class="bold">Superclass</span>, and <span class="bold">Interfaces</span>) for the entity.</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblinformal" -->
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a><br />
+<a href="tasks019.htm#BABBAGFI">Generating entities from tables</a><br />
+<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables Wizard</a></div>
+<!-- class="sect3" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm
index cdda46b2ec..6c0b85759d 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
@@ -2,21 +2,19 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>JPA Details view (for orm.xml)</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>JPA Details view (for orm.xml)</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:51Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Details view (for orm.xml)" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
@@ -26,18 +24,30 @@
<p>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="reference016.htm#CACCACGH">General information</a></p>
+<p><a href="reference013.htm#CACCACGH">General information</a></p>
+</li>
+<li>
+<p><a href="reference014.htm#CACEAGBG">Persistence Unit information</a></p>
+</li>
+<li>
+<p><a href="reference015.htm#CIAFGAIJ">Generators</a></p>
+</li>
+<li>
+<p><a href="reference016.htm#CIAIBAAJ">Queries</a></p>
</li>
<li>
-<p><a href="reference017.htm#CACEAGBG">Persistence Unit information</a></p>
+<p><a href="reference017.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>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
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
new file mode 100644
index 0000000000..a5939b0348
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_eclipselink_mapping_file.htm
@@ -0,0 +1,81 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>New EclipseLink Mapping File dialog</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="New EclipseLink Mapping File dialog" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIAEDEJF" name="CIAEDEJF"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>New EclipseLink Mapping File dialog</h1>
+<p>Specify the location and properties of the EclipseLink mapping file (<code>eclispelink-orm.xml</code>).</p>
+<div class="inftblhruleinformalmax">
+<table class="HRuleInformalMax" 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-t38">Property</th>
+<th align="left" valign="bottom" id="r1c2-t38">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t38" headers="r1c1-t38">Project</td>
+<td align="left" headers="r2c1-t38 r1c2-t38">Select the project in which to add the mapping file.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t38" headers="r1c1-t38">Source folder</td>
+<td align="left" headers="r3c1-t38 r1c2-t38">Click <span class="bold">Browse</span> and select the source file in which to add the mapping file. The default is <code>../</code><code><span class="codeinlineitalic">&lt;PROJECT&gt;</span></code><code>/src</code>.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t38" headers="r1c1-t38">File path</td>
+<td align="left" headers="r4c1-t38 r1c2-t38">Enter the filename and path of the mapping file. The default is <code>META-INF/eclipselink-orm.xml</code>.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t38" headers="r1c1-t38">Default access</td>
+<td align="left" headers="r5c1-t38 r1c2-t38">Select whether the entity's access to instance variables is <span class="bold">field</span>-based or <span class="bold">property</span>-based, as defined in the JPA specification.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t38" headers="r1c1-t38">Add to persistence unit</td>
+<td align="left" headers="r6c1-t38 r1c2-t38">Specify if this mapping file should be added to the persistence unit (<code>persistence.xml</code>).</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t38" headers="r1c1-t38">&nbsp;&nbsp;Persistence&nbsp;Unit</td>
+<td align="left" headers="r7c1-t38 r1c2-t38">Select the persistence unit in which to add the mapping file.</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformalmax" -->
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="reference003.htm#CIAJEIDJ">Mapping File</a></div>
+<!-- class="sect2" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_java_page.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_java_page.htm
new file mode 100644
index 0000000000..154e4fccdd
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_java_page.htm
@@ -0,0 +1,74 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Java Page</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:49Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Java Page" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIAGEBAA" name="CIAGEBAA"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Java Page</h1>
+<p>This table lists the properties available on the Java page of the <a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a>.</p>
+<div class="inftblinformal">
+<table class="Informal" title="This table describes the options on the Generate DDL - Objects page." summary="This table describes the options on the Generate DDL - Objects page." dir="ltr" border="1" width="100%" frame="border" rules="all" 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-t3">Property</th>
+<th align="left" valign="bottom" id="r1c2-t3">Description</th>
+<th align="left" valign="bottom" id="r1c3-t3">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t3" headers="r1c1-t3">Source folders on build path</td>
+<td align="left" headers="r2c1-t3 r1c2-t3">Click <span class="bold">Add Folder</span> to select an existing Java source folder to add to this project.</td>
+<td align="left" headers="r2c1-t3 r1c3-t3">EclipseLink</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t3" headers="r1c1-t3">Default output folder</td>
+<td align="left" headers="r3c1-t3 r1c2-t3">Specify the location of the&nbsp;<code>.class</code> files.</td>
+<td align="left" headers="r3c1-t3 r1c3-t3">build\classes</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblinformal" -->
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></div>
+<!-- class="sect3" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_join_columns.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_join_columns.htm
new file mode 100644
index 0000000000..414ae8de50
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_join_columns.htm
@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Join Columns</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:50Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Join Columns" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIAEGEEG" name="CIAEGEEG"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Join Columns</h1>
+<p><a id="sthref208" name="sthref208"></a>Use this dialog to specify the join columns of an association table.</p>
+<p>Click Add to specify the join columns between the two tables.</p>
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association</a><br />
+<a href="tasks019.htm#BABBAGFI">Generating entities from tables</a><br />
+<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables Wizard</a></div>
+<!-- class="sect3" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm
index 88c5595061..46b152fa0b 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
@@ -2,21 +2,19 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>JPA Facet page</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>JPA Facet page</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:49Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Facet page" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
@@ -26,61 +24,96 @@
<p>This table lists the properties available on the JPA Facet page of the <a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a>.</p>
<div class="inftblinformal">
<table class="Informal" title="This table describes the options on the Generate DDL - Objects page." summary="This table describes the options on the Generate DDL - Objects page." dir="ltr" border="1" width="100%" frame="border" rules="all" 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-t3">Property</th>
-<th align="left" valign="bottom" id="r1c2-t3">Description</th>
-<th align="left" valign="bottom" id="r1c3-t3">Default</th>
+<th align="left" valign="bottom" id="r1c1-t4">Property</th>
+<th align="left" valign="bottom" id="r1c2-t4">Description</th>
+<th align="left" valign="bottom" id="r1c3-t4">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t3" headers="r1c1-t3">Platform</td>
-<td align="left" headers="r2c1-t3 r1c2-t3">Vendor-specific JPA implementation.</td>
-<td align="left" headers="r2c1-t3 r1c3-t3">EclipseLink</td>
+<td align="left" id="r2c1-t4" headers="r1c1-t4">Platform</td>
+<td align="left" headers="r2c1-t4 r1c2-t4">Vendor-specific JPA implementation.</td>
+<td align="left" headers="r2c1-t4 r1c3-t4">EclipseLink</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t4" headers="r1c1-t4"><a id="sthref190" name="sthref190"></a><a id="sthref191" name="sthref191"></a>JPA Implementation</td>
+<td align="left" headers="r3c1-t4 r1c2-t4">Select a specific JPA library configuration.
+<p>Click <span class="bold">Manage libraries</span> to create or update a user library.</p>
+<p>Click <span class="bold">Download libraries</span> to download a specific library configuration.</p>
+</td>
+<td align="left" headers="r3c1-t4 r1c3-t4"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t4" headers="r1c1-t4">&nbsp;&nbsp;Type</td>
+<td align="left" headers="r4c1-t4 r1c2-t4">Select <span class="bold">User Library</span> to select from the available user-defined or downloaded libraries.
+<p>If you select Disable, you must manually include the JPA implementation library on the project classpath.</p>
+</td>
+<td align="left" headers="r4c1-t4 r1c3-t4">User Library</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t4" headers="r1c1-t4">&nbsp;&nbsp;Include libraries with this application</td>
+<td align="left" headers="r5c1-t4 r1c2-t4">Specify if the selected libraries are included when deploying the application.</td>
+<td align="left" headers="r5c1-t4 r1c3-t4">Selected</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t3" headers="r1c1-t3">Connection</td>
-<td align="left" headers="r3c1-t3 r1c2-t3">Select the database connection to use with the project. Dali requires an active database connection to use and validate the persistent entities and mappings.
+<td align="left" id="r6c1-t4" headers="r1c1-t4">Connection</td>
+<td align="left" headers="r6c1-t4 r1c2-t4">Select the database connection to use with the project. Dali requires an active database connection to use and validate the persistent entities and mappings.
<p>Click <span class="bold">Add connection</span> to create a new database connection.</p>
</td>
-<td align="left" headers="r3c1-t3 r1c3-t3"><br /></td>
+<td align="left" headers="r6c1-t4 r1c3-t4"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t3" headers="r1c1-t3">&nbsp;&nbsp;Override default schema from connection</td>
-<td align="left" headers="r4c1-t3 r1c2-t3">Select a schema other than the default one that is derived from the connection information. Use this option if the default schema cannot be used. For example, use this option when the deployment login differs from the design-time login.</td>
-<td align="left" headers="r4c1-t3 r1c3-t3">The value calculated by Dali.</td>
+<td align="left" id="r7c1-t4" headers="r1c1-t4">&nbsp;&nbsp;Override&nbsp;default schema from connection</td>
+<td align="left" headers="r7c1-t4 r1c2-t4">Select a schema other than the default one that is derived from the connection information. Use this option if the default schema cannot be used. For example, use this option when the deployment login differs from the design-time login.</td>
+<td align="left" headers="r7c1-t4 r1c3-t4">The value calculated by Dali.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t3" headers="r1c1-t3">JPA Implementation</td>
-<td align="left" headers="r5c1-t3 r1c2-t3">Select to use the <span class="bold">JPA implementation provided by the server at runtime</span>, or select a specific <span class="bold">implementation library</span> that contain the Java Persistence API (JPA) and entities to be added to the project's Java Build Path.
+<td align="left" id="r8c1-t4" headers="r1c1-t4">JPA Implementation</td>
+<td align="left" headers="r8c1-t4 r1c2-t4">Select to use the <span class="bold">JPA implementation provided by the server at runtime</span>, or select a specific <span class="bold">implementation library</span> that contain the Java Persistence API (JPA) and entities to be added to the project's Java Build Path.
<p>Click <span class="bold">Configure default JPA implementation library</span> to create a default library for the project or click <span class="bold">Configure user libraries</span> to define additional libraries.</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="r5c1-t3 r1c3-t3">Determined by server.</td>
+<td align="left" headers="r8c1-t4 r1c3-t4">Determined by server.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t3" headers="r1c1-t3">Persistent class management</td>
-<td align="left" headers="r6c1-t3 r1c2-t3">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.
+<td align="left" id="r9c1-t4" headers="r1c1-t4"><a id="sthref192" name="sthref192"></a>Persistent class management</td>
+<td align="left" headers="r9c1-t4 r1c2-t4">Specify if Dali will <span class="bold">discover annotated classes automatically</span>, or if the <span class="bold">annotated classes must be listed in the persistence.xml</span> file.
<p><span class="bold">Note</span>: To insure application portability, you should explicitly list the managed persistence classes that are included in the persistence unit.</p>
</td>
-<td align="left" headers="r6c1-t3 r1c3-t3">Determined by server.</td>
+<td align="left" headers="r9c1-t4 r1c3-t4">Determined by server.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t3" headers="r1c1-t3">Create orm.xml</td>
-<td align="left" headers="r7c1-t3 r1c2-t3">Specify if Dali should create a default <code>orm.xml</code> file for your entity mappings and persistence unit defaults.</td>
-<td align="left" headers="r7c1-t3 r1c3-t3">Selected</td>
+<td align="left" id="r10c1-t4" headers="r1c1-t4"><a id="sthref193" name="sthref193"></a>Create <code>orm.xml</code></td>
+<td align="left" headers="r10c1-t4 r1c2-t4">Specify if Dali should create a default <code>orm.xml</code> file for your entity mappings and persistence unit defaults.</td>
+<td align="left" headers="r10c1-t4 r1c3-t4">Selected</td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblinformal" --></div>
+<!-- class="inftblinformal" -->
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></div>
<!-- class="sect3" -->
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm
index df8834cfb4..d097c323b7 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm
@@ -2,21 +2,19 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:50 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>General information</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>General information</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:51Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="General information" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
@@ -26,92 +24,96 @@
<p>This table lists the General properties available in the <span class="gui-object-title">Java Details view</span> for each mapping type.</p>
<div class="inftblruleinformal">
<table class="RuleInformal" title="This table describes the options on the Persistence Properties view." summary="This table describes the options on the Persistence Properties view." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="21%" />
+<col width="*" />
+<col width="27%" />
+<col width="21%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t10">Property</th>
-<th align="left" valign="bottom" id="r1c2-t10">Description</th>
-<th align="left" valign="bottom" id="r1c3-t10">Default</th>
-<th align="left" valign="bottom" id="r1c4-t10">Available for Mapping Type</th>
+<th align="left" valign="bottom" id="r1c1-t16">Property</th>
+<th align="left" valign="bottom" id="r1c2-t16">Description</th>
+<th align="left" valign="bottom" id="r1c3-t16">Default</th>
+<th align="left" valign="bottom" id="r1c4-t16">Available for Mapping Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t10" headers="r1c1-t10">Mapping Type Hyperlink</td>
-<td align="left" headers="r2c1-t10 r1c2-t10">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 attribute.</td>
-<td align="left" headers="r2c1-t10 r1c3-t10">Basic</td>
-<td align="left" headers="r2c1-t10 r1c4-t10">All mapping types</td>
+<td align="left" id="r2c1-t16" headers="r1c1-t16">Mapping Type Hyperlink</td>
+<td align="left" headers="r2c1-t16 r1c2-t16">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 attribute.</td>
+<td align="left" headers="r2c1-t16 r1c3-t16">Basic</td>
+<td align="left" headers="r2c1-t16 r1c4-t16">All mapping types</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t10" headers="r1c1-t10"><a id="CACGCBHB" name="CACGCBHB"></a>Column</td>
-<td align="left" headers="r3c1-t10 r1c2-t10"><a id="sthref193" name="sthref193"></a><a id="sthref194" name="sthref194"></a>The database column that contains the value for the attribute. This field corresponds to the <code>@Column</code> annotation.</td>
-<td align="left" headers="r3c1-t10 r1c3-t10">By default, the Column is assumed to be named identically to the attribute.</td>
-<td align="left" headers="r3c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a>, <a href="tasks019.htm#BABHIBII">Version mapping</a></td>
+<td align="left" id="r3c1-t16" headers="r1c1-t16"><a id="CACGCBHB" name="CACGCBHB"></a>Column</td>
+<td align="left" headers="r3c1-t16 r1c2-t16"><a id="sthref230" name="sthref230"></a><a id="sthref231" name="sthref231"></a>The database column that contains the value for the attribute. This field corresponds to the <code>@Column</code> annotation.</td>
+<td align="left" headers="r3c1-t16 r1c3-t16">By default, the Column is assumed to be named identically to the attribute.</td>
+<td align="left" headers="r3c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a>, <a href="tasks018.htm#BABHIBII">Version mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Name</td>
-<td align="left" headers="r4c1-t10 r1c2-t10">Name of the database column.
+<td align="left" id="r4c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Name</td>
+<td align="left" headers="r4c1-t16 r1c2-t16">Name of the database column.
<p>This field corresponds to the <code>@Column</code> annotation.</p>
</td>
-<td align="left" headers="r4c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r4c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" headers="r4c1-t16 r1c3-t16"><br /></td>
+<td align="left" headers="r4c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Table</td>
-<td align="left" headers="r5c1-t10 r1c2-t10">Name of the database table that contains the selected column.</td>
-<td align="left" headers="r5c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r5c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" id="r5c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Table</td>
+<td align="left" headers="r5c1-t16 r1c2-t16">Name of the database table that contains the selected column.</td>
+<td align="left" headers="r5c1-t16 r1c3-t16"><br /></td>
+<td align="left" headers="r5c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Insertable</td>
-<td align="left" headers="r6c1-t10 r1c2-t10">Specifies if the column is always included in <code>SQL INSERT</code> statements.</td>
-<td align="left" headers="r6c1-t10 r1c3-t10">True</td>
-<td align="left" headers="r6c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" id="r6c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Insertable</td>
+<td align="left" headers="r6c1-t16 r1c2-t16">Specifies if the column is always included in <code>SQL INSERT</code> statements.</td>
+<td align="left" headers="r6c1-t16 r1c3-t16">True</td>
+<td align="left" headers="r6c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Updatable</td>
-<td align="left" headers="r7c1-t10 r1c2-t10">Specifies if this column is always included in <code>SQL UPDATE</code> statements.</td>
-<td align="left" headers="r7c1-t10 r1c3-t10">True</td>
-<td align="left" headers="r7c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" id="r7c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Updatable</td>
+<td align="left" headers="r7c1-t16 r1c2-t16">Specifies if this column is always included in <code>SQL UPDATE</code> statements.</td>
+<td align="left" headers="r7c1-t16 r1c3-t16">True</td>
+<td align="left" headers="r7c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Unique</td>
-<td align="left" headers="r8c1-t10 r1c2-t10">Sets the <code>UNIQUE</code> constraint for the column.</td>
-<td align="left" headers="r8c1-t10 r1c3-t10">False</td>
-<td align="left" headers="r8c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" id="r8c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Unique</td>
+<td align="left" headers="r8c1-t16 r1c2-t16">Sets the <code>UNIQUE</code> constraint for the column.</td>
+<td align="left" headers="r8c1-t16 r1c3-t16">False</td>
+<td align="left" headers="r8c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Nullable</td>
-<td align="left" headers="r9c1-t10 r1c2-t10">Specifies if the column allows null values.</td>
-<td align="left" headers="r9c1-t10 r1c3-t10">True</td>
-<td align="left" headers="r9c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" id="r9c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Nullable</td>
+<td align="left" headers="r9c1-t16 r1c2-t16">Specifies if the column allows null values.</td>
+<td align="left" headers="r9c1-t16 r1c3-t16">True</td>
+<td align="left" headers="r9c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r10c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Length</td>
-<td align="left" headers="r10c1-t10 r1c2-t10">Sets the column length.</td>
-<td align="left" headers="r10c1-t10 r1c3-t10">255</td>
-<td align="left" headers="r10c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" id="r10c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Length</td>
+<td align="left" headers="r10c1-t16 r1c2-t16">Sets the column length.</td>
+<td align="left" headers="r10c1-t16 r1c3-t16">255</td>
+<td align="left" headers="r10c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r11c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Precision</td>
-<td align="left" headers="r11c1-t10 r1c2-t10">Sets the precision for the column values.</td>
-<td align="left" headers="r11c1-t10 r1c3-t10">0</td>
-<td align="left" headers="r11c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" id="r11c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Precision</td>
+<td align="left" headers="r11c1-t16 r1c2-t16">Sets the precision for the column values.</td>
+<td align="left" headers="r11c1-t16 r1c3-t16">0</td>
+<td align="left" headers="r11c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r12c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Scale</td>
-<td align="left" headers="r12c1-t10 r1c2-t10">Sets the number of digits that appear to the right of the decimal point.</td>
-<td align="left" headers="r12c1-t10 r1c3-t10">0</td>
-<td align="left" headers="r12c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" id="r12c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Scale</td>
+<td align="left" headers="r12c1-t16 r1c2-t16">Sets the number of digits that appear to the right of the decimal point.</td>
+<td align="left" headers="r12c1-t16 r1c3-t16">0</td>
+<td align="left" headers="r12c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r13c1-t10" headers="r1c1-t10">&nbsp;&nbsp;Column Definition</td>
-<td align="left" headers="r13c1-t10 r1c2-t10">Define the DDL for a column. This is used when a table is being generated.</td>
-<td align="left" headers="r13c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r13c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" id="r13c1-t16" headers="r1c1-t16">&nbsp;&nbsp;Column Definition</td>
+<td align="left" headers="r13c1-t16 r1c2-t16">Define the DDL for a column. This is used when a table is being generated.</td>
+<td align="left" headers="r13c1-t16 r1c3-t16"><br /></td>
+<td align="left" headers="r13c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r14c1-t10" headers="r1c1-t10"><a id="CACGGGHB" name="CACGGGHB"></a><a id="sthref195" name="sthref195"></a><a id="sthref196" name="sthref196"></a><a id="sthref197" name="sthref197"></a>Fetch Type</td>
-<td align="left" headers="r14c1-t10 r1c2-t10">Defines how data is loaded from the database:
+<td align="left" id="r14c1-t16" headers="r1c1-t16"><a id="CACGGGHB" name="CACGGGHB"></a><a id="sthref232" name="sthref232"></a><a id="sthref233" name="sthref233"></a><a id="sthref234" name="sthref234"></a>Fetch Type</td>
+<td align="left" headers="r14c1-t16 r1c2-t16">Defines how data is loaded from the database:
<ul>
<li>
<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
@@ -121,26 +123,26 @@
</li>
</ul>
</td>
-<td align="left" headers="r14c1-t10 r1c3-t10">Eager</td>
-<td align="left" headers="r14c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></td>
+<td align="left" headers="r14c1-t16 r1c3-t16">Eager</td>
+<td align="left" headers="r14c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks016.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks013.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks014.htm#BABHFAFJ">Many-to-one mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r15c1-t10" headers="r1c1-t10">Optional</td>
-<td align="left" headers="r15c1-t10 r1c2-t10">Specifies if this field is can be null.</td>
-<td align="left" headers="r15c1-t10 r1c3-t10">Yes</td>
-<td align="left" headers="r15c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></td>
+<td align="left" id="r15c1-t16" headers="r1c1-t16">Optional</td>
+<td align="left" headers="r15c1-t16 r1c2-t16">Specifies if this field is can be null.</td>
+<td align="left" headers="r15c1-t16 r1c3-t16">Yes</td>
+<td align="left" headers="r15c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks016.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks014.htm#BABHFAFJ">Many-to-one mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r16c1-t10" headers="r1c1-t10"><a id="CACBBIBI" name="CACBBIBI"></a><a id="sthref198" name="sthref198"></a>Lob</td>
-<td align="left" headers="r16c1-t10 r1c2-t10">Specify if the field is mapped to <code>java.sql.Clob</code> or <code>java.sql.Blob</code>.
+<td align="left" id="r16c1-t16" headers="r1c1-t16"><a id="CACBBIBI" name="CACBBIBI"></a><a id="sthref235" name="sthref235"></a>Lob</td>
+<td align="left" headers="r16c1-t16 r1c2-t16">Specify if the field is mapped to <code>java.sql.Clob</code> or <code>java.sql.Blob</code>.
<p>This field corresponds to the <code>@Lob</code> annotation.</p>
</td>
-<td align="left" headers="r16c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r16c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a><br /></td>
+<td align="left" headers="r16c1-t16 r1c3-t16"><br /></td>
+<td align="left" headers="r16c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r17c1-t10" headers="r1c1-t10"><a id="CACEAJGD" name="CACEAJGD"></a><a id="sthref199" name="sthref199"></a><a id="sthref200" name="sthref200"></a><a id="sthref201" name="sthref201"></a>Temporal</td>
-<td align="left" headers="r17c1-t10 r1c2-t10">Specifies if this field is one of the following:
+<td align="left" id="r17c1-t16" headers="r1c1-t16"><a id="CACEAJGD" name="CACEAJGD"></a><a id="sthref236" name="sthref236"></a><a id="sthref237" name="sthref237"></a><a id="sthref238" name="sthref238"></a>Temporal</td>
+<td align="left" headers="r17c1-t16 r1c2-t16">Specifies if this field is one of the following:
<ul>
<li>
<p>Date &ndash; <code>java.sql.Date</code></p>
@@ -154,12 +156,12 @@
</ul>
<p>This field corresponds to the <code>@Temporal</code> annotation.</p>
</td>
-<td align="left" headers="r17c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r17c1-t10 r1c4-t10"><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks013.htm#BABGCBHG">ID mapping</a></td>
+<td align="left" headers="r17c1-t16 r1c3-t16"><br /></td>
+<td align="left" headers="r17c1-t16 r1c4-t16"><a href="tasks009.htm#BABBABCE">Basic mapping</a>, <a href="tasks012.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r18c1-t10" headers="r1c1-t10"><a id="sthref202" name="sthref202"></a><a id="sthref203" name="sthref203"></a><a id="sthref204" name="sthref204"></a>Enumerated</td>
-<td align="left" headers="r18c1-t10 r1c2-t10">Specify how to persist enumerated constraints if the <code>String</code> value suits your application requirements or to match an existing database schema.
+<td align="left" id="r18c1-t16" headers="r1c1-t16"><a id="sthref239" name="sthref239"></a><a id="sthref240" name="sthref240"></a><a id="sthref241" name="sthref241"></a>Enumerated</td>
+<td align="left" headers="r18c1-t16 r1c2-t16">Specify how to persist enumerated constraints if the <code>String</code> value suits your application requirements or to match an existing database schema.
<ul>
<li>
<p>ordinal</p>
@@ -170,18 +172,18 @@
</ul>
<p>This field corresponds to the <code>@Enumerated</code> annotation.</p>
</td>
-<td align="left" headers="r18c1-t10 r1c3-t10">Ordinal</td>
-<td align="left" headers="r18c1-t10 r1c4-t10"><br /></td>
+<td align="left" headers="r18c1-t16 r1c3-t16">Ordinal</td>
+<td align="left" headers="r18c1-t16 r1c4-t16"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r19c1-t10" headers="r1c1-t10">Target Entity</td>
-<td align="left" headers="r19c1-t10 r1c2-t10">The persistent entity to which the attribute is mapped.</td>
-<td align="left" headers="r19c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r19c1-t10 r1c4-t10"><a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks016.htm#BABHGEBD">One-to-many mapping</a> <a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></td>
+<td align="left" id="r19c1-t16" headers="r1c1-t16">Target Entity</td>
+<td align="left" headers="r19c1-t16 r1c2-t16">The persistent entity to which the attribute is mapped.</td>
+<td align="left" headers="r19c1-t16 r1c3-t16"><br /></td>
+<td align="left" headers="r19c1-t16 r1c4-t16"><a href="tasks016.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks015.htm#BABHGEBD">One-to-many mapping</a> <a href="tasks013.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks014.htm#BABHFAFJ">Many-to-one mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r20c1-t10" headers="r1c1-t10"><a id="CACJAIHB" name="CACJAIHB"></a>Cascade Type</td>
-<td align="left" headers="r20c1-t10 r1c2-t10">Specify which operations are propagated throughout the entity.
+<td align="left" id="r20c1-t16" headers="r1c1-t16"><a id="CACJAIHB" name="CACJAIHB"></a>Cascade Type</td>
+<td align="left" headers="r20c1-t16 r1c2-t16">Specify which operations are propagated throughout the entity.
<ul>
<li>
<p>All &ndash; All operations</p>
@@ -203,18 +205,18 @@
</li>
</ul>
</td>
-<td align="left" headers="r20c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r20c1-t10 r1c4-t10"><a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks016.htm#BABHGEBD">One-to-many mapping</a>, <a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></td>
+<td align="left" headers="r20c1-t16 r1c3-t16"><br /></td>
+<td align="left" headers="r20c1-t16 r1c4-t16"><a href="tasks016.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks015.htm#BABHGEBD">One-to-many mapping</a>, <a href="tasks013.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks014.htm#BABHFAFJ">Many-to-one mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r21c1-t10" headers="r1c1-t10"><a id="CACJDJJA" name="CACJDJJA"></a>Mapped By</td>
-<td align="left" headers="r21c1-t10 r1c2-t10">The field in the database table that "owns" the relationship. This field is required only on the non-owning side of the relationship.</td>
-<td align="left" headers="r21c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r21c1-t10 r1c4-t10"><a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks016.htm#BABHGEBD">One-to-many mapping</a></td>
+<td align="left" id="r21c1-t16" headers="r1c1-t16"><a id="CACJDJJA" name="CACJDJJA"></a>Mapped By</td>
+<td align="left" headers="r21c1-t16 r1c2-t16">The field in the database table that "owns" the relationship. This field is required only on the non-owning side of the relationship.</td>
+<td align="left" headers="r21c1-t16 r1c3-t16"><br /></td>
+<td align="left" headers="r21c1-t16 r1c4-t16"><a href="tasks016.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks015.htm#BABHGEBD">One-to-many mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r22c1-t10" headers="r1c1-t10"><a id="CACDADIH" name="CACDADIH"></a><a id="sthref205" name="sthref205"></a><a id="sthref206" name="sthref206"></a>Order By</td>
-<td align="left" headers="r22c1-t10 r1c2-t10">Specify the default order for objects returned from a query:
+<td align="left" id="r22c1-t16" headers="r1c1-t16"><a id="CACDADIH" name="CACDADIH"></a><a id="sthref242" name="sthref242"></a><a id="sthref243" name="sthref243"></a>Order By</td>
+<td align="left" headers="r22c1-t16 r1c2-t16">Specify the default order for objects returned from a query:
<ul>
<li>
<p>No ordering</p>
@@ -228,15 +230,15 @@
</ul>
<p>This field corresponds to the <code>@OrderBy</code> annotation.</p>
</td>
-<td align="left" headers="r22c1-t10 r1c3-t10">Primary key</td>
-<td align="left" headers="r22c1-t10 r1c4-t10"><a href="tasks016.htm#BABHGEBD">One-to-many mapping</a>. <a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></td>
+<td align="left" headers="r22c1-t16 r1c3-t16">Primary key</td>
+<td align="left" headers="r22c1-t16 r1c4-t16"><a href="tasks015.htm#BABHGEBD">One-to-many mapping</a>. <a href="tasks013.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks014.htm#BABHFAFJ">Many-to-one mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r23c1-t10" headers="r1c1-t10">Attribute Overrides</td>
-<td align="left" headers="r23c1-t10 r1c2-t10">Overrides <span class="bold">Basic</span> mappings of a mapped superclass (for example, if the inherited column name is incompatible with a pre-existing data model, or invalid as a column name in your database).</td>
-<td align="left" headers="r23c1-t10 r1c3-t10"><br /></td>
-<td align="left" headers="r23c1-t10 r1c4-t10"><a href="tasks011.htm#BABCBHDF">Embedded mapping</a>
-<p><a href="tasks011.htm#BABCBHDF">Embedded mapping</a></p>
+<td align="left" id="r23c1-t16" headers="r1c1-t16">Attribute Overrides</td>
+<td align="left" headers="r23c1-t16 r1c2-t16">Overrides <span class="bold">Basic</span> mappings of a mapped superclass (for example, if the inherited column name is incompatible with a pre-existing data model, or invalid as a column name in your database).</td>
+<td align="left" headers="r23c1-t16 r1c3-t16"><br /></td>
+<td align="left" headers="r23c1-t16 r1c4-t16"><a href="tasks010.htm#BABCBHDF">Embedded mapping</a>
+<p><a href="tasks010.htm#BABCBHDF">Embedded mapping</a></p>
<br /></td>
</tr>
</tbody>
@@ -251,8 +253,11 @@
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
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 36e6f539f5..4f2e4a2998 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
@@ -2,21 +2,19 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>New JPA Project page</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>New JPA Project page</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:49Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="New JPA Project page" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
@@ -26,6 +24,9 @@
<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="inftblinformal">
<table class="Informal" title="This table describes the options on the Generate DDL - Objects page." summary="This table describes the options on the Generate DDL - Objects page." dir="ltr" border="1" width="100%" frame="border" rules="all" 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-t2">Property</th>
@@ -67,16 +68,34 @@
</td>
<td align="left" headers="r6c1-t2 r1c3-t2"><br /></td>
</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t2" headers="r1c1-t2">Working sets</td>
+<td align="left" headers="r7c1-t2 r1c2-t2">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>Select <span class="bold">Add project to working sets</span>, then select a working set in which to add this project.</p>
+</td>
+<td align="left" headers="r7c1-t2 r1c3-t2"><br /></td>
+</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblinformal" --></div>
+<!-- class="inftblinformal" -->
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
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 bfb014e70e..3192c83290 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
@@ -2,41 +2,45 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Create New JPA Project wizard</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Create New JPA Project wizard</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:49Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Create New JPA Project wizard" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<p><a id="CACBJGBG" name="CACBJGBG"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Create New JPA Project wizard</h1>
-<p>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="sthref189" name="sthref189"></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>
</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%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
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
new file mode 100644
index 0000000000..10bfb40f96
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_general.htm
@@ -0,0 +1,119 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>General</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="General" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIACIFGJ" name="CIACIFGJ"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>General</h1>
+<p>The following table lists properties available in the General page of the <a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>.</p>
+<div class="tblformal"><a id="sthref256" name="sthref256"></a><a id="sthref257" name="sthref257"></a>
+<p class="titleintable">Properties of the General Page</p>
+<table class="Formal" title="Properties of the General Page" summary="This table describes the properties of the persistence.xml&rsquo;s General page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<col width="24%" />
+<col width="*" />
+<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>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t24" headers="r1c1-t24">
+<p>Name</p>
+</td>
+<td align="left" headers="r2c1-t24 r1c2-t24">
+<p>Enter the name of the persistence unit.</p>
+</td>
+<td align="left" headers="r2c1-t24 r1c3-t24">
+<p>The project name.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t24" headers="r1c1-t24">
+<p>Persistence Provider</p>
+</td>
+<td align="left" headers="r3c1-t24 r1c2-t24">
+<p>Enter the name of the persistence provider.</p>
+</td>
+<td align="left" headers="r3c1-t24 r1c3-t24">
+<p>Determined by the server.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t24" headers="r1c1-t24">
+<p>Description</p>
+</td>
+<td align="left" headers="r4c1-t24 r1c2-t24">
+<p>Enter a description for this persistence unit. This is an optional property.</p>
+</td>
+<td align="left" headers="r4c1-t24 r1c3-t24"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t24" headers="r1c1-t24">
+<p>Managed Classes</p>
+</td>
+<td align="left" headers="r5c1-t24 r1c2-t24">
+<p>Add or remove the classes managed through the persistence unit.</p>
+</td>
+<td align="left" headers="r5c1-t24 r1c3-t24"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t24" headers="r1c1-t24">
+<p>Exclude Unlisted Classes</p>
+</td>
+<td align="left" headers="r6c1-t24 r1c2-t24">
+<p>Select to include all annotated entity classes in the root of the persistence unit.</p>
+</td>
+<td align="left" headers="r6c1-t24 r1c3-t24">
+<p>False</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t24" headers="r1c1-t24">
+<p>XML Mapping Files</p>
+</td>
+<td align="left" headers="r7c1-t24 r1c2-t24">
+<p>Add or remove the object/relational mapping XML files that define the classes to be managed by the persistence unit.</p>
+</td>
+<td align="left" headers="r7c1-t24 r1c3-t24">
+<p>Meta-INF\orm.xml</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="tblformal" --></div>
+<!-- class="sect3" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm
index aba760059b..8ff575f0af 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
@@ -2,37 +2,35 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:50 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>JPA Details view (for attributes)</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>JPA Details view (for attributes)</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:51Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Details view (for attributes)" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<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="sthref190" name="sthref190"></a><a id="sthref191" name="sthref191"></a><a id="sthref192" name="sthref192"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected mapped attribute and contains the following areas:</p>
+<p><a id="sthref227" name="sthref227"></a><a id="sthref228" name="sthref228"></a><a id="sthref229" name="sthref229"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected mapped attribute and contains the following areas:</p>
<ul>
<li>
<p><a href="ref_mapping_general.htm#CACBHFIJ">General information</a></p>
</li>
<li>
-<p><a href="reference014.htm#CACBAEBC">Join Table Information</a></p>
+<p><a href="reference011.htm#CACBAEBC">Join Table Information</a></p>
</li>
<li>
-<p><a href="reference015.htm#CACFCEJC">Join Columns Information</a></p>
+<p><a href="reference012.htm#CACFCEJC">Join Columns Information</a></p>
</li>
<li>
<p><a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a></p>
@@ -41,8 +39,11 @@
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
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 11fa6b2224..c2426f38bd 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
@@ -2,29 +2,27 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>JPA Structure view</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>JPA Structure view</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Structure view" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<p><a id="BABEGGFE" name="BABEGGFE"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>JPA Structure view</h1>
-<p><a id="sthref215" name="sthref215"></a><a id="sthref216" name="sthref216"></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="sthref217" name="sthref217"></a>
+<p><a id="sthref253" name="sthref253"></a><a id="sthref254" name="sthref254"></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="sthref255" name="sthref255"></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" -->
@@ -38,8 +36,11 @@
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
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 7099087ada..bf43ac376c 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
@@ -2,28 +2,26 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:52 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>JPA Development perspective</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>JPA Development perspective</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Development perspective" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<p><a id="BABIFBDB" name="BABIFBDB"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>JPA Development perspective</h1>
-<p><a id="sthref244" name="sthref244"></a><a id="sthref245" name="sthref245"></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="sthref280" name="sthref280"></a><a id="sthref281" name="sthref281"></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>
@@ -45,8 +43,11 @@
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
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 d7a07c83d5..107977280c 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
@@ -2,47 +2,48 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>JPA Details view (for entities)</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>JPA Details view (for entities)</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:50Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Details view (for entities)" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<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="sthref177" name="sthref177"></a><a id="sthref178" name="sthref178"></a><a id="sthref179" name="sthref179"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected entity and contains the following tabs:</p>
+<p><a id="sthref210" name="sthref210"></a><a id="sthref211" name="sthref211"></a><a id="sthref212" name="sthref212"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected entity and contains the following tabs:</p>
<ul>
<li>
-<p><a href="reference009.htm#CACCAGGC">General information</a></p>
+<p><a href="reference006.htm#CACCAGGC">General information</a></p>
</li>
<li>
-<p><a href="reference010.htm#CACIJBGH">Attribute overrides</a></p>
+<p><a href="reference007.htm#CACIJBGH">Attribute overrides</a></p>
</li>
<li>
-<p><a href="reference011.htm#CACBHIDA">Secondary table information</a></p>
+<p><a href="reference008.htm#CACBHIDA">Secondary table information</a></p>
</li>
<li>
-<p><a href="reference012.htm#CACFHGHE">Inheritance information</a></p>
+<p><a href="reference009.htm#CACFHGHE">Inheritance information</a></p>
</li>
</ul>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
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
new file mode 100644
index 0000000000..cee6ee043c
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_xmll_editor.htm
@@ -0,0 +1,82 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>persistence.xml Editor</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="persistence.xml Editor" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIACCHID" name="CIACCHID"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>persistence.xml Editor</h1>
+<p>The persistence.xml Editor provides an interface that enables you to update the persistence.xml file. For projects using the EclipseLink platform, the perisistence.xml 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="reference018.htm#CIAFFJIE">Connection</a></p>
+</li>
+<li>
+<p><a href="reference019.htm#CIAJAFEG">Customization</a></p>
+</li>
+<li>
+<p><a href="reference020.htm#CIABEDCH">Caching</a></p>
+</li>
+<li>
+<p><a href="reference021.htm#CIABGHHI">Logging</a></p>
+</li>
+<li>
+<p><a href="reference022.htm#CIAFJCHE">Options</a></p>
+</li>
+<li>
+<p><a href="reference023.htm#CIACCFCB">Schema Generation</a></p>
+</li>
+<li>
+<p><a href="reference024.htm#CIAHJDFF">Properties</a></p>
+</li>
+<li>
+<p><a href="reference025.htm#CIAHCJAH">Source</a></p>
+</li>
+</ul>
+<p>For projects using the Generic platform, the following subset of these pages is available:</p>
+<ul>
+<li>
+<p><a href="ref_persistence_general.htm#CIACIFGJ">General</a></p>
+</li>
+<li>
+<p><a href="reference018.htm#CIAFFJIE">Connection</a></p>
+</li>
+<li>
+<p><a href="reference024.htm#CIAHJDFF">Properties</a></p>
+</li>
+<li>
+<p><a href="reference025.htm#CIAHCJAH">Source</a></p>
+</li>
+</ul>
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" --></div>
+</body>
+</html>
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 c98a548484..e9983540d8 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
@@ -2,46 +2,47 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Primary Key Generation information</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Primary Key Generation information</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:51Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Primary Key Generation information" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<p><a id="CACFCCAB" name="CACFCCAB"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Primary Key Generation information</h1>
-<p>This table lists the fields available in the <span class="gui-object-title">Primary Key Generation</span> area in JPA Details view for <a href="tasks013.htm#BABGCBHG">ID mapping</a> types.</p>
+<p>This table lists the fields available in the <span class="gui-object-title">Primary Key Generation</span> area in JPA Details view for <a href="tasks012.htm#BABGCBHG">ID mapping</a> types.</p>
<div class="inftblruleinformal">
<table class="RuleInformal" title="This table describes the options on the Join Columns tab." summary="This table describes the options on the Join Columns tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="26%" />
+<col width="*" />
+<col width="34%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t13">Property</th>
-<th align="left" valign="bottom" id="r1c2-t13">Description</th>
-<th align="left" valign="bottom" id="r1c3-t13">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-t13" headers="r1c1-t13"><a id="CACBAJBC" name="CACBAJBC"></a>Primary Key Generation</td>
-<td align="left" headers="r2c1-t13 r1c2-t13"><a id="sthref211" name="sthref211"></a><a id="sthref212" name="sthref212"></a>These fields define how the primary key is generated. These fields correspond to the <code>@GeneratedValue</code> annotation.</td>
-<td align="left" headers="r2c1-t13 r1c3-t13">Generated Value</td>
+<td align="left" id="r2c1-t19" headers="r1c1-t19"><a id="CACBAJBC" name="CACBAJBC"></a>Primary Key Generation</td>
+<td align="left" headers="r2c1-t19 r1c2-t19"><a id="sthref249" name="sthref249"></a><a id="sthref250" name="sthref250"></a>These fields define how the primary key is generated. These fields correspond to the <code>@GeneratedValue</code> annotation.</td>
+<td align="left" headers="r2c1-t19 r1c3-t19">Generated Value</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t13" headers="r1c1-t13"><a id="CACJEEEC" name="CACJEEEC"></a>&nbsp;&nbsp;&nbsp;Strategy</td>
-<td align="left" headers="r3c1-t13 r1c2-t13">
+<td align="left" id="r3c1-t19" headers="r1c1-t19"><a id="CACJEEEC" name="CACJEEEC"></a>&nbsp;&nbsp;&nbsp;Strategy</td>
+<td align="left" headers="r3c1-t19 r1c2-t19">
<ul>
<li>Auto</li>
<li>
@@ -55,61 +56,61 @@
</li>
</ul>
</td>
-<td align="left" headers="r3c1-t13 r1c3-t13">Auto</td>
+<td align="left" headers="r3c1-t19 r1c3-t19">Auto</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t13" headers="r1c1-t13"><a id="BABEEAHJ" name="BABEEAHJ"></a>&nbsp;&nbsp;Generator Name</td>
-<td align="left" headers="r4c1-t13 r1c2-t13">Unique name of the generated value.</td>
-<td align="left" headers="r4c1-t13 r1c3-t13"><br /></td>
+<td align="left" id="r4c1-t19" headers="r1c1-t19"><a id="BABEEAHJ" name="BABEEAHJ"></a>&nbsp;&nbsp;Generator Name</td>
+<td align="left" headers="r4c1-t19 r1c2-t19">Unique name of the generated value.</td>
+<td align="left" headers="r4c1-t19 r1c3-t19"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t13" headers="r1c1-t13"><a id="CACGFEAH" name="CACGFEAH"></a>Table Generator</td>
-<td align="left" headers="r5c1-t13 r1c2-t13">These fields define the database table used for generating the primary key and correspond to the <code>@TableGenerator</code> annotation.
+<td align="left" id="r5c1-t19" headers="r1c1-t19"><a id="CACGFEAH" name="CACGFEAH"></a>Table Generator</td>
+<td align="left" headers="r5c1-t19 r1c2-t19">These fields define the database table used for generating the primary key and correspond to the <code>@TableGenerator</code> annotation.
<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-t13 r1c3-t13"><br /></td>
+<td align="left" headers="r5c1-t19 r1c3-t19"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Name</td>
-<td align="left" headers="r6c1-t13 r1c2-t13">Unique name of the generator.</td>
-<td align="left" headers="r6c1-t13 r1c3-t13"><br /></td>
+<td align="left" id="r6c1-t19" headers="r1c1-t19">&nbsp;&nbsp;Name</td>
+<td align="left" headers="r6c1-t19 r1c2-t19">Unique name of the generator.</td>
+<td align="left" headers="r6c1-t19 r1c3-t19"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Table</td>
-<td align="left" headers="r7c1-t13 r1c2-t13">Database table that stores the generated ID values.</td>
-<td align="left" headers="r7c1-t13 r1c3-t13"><br /></td>
+<td align="left" id="r7c1-t19" headers="r1c1-t19">&nbsp;&nbsp;Table</td>
+<td align="left" headers="r7c1-t19 r1c2-t19">Database table that stores the generated ID values.</td>
+<td align="left" headers="r7c1-t19 r1c3-t19"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Primary Key Column</td>
-<td align="left" headers="r8c1-t13 r1c2-t13">The column in the table generator's <span class="bold">Table</span> that contains the primary key.</td>
-<td align="left" headers="r8c1-t13 r1c3-t13"><br /></td>
+<td align="left" id="r8c1-t19" headers="r1c1-t19">&nbsp;&nbsp;Primary Key Column</td>
+<td align="left" headers="r8c1-t19 r1c2-t19">The column in the table generator's <span class="bold">Table</span> that contains the primary key.</td>
+<td align="left" headers="r8c1-t19 r1c3-t19"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Value Column</td>
-<td align="left" headers="r9c1-t13 r1c2-t13">The column that stores the generated ID values.</td>
-<td align="left" headers="r9c1-t13 r1c3-t13"><br /></td>
+<td align="left" id="r9c1-t19" headers="r1c1-t19">&nbsp;&nbsp;Value Column</td>
+<td align="left" headers="r9c1-t19 r1c2-t19">The column that stores the generated ID values.</td>
+<td align="left" headers="r9c1-t19 r1c3-t19"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r10c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Primary Key Column Value</td>
-<td align="left" headers="r10c1-t13 r1c2-t13">The value for the <span class="bold">Primary Key Column</span> in the generator table.</td>
-<td align="left" headers="r10c1-t13 r1c3-t13"><br /></td>
+<td align="left" id="r10c1-t19" headers="r1c1-t19">&nbsp;&nbsp;Primary Key Column Value</td>
+<td align="left" headers="r10c1-t19 r1c2-t19">The value for the <span class="bold">Primary Key Column</span> in the generator table.</td>
+<td align="left" headers="r10c1-t19 r1c3-t19"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r11c1-t13" headers="r1c1-t13"><a id="CACFFHEH" name="CACFFHEH"></a>Sequence&nbsp;Generator</td>
-<td align="left" headers="r11c1-t13 r1c2-t13"><a id="sthref213" name="sthref213"></a><a id="sthref214" name="sthref214"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.
+<td align="left" id="r11c1-t19" headers="r1c1-t19"><a id="CACFFHEH" name="CACFFHEH"></a>Sequence&nbsp;Generator</td>
+<td align="left" headers="r11c1-t19 r1c2-t19"><a id="sthref251" name="sthref251"></a><a id="sthref252" name="sthref252"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.
<p>These fields apply only when <span class="bold">Strategy</span> = <span class="bold">Sequence</span>.</p>
</td>
-<td align="left" headers="r11c1-t13 r1c3-t13"><br /></td>
+<td align="left" headers="r11c1-t19 r1c3-t19"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r12c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Name</td>
-<td align="left" headers="r12c1-t13 r1c2-t13">Name of the sequence table to use for defining primary key values.</td>
-<td align="left" headers="r12c1-t13 r1c3-t13"><br /></td>
+<td align="left" id="r12c1-t19" headers="r1c1-t19">&nbsp;&nbsp;Name</td>
+<td align="left" headers="r12c1-t19 r1c2-t19">Name of the sequence table to use for defining primary key values.</td>
+<td align="left" headers="r12c1-t19 r1c3-t19"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r13c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Sequence</td>
-<td align="left" headers="r13c1-t13 r1c2-t13">Unique name of the sequence.</td>
-<td align="left" headers="r13c1-t13 r1c3-t13"><br /></td>
+<td align="left" id="r13c1-t19" headers="r1c1-t19">&nbsp;&nbsp;Sequence</td>
+<td align="left" headers="r13c1-t19 r1c2-t19">Unique name of the sequence.</td>
+<td align="left" headers="r13c1-t19 r1c3-t19"><br /></td>
</tr>
</tbody>
</table>
@@ -118,7 +119,7 @@
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="tasks013.htm#BABGCBHG">ID mapping</a>
+<a href="tasks012.htm#BABGCBHG">ID mapping</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
<br />
@@ -128,8 +129,11 @@
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
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 0fd473e54b..e0c5dadd28 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
@@ -2,45 +2,62 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:52 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Project Properties page - JPA Options</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Project Properties page &ndash; Java Persistence Options</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Project Properties page - JPA Options" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Project Properties page &ndash; Java Persistence Options" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<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="sthref232" name="sthref232"></a><a id="sthref233" name="sthref233"></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>
+<h1>Project Properties page &ndash; Java Persistence Options</h1>
+<p><a id="sthref271" name="sthref271"></a><a id="sthref272" name="sthref272"></a>Use the <span class="gui-object-title">Java Persistence</span> options on the <span class="gui-object-title">Properties</span> page to select the database connection to use with the project.</p>
<p>This table lists the properties available in the <span class="gui-object-title">JPA Details page</span>.</p>
<div class="inftblinformal">
<table class="Informal" title="This table describes the options on the Persistence Properties page." summary="This table describes the options on the Persistence Properties page." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t28">Property</th>
-<th align="left" valign="bottom" id="r1c2-t28">Description</th>
+<th align="left" valign="bottom" id="r1c1-t36">Property</th>
+<th align="left" valign="bottom" id="r1c2-t36">Description</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t28" headers="r1c1-t28"><a id="sthref234" name="sthref234"></a><a id="sthref235" name="sthref235"></a><a id="sthref236" name="sthref236"></a><a id="sthref237" name="sthref237"></a>Platform</td>
-<td align="left" headers="r2c1-t28 r1c2-t28">Select the vendor-specific platform.</td>
+<td align="left" id="r2c1-t36" headers="r1c1-t36"><a id="sthref273" name="sthref273"></a><a id="sthref274" name="sthref274"></a><a id="sthref275" name="sthref275"></a><a id="sthref276" name="sthref276"></a>Platform</td>
+<td align="left" headers="r2c1-t36 r1c2-t36">Select the vendor-specific platform.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t28" headers="r1c1-t28"><a id="sthref238" name="sthref238"></a><a id="sthref239" name="sthref239"></a><a id="sthref240" name="sthref240"></a>Connection</td>
-<td align="left" headers="r3c1-t28 r1c2-t28">The database connection used to map the persistent entities.
+<td align="left" id="r3c1-t36" headers="r1c1-t36">Library</td>
+<td align="left" headers="r3c1-t36 r1c2-t36">Select a specific JPA library configuration.
+<p>Click <span class="bold">Manage libraries</span> to create or update a user library.</p>
+<p>Click <span class="bold">Download libraries</span> to download a specific library configuration.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Type</td>
+<td align="left" headers="r4c1-t36 r1c2-t36">Select <span class="bold">User Library</span> to select from the available user-defined or downloaded libraries.
+<p>If you select Disable, you must manually include the JPA implementation library on the project classpath.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Include&nbsp;libraries&nbsp;with&nbsp;this&nbsp;application</td>
+<td align="left" headers="r5c1-t36 r1c2-t36">Specify if the selected libraries are included when deploying the application.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t36" headers="r1c1-t36"><a id="sthref277" name="sthref277"></a><a id="sthref278" name="sthref278"></a><a id="sthref279" name="sthref279"></a>Connection</td>
+<td align="left" headers="r6c1-t36 r1c2-t36">The database connection used to map the persistent entities.
<ul>
<li>
<p>To create a new connection, click <span class="bold">Add Connections</span>.</p>
@@ -52,12 +69,16 @@
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t28" headers="r1c1-t28">&nbsp;&nbsp;Override default schema from connection</td>
-<td align="left" headers="r4c1-t28 r1c2-t28">Select a schema other than the default one derived from the connection information. Use this option if the default schema is incorrect or cannot be used. For example, use this option when the deployment login differs from the design-time login.</td>
+<td align="left" id="r7c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Override&nbsp;default&nbsp;catalog&nbsp;from&nbsp;connection</td>
+<td align="left" headers="r7c1-t36 r1c2-t36">Select a catalog other than the default one derived from the connection information. Use this option if the default catalog is incorrect or cannot be used.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Override&nbsp;default&nbsp;schema&nbsp;from&nbsp;connection</td>
+<td align="left" headers="r8c1-t36 r1c2-t36">Select a schema other than the default one derived from the connection information. Use this option if the default schema is incorrect or cannot be used. For example, use this option when the deployment login differs from the design-time login.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t28" headers="r1c1-t28">Persistent Class Management</td>
-<td align="left" headers="r5c1-t28 r1c2-t28">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.
+<td align="left" id="r9c1-t36" headers="r1c1-t36">Persistent Class Management</td>
+<td align="left" headers="r9c1-t36 r1c2-t36">Specify if Dali will <span class="bold">discover annotated classes automatically</span>, or if the <span class="bold">annotated classes must be listed in the persistence.xml</span> file.
<p><span class="bold">Note</span>: To insure application portability, you should explicitly list the managed persistence classes that are included in the persistence unit.</p>
</td>
</tr>
@@ -68,14 +89,17 @@
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="tasks025.htm#BABDBCBI">Modifying persistent project properties</a></div>
+<a href="tasks024.htm#BABDBCBI">Modifying persistent project properties</a></div>
<!-- class="sect2" -->
<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm
new file mode 100644
index 0000000000..83e9cba92b
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm
@@ -0,0 +1,79 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Select Tables</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:50Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Select Tables" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIAHCGEE" name="CIAHCGEE"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Select Tables</h1>
+<p><a id="sthref200" name="sthref200"></a><a id="sthref201" name="sthref201"></a><a id="sthref202" name="sthref202"></a>Use the <span class="gui-object-title">Select Tables</span> dialog to specify the database connection and tables from which to create entities.</p>
+<div class="inftblinformal">
+<table class="Informal" title="This table describes the options on the Generate Entities dialog." summary="This table describes the options on the Generate Entities dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t8">Property</th>
+<th align="left" valign="bottom" id="r1c2-t8">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t8" headers="r1c1-t8">Connection</td>
+<td align="left" headers="r2c1-t8 r1c2-t8">Select a database connection or click <span class="bold">Add Connection</span> to create a new connection.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t8" headers="r1c1-t8">Schema</td>
+<td align="left" headers="r3c1-t8 r1c2-t8">Select the database schema from which to select tables.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t8" headers="r1c1-t8">Tables</td>
+<td align="left" headers="r4c1-t8 r1c2-t8">Select the tables from which to create Java persistent entities. The tables shown are determined by the database connection and schema selections.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t8" headers="r1c1-t8">Synchronize Classes listed in persistence.xml</td>
+<td align="left" headers="r5c1-t8 r1c2-t8">Specify if Dali should update the <code>persistence.xml</code> file to include the generated classes.</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblinformal" -->
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a><br />
+<a href="tasks019.htm#BABBAGFI">Generating entities from tables</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables Wizard</a></div>
+<!-- class="sect3" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new008.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_select_cascade_dialog.htm
index 098e2ea801..4c5d1c20c7 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new008.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_select_cascade_dialog.htm
@@ -2,39 +2,36 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:54 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Generate DDL from Entities wizard</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Select Cascade dialog</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Generate DDL from Entities wizard" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Select Cascade dialog" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CEGIDCCE" name="CEGIDCCE"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Generate DDL from Entities wizard</h1>
-<p>Use the <span class="gui-object-title">Generate DDL</span> 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>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="tasks021.htm#CIHJIGBE">Generating DDL from Entities</a></div>
-<!-- class="sect1" -->
+<p><a id="CIAFDGIJ" name="CIAFDGIJ"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Select Cascade dialog</h1>
+<p>Specify which operations are propagated throughout the association: All, Persist, Merge, Remove, or Refresh.</p>
+</div>
+<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm
new file mode 100644
index 0000000000..a0842f196b
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm
@@ -0,0 +1,78 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Table Associations</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:50Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Table Associations" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="CIACDICB" name="CIACDICB"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Table Associations</h1>
+<p><a id="sthref203" name="sthref203"></a>Use this page to create or edit the association between the database table and entity.</p>
+<div class="inftblinformal">
+<table class="Informal" title="This table describes the options on the Generate Entities dialog." summary="This table describes the options on the Table Associations dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t9">Property</th>
+<th align="left" valign="bottom" id="r1c2-t9">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t9" headers="r1c1-t9">Table associations</td>
+<td align="left" headers="r2c1-t9 r1c2-t9">Select an association to modify or click to create a new table association with the <a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association</a> wizard.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t9" headers="r1c1-t9">Generate this association</td>
+<td align="left" headers="r3c1-t9 r1c2-t9">Specify if Dali should create the selected association. If enabled, you can specify the Cardinality and Join table for the table association.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t9" headers="r1c1-t9">Generate a reference to <span class="italic">&lt;ROW&gt;</span> in <span class="italic">&lt;TABLE&gt;</span></td>
+<td align="left" headers="r4c1-t9 r1c2-t9">Specify if the entity should contain a reference to the specified table.
+<p>If enabled, you can also enter the <span class="bold">Property</span> name and select the <span class="bold">Cascade</span> method (all, persist, merge, remove, or refresh) for the reference.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblinformal" -->
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a><br />
+<a href="tasks019.htm#BABBAGFI">Generating entities from tables</a><br />
+<a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables Wizard</a></div>
+<!-- class="sect3" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
index ccf4052c61..84c3c9a98d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
@@ -2,25 +2,23 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Reference</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Reference</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:49Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content=" Reference" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="sthref168" name="sthref168"></a></p>
+<p><a id="sthref188" name="sthref188"></a></p>
<h1>Reference</h1>
<p>This section includes detailed help information for each of the following elements in the Dali OR Mapping Tool:</p>
<ul>
@@ -28,29 +26,32 @@
<p><a href="reference001.htm#CACJJJJH">Wizards</a></p>
</li>
<li>
-<p><a href="reference008.htm#CACDJIIG">Property pages</a></p>
+<p><a href="reference005.htm#CACDJIIG">Property pages</a></p>
</li>
<li>
-<p><a href="reference028.htm#CACDEIEE">Preferences</a></p>
+<p><a href="reference026.htm#CACDEIEE">Preferences</a></p>
</li>
<li>
-<p><a href="reference029.htm#CACGEJDA">Dialogs</a></p>
+<p><a href="reference027.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="reference031.htm#CACDHCIA">Icons and buttons</a></p>
+<p><a href="reference029.htm#CACDHCIA">Icons and buttons</a></p>
</li>
<li>
-<p><a href="reference034.htm#CACBBDIB">Dali Developer Documentation</a></p>
+<p><a href="reference032.htm#CACBBDIB">Dali Developer Documentation</a></p>
</li>
</ul>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm
index 0c326d1c60..d2277c8a66 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm
@@ -2,21 +2,19 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Wizards</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Wizards</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:49Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Wizards" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
@@ -29,14 +27,26 @@
<p><a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></p>
</li>
<li>
-<p><a href="reference002.htm#CIAGGGDF">Create JPA Entity wizard</a></p>
+<p><a href="ref_create_jpa_entity_wizard.htm#CIAGGGDF">Create JPA Entity wizard</a></p>
+</li>
+<li>
+<p><a href="reference004.htm#CIAGHCGA">Generate Tables from Entities Wizard</a></p>
+</li>
+<li>
+<p><a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables Wizard</a></p>
+</li>
+<li>
+<p><a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association</a></p>
</li>
</ul>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
index 55322e391c..ad018c9711 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
@@ -2,41 +2,35 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Create JPA Entity wizard</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Mapping File Wizard</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:49Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Create JPA Entity wizard" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Mapping File Wizard" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CIAGGGDF" name="CIAGGGDF"></a></p>
+<p><a id="CIAIJCCE" name="CIAIJCCE"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Create JPA Entity wizard</h1>
-<p>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="reference003.htm#CIAFEIGF">Entity Class page</a></p>
-</li>
-<li>
-<p><a href="reference004.htm#CIADECIA">Entity Properties page</a></p>
-</li>
-</ul>
+<h1>Mapping File Wizard</h1>
+<p>The 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">Mapping File Wizard</a> consists of the Mapping File page.</p>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
index 2cb08d872b..2774291de6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
@@ -2,127 +2,130 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Entity Class page</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Mapping File</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:49Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Entity Class page" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Mapping File" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CIAFEIGF" name="CIAFEIGF"></a></p>
+<p><a id="CIAJEIDJ" name="CIAJEIDJ"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Entity Class page</h1>
-<p>This table lists the properties of the Entity Class page of the <a href="reference002.htm#CIAGGGDF">Create JPA Entity wizard</a>.</p>
-<div class="tblformal"><a id="sthref169" name="sthref169"></a><a id="sthref170" name="sthref170"></a>
-<p class="titleintable">&nbsp;</p>
-<table class="Formal" title="" summary="This table describes the Entity Class page of the Create JPA Entities wizard." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<h1>Mapping File</h1>
+<p>This table lists the properties of the <a href="reference002.htm#CIAIJCCE">Mapping File Wizard</a>.</p>
+<div class="tblformal"><a id="sthref198" name="sthref198"></a><a id="sthref199" name="sthref199"></a>
+<p class="titleintable">Mapping File Wizard Properties</p>
+<table class="Formal" title="Mapping File Wizard Properties" summary="This table lists the properties of the Mapping File Wizard." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<col width="24%" />
+<col width="*" />
+<col width="24%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t4">Property</th>
-<th align="left" valign="bottom" id="r1c2-t4">Description</th>
-<th align="left" valign="bottom" id="r1c3-t4">Default</th>
+<th align="left" valign="bottom" id="r1c1-t7">Property</th>
+<th align="left" valign="bottom" id="r1c2-t7">Description</th>
+<th align="left" valign="bottom" id="r1c3-t7">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t4" headers="r1c1-t4">
+<td align="left" id="r2c1-t7" headers="r1c1-t7">
<p>Project</p>
</td>
-<td align="left" headers="r2c1-t4 r1c2-t4">
-<p>The name of t he JPA project.</p>
+<td align="left" headers="r2c1-t7 r1c2-t7">
+<p>The name of the JPA project.</p>
</td>
-<td align="left" headers="r2c1-t4 r1c3-t4"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t4" headers="r1c1-t4">
-<p>Source Folder</p>
+<td align="left" headers="r2c1-t7 r1c3-t7">
+<p>Selected.</p>
</td>
-<td align="left" headers="r3c1-t4 r1c2-t4">
-<p>The location of the JPA project's src folder.</p>
-</td>
-<td align="left" headers="r3c1-t4 r1c3-t4"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t4" headers="r1c1-t4">
-<p>Java Package</p>
-</td>
-<td align="left" headers="r4c1-t4 r1c2-t4">
-<p>The name of the class package.</p>
+<td align="left" id="r3c1-t7" headers="r1c1-t7">
+<p>Source folder</p>
</td>
-<td align="left" headers="r4c1-t4 r1c3-t4"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t4" headers="r1c1-t4">
-<p>Class name</p>
+<td align="left" headers="r3c1-t7 r1c2-t7">
+<p>The location of the project's src folder. If needed, click <span class="bold">Browse</span> to point the wizard to the src file's location.</p>
</td>
-<td align="left" headers="r5c1-t4 r1c2-t4">
-<p>The name of the Java class.</p>
+<td align="left" headers="r3c1-t7 r1c3-t7">
+<p>Selected.</p>
</td>
-<td align="left" headers="r5c1-t4 r1c3-t4"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t4" headers="r1c1-t4">
-<p>Superclass</p>
+<td align="left" id="r4c1-t7" headers="r1c1-t7">
+<p>File Path</p>
</td>
-<td align="left" headers="r6c1-t4 r1c2-t4">
-<p>Select the superclass.</p>
+<td align="left" headers="r4c1-t7 r1c2-t7">
+<p>The location for the new <code>orm.xml</code> file.</p>
+</td>
+<td align="left" headers="r4c1-t7 r1c3-t7">
+<p>Selected.</p>
</td>
-<td align="left" headers="r6c1-t4 r1c3-t4"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t4" headers="r1c1-t4">
-<p>Inheritance</p>
+<td align="left" id="r5c1-t7" headers="r1c1-t7">
+<p>Default Access</p>
</td>
-<td align="left" headers="r7c1-t4 r1c2-t4">
-<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>
-<p>Select <span class="bold">Mapped Superclass</span> if you defined a superclass.</p>
-<p>To add an <code>@Inheritance</code> notation to the entity, select <span class="bold">Inheritance</span> and then select one of the inheritance mapping strategies (described in JSR 220):</p>
+<td align="left" headers="r5c1-t7 r1c2-t7">
+<p>Select whether the access to the entity is field-based or property-based, as defined in JPA specification.</p>
<ul>
<li>
-<p>SINGLE_TABLE -- All classes in a hierarchy as mapped to a single table. This annotation is without an attribute for the inheritance strategy.</p>
+<p>None &ndash; No access type specified.</p>
</li>
<li>
-<p>TABLE_PER_CLASS -- Each class is mapped to a separate table.</p>
+<p><span class="bold">Property-based</span> &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>JOINED -- The root of the class hierarchy is represented by a single table. Each subclass is represented by a separate table that contains those fields that are specific to the subclass (not inherited from its superclass), as well as the column(s) that represent its primary key. The primary key column(s) of the subclass table serves as a foreign key to the primary key of the superclass table.</p>
+<p><span class="bold">Field-based</span> &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
</li>
</ul>
</td>
-<td align="left" headers="r7c1-t4 r1c3-t4">
-<p>Entity</p>
+<td align="left" headers="r5c1-t7 r1c3-t7">
+<p>None</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t4" headers="r1c1-t4">
-<p>XML Entity Mappings</p>
+<td align="left" id="r6c1-t7" headers="r1c1-t7">
+<p>Add to persistence unit</p>
+</td>
+<td align="left" headers="r6c1-t7 r1c2-t7">
+<p>Designates the persistence unit for this object map file.</p>
</td>
-<td align="left" headers="r8c1-t4 r1c2-t4">
-<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>
+<td align="left" headers="r6c1-t7 r1c3-t7">
+<p>Selected.</p>
</td>
-<td align="left" headers="r8c1-t4 r1c3-t4"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="tblformal" --></div>
+<!-- class="tblformal" -->
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a><br />
+<a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a><br />
+<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="reference002.htm#CIAIJCCE">Mapping File Wizard</a><br /></div>
<!-- class="sect3" -->
+<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
index fd1b9996f5..af6dd02911 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
@@ -2,109 +2,45 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Entity Properties page</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Generate Tables from Entities Wizard</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:49Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Entity Properties page" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Generate Tables from Entities Wizard" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CIADECIA" name="CIADECIA"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Entity Properties page</h1>
-<p>This table lists the properties of the Entity Properties page of the <a href="reference002.htm#CIAGGGDF">Create JPA Entity wizard</a>.</p>
-<div class="tblformal"><a id="sthref171" name="sthref171"></a><a id="sthref172" name="sthref172"></a>
-<p class="titleintable">&nbsp;</p>
-<table class="Formal" title="" summary="This table to be converted to informal." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t5">Property</th>
-<th align="left" valign="bottom" id="r1c2-t5">Description</th>
-<th align="left" valign="bottom" id="r1c3-t5">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t5" headers="r1c1-t5">
-<p>Entity Name</p>
-</td>
-<td align="left" headers="r2c1-t5 r1c2-t5">
-<p>The name of the entity. By default, this value is the same as the one entered as the class name. If the entity name differs from the class name, then the entity name is added as an attribute. For example: <code>@Entity(name="EntityName")</code>.</p>
-</td>
-<td align="left" headers="r2c1-t5 r1c3-t5">
-<p>Determined by server.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t5" headers="r1c1-t5">
-<p>Table Name</p>
-</td>
-<td align="left" headers="r3c1-t5 r1c2-t5">
-<p>Select <span class="bold">Use default</span> to match the name of the mapped table name to the entity name. Otherwise, clear the <span class="bold">Use default</span> option and enter the name in the <span class="italic">Table Name</span> field. These options result in the addition of the <code>@Table</code> option to the Java class file.</p>
-</td>
-<td align="left" headers="r3c1-t5 r1c3-t5">
-<p>Use default.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t5" headers="r1c1-t5">
-<p>Entity Fields</p>
-</td>
-<td align="left" headers="r4c1-t5 r1c2-t5">
-<p>Click the <span class="bold">Add</span> button to add persistence fields using the Entity Fields dialog. This dialog enable you to build a field by entering a field name and selecting among persistence types. The <span class="bold">Key</span> option enables you to mark a field as a primary key. The dialog's <span class="bold">Browse</span> function enables you to add other persistence types described in the JPA specification. The <span class="bold">Edit</span> button enables you to change the name or type set for a persistent field.</p>
-</td>
-<td align="left" headers="r4c1-t5 r1c3-t5"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t5" headers="r1c1-t5">
-<p>Access Type</p>
-</td>
-<td align="left" headers="r5c1-t5 r1c2-t5">
-<p>Select whether the entity's access to instance variables is field-based or property-based, as defined in the JPA specification.</p>
-<ul>
-<li>
-<p><span class="bold">Field-based</span> &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
-</li>
-<li>
-<p><span class="bold">Property-based</span> &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>
-</ul>
-</td>
-<td align="left" headers="r5c1-t5 r1c3-t5">
-<p>Field-based</p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="tblformal" -->
+<p><a id="CIAGHCGA" name="CIAGHCGA"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Generate Tables from Entities Wizard</h1>
+<p>Use the Generate DDL 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>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="tasks001.htm#BABFBJBG">Creating a JPA Entity</a><br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
+<a href="tasks019.htm#BABBAGFI">Generating entities from tables</a><br />
+<a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a><br />
+<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
-<!-- class="sect3" -->
+<a href="ref_create_jpa_entity_wizard.htm#CIAGGGDF">Create JPA Entity wizard</a><br /></div>
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
index 6bd404341b..7e0d83cd2c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
@@ -2,34 +2,48 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Mapping File Wizard</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Property pages</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:50Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Mapping File Wizard" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Property pages" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CIAIJCCE" name="CIAIJCCE"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Mapping File Wizard</h1>
-<p>The 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">Mapping File Wizard</a> consists of the Mapping File page.</p>
+<p><a id="CACDJIIG" name="CACDJIIG"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>Property pages</h1>
+<p>This section includes information on the following:</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>
+</li>
+</ul>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
index 2028c23e2b..584a0dd34f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
@@ -2,115 +2,98 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Mapping File Wizard</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>General information</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:50Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Mapping File Wizard" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="General information" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<div class="sect3"><!-- infolevel="all" infotype="General" --><a id="sthref173" name="sthref173"></a>
-<h1>Mapping File</h1>
-<p>This table lists the properties of the <a href="reference005.htm#CIAIJCCE">Mapping File Wizard</a>.</p>
-<div class="tblformal"><a id="sthref174" name="sthref174"></a><a id="sthref175" name="sthref175"></a>
-<p class="titleintable">Mapping File Wizard Properties</p>
-<table class="Formal" title="Mapping File Wizard Properties" summary="" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<p><a id="CACCAGGC" name="CACCAGGC"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>General information</h1>
+<p>This table lists the General information fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
+<div class="inftblinformal">
+<table class="Informal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="16%" />
+<col width="*" />
+<col width="17%" />
+<col width="25%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t6">Property</th>
-<th align="left" valign="bottom" id="r1c2-t6">Description</th>
-<th align="left" valign="bottom" id="r1c3-t6">Default</th>
+<th align="left" valign="bottom" id="r1c1-t13">Property</th>
+<th align="left" valign="bottom" id="r1c2-t13">Description</th>
+<th align="left" valign="bottom" id="r1c3-t13">Default</th>
+<th align="left" valign="bottom" id="r1c4-t13">Available for Entity&nbsp;Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t6" headers="r1c1-t6">
-<p>Project</p>
-</td>
-<td align="left" headers="r2c1-t6 r1c2-t6">
-<p>The name of the JPA project.</p>
-</td>
-<td align="left" headers="r2c1-t6 r1c3-t6">
-<p>Selected.</p>
-</td>
+<td align="left" id="r2c1-t13" headers="r1c1-t13">Mapping Type Hyperlink</td>
+<td align="left" headers="r2c1-t13 r1c2-t13">Clicking the name of the mapping type, which is represented as a hyperlink, invokes the Mapping Type Selection dialog. Use this dialog to specify the type of entity: Mapped Superclass, Embeddable or the default mapping type.</td>
+<td align="left" headers="r2c1-t13 r1c3-t13">Entity</td>
+<td align="left" headers="r2c1-t13 r1c4-t13"><a href="tasks005.htm#BABGBIEE">Entity</a>, <a href="tasks006.htm#BABFEICE">Embeddable</a>, and <a href="tasks007.htm#BABDAGCI">Mapped superclass</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t6" headers="r1c1-t6">
-<p>Source folder</p>
-</td>
-<td align="left" headers="r3c1-t6 r1c2-t6">
-<p>The location of the project's src folder. If needed, click <span class="bold">Browse</span> to point the wizard to the src file's location.</p>
-</td>
-<td align="left" headers="r3c1-t6 r1c3-t6">
-<p>Selected.</p>
-</td>
+<td align="left" id="r3c1-t13" headers="r1c1-t13">Name</td>
+<td align="left" headers="r3c1-t13 r1c2-t13">The name of this entity. By default, the class name is used as the entity name.</td>
+<td align="left" headers="r3c1-t13 r1c3-t13"><br /></td>
+<td align="left" headers="r3c1-t13 r1c4-t13"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t6" headers="r1c1-t6">
-<p>File Path</p>
-</td>
-<td align="left" headers="r4c1-t6 r1c2-t6">
-<p>The location for the new <code>orm.xml</code> file.</p>
-</td>
-<td align="left" headers="r4c1-t6 r1c3-t6">
-<p>Selected.</p>
-</td>
+<td align="left" id="r4c1-t13" headers="r1c1-t13">Table</td>
+<td align="left" headers="r4c1-t13 r1c2-t13">The default database table information for this entity. These fields can be overridden by the information in the <a href="reference007.htm#CACIJBGH">Attribute overrides</a> area.</td>
+<td align="left" headers="r4c1-t13 r1c3-t13"><br /></td>
+<td align="left" headers="r4c1-t13 r1c4-t13"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t6" headers="r1c1-t6">
-<p>Default Access</p>
-</td>
-<td align="left" headers="r5c1-t6 r1c2-t6">
-<p>Select whether the access to the entity is field-based or property-based, as defined in JPA specification.</p>
-<ul>
-<li>
-<p>None &ndash; No access type specified.</p>
-</li>
-<li>
-<p><span class="bold">Property-based</span> &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">Field-based</span> &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r5c1-t6 r1c3-t6">
-<p>None</p>
-</td>
+<td align="left" id="r5c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Name</td>
+<td align="left" headers="r5c1-t13 r1c2-t13">The name of the primary database table associated with the entity.</td>
+<td align="left" headers="r5c1-t13 r1c3-t13"><br /></td>
+<td align="left" headers="r5c1-t13 r1c4-t13"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t6" headers="r1c1-t6">
-<p>Add to persistence unit</p>
-</td>
-<td align="left" headers="r6c1-t6 r1c2-t6">
-<p>Designates the persistence unit for this object map file.</p>
-</td>
-<td align="left" headers="r6c1-t6 r1c3-t6">
-<p>Selected.</p>
-</td>
+<td align="left" id="r6c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Catalog</td>
+<td align="left" headers="r6c1-t13 r1c2-t13">The database catalog that contains the <span class="bold">Table</span>.</td>
+<td align="left" headers="r6c1-t13 r1c3-t13">As defined in <code>orm.xml</code>.</td>
+<td align="left" headers="r6c1-t13 r1c4-t13"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Schema</td>
+<td align="left" headers="r7c1-t13 r1c2-t13">The database schema that contains the <span class="bold">Table</span>.</td>
+<td align="left" headers="r7c1-t13 r1c3-t13">As defined in <code>orm.xml</code>.</td>
+<td align="left" headers="r7c1-t13 r1c4-t13"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="tblformal" --></div>
+<!-- class="inftblinformal" -->
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
<!-- class="sect3" -->
-<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
index de8a03ae2a..522bd43871 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
@@ -2,35 +2,76 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Mapping File Wizard Properties</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Attribute overrides</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:51Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Mapping File Wizard Properties" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Attribute overrides" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<div class="sect2"><!-- infolevel="all" infotype="General" --><a id="sthref176" name="sthref176"></a>
-<h1>Generate DDL from Entities Wizard</h1>
-<p>The Generate DDL 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>
-<!-- class="sect2" -->
-<!-- class="sect1" -->
+<p><a id="CACIJBGH" name="CACIJBGH"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Attribute overrides</h1>
+<p><a id="sthref213" name="sthref213"></a><a id="sthref214" name="sthref214"></a><a id="sthref215" name="sthref215"></a>Use the <span class="gui-object-title">Attribute Overrides</span> area in the <span class="gui-object-title">JPA Details</span> view to override the default settings specified in the <a href="reference006.htm#CACCAGGC">General information</a> area of an attribute. Attribute overrides generally override/configure attributes that are inherited or embedded.</p>
+<p>This table lists the Attribute override fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
+<div class="inftblinformal">
+<table class="Informal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="16%" />
+<col width="*" />
+<col width="17%" />
+<col width="25%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t14">Property</th>
+<th align="left" valign="bottom" id="r1c2-t14">Description</th>
+<th align="left" valign="bottom" id="r1c3-t14">Default</th>
+<th align="left" valign="bottom" id="r1c4-t14">Available for Entity&nbsp;Type</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t14" headers="r1c1-t14">Attribute Overrides</td>
+<td align="left" headers="r2c1-t14 r1c2-t14">Specify a property or field to be overridden (from the default mappings). Select <span class="bold">Override Default</span>.</td>
+<td align="left" headers="r2c1-t14 r1c3-t14"><br /></td>
+<td align="left" headers="r2c1-t14 r1c4-t14"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t14" headers="r1c1-t14">Join Columns</td>
+<td align="left" headers="r3c1-t14 r1c2-t14"><br /></td>
+<td align="left" headers="r3c1-t14 r1c3-t14"><br /></td>
+<td align="left" headers="r3c1-t14 r1c4-t14"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblinformal" -->
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="reference006.htm#CACCAGGC">General information</a><br />
+<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
+<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
index e1a36d01e9..d7e0a4fc6d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
@@ -2,50 +2,47 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Property pages</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Secondary table information</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:51Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Property pages" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Secondary table information" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CACDJIIG" name="CACDJIIG"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Property pages</h1>
-<p>This section includes information on the following:</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>
-</li>
-</ul>
+<p><a id="CACBHIDA" name="CACBHIDA"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Secondary table information</h1>
+<p><a id="sthref216" name="sthref216"></a><a id="sthref217" name="sthref217"></a><a id="sthref218" name="sthref218"></a><a id="sthref219" name="sthref219"></a>Use the <span class="gui-object-title">Secondary Tables</span> area in the <span class="gui-object-title">JPA Details</span> view to associate additional tables with an entity. Use this area if the data associated with an entity is spread across multiple tables.</p>
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a><br />
+<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
+<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
-<!-- class="footer" --></div>
+<!-- class="footer" -->
</body>
</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
index f1b9b244be..22ad6518d2 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
@@ -2,82 +2,95 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>General information</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Inheritance information</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:51Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="General information" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Inheritance information" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CACCAGGC" name="CACCAGGC"></a></p>
+<p><a id="CACFHGHE" name="CACFHGHE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>General information</h1>
-<p>This table lists the General information fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<h1>Inheritance information</h1>
+<p><a id="sthref220" name="sthref220"></a><a id="sthref221" name="sthref221"></a>This table lists the fields available on the <span class="gui-object-title">Inheritance</span> area in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
+<div class="inftblruleinformal">
+<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, Inheritance tab." summary="This table describes the options on the Persistence Properties view, Inheritance tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="24%" />
+<col width="*" />
+<col width="23%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t7">Property</th>
-<th align="left" valign="bottom" id="r1c2-t7">Description</th>
-<th align="left" valign="bottom" id="r1c3-t7">Default</th>
-<th align="left" valign="bottom" id="r1c4-t7">Available for Entity&nbsp;Type</th>
+<th align="left" valign="bottom" id="r1c1-t15">Property</th>
+<th align="left" valign="bottom" id="r1c2-t15">Description</th>
+<th align="left" valign="bottom" id="r1c3-t15">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t7" headers="r1c1-t7">Mapping Type Hyperlink</td>
-<td align="left" headers="r2c1-t7 r1c2-t7">Clicking the name of the mapping type, which is represented as a hyperlink, invokes the Mapping Type Selection dialog. Use this dialog to specify the type of entity: Mapped Superclass, Embeddable or the default mapping type.</td>
-<td align="left" headers="r2c1-t7 r1c3-t7">Entity</td>
-<td align="left" headers="r2c1-t7 r1c4-t7"><a href="tasks006.htm#BABGBIEE">Entity</a>, <a href="tasks007.htm#BABFEICE">Embeddable</a>, and <a href="tasks008.htm#BABDAGCI">Mapped superclass</a></td>
+<td align="left" id="r2c1-t15" headers="r1c1-t15">Strategy</td>
+<td align="left" headers="r2c1-t15 r1c2-t15">Specify the strategy to use when mapping a class or class hierarchy:
+<ul>
+<li>
+<p>Single table &ndash; All classes in the hierarchy are mapped to a single table.</p>
+</li>
+<li>
+<p>Joined &ndash; The root of the hierarchy is mapped to a single table; each child maps to its own table.</p>
+</li>
+<li>
+<p>Table per class &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-t15 r1c3-t15">Single table</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t7" headers="r1c1-t7">Name</td>
-<td align="left" headers="r3c1-t7 r1c2-t7">The name of this entity. By default, the class name is used as the entity name.</td>
-<td align="left" headers="r3c1-t7 r1c3-t7"><br /></td>
-<td align="left" headers="r3c1-t7 r1c4-t7"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" id="r3c1-t15" headers="r1c1-t15"><a id="sthref222" name="sthref222"></a><a id="sthref223" name="sthref223"></a>Discriminator Value</td>
+<td align="left" headers="r3c1-t15 r1c2-t15">Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified <span class="bold">Discriminator Type</span>.</td>
+<td align="left" headers="r3c1-t15 r1c3-t15"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t7" headers="r1c1-t7">Table</td>
-<td align="left" headers="r4c1-t7 r1c2-t7">The default database table information for this entity. These fields can be overridden by the information in the <a href="reference010.htm#CACIJBGH">Attribute overrides</a> area.</td>
-<td align="left" headers="r4c1-t7 r1c3-t7"><br /></td>
-<td align="left" headers="r4c1-t7 r1c4-t7"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" id="r4c1-t15" headers="r1c1-t15"><a id="sthref224" name="sthref224"></a><a id="sthref225" name="sthref225"></a>Discriminator Column</td>
+<td align="left" headers="r4c1-t15 r1c2-t15">These fields are available when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.
+<p>This field corresponds to the <code>@DiscriminatorColumn</code> annotation.</p>
+<p>Use the <span class="bold">Details</span> area to define the <span class="bold">Length</span> and <span class="bold">Column definition</span> of this Discriminator Column.</p>
+</td>
+<td align="left" headers="r4c1-t15 r1c3-t15"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t7" headers="r1c1-t7">&nbsp;&nbsp;Name</td>
-<td align="left" headers="r5c1-t7 r1c2-t7">The name of the primary database table associated with the entity.</td>
-<td align="left" headers="r5c1-t7 r1c3-t7"><br /></td>
-<td align="left" headers="r5c1-t7 r1c4-t7"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" id="r5c1-t15" headers="r1c1-t15">&nbsp;&nbsp;Name</td>
+<td align="left" headers="r5c1-t15 r1c2-t15">Name of the discriminator column</td>
+<td align="left" headers="r5c1-t15 r1c3-t15"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t7" headers="r1c1-t7">&nbsp;&nbsp;Catalog</td>
-<td align="left" headers="r6c1-t7 r1c2-t7">The database catalog that contains the <span class="bold">Table</span>.</td>
-<td align="left" headers="r6c1-t7 r1c3-t7">As defined in <code>orm.xml</code>.</td>
-<td align="left" headers="r6c1-t7 r1c4-t7"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" id="r6c1-t15" headers="r1c1-t15">&nbsp;&nbsp;Type</td>
+<td align="left" headers="r6c1-t15 r1c2-t15">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.</td>
+<td align="left" headers="r6c1-t15 r1c3-t15">String</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t7" headers="r1c1-t7">&nbsp;&nbsp;Schema</td>
-<td align="left" headers="r7c1-t7 r1c2-t7">The database schema that contains the <span class="bold">Table</span>.</td>
-<td align="left" headers="r7c1-t7 r1c3-t7">As defined in <code>orm.xml</code>.</td>
-<td align="left" headers="r7c1-t7 r1c4-t7"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" id="r7c1-t15" headers="r1c1-t15">Primary Key Join Columns</td>
+<td align="left" headers="r7c1-t15 r1c2-t15">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.
+<p>This field corresponds with @PrimaryKeyJoinColumn annotation.</p>
+</td>
+<td align="left" headers="r7c1-t15 r1c3-t15"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblinformal" -->
+<!-- class="inftblruleinformal" -->
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
+<a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a><br />
<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
@@ -87,8 +100,11 @@
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
index 21bdad0d62..d0fad851e0 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
@@ -2,71 +2,43 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:49 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Attribute overrides</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Queries</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:51Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Attribute overrides" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Queries" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CACIJBGH" name="CACIJBGH"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Attribute overrides</h1>
-<p><a id="sthref180" name="sthref180"></a><a id="sthref181" name="sthref181"></a><a id="sthref182" name="sthref182"></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="reference009.htm#CACCAGGC">General information</a> area of an attribute. Attribute overrides generally override/configure attribtues that are inherited or embedded.</p>
-<p>This table lists the Attribute override fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t8">Property</th>
-<th align="left" valign="bottom" id="r1c2-t8">Description</th>
-<th align="left" valign="bottom" id="r1c3-t8">Default</th>
-<th align="left" valign="bottom" id="r1c4-t8">Available for Entity&nbsp;Type</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t8" headers="r1c1-t8">Attribute Overrides</td>
-<td align="left" headers="r2c1-t8 r1c2-t8">Specify a property or field to be overridden (from the default mappings). Select <span class="bold">Override Default</span>.</td>
-<td align="left" headers="r2c1-t8 r1c3-t8"><br /></td>
-<td align="left" headers="r2c1-t8 r1c4-t8"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t8" headers="r1c1-t8">Join Columns</td>
-<td align="left" headers="r3c1-t8 r1c2-t8"><br /></td>
-<td align="left" headers="r3c1-t8 r1c3-t8"><br /></td>
-<td align="left" headers="r3c1-t8 r1c4-t8"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblinformal" -->
+<div class="sect3"><!-- infolevel="all" infotype="General" --><a id="sthref226" name="sthref226"></a>
+<h1>Queries</h1>
+<p>Use the queries area of the JPA Details view to create named queries and named native queries. Refer to <a href="tasks008.htm#BABIGBGG">"Creating Named Queries"</a> for additional information.</p>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="reference009.htm#CACCAGGC">General information</a><br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
+<a href="tasks008.htm#BABIGBGG">Creating Named Queries</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
<!-- class="sect3" -->
+<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
index ed5e368429..bf92c5d1c6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
@@ -2,43 +2,78 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:50 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Secondary table information</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Join Table Information</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:51Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Secondary table information" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Join Table Information" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CACBHIDA" name="CACBHIDA"></a></p>
+<p><a id="CACBAEBC" name="CACBAEBC"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Secondary table information</h1>
-<p><a id="sthref183" name="sthref183"></a><a id="sthref184" name="sthref184"></a><a id="sthref185" name="sthref185"></a><a id="sthref186" name="sthref186"></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>
+<h1>Join Table Information</h1>
+<p>Use area to specify a mapped column for joining an entity association. By default, the mapping is assumed to have a single join.</p>
+<p>This table lists the fields available on the <span class="gui-object-title">Join Table</span> area in <span class="gui-object-title">the JPA Details</span> view for <a href="tasks015.htm#BABHGEBD">One-to-many mapping</a> and <a href="tasks013.htm#BABEIEGD">Many-to-many mapping</a> mapping types.</p>
+<div class="inftblruleinformal">
+<table class="RuleInformal" title="This table describes the options on the Join Table tab." summary="This table describes the options on the Join Table tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="26%" />
+<col width="*" />
+<col width="34%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t17">Property</th>
+<th align="left" valign="bottom" id="r1c2-t17">Description</th>
+<th align="left" valign="bottom" id="r1c3-t17">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t17" headers="r1c1-t17">Name</td>
+<td align="left" headers="r2c1-t17 r1c2-t17">Name of the join table that contains the foreign key column.</td>
+<td align="left" headers="r2c1-t17 r1c3-t17">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t17" headers="r1c1-t17"><a id="CACBBDFG" name="CACBBDFG"></a>Join Columns</td>
+<td align="left" headers="r3c1-t17 r1c2-t17"><a id="sthref244" name="sthref244"></a><a id="sthref245" name="sthref245"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
+<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
+</td>
+<td align="left" headers="r3c1-t17 r1c3-t17">By default, the mapping is assumed to have a single join.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t17" headers="r1c1-t17">Inverse Join Columns</td>
+<td align="left" headers="r4c1-t17 r1c2-t17">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
+<td align="left" headers="r4c1-t17 r1c3-t17"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblruleinformal" -->
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a><br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
+<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
+<a href="reference028.htm#CACCGEHC">Edit Join Columns Dialog</a></div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
index 544604dfb5..108c284bae 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
@@ -2,76 +2,45 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:50 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Inheritance information</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Join Columns Information</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:51Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Inheritance information" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Join Columns Information" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CACFHGHE" name="CACFHGHE"></a></p>
+<p><a id="CACFCEJC" name="CACFCEJC"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Inheritance information</h1>
-<p><a id="sthref187" name="sthref187"></a><a id="sthref188" name="sthref188"></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>
+<h1>Join Columns Information</h1>
+<p><a id="sthref246" name="sthref246"></a>This table lists the fields available in the <span class="gui-object-title">Join Table</span> area in <span class="gui-object-title">JPA Details</span> view for <a href="tasks014.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks016.htm#BABFHBCJ">One-to-one mapping</a> mapping types.</p>
<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, Inheritance tab." summary="This table describes the options on the Persistence Properties view, Inheritance tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<table class="RuleInformal" title="This table describes the options on the Join Columns tab." summary="This table describes the options on the Join Columns tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="26%" />
+<col width="*" />
+<col width="34%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t9">Property</th>
-<th align="left" valign="bottom" id="r1c2-t9">Description</th>
-<th align="left" valign="bottom" id="r1c3-t9">Default</th>
+<th align="left" valign="bottom" id="r1c1-t18">Property</th>
+<th align="left" valign="bottom" id="r1c2-t18">Description</th>
+<th align="left" valign="bottom" id="r1c3-t18">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t9" headers="r1c1-t9">Strategy</td>
-<td align="left" headers="r2c1-t9 r1c2-t9">Specify the strategy to use when mapping a class or class hierarchy:
-<ul>
-<li>
-<p>Single table &ndash; All classes in the hierarchy are mapped to a single table.</p>
-</li>
-<li>
-<p>Joined &ndash; The root of the hierarchy is mapped to a single table; each child maps to its own table.</p>
-</li>
-<li>
-<p>Table per class &ndash; Each class is mapped to a separate table.</p>
-</li>
-</ul>
+<td align="left" id="r2c1-t18" headers="r1c1-t18">Join Column</td>
+<td align="left" headers="r2c1-t18 r1c2-t18"><a id="sthref247" name="sthref247"></a><a id="sthref248" name="sthref248"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
+<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
</td>
-<td align="left" headers="r2c1-t9 r1c3-t9">Single table</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t9" headers="r1c1-t9">Discriminator Column</td>
-<td align="left" headers="r3c1-t9 r1c2-t9">Use to specify the name of the discriminator column when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.</td>
-<td align="left" headers="r3c1-t9 r1c3-t9"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t9" headers="r1c1-t9">Discriminator Type</td>
-<td align="left" headers="r4c1-t9 r1c2-t9">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.</td>
-<td align="left" headers="r4c1-t9 r1c3-t9">String</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t9" headers="r1c1-t9">Discriminator Value</td>
-<td align="left" headers="r5c1-t9 r1c2-t9">Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified <span class="bold">Discriminator Type</span>.</td>
-<td align="left" headers="r5c1-t9 r1c3-t9"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t9" headers="r1c1-t9">Primary Key Join Columns</td>
-<td align="left" headers="r6c1-t9 r1c2-t9">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.
-<p>This field corresponds with @PrimaryKeyJoinColumn annotation.</p>
-</td>
-<td align="left" headers="r6c1-t9 r1c3-t9"><br /></td>
+<td align="left" headers="r2c1-t18 r1c3-t18">By default, the mapping is assumed to have a single join.</td>
</tr>
</tbody>
</table>
@@ -80,18 +49,20 @@
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a><br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
+<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
+<a href="reference028.htm#CACCGEHC">Edit Join Columns Dialog</a></div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
index dd495829e1..ccc78a41c1 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
@@ -2,42 +2,94 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:50 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Inheritance information</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>General information</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:51Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Inheritance information" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="General information" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<div class="sect3"><!-- infolevel="all" infotype="General" --><a id="sthref189" name="sthref189"></a>
-<h1>Queries</h1>
-<p>Use the queries area of the JPA Details view to create named queries and named native queries. Refer to <a href="tasks009.htm#BABIGBGG">"Creating Named Queries"</a> for additional information.</p>
+<p><a id="CACCACGH" name="CACCACGH"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>General information</h1>
+<p>This table lists the General information fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
+<div class="inftblruleinformal">
+<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="21%" />
+<col width="*" />
+<col width="22%" />
+<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>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t20" headers="r1c1-t20">Package</td>
+<td align="left" headers="r2c1-t20 r1c2-t20">The Java package that contains the persistent entities. Click <span class="bold">Browse</span> and select the package</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">Schema</td>
+<td align="left" headers="r3c1-t20 r1c2-t20">The database schema that contains the <span class="bold">Table</span>.
+<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-t20 r1c3-t20"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t20" headers="r1c1-t20">Catalog</td>
+<td align="left" headers="r4c1-t20 r1c2-t20">The database catalog that contains the <span class="bold">Table</span>.
+<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-t20 r1c3-t20"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t20" headers="r1c1-t20">Access</td>
+<td align="left" headers="r5c1-t20 r1c2-t20">Specify the default access method for the variables in the project:
+<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-t20 r1c3-t20"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblruleinformal" -->
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="tasks009.htm#BABIGBGG">Creating Named Queries</a>
+<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
<!-- class="sect3" -->
-<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
index d19978121e..9395b34614 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
@@ -2,55 +2,80 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:50 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Join Table Information</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Persistence Unit information</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Join Table Information" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Persistence Unit information" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CACBAEBC" name="CACBAEBC"></a></p>
+<p><a id="CACEAGBG" name="CACEAGBG"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Join Table Information</h1>
-<p>Use area to specify a mapped column for joining an entity association. By default, the mapping is assumed to have a single join.</p>
-<p>This table lists the fields available on the <span class="gui-object-title">Join Table</span> area in <span class="gui-object-title">the JPA Details</span> view for <a href="tasks016.htm#BABHGEBD">One-to-many mapping</a> and <a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a> mapping types.</p>
+<h1>Persistence Unit information</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="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Join Table tab." summary="This table describes the options on the Join Table tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="21%" />
+<col width="*" />
+<col width="22%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t11">Property</th>
-<th align="left" valign="bottom" id="r1c2-t11">Description</th>
-<th align="left" valign="bottom" id="r1c3-t11">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-t11" headers="r1c1-t11">Name</td>
-<td align="left" headers="r2c1-t11 r1c2-t11">Name of the join table that contains the foreign key column.</td>
-<td align="left" headers="r2c1-t11 r1c3-t11">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
+<td align="left" id="r2c1-t21" headers="r1c1-t21">XML Mapping Data Complete</td>
+<td align="left" headers="r2c1-t21 r1c2-t21">Specifies that the Java classes in this persistence unit are fully specified by their metadata. Any annotations will be ignored.
+<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-t21 r1c3-t21"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t21" headers="r1c1-t21">Schema</td>
+<td align="left" headers="r3c1-t21 r1c2-t21">The database schema that contains the <span class="bold">Table</span>.
+<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-t21 r1c3-t21"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t11" headers="r1c1-t11"><a id="CACBBDFG" name="CACBBDFG"></a>Join Columns</td>
-<td align="left" headers="r3c1-t11 r1c2-t11"><a id="sthref207" name="sthref207"></a><a id="sthref208" name="sthref208"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
-<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
+<td align="left" id="r4c1-t21" headers="r1c1-t21">Catalog</td>
+<td align="left" headers="r4c1-t21 r1c2-t21">The database catalog that contains the <span class="bold">Table</span>.
+<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="r3c1-t11 r1c3-t11">By default, the mapping is assumed to have a single join.</td>
+<td align="left" headers="r4c1-t21 r1c3-t21"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t11" headers="r1c1-t11">Inverse Join Columns</td>
-<td align="left" headers="r4c1-t11 r1c2-t11">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
-<td align="left" headers="r4c1-t11 r1c3-t11"><br /></td>
+<td align="left" id="r5c1-t21" headers="r1c1-t21">Access</td>
+<td align="left" headers="r5c1-t21 r1c2-t21">Specify how the entity its access instance variables.
+<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>
+<td align="left" headers="r5c1-t21 r1c3-t21">Property</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t21" headers="r1c1-t21">Cascade Persist</td>
+<td align="left" headers="r6c1-t21 r1c2-t21">Adds cascade-persist to the set of cascade options in entity relationships of the persistence unit.
+<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-t21 r1c3-t21"><br /></td>
</tr>
</tbody>
</table>
@@ -59,17 +84,20 @@
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
+<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
-<a href="reference030.htm#CACCGEHC">Edit Join Columns Dialog</a></div>
+<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
index 11e35fa477..f8459ce82a 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
@@ -2,44 +2,69 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:50 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Join Columns Information</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Generators</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Join Columns Information" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Generators" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CACFCEJC" name="CACFCEJC"></a></p>
+<p><a id="CIAFGAIJ" name="CIAFGAIJ"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Join Columns Information</h1>
-<p>This table lists the fields available in the <span class="gui-object-title">Join Table</span> area in <span class="gui-object-title">JPA Details</span> view for <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a> mapping types.</p>
+<h1>Generators</h1>
+<p>This table lists the Generator information fields available in the <span class="gui-object-title">JPA Details</span> view for the <code>orm.xml</code> file.</p>
<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Join Columns tab." summary="This table describes the options on the Join Columns tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="21%" />
+<col width="*" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t12">Property</th>
-<th align="left" valign="bottom" id="r1c2-t12">Description</th>
-<th align="left" valign="bottom" id="r1c3-t12">Default</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-t12" headers="r1c1-t12">Join Column</td>
-<td align="left" headers="r2c1-t12 r1c2-t12"><a id="sthref209" name="sthref209"></a><a id="sthref210" name="sthref210"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
-<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
+<td align="left" id="r2c1-t22" headers="r1c1-t22">Generator</td>
+<td align="left" headers="r2c1-t22 r1c2-t22">Displays the existing Sequence and Table generators.
+<p>Click <span class="bold">Add Sequence</span> or <span class="bold">Add Table</span> to add a new generator.</p>
+<p>For sequence generators, you must complete the following fields:</p>
+<ul>
+<li>
+<p>Name</p>
+</li>
+<li>
+<p>Sequence</p>
+</li>
+</ul>
+<p>For table generators, you must complete the following fields:</p>
+<ul>
+<li>
+<p>Name</p>
+</li>
+<li>
+<p>Table</p>
+</li>
+<li>
+<p>Primary key column</p>
+</li>
+<li>
+<p>Value column</p>
+</li>
+<li>
+<p>Primary key column value</p>
+</li>
+</ul>
</td>
-<td align="left" headers="r2c1-t12 r1c3-t12">By default, the mapping is assumed to have a single join.</td>
</tr>
</tbody>
</table>
@@ -48,17 +73,20 @@
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
+<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
-<a href="reference030.htm#CACCGEHC">Edit Join Columns Dialog</a></div>
+<a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
index b938a47f57..715d76b60b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
@@ -2,71 +2,50 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>General information</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Queries</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="General information" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Queries" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CACCACGH" name="CACCACGH"></a></p>
+<p><a id="CIAIBAAJ" name="CIAIBAAJ"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>General information</h1>
-<p>This table lists the General information fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
+<h1>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>
<div class="inftblruleinformal">
<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="21%" />
+<col width="*" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t14">Property</th>
-<th align="left" valign="bottom" id="r1c2-t14">Description</th>
-<th align="left" valign="bottom" id="r1c3-t14">Default</th>
+<th align="left" valign="bottom" id="r1c1-t23">Property</th>
+<th align="left" valign="bottom" id="r1c2-t23">Description</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t14" headers="r1c1-t14">Package</td>
-<td align="left" headers="r2c1-t14 r1c2-t14">The Java package that contains the persistent entities. Click <span class="bold">Browse</span> and select the package</td>
-<td align="left" headers="r2c1-t14 r1c3-t14"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t14" headers="r1c1-t14">Schema</td>
-<td align="left" headers="r3c1-t14 r1c2-t14">The database schema that contains the <span class="bold">Table</span>.
-<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-t14 r1c3-t14"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t14" headers="r1c1-t14">Catalog</td>
-<td align="left" headers="r4c1-t14 r1c2-t14">The database catalog that contains the <span class="bold">Table</span>.
-<p>This field corresponds to the <code>&lt;catalog&gt;</code> element in the <code>orm.xml</code> file.</p>
+<td align="left" id="r2c1-t23" headers="r1c1-t23">Queries</td>
+<td align="left" headers="r2c1-t23 r1c2-t23">Displays the existing Named and Native queries.
+<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="r4c1-t14 r1c3-t14"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t14" headers="r1c1-t14">Access</td>
-<td align="left" headers="r5c1-t14 r1c2-t14">Specify the default access method for the variables in the project:
-<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" id="r3c1-t23" headers="r1c1-t23">Query Hints</td>
+<td align="left" headers="r3c1-t23 r1c2-t23">Displays the existing query hints (Name and Value).
+<p>Click <span class="bold">Add</span> to add a new query hint.</p>
</td>
-<td align="left" headers="r5c1-t14 r1c3-t14"><br /></td>
</tr>
</tbody>
</table>
@@ -75,17 +54,20 @@
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
+<a href="tasks008.htm#BABIGBGG">Creating Named Queries</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
+<a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
index e183172b5a..743078007e 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
@@ -2,99 +2,42 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Persistence Unit information</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Converters</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Persistence Unit information" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Converters" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CACEAGBG" name="CACEAGBG"></a></p>
+<p><a id="CIADGCID" name="CIADGCID"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Persistence Unit information</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="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t15">Property</th>
-<th align="left" valign="bottom" id="r1c2-t15">Description</th>
-<th align="left" valign="bottom" id="r1c3-t15">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t15" headers="r1c1-t15">XML Mapping Data Complete</td>
-<td align="left" headers="r2c1-t15 r1c2-t15">Specifies that the Java classes in this persistence unit are fully specified by their metadata. Any annotations will be ignored.
-<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-t15 r1c3-t15"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t15" headers="r1c1-t15">Schema</td>
-<td align="left" headers="r3c1-t15 r1c2-t15">The database schema that contains the <span class="bold">Table</span>.
-<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-t15 r1c3-t15"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t15" headers="r1c1-t15">Catalog</td>
-<td align="left" headers="r4c1-t15 r1c2-t15">The database catalog that contains the <span class="bold">Table</span>.
-<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-t15 r1c3-t15"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t15" headers="r1c1-t15">Access Type</td>
-<td align="left" headers="r5c1-t15 r1c2-t15">Specify how the entity its access instance variables.
-<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>
-<td align="left" headers="r5c1-t15 r1c3-t15">Property</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t15" headers="r1c1-t15">Cascade Persist</td>
-<td align="left" headers="r6c1-t15 r1c2-t15">Adds cascade-persist to the set of cascade options in entity relationships of the persistence unit.
-<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-t15 r1c3-t15"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" -->
+<h1>Converters</h1>
+<p>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>
<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
+<a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></div>
<!-- class="sect3" -->
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
index fbdbc4646d..7d68189385 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
@@ -2,80 +2,182 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>persistence.xml Editor</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Connection</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="persistence.xml Editor" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Connection" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CIACCHID" name="CIACCHID"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>persistence.xml Editor</h1>
-<p>The persistence.xml Editor provides an interface that enables you to update the persistence.xml file. For projects using the EclipseLink platform, the perisistence.xml Editor consists of the following pages:</p>
+<p><a id="CIAFFJIE" name="CIAFFJIE"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Connection</h1>
+<p>The following table lists the properties available in the Connection page of the <a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>.</p>
+<div class="tblformal"><a id="sthref258" name="sthref258"></a><a id="sthref259" name="sthref259"></a>
+<p class="titleintable">Properties of the Connection Page</p>
+<table class="Formal" title="Properties of the Connection Page" summary="This table lists the properties for the persistence.xml editor&rsquo;s connection page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<col width="24%" />
+<col width="*" />
+<col width="24%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t25">Property</th>
+<th align="left" valign="bottom" id="r1c2-t25">Description</th>
+<th align="left" valign="bottom" id="r1c3-t25">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t25" headers="r1c1-t25">
+<p>Transaction Type</p>
+</td>
+<td align="left" headers="r2c1-t25 r1c2-t25">
+<p>Specify if the connection for this persistence unit uses one of the following transaction types:</p>
<ul>
<li>
-<p><a href="reference019.htm#CIACIFGJ">General</a></p>
-</li>
-<li>
-<p><a href="reference020.htm#CIAFFJIE">Connection</a></p>
-</li>
-<li>
-<p><a href="reference021.htm#CIAJAFEG">Customization</a></p>
-</li>
-<li>
-<p><a href="reference022.htm#CIABEDCH">Caching</a></p>
-</li>
-<li>
-<p><a href="reference023.htm#CIABGHHI">Logging</a></p>
-</li>
-<li>
-<p><a href="reference024.htm#CIAFJCHE">Options</a></p>
-</li>
-<li>
-<p><a href="reference025.htm#CIACCFCB">Schema Generation</a></p>
+<p><span class="bold">Default</span> -- Select to use the container used by the container.</p>
</li>
<li>
-<p><a href="reference026.htm#CIAHJDFF">Properties</a></p>
+<p><span class="bold">JTA</span> (Java Transaction API) -- Transactions of the Java EE server.</p>
</li>
<li>
-<p><a href="reference027.htm#CIAHCJAH">Source</a></p>
+<p><span class="bold">Resource Local</span> -- Native actions of a JDBC driver that are referenced by a persistence unit.</p>
</li>
</ul>
-<p>For projects using the Generic platform, the following subset of these pages is available:</p>
+</td>
+<td align="left" headers="r2c1-t25 r1c3-t25"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t25" headers="r1c1-t25">
+<p>Batch Writing</p>
+</td>
+<td align="left" headers="r3c1-t25 r1c2-t25">
+<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>Note: 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><a href="reference019.htm#CIACIFGJ">General</a></p>
+<p><span class="bold">JDBC</span>&ndash;Use JDBC batch writing.</p>
</li>
<li>
-<p><a href="reference020.htm#CIAFFJIE">Connection</a></p>
+<p><span class="bold">Buffered</span>&ndash;Do not use either JDBC batch writing nor native platform batch writing.</p>
</li>
<li>
-<p><a href="reference026.htm#CIAHJDFF">Properties</a></p>
+<p><span class="bold">OracleJDBC</span>&ndash;Use both JDBC batch writing and Oracle native platform batch writing.</p>
</li>
<li>
-<p><a href="reference027.htm#CIAHCJAH">Source</a></p>
+<p><span class="bold">None</span>&ndash;Do not use batch writing (turn it off).</p>
</li>
</ul>
+</td>
+<td align="left" headers="r3c1-t25 r1c3-t25">
+<p>None</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t25" headers="r1c1-t25">
+<p>Statement caching</p>
+</td>
+<td align="left" headers="r4c1-t25 r1c2-t25"><br /></td>
+<td align="left" headers="r4c1-t25 r1c3-t25"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t25" headers="r1c1-t25">
+<p>Native SQL</p>
+</td>
+<td align="left" headers="r5c1-t25 r1c2-t25"><br /></td>
+<td align="left" headers="r5c1-t25 r1c3-t25">
+<p>False</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t25" headers="r1c1-t25">
+<p>JTA Data Source Name</p>
+</td>
+<td align="left" headers="r6c1-t25 r1c2-t25">
+<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>
+<td align="left" headers="r6c1-t25 r1c3-t25"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t25" headers="r1c1-t25">
+<p>Non-JTA Data Source Name</p>
+</td>
+<td align="left" headers="r7c1-t25 r1c2-t25">
+<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 Generic platform.</p>
+</td>
+<td align="left" headers="r7c1-t25 r1c3-t25"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t25" headers="r1c1-t25">
+<p>&nbsp;&nbsp;Bind&nbsp;Parameters</p>
+</td>
+<td align="left" headers="r8c1-t25 r1c2-t25">
+<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="r8c1-t25 r1c3-t25"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t25" headers="r1c1-t25">
+<p>EclipseLink Connection Pool</p>
+</td>
+<td align="left" headers="r9c1-t25 r1c2-t25">
+<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-t25 r1c3-t25"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t25" headers="r1c1-t25">
+<p>&nbsp;&nbsp;Read&nbsp;Connection</p>
+</td>
+<td align="left" headers="r10c1-t25 r1c2-t25">
+<p>The maximum and minimum number of connections allowed in the JDBC read connection pool.</p>
+<p>Note: 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="r10c1-t25 r1c3-t25"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t25" headers="r1c1-t25">
+<p>&nbsp;&nbsp;Write&nbsp;Connection</p>
+</td>
+<td align="left" headers="r11c1-t25 r1c2-t25">
+<p>The maximum and minimum number of connections allowed in the JDBC read connection pool.</p>
+<p>Note: 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-t25 r1c3-t25"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="tblformal" --></div>
+<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
-<!-- class="footer" --></div>
+<!-- class="footer" -->
</body>
</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm
index 69660c6367..ae132d2cdd 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm
@@ -2,111 +2,217 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>General</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Customization</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="General" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Customization" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CIACIFGJ" name="CIACIFGJ"></a></p>
+<p><a id="CIAJAFEG" name="CIAJAFEG"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>General</h1>
-<p>The following table lists properties available in the General page of the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div class="tblformal"><a id="sthref218" name="sthref218"></a><a id="sthref219" name="sthref219"></a>
-<p class="titleintable">Properties of the General Page</p>
-<table class="Formal" title="Properties of the General Page" summary="This table describes the properties of the persistence.xml&rsquo;s General page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<h1>Customization</h1>
+<p>The following table lists the properties available in the Customization page of the <a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>.</p>
+<div class="tblformal"><a id="sthref260" name="sthref260"></a><a id="sthref261" name="sthref261"></a>
+<p class="titleintable">Properties of the Customization Page</p>
+<table class="Formal" title="Properties of the Customization Page" summary="This table lists the properties of the persistence.xml Editor&rsquo;s Customization page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<col width="24%" />
+<col width="*" />
+<col width="23%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t16">Property</th>
-<th align="left" valign="bottom" id="r1c2-t16">Description</th>
-<th align="left" valign="bottom" id="r1c3-t16">Default</th>
+<th align="left" valign="bottom" id="r1c1-t26">Property</th>
+<th align="left" valign="bottom" id="r1c2-t26">Description</th>
+<th align="left" valign="bottom" id="r1c3-t26">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t16" headers="r1c1-t16">
-<p>Name</p>
+<td align="left" id="r2c1-t26" headers="r1c1-t26">
+<p>Weaving</p>
+</td>
+<td align="left" headers="r2c1-t26 r1c2-t26">
+<p>Specifies if weaving of the entity classes is performed. The EclipseLink JPA persistence provider uses weaving to enhance JPA entities for such properties as lazy loading, change tracking, fetch groups, and internal optimizations. Select from the following options:</p>
+<ul>
+<li>
+<p><span class="bold">No Weaving</span></p>
+</li>
+<li>
+<p><span class="bold">Weave Dynamically</span></p>
+</li>
+<li>
+<p><span class="bold">Weave Statically</span> -- Use this option if you plan to execute your application outside of a Java EE 5 container in an environment that does not permit the use of <code>-javaagent:eclipselink.jar</code> on the JVM command line. This assumes that classes have already been statically woven. Run the static weaver on the classes before deploying them.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r2c1-t26 r1c3-t26">
+<p>Weave Dynamically</p>
</td>
-<td align="left" headers="r2c1-t16 r1c2-t16">
-<p>Enter the name of the persistence unit.</p>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t26" headers="r1c1-t26">
+<p>&nbsp;&nbsp;Weaving&nbsp;Lazy</p>
</td>
-<td align="left" headers="r2c1-t16 r1c3-t16">
-<p>The project name.</p>
+<td align="left" headers="r3c1-t26 r1c2-t26">
+<p>Select this option to enable lazy weaving.</p>
+</td>
+<td align="left" headers="r3c1-t26 r1c3-t26">
+<p>True</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t16" headers="r1c1-t16">
-<p>Persistence Provider</p>
+<td align="left" id="r4c1-t26" headers="r1c1-t26">
+<p>&nbsp;&nbsp;Weaving&nbsp;Fetch&nbsp;Groups</p>
+</td>
+<td align="left" headers="r4c1-t26 r1c2-t26">
+<p>Select this option to enable fetch groups through weaving. Set this option to false if:</p>
+<ul>
+<li>
+<p>There is no weaving.</p>
+</li>
+<li>
+<p>Classes should not be changed during weaving (for example, when debugging).</p>
+</li>
+</ul>
+<p>Set this property to false for platforms where it is not supported.</p>
+</td>
+<td align="left" headers="r4c1-t26 r1c3-t26">
+<p>True</p>
</td>
-<td align="left" headers="r3c1-t16 r1c2-t16">
-<p>Enter the name of the persistence provider.</p>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t26" headers="r1c1-t26">
+<p>Weaving&nbsp;internal</p>
</td>
-<td align="left" headers="r3c1-t16 r1c3-t16">
-<p>Determined by the server.</p>
+<td align="left" headers="r5c1-t26 r1c2-t26"><br /></td>
+<td align="left" headers="r5c1-t26 r1c3-t26">
+<p>True</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t16" headers="r1c1-t16">
-<p>Description</p>
+<td align="left" id="r6c1-t26" headers="r1c1-t26">
+<p>Weaving&nbsp;eager</p>
</td>
-<td align="left" headers="r4c1-t16 r1c2-t16">
-<p>Enter a description for this persistence unit. This is an optional property.</p>
+<td align="left" headers="r6c1-t26 r1c2-t26"><br /></td>
+<td align="left" headers="r6c1-t26 r1c3-t26">
+<p>False</p>
</td>
-<td align="left" headers="r4c1-t16 r1c3-t16"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t16" headers="r1c1-t16">
-<p>Managed Classes</p>
+<td align="left" id="r7c1-t26" headers="r1c1-t26">
+<p>&nbsp;&nbsp;Weaving&nbsp;Change&nbsp;Tracking</p>
</td>
-<td align="left" headers="r5c1-t16 r1c2-t16">
-<p>Add or remove the classes managed through the persistence unit.</p>
+<td align="left" headers="r7c1-t26 r1c2-t26">
+<p>Select this option to use weaving to detect which fields or properties of the object change.</p>
+</td>
+<td align="left" headers="r7c1-t26 r1c3-t26">
+<p>True</p>
</td>
-<td align="left" headers="r5c1-t16 r1c3-t16"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t16" headers="r1c1-t16">
-<p>Exclude Unlisted Classes</p>
+<td align="left" id="r8c1-t26" headers="r1c1-t26">
+<p>&nbsp;&nbsp;Throw&nbsp;Exceptions</p>
</td>
-<td align="left" headers="r6c1-t16 r1c2-t16">
-<p>Select to include all annotated entity classes in the root of the persistence unit.</p>
+<td align="left" headers="r8c1-t26 r1c2-t26">
+<p>Select this option to set EclipseLink to throw an exception or log a warning when it encounters a problem with any of the files listed in a <span class="bold">persistence.xml</span> file <code>&lt;mapping-file&gt;</code> element.</p>
</td>
-<td align="left" headers="r6c1-t16 r1c3-t16">
-<p>False</p>
+<td align="left" headers="r8c1-t26 r1c3-t26">
+<p>True</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t16" headers="r1c1-t16">
-<p>XML Mapping Files</p>
+<td align="left" id="r9c1-t26" headers="r1c1-t26">
+<p>Exception handler</p>
</td>
-<td align="left" headers="r7c1-t16 r1c2-t16">
-<p>Add or remove the object/relational mapping XML files that define the classes to be managed by the persistence unit.</p>
+<td align="left" headers="r9c1-t26 r1c2-t26">
+<p>Select (or create) a Java class to handle excpetions.</p>
+</td>
+<td align="left" headers="r9c1-t26 r1c3-t26"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t26" headers="r1c1-t26">
+<p>Session Customizer</p>
+</td>
+<td align="left" headers="r10c1-t26 r1c2-t26">
+<p>Select a session customizer class: a Java class that implements the <code>eclipselink.tools.sessionconfiguration.SessionCustomizer</code> interface and provides a default (zero-argument) constructor. Use this class' <code>customize</code> method, which takes an <code>eclipselink.sessions.Session</code>, to programmatically access advanced EclipseLink session API.</p>
+</td>
+<td align="left" headers="r10c1-t26 r1c3-t26"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t26" headers="r1c1-t26">
+<p>Descriptor Customizer</p>
</td>
-<td align="left" headers="r7c1-t16 r1c3-t16">
-<p>Meta-INF\orm.xml</p>
+<td align="left" headers="r11c1-t26 r1c2-t26">
+<p>Select an EclipseLink descriptor customizer class&ndash;a Java class that implements the <code>eclipselink.tools.sessionconfiguration.DescriptorCustomizer</code> interface and provides a default (zero-argument) constructor. Use this class's <code>customize</code> method, which takes an <code>eclipselink.descriptors.ClassDescriptor</code>, to programmatically access advanced EclipseLink descriptor and mapping API for the descriptor associated with the JPA entity named <code>&lt;ENTITY&gt;</code>.</p>
+</td>
+<td align="left" headers="r11c1-t26 r1c3-t26"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t26" headers="r1c1-t26">
+<p>Validation only</p>
+</td>
+<td align="left" headers="r12c1-t26 r1c2-t26"><br /></td>
+<td align="left" headers="r12c1-t26 r1c3-t26">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r13c1-t26" headers="r1c1-t26">
+<p>Profiler</p>
+</td>
+<td align="left" headers="r13c1-t26 r1c2-t26">
+<ul>
+<li>
+<p>No Profiler</p>
+</li>
+<li>
+<p>Performance Profiler</p>
+</li>
+<li>
+<p>Query Monitor</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r13c1-t26 r1c3-t26">
+<p>NoProfiler</p>
</td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="tblformal" --></div>
+<!-- class="tblformal" -->
+<div align="center">
+<div class="inftblnote"><br />
+<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
+<tbody>
+<tr>
+<td align="left">
+<p class="notep1">Note:</p>
+This page is not available for projects using the <span class="bold">Generic</span> platform.</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblnote" --></div>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm
index 672b473bea..c26c971f5b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm
@@ -2,159 +2,181 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Connection</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Caching</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Connection" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Caching" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CIAFFJIE" name="CIAFFJIE"></a></p>
+<p><a id="CIABEDCH" name="CIABEDCH"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Connection</h1>
-<p>The following table lists the properties available in the Connection page of the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div class="tblformal"><a id="sthref220" name="sthref220"></a><a id="sthref221" name="sthref221"></a>
-<p class="titleintable">Properties of the Connection Page</p>
-<table class="Formal" title="Properties of the Connection Page" summary="This table lists the properties for the persistence.xml editor&rsquo;s connection page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<h1><a id="sthref262" name="sthref262"></a>Caching</h1>
+<p>This table lists the properties of the Caching page of the <a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>.</p>
+<div class="tblformal"><a id="sthref263" name="sthref263"></a><a id="sthref264" name="sthref264"></a>
+<p class="titleintable">Properties of the Caching Page</p>
+<table class="Formal" title="Properties of the Caching Page" summary="This table lists the properties of the persistence.xml&rsquo;s Caching page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<col width="24%" />
+<col width="*" />
+<col width="24%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t17">Property</th>
-<th align="left" valign="bottom" id="r1c2-t17">Description</th>
-<th align="left" valign="bottom" id="r1c3-t17">Default</th>
+<th align="left" valign="bottom" id="r1c1-t28">Property</th>
+<th align="left" valign="bottom" id="r1c2-t28">Description</th>
+<th align="left" valign="bottom" id="r1c3-t28">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t17" headers="r1c1-t17">
-<p>Transaction Type</p>
+<td align="left" id="r2c1-t28" headers="r1c1-t28">
+<p>Default Cache Type</p>
</td>
-<td align="left" headers="r2c1-t17 r1c2-t17">
-<p>Specify if the connection for this persistence unit uses one of the following transaction types:</p>
+<td align="left" headers="r2c1-t28 r1c2-t28">
+<p>Select one of the following as the Default Cache Type:</p>
<ul>
<li>
-<p><span class="bold">Default</span> -- Select to use the container used by the container.</p>
+<p><span class="bold">Soft with Weak 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">JTA</span> (Java Transaction API) -- Transactions of the Java EE server.</p>
+<p><span class="bold">Week 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">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-t17 r1c3-t17"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t17" headers="r1c1-t17">
-<p>Batch Writing</p>
-</td>
-<td align="left" headers="r3c1-t17 r1c2-t17">
-<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>Note: 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>
+<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">Buffered</span>&ndash;Do not use either JDBC batch writing nor native platform batch writing.</p>
+<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">OracleJDBC</span>&ndash;Use both JDBC batch writing and Oracle native platform batch writing.</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><span class="bold">None</span>&ndash;Do not use batch writing (turn it off).</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="r3c1-t17 r1c3-t17">
-<p>None</p>
+<td align="left" headers="r2c1-t28 r1c3-t28">
+<p>Weak with hard subcache</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t17" headers="r1c1-t17">
-<p>JTA Data Source Name</p>
+<td align="left" id="r3c1-t28" headers="r1c1-t28">
+<p>Default Cache Size</p>
+</td>
+<td align="left" headers="r3c1-t28 r1c2-t28">
+<p>Set the size (maximum number of objects) of the cache.</p>
</td>
-<td align="left" headers="r4c1-t17 r1c2-t17">
-<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="r3c1-t28 r1c3-t28">
+<p>100</p>
</td>
-<td align="left" headers="r4c1-t17 r1c3-t17"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t17" headers="r1c1-t17">
-<p>Non-JTA Data Source Name</p>
+<td align="left" id="r4c1-t28" headers="r1c1-t28">
+<p>Default Shared Cache</p>
</td>
-<td align="left" headers="r5c1-t17 r1c2-t17">
-<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 Generic platform.</p>
+<td align="left" headers="r4c1-t28 r1c2-t28">
+<p>Specifies if cached instances should be in the shared cache or in a client isolated cache.</p>
+</td>
+<td align="left" headers="r4c1-t28 r1c3-t28">
+<p>True</p>
</td>
-<td align="left" headers="r5c1-t17 r1c3-t17"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t17" headers="r1c1-t17">
-<p>&nbsp;&nbsp;Bind Parameters</p>
+<td align="left" id="r5c1-t28" headers="r1c1-t28">
+<p>Entity Caching</p>
</td>
-<td align="left" headers="r6c1-t17 r1c2-t17">
-<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 align="left" headers="r5c1-t28 r1c2-t28">
+<p>Specify the entity-specific caching information.</p>
</td>
-<td align="left" headers="r6c1-t17 r1c3-t17"><br /></td>
+<td align="left" headers="r5c1-t28 r1c3-t28"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t17" headers="r1c1-t17">
-<p>EclipseLink Connection Pool</p>
+<td align="left" id="r6c1-t28" headers="r1c1-t28">
+<p>&nbsp;&nbsp;Cache&nbsp;Type</p>
</td>
-<td align="left" headers="r7c1-t17 r1c2-t17">
-<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 align="left" headers="r6c1-t28 r1c2-t28">
+<p>See <span class="italic">Default Cache Type.</span></p>
</td>
-<td align="left" headers="r7c1-t17 r1c3-t17"><br /></td>
+<td align="left" headers="r6c1-t28 r1c3-t28"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t17" headers="r1c1-t17">
-<p>&nbsp;&nbsp;Read Connection</p>
+<td align="left" id="r7c1-t28" headers="r1c1-t28">
+<p>&nbsp;&nbsp;Cache&nbsp;Size</p>
</td>
-<td align="left" headers="r8c1-t17 r1c2-t17">
-<p>The maximum and minimum number of connections allowed in the JDBC read connection pool.</p>
-<p>Note: These properties apply when used in a Java SE environment.</p>
-<p>These properties are not available for projects using the Generic platform</p>
+<td align="left" headers="r7c1-t28 r1c2-t28">
+<p>See <span class="italic">Default Cache Size.</span></p>
</td>
-<td align="left" headers="r8c1-t17 r1c3-t17"><br /></td>
+<td align="left" headers="r7c1-t28 r1c3-t28"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t17" headers="r1c1-t17">
-<p>&nbsp;&nbsp;Write Connection</p>
+<td align="left" id="r8c1-t28" headers="r1c1-t28">
+<p>&nbsp;&nbsp;Shared&nbsp;Cache</p>
</td>
-<td align="left" headers="r9c1-t17 r1c2-t17">
-<p>The maximum and minimum number of connections allowed in the JDBC write connection pool.</p>
-<p>Note: These properties apply when used in a Java SE environment.</p>
-<p>These properties are not available for projects using the Generic platform</p>
+<td align="left" headers="r8c1-t28 r1c2-t28">
+<p>See <span class="italic">Default Shared Cache</span>.</p>
+</td>
+<td align="left" headers="r8c1-t28 r1c3-t28"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t28" headers="r1c1-t28">
+<p>Flush clear cache</p>
+</td>
+<td align="left" headers="r9c1-t28 r1c2-t28">
+<p>Select one of the following as the Default Cache Type:</p>
+<ul>
+<li>
+<p><span class="bold">Drop</span> &ndash; This mode is the fastest and uses the least memory. However, after commit the shared cache might potentially contain stale data.</p>
+</li>
+<li>
+<p><span class="bold">Drop Invalidate</span> &ndash; Classes that have at least one object updated or deleted are invalidated in the shared cache at commit time. This mode is slower than <span class="bold">Drop</span>, but as efficient memory usage-wise, and prevents stale data.</p>
+</li>
+<li>
+<p><span class="bold">Merge</span> &ndash; Drop classes from the EntityManager's cache of objects that have not been flushed. This mode leaves the shared cache in a perfect state after commit. However, it is the least memory-efficient mode; the memory might even run out in a very large transaction.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r9c1-t28 r1c3-t28">
+<p>Drop Invalidate</p>
</td>
-<td align="left" headers="r9c1-t17 r1c3-t17"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="tblformal" --></div>
+<!-- class="tblformal" -->
+<div align="center">
+<div class="inftblnote"><br />
+<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
+<tbody>
+<tr>
+<td align="left">
+<p class="notep1">Note:</p>
+This page is not available for projects using the <span class="bold">Generic</span> platform.</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblnote" --></div>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm
index 395b15aec7..ccfeeded9b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm
@@ -2,149 +2,237 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Customization</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Logging</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Customization" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Logging" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CIAJAFEG" name="CIAJAFEG"></a></p>
+<p><a id="CIABGHHI" name="CIABGHHI"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Customization</h1>
-<p>The following table lists the properties available in the Customization page of the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div class="tblformal"><a id="sthref222" name="sthref222"></a><a id="sthref223" name="sthref223"></a>
-<p class="titleintable">Properties of the Customization Page</p>
-<table class="Formal" title="Properties of the Customization Page" summary="This table lists the properties of the persistence.xml Editor&rsquo;s Customization page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<h1>Logging</h1>
+<p>This table lists the properties of the Logging page of the <a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>.</p>
+<div align="center">
+<div class="inftblnote"><br />
+<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
+<tbody>
+<tr>
+<td align="left">
+<p class="notep1">Note:</p>
+This page is not available for projects using the <span class="bold">Generic</span> platform.</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblnote" --></div>
+<div class="tblformal"><a id="sthref265" name="sthref265"></a><a id="sthref266" name="sthref266"></a>
+<p class="titleintable">Properties of the Logging Page</p>
+<table class="Formal" title="Properties of the Logging Page" summary="This table lists the properties of the Logging page of the persistence.xml Editor." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<col width="24%" />
+<col width="*" />
+<col width="24%" />
<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-t31">Property</th>
+<th align="left" valign="bottom" id="r1c2-t31">Description</th>
+<th align="left" valign="bottom" id="r1c3-t31">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t18" headers="r1c1-t18">
-<p>Weaving</p>
+<td align="left" id="r2c1-t31" headers="r1c1-t31">
+<p>Logging Level</p>
</td>
-<td align="left" headers="r2c1-t18 r1c2-t18">
-<p>Specifies if weaving of the entity classes is performed. The EclipseLink JPA persistence provider uses weaving to enhance JPA entities for such properties as lazy loading, change tracking, fetch groups, and internal optimizations. Select from the following options:</p>
+<td align="left" headers="r2c1-t31 r1c2-t31">
+<p>Specifies the amount and detail of log output by selecting the log level (in ascending order of information):</p>
+<p>The following are the valid values for the <code>java.util.logging.Level</code>:</p>
<ul>
<li>
-<p><span class="bold">No Weaving</span></p>
+<p><span class="bold">OFF</span>&ndash;disables logging</p>
+</li>
+<li>
+<p><span class="bold">SEVERE</span>&ndash;logs exceptions indicating TopLink cannot continue, as well as any exceptions generated during login. This includes a stack trace.</p>
+</li>
+<li>
+<p><span class="bold">WARNING</span>&ndash;logs exceptions that do not force TopLink to stop, including all exceptions not logged with severe level. This does not include a stack trace.</p>
</li>
<li>
-<p><span class="bold">Weave Dynamically</span></p>
+<p><span class="bold">INFO</span>&ndash;logs the login/logout per sever session, including the user name. After acquiring the session, detailed information is logged.</p>
</li>
<li>
-<p><span class="bold">Weave Statically</span> -- Use this option if you plan to execute your application outside of a Java EE 5 container in an environment that does not permit the use of <code>-javaagent:eclipselink.jar</code> on the JVM command line. This assumes that classes have already been statically woven. Run the static weaver on the classes before deploying them.</p>
+<p><span class="bold">CONFIG</span>&ndash;logs only login, JDBC connection, and database information.</p>
+</li>
+<li>
+<p><span class="bold">FINE</span>&ndash;logs SQL.</p>
+</li>
+<li>
+<p><span class="bold">FINER</span>&ndash;similar to warning. Includes stack trace.</p>
+</li>
+<li>
+<p><span class="bold">FINEST</span>&ndash;includes additional low level information.</p>
</li>
</ul>
-</td>
-<td align="left" headers="r2c1-t18 r1c3-t18">
-<p>Weave Dynamically</p>
+<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
+<pre xml:space="preserve" class="oac_no_warn">
+&lt;property name="eclipselink.logging.level" value="INFO"/&gt;
+</pre></td>
+<td align="left" headers="r2c1-t31 r1c3-t31">
+<p>Info</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t18" headers="r1c1-t18">
-<p>&nbsp;&nbsp;Weaving Lazy</p>
+<td align="left" id="r3c1-t31" headers="r1c1-t31">
+<p>&nbsp;&nbsp;Timestamp</p>
</td>
-<td align="left" headers="r3c1-t18 r1c2-t18">
-<p>Select this optoin to enable lazy weaving.</p>
+<td align="left" headers="r3c1-t31 r1c2-t31">
+<p>Control whether the timestamp is logged in each log entry.</p>
+<p>The following are the valid values:</p>
+<ul>
+<li>
+<p><span class="bold">true</span>&ndash;log a timestamp.</p>
+</li>
+<li>
+<p><span class="bold">false</span>&ndash;do not log a timestamp.</p>
+</li>
+</ul>
+<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
+<pre xml:space="preserve" class="oac_no_warn">
+&lt;property name="eclipselink.logging.timestamp" value="false"/&gt;
+</pre></td>
+<td align="left" headers="r3c1-t31 r1c3-t31">
+<p>true</p>
</td>
-<td align="left" headers="r3c1-t18 r1c3-t18"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t18" headers="r1c1-t18">
-<p>&nbsp;&nbsp;Weaving Fetch Groups</p>
+<td align="left" id="r4c1-t31" headers="r1c1-t31">
+<p>&nbsp;&nbsp;Thread</p>
</td>
-<td align="left" headers="r4c1-t18 r1c2-t18">
-<p>Select this option to enable fetch groups through weaving. Set this option to false if:</p>
+<td align="left" headers="r4c1-t31 r1c2-t31">
+<p>Control whether a thread identifier is logged in each log entry.</p>
+<p>The following are the valid values:</p>
<ul>
<li>
-<p>There is no weaving.</p>
+<p><span class="bold">true</span>&ndash;log a thread identifier.</p>
</li>
<li>
-<p>Classes should not be changed during weaving (for example, when debugging).</p>
+<p><span class="bold">false</span>&ndash;do not log a thread identifier.</p>
</li>
</ul>
-<p>Set this property to false for platforms where it is not supported.</p>
</td>
-<td align="left" headers="r4c1-t18 r1c3-t18"><br /></td>
+<td align="left" headers="r4c1-t31 r1c3-t31">
+<p>true</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t18" headers="r1c1-t18">
-<p>&nbsp;&nbsp;Weaving Change Tracking</p>
+<td align="left" id="r5c1-t31" headers="r1c1-t31">
+<p>&nbsp;&nbsp;Session</p>
</td>
-<td align="left" headers="r5c1-t18 r1c2-t18">
-<p>Select this option to use weaving to detect which fields or properties of the object change.</p>
+<td align="left" headers="r5c1-t31 r1c2-t31">
+<p>Control whether an EclipseLink session identifier is logged in each log entry.</p>
+<p>The following are the valid values:</p>
+<ul>
+<li>
+<p><span class="bold">true</span>&ndash;log a EclipseLink session identifier.</p>
+</li>
+<li>
+<p><span class="bold">false</span>&ndash;do not log a EclipseLink session identifier.</p>
+</li>
+</ul>
+<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
+<pre xml:space="preserve" class="oac_no_warn">
+&lt;property name="eclipselink.logging.session" value="false"/&gt;
+</pre></td>
+<td align="left" headers="r5c1-t31 r1c3-t31">
+<p>true</p>
</td>
-<td align="left" headers="r5c1-t18 r1c3-t18"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t18" headers="r1c1-t18">
-<p>&nbsp;&nbsp;Throw Exceptions</p>
+<td align="left" id="r6c1-t31" headers="r1c1-t31">
+<p>&nbsp;&nbsp;Exceptions</p>
</td>
-<td align="left" headers="r6c1-t18 r1c2-t18">
-<p>Select this option to set EclipseLink to throw an exception or log a warning when it encounters a problem with any of the files listed in a <span class="bold">persistence.xml</span> file <code>&lt;mapping-file&gt;</code> element.</p>
+<td align="left" headers="r6c1-t31 r1c2-t31">
+<p>Control whether the exceptions thrown from within the EclipseLink code are logged prior to returning the exception to the calling application. Ensures that all exceptions are logged and not masked by the application code.</p>
+<p>The following are the valid values:</p>
+<ul>
+<li>
+<p><span class="bold">true</span>&ndash;log all exceptions.</p>
+</li>
+<li>
+<p><span class="bold">false</span>&ndash;do not log exceptions.</p>
+</li>
+</ul>
+<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
+<pre xml:space="preserve" class="oac_no_warn">
+&lt;property name="eclipselink.logging.exceptions" value="true"/&gt;
+</pre></td>
+<td align="left" headers="r6c1-t31 r1c3-t31">
+<p>false</p>
</td>
-<td align="left" headers="r6c1-t18 r1c3-t18"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t18" headers="r1c1-t18">
-<p>Session Customizer</p>
+<td align="left" id="r7c1-t31" headers="r1c1-t31">
+<p>Log file</p>
</td>
-<td align="left" headers="r7c1-t18 r1c2-t18">
-<p>Select a session customizer class: a Java class that implements the <code>eclipselink.tools.sessionconfiguration.SessionCustomizer</code> interface and provides a default (zero-argument) constructor. Use this class' <code>customize</code> method, which takes an <code>eclipselink.sessions.Session</code>, to programmatically access advanced EclipseLink session API.</p>
-</td>
-<td align="left" headers="r7c1-t18 r1c3-t18"><br /></td>
+<td align="left" headers="r7c1-t31 r1c2-t31">
+<p>Specify a file location for the log output (instead of the standard out).</p>
+<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
+<pre xml:space="preserve" class="oac_no_warn">
+&lt;property name="eclipselink.logging.file" value="C:\myout\" /&gt;
+</pre></td>
+<td align="left" headers="r7c1-t31 r1c3-t31"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t18" headers="r1c1-t18">
-<p>Descriptor Customizer</p>
+<td align="left" id="r8c1-t31" headers="r1c1-t31">
+<p>Logger</p>
</td>
-<td align="left" headers="r8c1-t18 r1c2-t18">
-<p>Select an EclipseLink descriptor customizer class&ndash;a Java class that implements the <code>eclipselink.tools.sessionconfiguration.DescriptorCustomizer</code> interface and provides a default (zero-argument) constructor. Use this class's <code>customize</code> method, which takes an <code>eclipselink.descriptors.ClassDescriptor</code>, to programmatically access advanced EclipseLink descriptor and mapping API for the descriptor associated with the JPA entity named <code>&lt;ENTITY&gt;</code>.</p>
+<td align="left" headers="r8c1-t31 r1c2-t31">
+<p>Select the type of logger to use:</p>
+<p>The following are the valid values:</p>
+<ul>
+<li>
+<p><span class="bold">DefaultLogger</span>&ndash;the EclipseLink native logger <code>eclipselink.logging.DefaultSessionLog</code>.</p>
+</li>
+<li>
+<p><span class="bold">JavaLogger</span>&ndash;the <code>java.util.logging</code> logger <code>eclipselink.logging.JavaLog</code>.</p>
+</li>
+<li>
+<p><span class="bold">ServerLogger</span>&ndash;the <code>java.util.logging</code> logger <code>eclipselink.platform.server.ServerLog</code>. Integrates with the application server's logging as define in the <code>eclipselink.platform.server.ServerPlatform.</code></p>
+</li>
+<li>
+<p>Fully qualified class name of a custom logger. The custom logger must implement the <code>eclipselink.logging.SessionLog</code> interface.</p>
+</li>
+</ul>
+<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
+<pre xml:space="preserve" class="oac_no_warn">
+&lt;property name="eclipselink.logging.logger" value="acme.loggers.MyCustomLogger" /&gt;
+</pre></td>
+<td align="left" headers="r8c1-t31 r1c3-t31">
+<p>DefaultLogger</p>
</td>
-<td align="left" headers="r8c1-t18 r1c3-t18"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="tblformal" -->
-<p>The following table lists the properties of the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-This page is not available for projects using the <span class="bold">Generic</span> platform.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-</div>
+<!-- class="tblformal" --></div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm
index 391d913f21..47f4da1019 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm
@@ -2,153 +2,166 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Caching</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Options</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Caching" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Options" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CIABEDCH" name="CIABEDCH"></a></p>
+<p><a id="CIAFJCHE" name="CIAFJCHE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Caching</h1>
-<p>This table lists the properties of the Caching page of the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div class="tblformal"><a id="sthref224" name="sthref224"></a><a id="sthref225" name="sthref225"></a>
-<p class="titleintable">Properties of the Caching Page</p>
-<table class="Formal" title="Properties of the Caching Page" summary="This table lists the properties of the persistence.xml&rsquo;s Caching page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<h1>Options</h1>
+<p>This table lists the properties of the Options page of the <a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>.</p>
+<div align="center">
+<div class="inftblnote"><br />
+<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
+<tbody>
+<tr>
+<td align="left">
+<p class="notep1">Note:</p>
+This page is not available for projects using the <span class="bold">Generic</span> platform.</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblnote" --></div>
+<div class="tblformal"><a id="sthref267" name="sthref267"></a><a id="sthref268" name="sthref268"></a>
+<p class="titleintable">Properties of the Options Page</p>
+<table class="Formal" title="Properties of the Options Page" summary="Properties of the Options Page" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<col width="24%" />
+<col width="*" />
+<col width="24%" />
<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-t33">Property</th>
+<th align="left" valign="bottom" id="r1c2-t33">Description</th>
+<th align="left" valign="bottom" id="r1c3-t33">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t20" headers="r1c1-t20">
-<p>Default Cache Type</p>
-</td>
-<td align="left" headers="r2c1-t20 r1c2-t20">
-<p>Select one of the following as the Default Cache Type:</p>
-<ul>
-<li>
-<p><span class="bold">Soft with Weak 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">Week 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="r2c1-t20 r1c3-t20">
-<p>Weak with hard subcache</p>
-</td>
+<td align="left" id="r2c1-t33" headers="r1c1-t33">
+<p>Session Name</p>
+</td>
+<td align="left" headers="r2c1-t33 r1c2-t33">
+<p>Specify the name by which the EclipseLink session is stored in the static session manager. Use this option if you need to access the EclipseLink shared session outside of the context of the JPA or to use a pre-existing EclipseLink session configured through a EclipseLink <code>sessions.xml</code> file</p>
+<p>Valid values: a valid EclipseLink session name that is unique in a server deployment.</p>
+<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
+<pre xml:space="preserve" class="oac_no_warn">
+&lt;property name="eclipselink.session-name" value="MySession"/&gt;
+</pre></td>
+<td align="left" headers="r2c1-t33 r1c3-t33"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t20" headers="r1c1-t20">
-<p>Default Cache Size</p>
-</td>
-<td align="left" headers="r3c1-t20 r1c2-t20">
-<p>Set the size of the cache.</p>
-</td>
-<td align="left" headers="r3c1-t20 r1c3-t20">
-<p>1000</p>
-</td>
+<td align="left" id="r3c1-t33" headers="r1c1-t33">
+<p>Sessions XML</p>
+</td>
+<td align="left" headers="r3c1-t33 r1c2-t33">
+<p>Specify persistence information loaded from the EclipseLink session configuration file (<code>sessions.xml</code>).</p>
+<p>You can use this option as an alternative to annotations and deployment XML. If you specify this property, EclipseLink will override all class annotation and the object relational mapping from the <code>persistence.xml</code>, as well as <code>ORM.xml</code> and other mapping files, if present.</p>
+<p>Indicate the session by setting the <code>eclipselink.session-name</code> property.</p>
+<p>Note: If you do not specify the value for this property, <code>sessions.xml</code> file will not be used.</p>
+<p>Valid values: the resource name of the sessions XML file.</p>
+<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
+<pre xml:space="preserve" class="oac_no_warn">
+&lt;property name="toplink.session-xml" value="mysession.xml"/&gt;
+</pre></td>
+<td align="left" headers="r3c1-t33 r1c3-t33"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t20" headers="r1c1-t20">
-<p>Default Shared Cache</p>
-</td>
-<td align="left" headers="r4c1-t20 r1c2-t20">
-<p>Specfies if cached instances should be in the shared cache or in a client isolated cache.</p>
+<td align="left" id="r4c1-t33" headers="r1c1-t33">
+<p>Target Database</p>
+</td>
+<td align="left" headers="r4c1-t33 r1c2-t33">
+<p>Select the target database. You can also set the value to the fully qualified classname of a subclass of the <code>org.eclipse.persistence.platform.DatabasePlatform class</code>.</p>
+<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
+<pre xml:space="preserve" class="oac_no_warn">
+&lt;property name="eclipselink.target-database" value="Oracle"/&gt;
+</pre></td>
+<td align="left" headers="r4c1-t33 r1c3-t33">
+<p>Auto</p>
</td>
-<td align="left" headers="r4c1-t20 r1c3-t20"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t20" headers="r1c1-t20">
-<p>Entity Caching</p>
+<td align="left" id="r5c1-t33" headers="r1c1-t33">
+<p>Target Server</p>
+</td>
+<td align="left" headers="r5c1-t33 r1c2-t33">
+<p>Select the target server for your JPA application.</p>
+<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
+<pre xml:space="preserve" class="oac_no_warn">
+&lt;property name="eclipselink.target-server" value="OC4J_10_1_3"/&gt;
+</pre></td>
+<td align="left" headers="r5c1-t33 r1c3-t33">
+<p>None</p>
</td>
-<td align="left" headers="r5c1-t20 r1c2-t20">
-<p>Specify the entity.</p>
-</td>
-<td align="left" headers="r5c1-t20 r1c3-t20"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t20" headers="r1c1-t20">
-<p>&nbsp;&nbsp;Cache Type</p>
-</td>
-<td align="left" headers="r6c1-t20 r1c2-t20">
-<p>Select a cache type. See <span class="italic">Default Cache</span></p>
-</td>
-<td align="left" headers="r6c1-t20 r1c3-t20"><br /></td>
+<td align="left" id="r6c1-t33" headers="r1c1-t33">
+<p>Event Listener</p>
+</td>
+<td align="left" headers="r6c1-t33 r1c2-t33">
+<p>Specify a descriptor event listener to be added during bootstrapping.</p>
+<p>Valid values: qualified class name for a class that implements the <code>eclipselink.sessions.SessionEventListener</code> interface.</p>
+<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
+<pre xml:space="preserve" class="oac_no_warn">
+&lt;property name="eclipselink.session-event-listener" value="mypackage.MyClass.class"/&gt;
+</pre></td>
+<td align="left" headers="r6c1-t33 r1c3-t33"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t20" headers="r1c1-t20">
-<p>&nbsp;&nbsp;Cache Size</p>
+<td align="left" id="r7c1-t33" headers="r1c1-t33">
+<p>Include Descriptor Queries</p>
</td>
-<td align="left" headers="r7c1-t20 r1c2-t20">
-<p>Set the size of the cache.</p>
+<td align="left" headers="r7c1-t33 r1c2-t33">
+<p>Enable or disable the default copying of all named queries from the descriptors to the session. These queries include the ones defined using EclipseLink API, descriptor amendment methods, and so on.</p>
</td>
-<td align="left" headers="r7c1-t20 r1c3-t20"><br /></td>
+<td align="left" headers="r7c1-t33 r1c3-t33"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t20" headers="r1c1-t20">
-<p>&nbsp;&nbsp;Shared Cache</p>
+<td align="left" id="r8c1-t33" headers="r1c1-t33">
+<p>Miscellaneous Options</p>
</td>
-<td align="left" headers="r8c1-t20 r1c2-t20">
-<p>See <span class="italic">Default Shared Cache</span>.</p>
-</td>
-<td align="left" headers="r8c1-t20 r1c3-t20"><br /></td>
+<td align="left" headers="r8c1-t33 r1c2-t33"><br /></td>
+<td align="left" headers="r8c1-t33 r1c3-t33"><br /></td>
</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="tblformal" -->
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-This page is not available for projects using the <span class="bold">Generic</span> platform.</td>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t33" headers="r1c1-t33">
+<p>&nbsp;&nbsp;Temporal mutable</p>
+</td>
+<td align="left" headers="r9c1-t33 r1c2-t33">
+<p>Specify if all <code>Date</code> and <code>Calendar</code> persistent fields should be handled as mutable objects.</p>
+<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
+<pre xml:space="preserve" class="oac_no_warn">
+&lt;property name="eclipselink.temporal.mutable" value="true"/&gt;
+</pre></td>
+<td align="left" headers="r9c1-t33 r1c3-t33">
+<p>False</p>
+</td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblnote" --></div>
-</div>
+<!-- class="tblformal" --></div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm
index 693ad1dd65..18577b4690 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm
@@ -2,28 +2,26 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Logging</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Schema Generation</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Logging" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Schema Generation" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CIABGHHI" name="CIABGHHI"></a></p>
+<p><a id="CIACCFCB" name="CIACCFCB"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Logging</h1>
-<p>This table lists the properties of the Logging page of the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
+<h1>Schema Generation</h1>
+<p>This table lists the properties of the Schema Generation page of the <a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>.</p>
<div align="center">
<div class="inftblnote"><br />
<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
@@ -37,166 +35,91 @@ This page is not available for projects using the <span class="bold">Generic</sp
</table>
<br /></div>
<!-- class="inftblnote" --></div>
-<div class="tblformal"><a id="sthref226" name="sthref226"></a><a id="sthref227" name="sthref227"></a>
-<p class="titleintable">Properties of the Logging Page</p>
-<table class="Formal" title="Properties of the Logging Page" summary="This table lists the properties of the Logging page of the persistence.xml Editor." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<div class="tblformal"><a id="sthref269" name="sthref269"></a><a id="sthref270" name="sthref270"></a>
+<p class="titleintable">&nbsp;</p>
+<table class="Formal" title="" summary="This table lists the properties of the persistence.xml Editor&rsquo;s Schema Generation page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<col width="24%" />
+<col width="*" />
+<col width="24%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t23">Property</th>
-<th align="left" valign="bottom" id="r1c2-t23">Description</th>
-<th align="left" valign="bottom" id="r1c3-t23">Default</th>
+<th align="left" valign="bottom" id="r1c1-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-t23" headers="r1c1-t23">
-<p>Logging Level</p>
+<td align="left" id="r2c1-t35" headers="r1c1-t35">
+<p>DDL Generation Type</p>
</td>
-<td align="left" headers="r2c1-t23 r1c2-t23">
-<p>Specifies the amount and detail of log output by selecting the log level (in ascending order of information):</p>
-<p>The following are the valid values for the <code>java.util.logging.Level</code>:</p>
+<td align="left" headers="r2c1-t35 r1c2-t35">
+<p>Select the type of DDL generation:</p>
<ul>
<li>
-<p><span class="bold">OFF</span>&ndash;disables logging</p>
+<p><span class="bold">None</span> -- Do not generate DDL; no schema is generated.</p>
</li>
<li>
-<p><span class="bold">SEVERE</span>&ndash;logs exceptions indicating TopLink cannot continue, as well as any exceptions generated during login. This includes a stack trace.</p>
+<p><span class="bold">Create Tables</span> -- Create DDL for non-existent tables; leave existing tables unchanged.</p>
</li>
<li>
-<p><span class="bold">WARNING</span>&ndash;logs exceptions that do not force TopLink to stop, including all exceptions not logged with severe level. This does not include a stack trace.</p>
-</li>
-<li>
-<p><span class="bold">INFO</span>&ndash;logs the login/logout per sever session, including the user name. After acquiring the session, detailed information is logged.</p>
-</li>
-<li>
-<p><span class="bold">CONFIG</span>&ndash;logs only login, JDBC connection, and database information.</p>
-</li>
-<li>
-<p><span class="bold">FINE</span>&ndash;logs SQL.</p>
-</li>
-<li>
-<p><span class="bold">FINER</span>&ndash;similar to warning. Includes stack trace.</p>
-</li>
-<li>
-<p><span class="bold">FINEST</span>&ndash;includes additional low level information.</p>
+<p><span class="bold">Drop and Create Tables</span> -- Create DDL for all tables; drop all existing tables.</p>
</li>
</ul>
-<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;property name="eclipselink.logging.level" value="INFO"/&gt;
-</pre></td>
-<td align="left" headers="r2c1-t23 r1c3-t23">
-<p>Info</p>
+</td>
+<td align="left" headers="r2c1-t35 r1c3-t35">
+<p>None</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t23" headers="r1c1-t23">
-<p>&nbsp;&nbsp;TimeStamp</p>
+<td align="left" id="r3c1-t35" headers="r1c1-t35">
+<p>Output Mode</p>
</td>
-<td align="left" headers="r3c1-t23 r1c2-t23">
-<p>Control whether the timestamp is logged in each log entry.</p>
-<p>The following are the valid values:</p>
+<td align="left" headers="r3c1-t35 r1c2-t35">
+<p>Select the DDL generation target:</p>
<ul>
<li>
-<p><span class="bold">true</span>&ndash;log a timestamp.</p>
+<p><span class="bold">Both</span> -- Generate SQL files and execute them on the database.</p>
</li>
<li>
-<p><span class="bold">false</span>&ndash;do not log a timestamp.</p>
+<p><span class="bold">Database</span> -- Execute SQL on the database only (do not generate SQL files).</p>
</li>
-</ul>
-<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;property name="eclipselink.logging.timestamp" value="false"/&gt;
-</pre></td>
-<td align="left" headers="r3c1-t23 r1c3-t23"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t23" headers="r1c1-t23">
-<p>&nbsp;&nbsp;Thread</p>
-</td>
-<td align="left" headers="r4c1-t23 r1c2-t23">
-<p>Control whether a thread identifier is logged in each log entry.</p>
-<p>The following are the valid values:</p>
-<ul>
<li>
-<p><span class="bold">true</span>&ndash;log a thread identifier.</p>
-</li>
-<li>
-<p><span class="bold">false</span>&ndash;do not log a thread identifier.</p>
+<p><span class="bold">SQL Script</span> -- Generate SQL files only (do not execute them on the database).</p>
</li>
</ul>
</td>
-<td align="left" headers="r4c1-t23 r1c3-t23"><br /></td>
+<td align="left" headers="r3c1-t35 r1c3-t35"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t23" headers="r1c1-t23">
-<p>&nbsp;&nbsp;Session</p>
+<td align="left" id="r4c1-t35" headers="r1c1-t35">
+<p>DDL Generation Location</p>
</td>
-<td align="left" headers="r5c1-t23 r1c2-t23">
-<p>Control whether an EclipseLink session identifier is logged in each log entry.</p>
-<p>The following are the valid values:</p>
-<ul>
-<li>
-<p><span class="bold">true</span>&ndash;log a EclipseLink session identifier.</p>
-</li>
-<li>
-<p><span class="bold">false</span>&ndash;do not log a EclipseLink session identifier.</p>
-</li>
-</ul>
-<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;property name="eclipselink.logging.session" value="false"/&gt;
-</pre></td>
-<td align="left" headers="r5c1-t23 r1c3-t23"><br /></td>
+<td align="left" headers="r4c1-t35 r1c2-t35">
+<p>Specify where EclipseLink writes DDL output. Specify a file specification to a directory in which you have write access. The file specification may be relative to your current working directory or absolute. If it does not end in a file separator, then EclipseLink appends one that is valid for your operating system.</p>
+</td>
+<td align="left" headers="r4c1-t35 r1c3-t35"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t23" headers="r1c1-t23">
-<p>&nbsp;&nbsp;Exceptions</p>
+<td align="left" id="r5c1-t35" headers="r1c1-t35">
+<p>Create DDL File Name</p>
+</td>
+<td align="left" headers="r5c1-t35 r1c2-t35">
+<p>Specify the file name of the DDL file that EclipseLink generates that contains SQL statements for creating tables for JPA entities. Specify a file name valid for your operating system.</p>
+</td>
+<td align="left" headers="r5c1-t35 r1c3-t35">
+<p>createDDL.jdbc</p>
</td>
-<td align="left" headers="r6c1-t23 r1c2-t23">
-<p>Control whether the exceptions thrown from within the TopLink code are logged prior to returning the exception to the calling application. Ensures that all exceptions are logged and not masked by the application code.</p>
-<p>The following are the valid values:</p>
-<ul>
-<li>
-<p><span class="bold">true</span>&ndash;log all exceptions.</p>
-</li>
-<li>
-<p><span class="bold">false</span>&ndash;do not log exceptions.</p>
-</li>
-</ul>
-<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;property name="eclipselink.logging.exceptions" value="true"/&gt;
-</pre></td>
-<td align="left" headers="r6c1-t23 r1c3-t23"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t23" headers="r1c1-t23">
-<p>Logger</p>
+<td align="left" id="r6c1-t35" headers="r1c1-t35">
+<p>Drop DDL File Name</p>
</td>
-<td align="left" headers="r7c1-t23 r1c2-t23">
-<p>Select the type of logger to use:</p>
-<p>The following are the valid values:</p>
-<ul>
-<li>
-<p><span class="bold">DefaultLogger</span>&ndash;the EclipseLink native logger <code>eclipselink.logging.DefaultSessionLog</code>.</p>
-</li>
-<li>
-<p><span class="bold">JavaLogger</span>&ndash;the <code>java.util.logging</code> logger <code>eclipselink.logging.JavaLog</code>.</p>
-</li>
-<li>
-<p><span class="bold">ServerLogger</span>&ndash;the <code>java.util.logging</code> logger <code>eclipselink.platform.server.ServerLog</code>. Integrates with the application server's logging as define in the <code>eclipselink.platform.server.ServerPlatform.</code></p>
-</li>
-<li>
-<p>Fully qualified class name of a custom logger. The custom logger must implement the <code>eclipselink.logging.SessionLog</code> interface.</p>
-</li>
-</ul>
-<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;property name="eclipselink.logging.logger" value="acme.loggers.MyCustomLogger" /&gt;
-</pre></td>
-<td align="left" headers="r7c1-t23 r1c3-t23">
-<p>DefaultLogger</p>
+<td align="left" headers="r6c1-t35 r1c2-t35">
+<p>Specify the file name of the DDL file that EclipseLink generates that contains SQL statements for dropping tables for JPA entities.</p>
+</td>
+<td align="left" headers="r6c1-t35 r1c3-t35">
+<p>dropDDL.jdbc</p>
</td>
</tr>
</tbody>
@@ -207,8 +130,11 @@ This page is not available for projects using the <span class="bold">Generic</sp
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm
index 076e38dcee..b0b5ffa8b0 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm
@@ -2,120 +2,37 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Options</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Properties</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Options" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Properties" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CIAFJCHE" name="CIAFJCHE"></a></p>
+<p><a id="CIAHJDFF" name="CIAHJDFF"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Options</h1>
-<p>This table lists the properties of the Options page of the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-This page is not available for projects using the <span class="bold">Generic</span> platform.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-<div class="tblformal"><a id="sthref228" name="sthref228"></a><a id="sthref229" name="sthref229"></a>
-<p class="titleintable">Properties of the Options Page</p>
-<table class="Formal" title="Properties of the Options Page" summary="" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t25">Property</th>
-<th align="left" valign="bottom" id="r1c2-t25">Description</th>
-<th align="left" valign="bottom" id="r1c3-t25">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t25" headers="r1c1-t25">
-<p>Session Name</p>
-</td>
-<td align="left" headers="r2c1-t25 r1c2-t25">
-<p>Specify the name by which the EclipseLink session is stored in the static session manager. Use this option if you need to access the EclipseLink shared session outside of the context of the JPA or to use a pre-existing EclipseLink session configured through a EclipseLink <code>sessions.xml</code> file</p>
-<p>Valid values: a valid EclipseLink session name that is unique in a server deployment.</p>
-<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;property name="eclipselink.session-name" value="MySession"/&gt;
-</pre></td>
-<td align="left" headers="r2c1-t25 r1c3-t25"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t25" headers="r1c1-t25">
-<p>Sessions XML</p>
-</td>
-<td align="left" headers="r3c1-t25 r1c2-t25">
-<p>Specify persistence information loaded from the EclipseLink session configuration file (<code>sessions.xml</code>).</p>
-<p>You can use this option as an alternative to annotations and deployment XML. If you specify this property, TopLink will override all class annotation and the object relational mapping from the <code>persistence.xml</code>, as well as <code>ORM.xml</code> and other mapping files, if present. .</p>
-<p>Indicate the session by setting the <code>eclipselink.session-name</code> property.</p>
-<p>Note: If you do not specify the value for this property, <code>sessions.xml</code> file will not be used.</p>
-<p>Valid values: the resource name of the sessions XML file.</p>
-<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;property name="toplink.session-xml" value="mysession.xml"/&gt;
-</pre></td>
-<td align="left" headers="r3c1-t25 r1c3-t25"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t25" headers="r1c1-t25">
-<p>Target Database</p>
-</td>
-<td align="left" headers="r4c1-t25 r1c2-t25"><br /></td>
-<td align="left" headers="r4c1-t25 r1c3-t25"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t25" headers="r1c1-t25">
-<p>Event Listener</p>
-</td>
-<td align="left" headers="r5c1-t25 r1c2-t25">
-<p>Specify a descriptor event listener to be added during bootstrapping.</p>
-<p>Valid values: qualified class name for a class that implements the <code>eclipselink.sessions.SessionEventListener</code> interface.</p>
-<p><span class="bold">Example</span>: <code>persistence.xml</code> file</p>
-<pre xml:space="preserve" class="oac_no_warn">
-&lt;property name="eclipselink.session-event-listener" value="mypackage.MyClass.class"/&gt;
-</pre></td>
-<td align="left" headers="r5c1-t25 r1c3-t25"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t25" headers="r1c1-t25">
-<p>Include Descriptor Queries</p>
-</td>
-<td align="left" headers="r6c1-t25 r1c2-t25">
-<p>Enable or disable the default copying of all named queries from the descriptors to the session. These queries include the ones defined using EclipseLink API, descriptor amendment methods, and so on.</p>
-</td>
-<td align="left" headers="r6c1-t25 r1c3-t25"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="tblformal" --></div>
+<h1>Properties</h1>
+<p>This page enables you to add or remove the vendor-specific <code>&lt;properties&gt;</code> elements of <code>persistence.xml</code>.</p>
+<p>To add a property, click <span class="bold">Add</span> then enter the property <span class="bold">Name</span> and <span class="bold">Value</span>.</p>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm
index 183e31790b..2af38698b4 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm
@@ -2,135 +2,42 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Schema Generation</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Source</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Schema Generation" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Source" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CIACCFCB" name="CIACCFCB"></a></p>
+<p><a id="CIAHCJAH" name="CIAHCJAH"></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="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
-<tbody>
-<tr>
-<td align="left">
-<p class="notep1">Note:</p>
-This page is not available for projects using the <span class="bold">Generic</span> platform.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
-<div class="tblformal"><a id="sthref230" name="sthref230"></a><a id="sthref231" name="sthref231"></a>
-<p class="titleintable">&nbsp;</p>
-<table class="Formal" title="" summary="This table lists the properties of the persistence.xml Editor&rsquo;s Schema Generation page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t27">Property</th>
-<th align="left" valign="bottom" id="r1c2-t27">Description</th>
-<th align="left" valign="bottom" id="r1c3-t27">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t27" headers="r1c1-t27">
-<p>DDL Generation Type</p>
-</td>
-<td align="left" headers="r2c1-t27 r1c2-t27">
-<p>Select the type of DDL generation:</p>
-<ul>
-<li>
-<p><span class="bold">None</span> -- Do not generate DDL; no schema is generated.</p>
-</li>
-<li>
-<p><span class="bold">Create Tables</span> -- Create DDL for non-existent tables; leave existing tables unchanged.</p>
-</li>
-<li>
-<p><span class="bold">Drop and Create Tables</span> -- Create DDL for all tables; drop all existing tables.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r2c1-t27 r1c3-t27">
-<p>None</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t27" headers="r1c1-t27">
-<p>Output Mode</p>
-</td>
-<td align="left" headers="r3c1-t27 r1c2-t27">
-<p>Select the DDL generation target:</p>
-<ul>
-<li>
-<p><span class="bold">Both</span> -- Generate SQL files and execute them on the database.</p>
-</li>
-<li>
-<p><span class="bold">Database</span> -- Execute SQL on the database only (do not generate SQL files).</p>
-</li>
-<li>
-<p><span class="bold">SQL Script</span> -- Generate SQL files only (do not execute them on the database).</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r3c1-t27 r1c3-t27"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t27" headers="r1c1-t27">
-<p>DDL Generation Location</p>
-</td>
-<td align="left" headers="r4c1-t27 r1c2-t27">
-<p>Specify where EclipseLink writes DDL output. Specify a file specification to a directory in which you have write access. The file specification may be relative to your current working directory or absolute. If it does not end in a file separator, then EclipseLink appends one that is valid for your operating system.</p>
-</td>
-<td align="left" headers="r4c1-t27 r1c3-t27"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t27" headers="r1c1-t27">
-<p>Create DDL File Name</p>
-</td>
-<td align="left" headers="r5c1-t27 r1c2-t27">
-<p>Specify the file name of the DDL file that EclipseLink generates that contains SQL statements for creating tables for JPA entities. Specify a file name valid for your operating system.</p>
-</td>
-<td align="left" headers="r5c1-t27 r1c3-t27">
-<p>createDDL.jdbc</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t27" headers="r1c1-t27">
-<p>Drop DDL File Name</p>
-</td>
-<td align="left" headers="r6c1-t27 r1c2-t27">
-<p>Specify the file name of the DDL file that EclipseLink generates that contains SQL statements for dropping tables for JPA entities.</p>
-</td>
-<td align="left" headers="r6c1-t27 r1c3-t27">
-<p>dropDDL.jdbc</p>
-</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="tblformal" --></div>
+<h1>Source</h1>
+<p>Using this page, you can manually edit the <code>persistence.xml</code> file.</p>
+<p>See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for additional information.</p>
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a></div>
<!-- class="sect3" -->
+<!-- class="sect2" -->
+<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm
index 000c41403c..1de4850b5e 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm
@@ -2,38 +2,42 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Properties</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Preferences</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Properties" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Preferences" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CIAHJDFF" name="CIAHJDFF"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Properties</h1>
-<p>This page enables you to add or remove the vendor-specific <code>&lt;properties&gt;</code> elements of persistence.xml.</p>
-</div>
-<!-- class="sect3" -->
+<p><a id="CACDEIEE" name="CACDEIEE"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>Preferences</h1>
+<p>This section includes information on the following preference pages:</p>
+<ul>
+<li>
+<p><a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; Java Persistence Options</a></p>
+</li>
+</ul>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
-<!-- class="footer" -->
+<!-- class="footer" --></div>
</body>
</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm
index 2569ec9ef5..2217c80833 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm
@@ -2,44 +2,48 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:51 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Source</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Dialogs</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Source" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Dialogs" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CIAHCJAH" name="CIAHCJAH"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Source</h1>
-<p>Using this page, you can manually edit the persistence.xml file.</p>
-<p>See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for additional information.</p>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a></div>
-<!-- class="sect3" -->
-<!-- class="sect2" -->
-<!-- class="sect1" -->
+<p><a id="CACGEJDA" name="CACGEJDA"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>Dialogs</h1>
+<p>This section includes information on the following preference pages:</p>
+<ul>
+<li>
+<p><a href="reference028.htm#CACCGEHC">Edit Join Columns Dialog</a></p>
+</li>
+<li>
+<p><a href="ref_select_cascade_dialog.htm#CIAFDGIJ">Select Cascade dialog</a></p>
+</li>
+<li>
+<p><a href="ref_eclipselink_mapping_file.htm#CIAEDEJF">New EclipseLink Mapping File dialog</a></p>
+</li>
+</ul>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
-<!-- class="footer" -->
+<!-- class="footer" --></div>
</body>
</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm
index 72bfc39bb6..4b29c726e8 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm
@@ -2,41 +2,66 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:52 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Preferences</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Edit Join Columns Dialog</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:52Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Preferences" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Edit Join Columns Dialog" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CACDEIEE" name="CACDEIEE"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Preferences</h1>
-<p>This section includes information on the following preference pages:</p>
-<ul>
-<li>
-<p><a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; JPA Options</a></p>
-</li>
-</ul>
+<p><a id="CACCGEHC" name="CACCGEHC"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Edit Join Columns Dialog</h1>
+<p>Use the <span class="gui-object-title">Join Columns</span> dialog to create or modify the join tables and columns in relationship mappings.</p>
+<p>This table lists the properties available in the <span class="gui-object-title">Join Columns</span> dialog.</p>
+<div class="inftblinformal">
+<table class="Informal" title="This table describes the options on the Join Columns dialog." summary="This table describes the options on the Join Columns dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t37">Property</th>
+<th align="left" valign="bottom" id="r1c2-t37">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t37" headers="r1c1-t37">Name</td>
+<td align="left" headers="r2c1-t37 r1c2-t37">Name of the joint table column that contains the foreign key column.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t37" headers="r1c1-t37">Referenced Column Name</td>
+<td align="left" headers="r3c1-t37 r1c2-t37">Name of the database column that contains the foreign key reference for the entity relationship.</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblinformal" -->
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="reference011.htm#CACBAEBC">Join Table Information</a><br />
+<a href="reference012.htm#CACFCEJC">Join Columns Information</a></div>
+<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
-<!-- class="footer" --></div>
+<!-- class="footer" -->
</body>
</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm
index 09d9498ec7..1dad1de5f2 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm
@@ -2,41 +2,42 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:52 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Dialogs</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Icons and buttons</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:53Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Dialogs" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Icons and buttons" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CACGEJDA" name="CACGEJDA"></a></p>
+<p><a id="CACDHCIA" name="CACDHCIA"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Dialogs</h1>
-<p>This section includes information on the following preference pages:</p>
+<h1>Icons and buttons</h1>
+<p>This section includes information on each of the icons and buttons used in the Dali OR Mapping Tool.</p>
<ul>
<li>
-<p><a href="task_generate_entities.htm#CACDAFJD">Generate Entities from Tables dialog</a></p>
+<p><a href="reference030.htm#CACGEACG">Icons</a></p>
</li>
<li>
-<p><a href="reference030.htm#CACCGEHC">Edit Join Columns Dialog</a></p>
+<p><a href="reference031.htm#CACDJCEI">Buttons</a></p>
</li>
</ul>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm
index 0123de3e64..22637b3354 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm
@@ -2,61 +2,121 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:52 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Edit Join Columns Dialog</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Icons</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:53Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Edit Join Columns Dialog" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Icons" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CACCGEHC" name="CACCGEHC"></a></p>
+<p><a id="CACGEACG" name="CACGEACG"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Edit Join Columns Dialog</h1>
-<p>Use the <span class="gui-object-title">Join Columns</span> dialog to create or modify the join tables and columns in relationship mappings.</p>
-<p>This table lists the properties available in the <span class="gui-object-title">Join Columns</span> dialog.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Join Columns dialog." summary="This table describes the options on the Join Columns dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<h1>Icons</h1>
+<p>The following icons are used throughout the Dali OR Mapping Tool.</p>
+<div class="inftblruleinformal">
+<table class="RuleInformal" title="This table describes the icons used in the Dali plug-in." summary="This table describes the icons used in the Dali plug-in." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="23%" />
+<col width="*" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t30">Property</th>
-<th align="left" valign="bottom" id="r1c2-t30">Description</th>
+<th align="left" valign="bottom" id="r1c1-t40">Icon</th>
+<th align="left" valign="bottom" id="r1c2-t40">Description</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t30" headers="r1c1-t30">Name</td>
-<td align="left" headers="r2c1-t30 r1c2-t30">Name of the joint table column that contains the foreign key column.</td>
+<td align="left" id="r2c1-t40" headers="r1c1-t40"><img src="img/new_icon_mappedentity.png" alt="" title="" /><br /></td>
+<td align="left" headers="r2c1-t40 r1c2-t40"><a href="tasks005.htm#BABGBIEE">Entity</a><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t30" headers="r1c1-t30">Referenced Column Name</td>
-<td align="left" headers="r3c1-t30 r1c2-t30">Name of the database column that contains the foreign key reference for the entity relationship.</td>
+<td align="left" id="r3c1-t40" headers="r1c1-t40"><img src="img/new_icon_embeddableentitymapping.png" alt="Embeddable entity icon" title="Embeddable entity icon" /><br /></td>
+<td align="left" headers="r3c1-t40 r1c2-t40"><a href="tasks006.htm#BABFEICE">Embeddable</a> entity</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t40" headers="r1c1-t40"><img src="img/new_icon_mappedsuperclass.png" alt="Mapped superclass icon" title="Mapped superclass icon" /><br /></td>
+<td align="left" headers="r4c1-t40 r1c2-t40"><a href="tasks007.htm#BABDAGCI">Mapped superclass</a></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t40" headers="r1c1-t40"><img src="img/new_icon_basicmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
+<td align="left" headers="r5c1-t40 r1c2-t40"><a href="tasks009.htm#BABBABCE">Basic mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t40" headers="r1c1-t40"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
+<td align="left" headers="r6c1-t40 r1c2-t40">Basic collection mapping</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t40" headers="r1c1-t40"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
+<td align="left" headers="r7c1-t40 r1c2-t40">Basic map mapping</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t40" headers="r1c1-t40"><img src="img/new_icon_embeddedidmapping.png" alt="Embedded mapping icon" title="Embedded mapping icon" /><br /></td>
+<td align="left" headers="r8c1-t40 r1c2-t40"><a href="tasks010.htm#BABCBHDF">Embedded mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t40" headers="r1c1-t40"><img src="img/new_icon_embeddedmapping.png" alt="Embedded ID mapping icon" title="Embedded ID mapping icon" /><br /></td>
+<td align="left" headers="r9c1-t40 r1c2-t40"><a href="tasks011.htm#CIHDIAEE">Embedded ID mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t40" headers="r1c1-t40"><img src="img/new_icon_idmapping.png" alt="ID mapping icon" title="ID mapping icon" /><br /></td>
+<td align="left" headers="r10c1-t40 r1c2-t40"><a href="tasks012.htm#BABGCBHG">ID mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t40" headers="r1c1-t40"><img src="img/new_icon_manytomanymapping.png" alt="Many-to-many mapping icon" title="Many-to-many mapping icon" /><br /></td>
+<td align="left" headers="r11c1-t40 r1c2-t40"><a href="tasks013.htm#BABEIEGD">Many-to-many mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t40" headers="r1c1-t40"><img src="img/new_icon_manytoonemapping.png" alt="Many-to-one mapping icon." title="Many-to-one mapping icon." /><br /></td>
+<td align="left" headers="r12c1-t40 r1c2-t40"><a href="tasks014.htm#BABHFAFJ">Many-to-one mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r13c1-t40" headers="r1c1-t40"><img src="img/new_icon_onetomanymapping.png" alt="One-to-many mapping icon" title="One-to-many mapping icon" /><br /></td>
+<td align="left" headers="r13c1-t40 r1c2-t40"><a href="tasks015.htm#BABHGEBD">One-to-many mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r14c1-t40" headers="r1c1-t40"><img src="img/new_icon_onetoonemapping.png" alt="One-to-one mapping icon." title="One-to-one mapping icon." /><br /></td>
+<td align="left" headers="r14c1-t40 r1c2-t40"><a href="tasks016.htm#BABFHBCJ">One-to-one mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r15c1-t40" headers="r1c1-t40"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
+<td align="left" headers="r15c1-t40 r1c2-t40">Transformation mappings</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r16c1-t40" headers="r1c1-t40"><img src="img/new_icon_transientmapping.png" alt="Transient mapping icon." title="Transient mapping icon." /><br /></td>
+<td align="left" headers="r16c1-t40 r1c2-t40"><a href="tasks017.htm#BABHFHEI">Transient mapping</a><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r17c1-t40" headers="r1c1-t40"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
+<td align="left" headers="r17c1-t40 r1c2-t40">Variable one-to-one mappings</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r18c1-t40" headers="r1c1-t40"><img src="img/new_icon_versionmapping.png" alt="Version mapping icon." title="Version mapping icon." /><br /></td>
+<td align="left" headers="r18c1-t40 r1c2-t40"><a href="tasks018.htm#BABHIBII">Version mapping</a><br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblinformal" -->
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="reference014.htm#CACBAEBC">Join Table Information</a><br />
-<a href="reference015.htm#CACFCEJC">Join Columns Information</a></div>
+<!-- class="inftblruleinformal" -->
+<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
+<p><a href="reference029.htm#CACDHCIA">Icons and buttons</a></p>
+</div>
<!-- class="sect2" -->
-<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm
index c9d1e3ec95..0e5faa8471 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm
@@ -2,44 +2,61 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:52 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Icons and buttons</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Buttons</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:54Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Icons and buttons" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Buttons" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CACDHCIA" name="CACDHCIA"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Icons and buttons</h1>
-<p>This section includes information on each of the icons and buttons used in the Dali OR Mapping Tool.</p>
-<ul>
-<li>
-<p><a href="reference032.htm#CACGEACG">Icons</a></p>
-</li>
-<li>
-<p><a href="reference033.htm#CACDJCEI">Buttons</a></p>
-</li>
-</ul>
+<p><a id="CACDJCEI" name="CACDJCEI"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Buttons</h1>
+<p>The following buttons are used throughout the Dali OR Mapping Tool.</p>
+<div class="inftblruleinformal">
+<table class="RuleInformal" title="This table describes the buttons used in the Dali plug-in." summary="This table describes the buttons used in the Dali plug-in." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="27%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t41">Icon</th>
+<th align="left" valign="bottom" id="r1c2-t41">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t41" headers="r1c1-t41"><img src="img/new_jpa_perspective_button.png" alt="The JPA Perspective icon" title="The JPA Perspective icon" /><br /></td>
+<td align="left" headers="r2c1-t41 r1c2-t41">JPA Development perspective</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblruleinformal" -->
+<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
+<p><a href="reference029.htm#CACDHCIA">Icons and buttons</a></p>
+</div>
+<!-- class="sect2" -->
+<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
-<!-- class="footer" --></div>
+<!-- class="footer" -->
</body>
</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm
index fc1cd84f6a..969a73e066 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm
@@ -2,102 +2,49 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:52 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Icons</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Dali Developer Documentation</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:54Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Icons" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="doctitle" content="Dali Developer Documentation" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
-<p><a id="CACGEACG" name="CACGEACG"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Icons</h1>
-<p>The following icons are used throughout the Dali OR Mapping Tool.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the icons used in the Dali plug-in." summary="This table describes the icons used in the Dali plug-in." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t31">Icon</th>
-<th align="left" valign="bottom" id="r1c2-t31">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t31" headers="r1c1-t31"><img src="img/new_icon_mappedentity.png" alt="" title="" /><br /></td>
-<td align="left" headers="r2c1-t31 r1c2-t31"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t31" headers="r1c1-t31"><img src="img/new_icon_embeddableentitymapping.png" alt="Embeddable entity icon" title="Embeddable entity icon" /><br /></td>
-<td align="left" headers="r3c1-t31 r1c2-t31"><a href="tasks007.htm#BABFEICE">Embeddable</a> entity</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t31" headers="r1c1-t31"><img src="img/new_icon_mappedsuperclass.png" alt="Mapped superclass icon" title="Mapped superclass icon" /><br /></td>
-<td align="left" headers="r4c1-t31 r1c2-t31"><a href="tasks008.htm#BABDAGCI">Mapped superclass</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t31" headers="r1c1-t31"><img src="img/new_icon_basicmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
-<td align="left" headers="r5c1-t31 r1c2-t31"><a href="tasks010.htm#BABBABCE">Basic mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t31" headers="r1c1-t31"><img src="img/new_icon_embeddedidmapping.png" alt="Embedded mapping icon" title="Embedded mapping icon" /><br /></td>
-<td align="left" headers="r6c1-t31 r1c2-t31"><a href="tasks011.htm#BABCBHDF">Embedded mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t31" headers="r1c1-t31"><img src="img/new_icon_embeddedmapping.png" alt="Embedded ID mapping icon" title="Embedded ID mapping icon" /><br /></td>
-<td align="left" headers="r7c1-t31 r1c2-t31"><a href="tasks012.htm#CIHDIAEE">Embedded ID mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t31" headers="r1c1-t31"><img src="img/new_icon_idmapping.png" alt="ID mapping icon" title="ID mapping icon" /><br /></td>
-<td align="left" headers="r8c1-t31 r1c2-t31"><a href="tasks013.htm#BABGCBHG">ID mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r9c1-t31" headers="r1c1-t31"><img src="img/new_icon_manytomanymapping.png" alt="Many-to-many mapping icon" title="Many-to-many mapping icon" /><br /></td>
-<td align="left" headers="r9c1-t31 r1c2-t31"><a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r10c1-t31" headers="r1c1-t31"><img src="img/new_icon_manytoonemapping.png" alt="Many-to-one mapping icon." title="Many-to-one mapping icon." /><br /></td>
-<td align="left" headers="r10c1-t31 r1c2-t31"><a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r11c1-t31" headers="r1c1-t31"><img src="img/new_icon_onetomanymapping.png" alt="One-to-many mapping icon" title="One-to-many mapping icon" /><br /></td>
-<td align="left" headers="r11c1-t31 r1c2-t31"><a href="tasks016.htm#BABHGEBD">One-to-many mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r12c1-t31" headers="r1c1-t31"><img src="img/new_icon_onetoonemapping.png" alt="One-to-one mapping icon." title="One-to-one mapping icon." /><br /></td>
-<td align="left" headers="r12c1-t31 r1c2-t31"><a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r13c1-t31" headers="r1c1-t31"><img src="img/new_icon_transientmapping.png" alt="Transient mapping icon." title="Transient mapping icon." /><br /></td>
-<td align="left" headers="r13c1-t31 r1c2-t31"><a href="tasks018.htm#BABHFHEI">Transient mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r14c1-t31" headers="r1c1-t31"><img src="img/new_icon_versionmapping.png" alt="Version mapping icon." title="Version mapping icon." /><br /></td>
-<td align="left" headers="r14c1-t31 r1c2-t31"><a href="tasks019.htm#BABHIBII">Version mapping</a><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" -->
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<p><a href="reference031.htm#CACDHCIA">Icons and buttons</a></p>
+<p><a id="CACBBDIB" name="CACBBDIB"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>Dali Developer Documentation</h1>
+<p><a id="sthref282" name="sthref282"></a><a id="sthref283" name="sthref283"></a><a id="sthref284" name="sthref284"></a>Additional Dali documentation is available online at:</p>
+<p><code><a href="http://wiki.eclipse.org/index.php/Dali_Developer_Documentation">http://wiki.eclipse.org/index.php/Dali_Developer_Documentation</a></code></p>
+<p>This developer documentation includes information about:</p>
+<ul>
+<li>
+<p>Dali architecture</p>
+</li>
+<li>
+<p>Plugins that comprise the Dali JPA Eclipse feature</p>
+</li>
+<li>
+<p>Extension points</p>
+</li>
+</ul>
</div>
-<!-- class="sect2" -->
+<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm
deleted file mode 100644
index 912e486719..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:53 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Buttons</title>
-
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Buttons" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACDJCEI" name="CACDJCEI"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Buttons</h1>
-<p>The following buttons are used throughout the Dali OR Mapping Tool.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the buttons used in the Dali plug-in." summary="This table describes the buttons used in the Dali plug-in." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t32">Icon</th>
-<th align="left" valign="bottom" id="r1c2-t32">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t32" headers="r1c1-t32"><img src="img/new_jpa_perspective_button.png" alt="The JPA Perspective icon" title="The JPA Perspective icon" /><br /></td>
-<td align="left" headers="r2c1-t32 r1c2-t32">JPA Development perspective</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" -->
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<p><a href="reference031.htm#CACDHCIA">Icons and buttons</a></p>
-</div>
-<!-- class="sect2" -->
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm
index 2fde1e2c47..90e86cf461 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm
@@ -2,37 +2,35 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:44 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Adding persistence to a class</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Adding persistence to a class</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:44Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Adding persistence to a class" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<p><a id="BABHICAI" name="BABHICAI"></a></p>
<div class="sect1">
<h1>Adding persistence to a class</h1>
-<p><a id="sthref54" name="sthref54"></a><a id="sthref55" name="sthref55"></a><a id="sthref56" name="sthref56"></a>You can make a Java class into one of the following persistent types:</p>
+<p><a id="sthref66" name="sthref66"></a><a id="sthref67" name="sthref67"></a><a id="sthref68" name="sthref68"></a>You can make a Java class into one of the following persistent types:</p>
<ul>
<li>
-<p><a href="tasks006.htm#BABGBIEE">Entity</a></p>
+<p><a href="tasks005.htm#BABGBIEE">Entity</a></p>
</li>
<li>
-<p><a href="tasks007.htm#BABFEICE">Embeddable</a></p>
+<p><a href="tasks006.htm#BABFEICE">Embeddable</a></p>
</li>
<li>
-<p><a href="tasks008.htm#BABDAGCI">Mapped superclass</a></p>
+<p><a href="tasks007.htm#BABDAGCI">Mapped superclass</a></p>
</li>
</ul>
<p>&nbsp;</p>
@@ -49,8 +47,11 @@
<a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a> <!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm
index ba760f6083..2155ba27fe 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm
@@ -2,36 +2,34 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:45 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Specifying additional tables</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Specifying additional tables</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:45Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Specifying additional tables" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<p><a id="CIHGBIEI" name="CIHGBIEI"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>Specifying additional tables</h1>
-<p>Add a secondary table annotation to an entity if its data is split across more more than one table.</p>
+<p>Add a secondary table annotation to an entity if its data is split across more than one table.</p>
<p>To add a secondary table to the entity,</p>
-<ol start="1">
+<ol>
<li>
-<p>Select the entity in the <span class="gui-object-title">Package Explorer</span>.</p>
+<p>Select the entity in the <span class="gui-object-title">Project Explorer</span>.</p>
</li>
<li>
<p>In the <span class="gui-object-title">JPA Details</span> view, select the <span class="gui-object-action">Secondary Tables</span> information.</p>
-<div class="figure"><a id="sthref79" name="sthref79"></a>
+<div class="figure"><a id="sthref91" name="sthref91"></a>
<p class="titleinfigure">Specifying Secondary Tables</p>
<img src="img/secondary_tables.png" alt="Secondary Tables area on the JPA Details view." title="Secondary Tables area on the JPA Details view." /><br /></div>
<!-- class="figure" --></li>
@@ -44,9 +42,22 @@
</ol>
<p>Eclipse adds the following annotations the entity:</p>
<pre xml:space="preserve" class="oac_no_warn">
-@SecondaryTable(name="NAME", catalog = "CATALOG", schema = "SCHEMA"
+@SecondaryTable(name="NAME", catalog = "CATALOG", schema = "SCHEMA")
</pre>
+<p>To override the default primary key:</p>
+<ol>
+<li>
+<p>Enable the <span class="bold">Overwrite default</span> option, then click <span class="bold">Add</span> to specify a new primary key join column. The Create New Primary Key Join Column appears.</p>
+</li>
+<li>
+<p>Select the <span class="bold">Name</span>, <span class="bold">Referenced column name</span>, <span class="bold">Table</span>, and <span class="bold">Column definition</span> of the primary key for the entity.</p>
+<p>Eclipse adds the following annotations the entity:</p>
+<pre xml:space="preserve" class="oac_no_warn">
+@SecondaryTable(name="NAME", catalog = "CATALOG", schema = "SCHEMA", pkJoinColumns = {@PrimaryKeyJoinColumn(name="id", referencedColumnName = "id"),@PrimaryKeyJoinColumn(name="NAME", referencedColumnName = "REFERENCED COLUMN NAME", columnDefinition = "COLUMN DEFINITION")})
+
+</pre></li>
+</ol>
<br />
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
@@ -60,8 +71,11 @@
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_create_jpa_entity.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_create_jpa_entity.htm
new file mode 100644
index 0000000000..8d48c4f597
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_create_jpa_entity.htm
@@ -0,0 +1,160 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Creating a JPA Entity</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:42Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Creating a JPA Entity" />
+<meta name="relnum" content="Release 2.2" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<!-- contents -->
+</head>
+<body>
+<p><a id="BABFBJBG" name="BABFBJBG"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1><a id="sthref40" name="sthref40"></a>Creating a JPA Entity</h1>
+<p>Use this procedure to create a JPA entity:</p>
+<ol>
+<li>
+<p>From the Navigator or Project Explorer, select the JPA project and then <span class="bold">File &gt; New &gt; Other</span>. The Select a Wizard dialog appears.</p>
+<div class="figure"><a id="sthref41" name="sthref41"></a>
+<p class="titleinfigure">Selecting the Create a JPA Entity Wizard</p>
+<img src="img/select_a_wizard_entity.png" alt="The Select a Wizard dialog with Entity selected." title="The Select a Wizard dialog with Entity selected." /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Select <span class="bold">JPA &gt; Entity</span> and then click <span class="bold">Next</span>. The <a href="ref_EntityClassPage.htm#CIAFEIGF">Entity Class page</a> appears.</p>
+<div class="figure"><a id="sthref42" name="sthref42"></a>
+<p class="titleinfigure"><a id="sthref43" name="sthref43"></a>The Entity Class Page</p>
+<img src="img/create_jpa_entity_wizard.png" alt="The Entity Class page of the Create a JPA Entity wizard." title="The Entity Class page of the Create a JPA Entity wizard." /><br /></div>
+<!-- class="figure" -->
+<p>Complete this page as follows:</p>
+<ul>
+<li>
+<p>Select the JPA project in the <span class="bold">Project</span> field.</p>
+</li>
+<li>
+<p>In the <span class="bold">Source Folder</span> field, select, or enter, the location of the JPA project's <code>src</code> folder.</p>
+</li>
+<li>
+<p>Select, or enter, the name of the class package for this entity in the <span class="bold">Java Package</span> field.</p>
+</li>
+<li>
+<p>Enter the name of the Java class in the <span class="bold">Class name</span> field.</p>
+</li>
+<li>
+<p>If needed, enter, or select a superclass.</p>
+</li>
+<li>
+<p>If needed, complete the Inheritance section as follows (these properties are optional):</p>
+<ul>
+<li>
+<p>Accept the <span class="bold">Entity</span> option (the default) to create a Java class with the <code>@Entity</code> option.</p>
+</li>
+<li>
+<p>Alternatively, select <a href="tasks007.htm#BABDAGCI">Mapped superclass</a> (if you defined a super class).</p>
+</li>
+<li>
+<p>Select <span class="bold">Inheritance</span> and then select one of the JSR 220 inheritance mapping strategies (SINGLE_TABLE, TABLE_PER_CLASS, JOINED).</p>
+</li>
+<li>
+<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>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
+<p>Click <span class="bold">Next</span> to proceed to the <a href="ref_EntityPropertiesPage.htm#CIADECIA">Entity Properties page</a> where you define the persistent fields for the entity.</p>
+<div class="figure"><a id="sthref44" name="sthref44"></a>
+<p class="titleinfigure"><a id="sthref45" name="sthref45"></a>The Entity Properties Page</p>
+<img src="img/create_jpa_fields.png" alt="The Entity Properties page of the Create JPA Entity wizard." title="The Entity Properties page of the Create JPA Entity wizard." /><br /></div>
+<!-- class="figure" -->
+<p>Alternatively, click <span class="bold">Finish</span> to complete the entity.</p>
+</li>
+<li>
+<p>Complete the page as follows:</p>
+<ol>
+<li>
+<p>If needed, enter a new name for the entity. Doing so results in adding a <code>name</code> attribute to the <code>@Entity</code> notation (<code>@Entity(name="EntityName")</code>).</p>
+</li>
+<li>
+<p>Accept <span class="bold">Use default</span> (the default setting) to use the default value for the name of the mapped table. Entering a different name results in adding the <code>@Table</code> notation with its <code>name</code> attribute defined as the new table (<code>@Table(name="TableName")</code>).</p>
+<div align="center">
+<div class="inftblnote"><br />
+<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
+<tbody>
+<tr>
+<td align="left">
+<p class="notep1">Note:</p>
+The Entity Name-related options are not available if you selected <a href="tasks007.htm#BABDAGCI">Mapped superclass</a> on the <a href="ref_EntityClassPage.htm#CIAFEIGF">Entity Class page</a></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblnote" --></div>
+</li>
+<li>
+<p>Add persistence fields to the entity by clicking <span class="bold">Add</span>. The Entity Fields dialog appears.</p>
+<div class="figure"><a id="sthref46" name="sthref46"></a>
+<p class="titleinfigure">The Entity Fields Dialog</p>
+<img src="img/jpa_wizard_create_fields.png" alt="The Entity Fields dialog." title="The Entity Fields dialog." /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Select a persistence type from the Type list. You can retrieve additional types using the <span class="bold">Browse</span> function.</p>
+</li>
+<li>
+<p>Enter the field name and then click <span class="bold">OK</span>. Repeat this procedure for each field.</p>
+</li>
+<li>
+<p>If needed, select <span class="bold">Key</span> to designate the field as a primary key.</p>
+</li>
+<li>
+<p>Select either the <span class="bold">Field-based</span> access type (the default) or <span class="bold">Property-based</span> access type.</p>
+</li>
+</ol>
+</li>
+<li>
+<p>Click <span class="bold">Finish</span>. Eclipse adds the entity to your project.</p>
+</li>
+</ol>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<a href="ref_create_jpa_entity_wizard.htm#CIAGGGDF">Create JPA Entity wizard</a><br />
+<a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a><br />
+<a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a>
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
+<br />
+<a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a><br />
+<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
+<p>&nbsp;</p>
+<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
+<br />
+<a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a><br />
+<a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a><br />
+<p>&nbsp;</p>
+</div>
+<!-- class="sect1" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm
index 1a7ad4a032..9d5aa5f3dd 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm
@@ -2,31 +2,29 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:42 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Creating a new JPA project</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Creating a new JPA project</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:42Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Creating a new JPA project" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<p><a id="CIHHEJCJ" name="CIHHEJCJ"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>Creating a new JPA project</h1>
-<p><a id="sthref25" name="sthref25"></a><a id="sthref26" name="sthref26"></a>Use this procedure to create a new JPA project.</p>
-<ol start="1">
+<p><a id="sthref26" name="sthref26"></a><a id="sthref27" name="sthref27"></a>Use this procedure to create a new JPA project.</p>
+<ol>
<li>
-<p>From the Navigator or Package Explorer, select <span class="bold">File &gt; New &gt; Project</span>. The Select a wizard dialog appears.</p>
+<p>From the Navigator or Project Explorer, select <span class="bold">File &gt; New &gt; Project</span>. The Select a wizard dialog appears.</p>
<div align="center">
<div class="inftblnotealso"><br />
<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0">
@@ -40,14 +38,14 @@ You can also select the JPA perspective and then select <span class="bold">File
</table>
<br /></div>
<!-- class="inftblnotealso" --></div>
-<div class="figure"><a id="sthref27" name="sthref27"></a>
-<p class="titleinfigure">Selecting the Create a JPA Project wizard</p>
+<div class="figure"><a id="sthref28" name="sthref28"></a>
+<p class="titleinfigure"><a id="sthref29" name="sthref29"></a>Selecting the Create a JPA Project wizard</p>
<img src="img/select_a_wizard_jpa_project.png" alt="The Select a Wizard dialog with JPA project selected." title="The Select a Wizard dialog with JPA project selected." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>Select <span class="bold">JPA Project</span> and then click <span class="bold">Next</span>. The <a href="ref_new_jpa_project.htm#CACBJAGC">New JPA Project page</a> appears.</p>
-<div class="figure"><a id="sthref28" name="sthref28"></a>
-<p class="titleinfigure">The JPA Project Page</p>
+<div class="figure"><a id="sthref30" name="sthref30"></a>
+<p class="titleinfigure"><a id="sthref31" name="sthref31"></a>The JPA Project Page</p>
<img src="img/new_jpa_project_task.png" alt="The JPA Project page of the Create a JPA Project wizard." title="The JPA Project page of the Create a JPA Project wizard." /><br /></div>
<!-- class="figure" --></li>
<li>
@@ -67,15 +65,25 @@ The Target Runtime is not required for Java SE development.</td>
<!-- class="inftblnote" --></div>
</li>
<li>
+<p>Click <span class="bold">Next</span>. The Java source page appears.</p>
+<div class="figure"><a id="sthref32" name="sthref32"></a>
+<p class="titleinfigure">The Java Source Page</p>
+<img src="img/java_editor_address.png" alt="The JPA Facet page of the Create a JPA Project wizard." title="The JPA Facet page of the Create a JPA Project wizard." /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Click <span class="bold">Add Folder</span> to add existing Java source files to the project.</p>
+</li>
+<li>
<p>Click <span class="bold">Next</span>. <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a> appears.</p>
-<div class="figure"><a id="sthref29" name="sthref29"></a>
-<p class="titleinfigure">The JPA Facet Page</p>
+<div class="figure"><a id="sthref33" name="sthref33"></a>
+<p class="titleinfigure"><a id="sthref34" name="sthref34"></a>The JPA Facet Page</p>
<img src="img/new_jpa_facet_task.png" alt="The JPA Facet page of the Create a JPA Project wizard." title="The JPA Facet page of the Create a JPA Project wizard." /><br /></div>
<!-- class="figure" --></li>
<li>
-<p>Complete the fields on the <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a> to specify your vender-specific platform, database connection, and JPA implementation library.</p>
+<p>Complete the fields on the <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a> to specify your vender-specific platform, JPA implementation library, and database connection.</p>
+<p>Click <span class="bold">Manage libraries</span> to create or update your JPA user libraries. Click <span class="bold">Download libraries</span> to obtain additional JPA implementation libraries.</p>
<p>If Dali derives the incorrect schema, select <span class="bold">Override the Default Schema for Connection</span>. Using this option, you can select a development time schema for defaults and validation.</p>
-<p>If you clear the <span class="bold">Create orm.xml</span> option (which is selected by default), you can later add a mapping file to the project using the <a href="reference005.htm#CIAIJCCE">Mapping File Wizard</a>.</p>
+<p>If you clear the <span class="bold">Create orm.xml</span> option (which is selected by default), you can later add a mapping file to the project using the <a href="reference002.htm#CIAIJCCE">Mapping File Wizard</a>.</p>
<div align="center">
<div class="inftblnote"><br />
<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
@@ -85,6 +93,7 @@ The Target Runtime is not required for Java SE development.</td>
<p class="notep1">Note:</p>
If the server runtime does not provide a JPA implementation, you must explicitly select a JPA implementation library.
<p>To insure the portability of your application, you must explicitly list the managed persistence classes that are included in the persistence unit. If the server supports EJB 3.0, the persistent classes will be discovered automatically.</p>
+<p>Depending on your JPA implementation (for example, Generic or EclipseLink), different options may be available when creating JPA projects.</p>
</td>
</tr>
</tbody>
@@ -101,12 +110,13 @@ If the server runtime does not provide a JPA implementation, you must explicitly
<br />
<a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a><br />
<a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a><br />
-<a href="reference005.htm#CIAIJCCE">Mapping File Wizard</a>
+<a href="reference002.htm#CIAIJCCE">Mapping File Wizard</a>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
<br />
<a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a><br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
+<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a><br />
+<a href="tasks001.htm#BEIBADHH">Converting a Java Project to a JPA Project</a>
<p>&nbsp;</p>
<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
<br />
@@ -118,8 +128,11 @@ If the server runtime does not provide a JPA implementation, you must explicitly
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_entities.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_entities.htm
deleted file mode 100644
index 299aedd3db..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_entities.htm
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = July 23, 2008 8:59:52 -->
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Generate Entities from Tables dialog</title>
-
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Generate Entities from Tables dialog" />
-<meta name="relnum" content="Release 2.0" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
-<!-- contents -->
-</head>
-<body>
-<p><a id="CACDAFJD" name="CACDAFJD"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Generate Entities from Tables dialog</h1>
-<p><a id="sthref241" name="sthref241"></a><a id="sthref242" name="sthref242"></a><a id="sthref243" name="sthref243"></a>Use the <span class="gui-object-title">Generate Entities</span> dialog to create Java persistent entities from your database tables and columns.</p>
-<p>This table lists the properties available in the <span class="gui-object-title">Generate Entities dialog</span>.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Generate Entities dialog." summary="This table describes the options on the Generate Entities dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t29">Property</th>
-<th align="left" valign="bottom" id="r1c2-t29">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t29" headers="r1c1-t29">Source Folder</td>
-<td align="left" headers="r2c1-t29 r1c2-t29">Enter a project folder name in which to generate the Java persistent entities, or click <span class="bold">Browse</span> to select an existing folder.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t29" headers="r1c1-t29">Package</td>
-<td align="left" headers="r3c1-t29 r1c2-t29">Enter a package name in which to generate the Java persistent entities, or click <span class="bold">Browse</span> to select an existing package.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t29" headers="r1c1-t29">Synchronize Classes in persistence.xml</td>
-<td align="left" headers="r4c1-t29 r1c2-t29">Specify if Dali should update the persistence.xml file to include the generated classes.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t29" headers="r1c1-t29">Tables</td>
-<td align="left" headers="r5c1-t29 r1c2-t29">Select the tables from which to create Java persistent entities. The tables shown are determined by the database connection that you defined in the <a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; JPA Options</a>.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblinformal" -->
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<p><a href="tasks020.htm#BABBAGFI">Generating entities from tables</a></p>
-<p>&nbsp;</p>
-</div>
-<!-- class="sect2" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm
index d4e124b0ef..f213fa119d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm
@@ -2,36 +2,34 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:45 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Specifying entity inheritance</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Specifying entity inheritance</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:45Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Specifying entity inheritance" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<p><a id="CIHCCCJD" name="CIHCCCJD"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>Specifying entity inheritance</h1>
-<p><a id="sthref80" name="sthref80"></a><a id="sthref81" name="sthref81"></a>An entity may inherit properties from other entities. You can specify a specific strategy to use for inheritance.</p>
+<p><a id="sthref92" name="sthref92"></a><a id="sthref93" name="sthref93"></a>An entity may inherit properties from other entities. You can specify a specific strategy to use for inheritance.</p>
<p>Use this procedure to specify inheritance (<code>@Inheritance)</code> for an existing entity (<code>@Entity</code>):</p>
-<ol start="1">
+<ol>
<li>
-<p>Select the entity in the <span class="gui-object-title">Package Explorer</span>.</p>
+<p>Select the entity in the <span class="gui-object-title">Project Explorer</span>.</p>
</li>
<li>
<p>In the <span class="gui-object-title">JPA Details</span> view, select the <span class="gui-object-action">Inheritance</span> information.</p>
-<div class="figure"><a id="sthref82" name="sthref82"></a>
+<div class="figure"><a id="sthref94" name="sthref94"></a>
<p class="titleinfigure">Specifying Inheritance</p>
<img src="img/inheritance_tab.png" alt="Selecting the Inheritance area on the JPA Details view." title="Selecting the Inheritance area on the JPA Details view." /><br /></div>
<!-- class="figure" --></li>
@@ -50,42 +48,45 @@
</ul>
</li>
<li>
-<p>Use the following table to complete the remaining fields on the tab. See <a href="reference012.htm#CACFHGHE">"Inheritance information"</a> for additional details.</p>
+<p>Use the following table to complete the remaining fields on the tab. See <a href="reference009.htm#CACFHGHE">"Inheritance information"</a> for additional details.</p>
<div class="inftblruleinformal">
<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, Inheritance tab." summary="This table describes the options on the Persistence Properties view, Inheritance tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<col width="24%" />
+<col width="*" />
+<col width="23%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t14">Property</th>
-<th align="left" valign="bottom" id="r1c2-t14">Description</th>
-<th align="left" valign="bottom" id="r1c3-t14">Default</th>
+<th align="left" valign="bottom" id="r1c1-t13">Property</th>
+<th align="left" valign="bottom" id="r1c2-t13">Description</th>
+<th align="left" valign="bottom" id="r1c3-t13">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t14" headers="r1c1-t14"><a id="sthref83" name="sthref83"></a><a id="sthref84" name="sthref84"></a>Discriminator Column</td>
-<td align="left" headers="r2c1-t14 r1c2-t14">Name of the discriminator column when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.
+<td align="left" id="r2c1-t13" headers="r1c1-t13"><a id="sthref95" name="sthref95"></a><a id="sthref96" name="sthref96"></a>Discriminator Column</td>
+<td align="left" headers="r2c1-t13 r1c2-t13">Name of the discriminator column when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.
<p>This field corresponds to the <code>@DiscriminatorColumn</code> annotation.</p>
</td>
-<td align="left" headers="r2c1-t14 r1c3-t14"><br /></td>
+<td align="left" headers="r2c1-t13 r1c3-t13"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t14" headers="r1c1-t14">Discriminator Type</td>
-<td align="left" headers="r3c1-t14 r1c2-t14">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.</td>
-<td align="left" headers="r3c1-t14 r1c3-t14">String</td>
+<td align="left" id="r3c1-t13" headers="r1c1-t13">Discriminator Type</td>
+<td align="left" headers="r3c1-t13 r1c2-t13">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.</td>
+<td align="left" headers="r3c1-t13 r1c3-t13">String</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t14" headers="r1c1-t14"><a id="sthref85" name="sthref85"></a><a id="sthref86" name="sthref86"></a>Discriminator Value</td>
-<td align="left" headers="r4c1-t14 r1c2-t14">Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified <span class="bold">Discriminator Type</span>.
+<td align="left" id="r4c1-t13" headers="r1c1-t13"><a id="sthref97" name="sthref97"></a><a id="sthref98" name="sthref98"></a>Discriminator Value</td>
+<td align="left" headers="r4c1-t13 r1c2-t13">Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified <span class="bold">Discriminator Type</span>.
<p>This field corresponds to the <code>@DiscriminatorValue</code> annotation.</p>
</td>
-<td align="left" headers="r4c1-t14 r1c3-t14"><br /></td>
+<td align="left" headers="r4c1-t13 r1c3-t13"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t14" headers="r1c1-t14">Override Default</td>
-<td align="left" headers="r5c1-t14 r1c2-t14">Use this field to specify custom primary key join columns.
+<td align="left" id="r5c1-t13" headers="r1c1-t13">Override Default</td>
+<td align="left" headers="r5c1-t13 r1c2-t13">Use this field to specify custom primary key join columns.
<p>This field corresponds to the <code>@PrimaryKeyJoinClumn</code> annotation.</p>
</td>
-<td align="left" headers="r5c1-t14 r1c3-t14"><br /></td>
+<td align="left" headers="r5c1-t13 r1c3-t13"><br /></td>
</tr>
</tbody>
</table>
@@ -102,13 +103,13 @@
referencedColumnName = "<span class="italic">&lt;REFERENCED_COLUMN_NAME&gt;</span>")
</pre>
-<p><a id="sthref87" name="sthref87"></a><a id="sthref88" name="sthref88"></a><a id="sthref89" name="sthref89"></a>The following figures illustrates the different inheritance strategies.</p>
-<div class="figure"><a id="sthref90" name="sthref90"></a>
+<p><a id="sthref99" name="sthref99"></a><a id="sthref100" name="sthref100"></a><a id="sthref101" name="sthref101"></a>The following figures illustrates the different inheritance strategies.</p>
+<div class="figure"><a id="sthref102" name="sthref102"></a>
<p class="titleinfigure">Single Table Inheritance</p>
<img src="img/inheritance_single.png" alt="This figure illustrates entity inheritance in a single table." title="This figure illustrates entity inheritance in a single table." /><br /></div>
<!-- class="figure" -->
-<div class="figure"><a id="sthref91" name="sthref91"></a>
-<p class="titleinfigure"><a id="sthref92" name="sthref92"></a><a id="sthref93" name="sthref93"></a>Joined Table Inheritance</p>
+<div class="figure"><a id="sthref103" name="sthref103"></a>
+<p class="titleinfigure"><a id="sthref104" name="sthref104"></a><a id="sthref105" name="sthref105"></a>Joined Table Inheritance</p>
<img src="img/inheritance_join.png" alt="This figure illustrates a joined subclass inheritance strategy." title="This figure illustrates a joined subclass inheritance strategy." /><br /></div>
<!-- class="figure" -->
<br />
@@ -124,8 +125,11 @@
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm
index 76780e6360..fa5c8de674 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm
@@ -2,29 +2,27 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:43 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Managing the orm.xml file</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Managing the orm.xml file</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:44Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Managing the orm.xml file" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<p><a id="CIHDGDCD" name="CIHDGDCD"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref46" name="sthref46"></a>Managing the orm.xml file</h1>
+<h1><a id="sthref57" name="sthref57"></a>Managing the orm.xml file</h1>
<p>When creating a JPA project, (see <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a>) you can also create the <code>orm.xml</code> file that defines the mapping metadata and defaults.</p>
-<p><a id="sthref47" name="sthref47"></a>Eclipse creates the <code>META-INF\orm.xml</code> file in your project's directory:</p>
+<p><a id="sthref58" name="sthref58"></a>Eclipse creates the <code>META-INF\orm.xml</code> file in your project's directory:</p>
<pre xml:space="preserve" class="oac_no_warn">
&lt;?xml version="1.0" encoding="UTF-8"?&gt;
&lt;persistence version="<span class="italic">&lt;PERSISTENCE_VERSION&gt;</span>"
@@ -40,11 +38,12 @@
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
-<a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a>
+<a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a><br />
+<a href="ref_eclipselink_mapping_file.htm#CIAEDEJF">New EclipseLink Mapping File dialog</a>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="tasks005.htm#CIHBCDCE">Working with orm.xml file</a><br />
+<a href="tasks004.htm#CIHBCDCE">Working with orm.xml file</a><br />
<p>&nbsp;</p>
<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
<br />
@@ -52,8 +51,11 @@
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2008,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2009,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td>
</tr>
</table>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm
index 8be90a2e23..2427daf920 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm
@@ -2,29 +2,27 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = July 23, 2008 8:59:43 -->
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>Managing the persistence.xml file</title>
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.0" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<title>Managing the persistence.xml file</title>
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1 Build 004" />
+<meta name="date" content="2009-05-01T8:12:43Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Managing the persistence.xml file" />
-<meta name="relnum" content="Release 2.0" />
+<meta name="relnum" content="Release 2.2" />
<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- start-->
<!-- contents -->
</head>
<body>
<p><a id="CIHDAJID" name="CIHDAJID"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref35" name="sthref35"></a>Managing the persistence.xml file</h1>
-<p><a id="sthref36" name="sthref36"></a>When you create a project, Eclipse creates the <code>META-INF\persistence.xml</code> file in the project's directory.</p>
-<p>You can create a stub <code>persistence.xml</code> file in the META-INF directory when you create a JPA project (see <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a>). You can manage this file either through the XML editor (see <a href="tasks002.htm#CIHEJAIE">"Using the XML Editor to edit the persistence.xml file"</a>) or through the <a href="reference018.htm#CIACCHID">persistence.xml Editor</a>.</p>
+<h1><a id="sthref47" name="sthref47"></a>Managing the persistence.xml file</h1>
+<p><a id="sthref48" name="sthref48"></a>When you create a project, Eclipse creates the <code>META-INF\persistence.xml</code> file in the project's directory.</p>
+<p>You can create a stub <code>persistence.xml</code> file in the META-INF directory when you create a JPA project (see <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a>). You can manage this file either through the XML editor (see ) or through the <a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>.</p>
<div align="center">
<div class="inftblnote"><br />
<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
@@ -32,31 +30,31 @@
<tr>
<td align="left">
<p class="notep1">Note:</p>
-In additon to the General, Connection, Properties and Source pages, the persistence.xml Editor pages for projects that use the EclipseLink platform include the following:
+Depending on your JPA implementation (for example, EclipseLink), the following additional pages may be available in the persistence.xml Editor:
<ul>
<li>
-<p><a href="reference021.htm#CIAJAFEG">Customization</a></p>
+<p><a href="reference019.htm#CIAJAFEG">Customization</a></p>
<p>Use this page to define change-tracking and session customizer-related properties.</p>
</li>
<li>
-<p><a href="reference022.htm#CIABEDCH">Caching</a></p>
+<p><a href="reference020.htm#CIABEDCH">Caching</a></p>
<p>Use this page to define caching properties.</p>
</li>
<li>
-<p><a href="reference023.htm#CIABGHHI">Logging</a></p>
+<p><a href="reference021.htm#CIABGHHI">Logging</a></p>
<p>Use this page to define logging properties.</p>
</li>
<li>
-<p><a href="reference024.htm#CIAFJCHE">Options</a></p>
+<p><a href="reference022.htm#CIAFJCHE">Options</a></p>
<p>Use this page to define session and target database properties.</p>
</li>
<li>
-<p><a href="reference025.htm#CIACCFCB">Schema Generation</a></p>
+<p><a href="reference023.htm#CIACCFCB">Schema Generation</a></p>
<p>Use this page to define DDL-related properties.</p>
</li>
</ul>
-<p>For projects using the EclipseLink platform, the Connections page also includes JDBC connection pool properties.</p>
-<p>If the project uses the Generic platform, then only the General, Connection, Properties and Source pages are available.</p>
+<p>For projects using the EclipseLink JPA implementation, the Connections page also includes JDBC connection pool properties.</p>
+<p>If the project uses the Generic platform, then only the <a href="ref_persistence_general.htm#CIACIFGJ">General</a>, <a href="reference018.htm#CIAFFJIE">Connection</a>, <a href="reference024.htm#CIAHJDFF">Properties</a> and <a href="reference025.htm#CIAHCJAH">Source</a> pages are available.</p>
</td>
</tr>
</tbody>
@@ -64,12 +62,12 @@ In additon to the General, Connection, Properties and Source