Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Sapir2012-09-11 12:02:35 +0000
committerRick Sapir2012-09-11 12:02:35 +0000
commit8e0365779296d9be8fc41a2f70b35f664037c59c (patch)
treeeee45362bee52cded0193714a39eae0cdffc01f4
parentafcbd30b7682e576495f1c2069cdf9fe719aeacf (diff)
downloadwebtools.dali-8e0365779296d9be8fc41a2f70b35f664037c59c.tar.gz
webtools.dali-8e0365779296d9be8fc41a2f70b35f664037c59c.tar.xz
webtools.dali-8e0365779296d9be8fc41a2f70b35f664037c59c.zip
Updated docs, preliminary review
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/about.htm22
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm25
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm20
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm22
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm33
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm46
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm38
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml1279
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm20
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm22
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm29
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm33
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm119
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/MakePersistentMenu.pngbin0 -> 32841 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/add_query.pngbin0 -> 10351 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/address.java_jpa_details.pngbin14825 -> 15761 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/address_id_details_quickstart.pngbin11473 -> 12537 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/customize_default_entity_generation.pngbin27589 -> 29062 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/customize_default_entity_generation_dynamic.pngbin0 -> 25854 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/customize_individual_entities_dynamic.pngbin0 -> 41683 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/details_entitymappings.pngbin10563 -> 12574 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/generate_dynamic_entities.pngbin0 -> 10440 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/generate_entities.pngbin11583 -> 10522 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/generate_tables.pngbin0 -> 14422 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/generate_tables_from_entities.pngbin0 -> 10313 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/icon_arraymapping.pngbin0 -> 361 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/icon_elementcollection.pngbin0 -> 279 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details.manytomany.pngbin0 -> 10226 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_basic.pngbin0 -> 9131 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_elementcollection.pngbin0 -> 14541 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_embedded.pngbin0 -> 4917 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_idmapping.pngbin0 -> 8256 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_joiningstrategy.pngbin0 -> 14366 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_manytoone.pngbin0 -> 10404 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_multitenancy.pngbin0 -> 4694 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_onetomany.pngbin0 -> 11208 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_onetoone.pngbin0 -> 11150 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_primarykeygeneration.pngbin0 -> 8331 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_query_1.pngbin0 -> 2362 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_query_2.pngbin0 -> 7266 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_version.pngbin0 -> 7690 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_perspective.pngbin0 -> 164721 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/make_persistence_dialog.pngbin0 -> 20803 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/mapped_entity_type_link.pngbin14896 -> 16915 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_file_new.pngbin19392 -> 20664 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/move_to_xml.pngbin0 -> 12653 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_facet_task.pngbin27810 -> 27282 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_source.pngbin0 -> 17475 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_task.pngbin26056 -> 28039 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/new_mapping_file_options.pngbin0 -> 15610 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_connection.pngbin0 -> 18221 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_customization.pngbin0 -> 16394 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_general.pngbin0 -> 16160 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/project_properties_tasks.pngbin29075 -> 32173 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/properties_jpa_eclipselink.pngbin0 -> 25365 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/quickstart_project.pngbin9676 -> 8432 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_entity.pngbin20222 -> 21866 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_jpa_project.pngbin20446 -> 21045 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_mapping.pngbin22231 -> 24271 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/select_tables.pngbin21639 -> 22607 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/select_tables_dynamic.pngbin0 -> 23743 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/synchornize_classes.pngbin10643 -> 11567 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/table_associations_dynamic.pngbin0 -> 27973 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/xmlpath_validation.pngbin0 -> 27098 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/index.xml798
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/legal.htm7
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml62
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm129
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm90
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_add_converter.htm50
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_association_cardinality.htm49
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_association_table.htm72
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_create_custom_entities_wizard.htm24
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_create_jpa_entity_wizard.htm16
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_create_new_association_wizard.htm24
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_customizIndividualEntities.htm104
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm119
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm26
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_eclipselink_mapping_file.htm87
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_java_page.htm75
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_join_columns.htm49
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm153
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project.htm131
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project_wizard.htm18
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_general.htm137
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm70
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_outline.htm32
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm29
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_prop_view.htm58
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_xmll_editor.htm38
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_primary_key.htm237
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_project_properties.htm131
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm87
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_select_cascade_dialog.htm16
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm82
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference.htm30
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm29
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm42
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm130
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm101
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm109
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm149
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm81
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm117
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm122
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm54
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm106
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm77
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm133
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm97
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm122
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm255
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm204
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm192
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm208
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm216
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm370
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm176
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm174
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm114
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm222
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm151
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm99
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm42
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm194
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm136
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm210
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm154
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm161
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm199
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference035.htm141
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference036.htm39
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference037.htm152
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference038.htm130
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference039.htm146
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference040.htm82
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference041.htm118
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference042.htm135
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference043.htm193
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference044.htm151
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference045.htm49
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference046.htm236
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference047.htm221
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference048.htm166
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference049.htm293
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference050.htm220
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference051.htm143
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference052.htm41
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference053.htm50
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference054.htm61
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference055.htm103
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference056.htm109
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference057.htm89
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference058.htm76
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference059.htm110
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference060.htm61
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference061.htm79
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference062.htm115
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference063.htm79
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference064.htm85
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference065.htm108
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference066.htm86
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference067.htm93
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference068.htm46
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference069.htm192
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference070.htm69
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference071.htm53
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm76
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm43
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_create_jpa_entity.htm109
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm101
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm101
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm65
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm188
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm61
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm47
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm89
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm99
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm69
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm84
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm55
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm99
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm88
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm85
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm52
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm131
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm114
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm108
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm169
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm190
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm172
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm188
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm167
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm96
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm130
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm101
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm55
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks022.htm54
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm96
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm126
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm94
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks026.htm64
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks027.htm76
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks028.htm61
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tips_and_tricks.htm70
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/title.htm28
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/toc.xml277
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm31
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm80
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm33
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm33
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm22
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm23
213 files changed, 12213 insertions, 6091 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/about.htm b/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
index 29a91352c6..a9310879e6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
@@ -3,25 +3,25 @@
<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>About this content</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:49Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:10Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="About this content" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref295" name="sthref295"></a>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref488" name="sthref488"></a>
<h1>About this content</h1>
-<p>November, 2009</p>
-<a id="sthref296" name="sthref296"></a>
+<p>August, 2012</p>
+<a id="sthref489" name="sthref489"></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>
@@ -33,11 +33,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 59f7d97bfd..332e642bb1 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm
@@ -3,32 +3,31 @@
<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>Understanding OR mappings</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:41Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:3Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Understanding OR mappings" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BABBDJFI" name="BABBDJFI"></a></p>
<div class="sect1">
<h1>Understanding OR mappings</h1>
-<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><a id="sthref22" name="sthref22"></a><a id="sthref23" name="sthref23"></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 />
+<a id="sthref24" name="sthref24"></a>
+<p class="subhead2">Related tasks</p>
<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-</div>
+<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></div>
<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
@@ -36,11 +35,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 3c7f80bf06..b9a097035d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm
@@ -3,26 +3,26 @@
<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>Understanding Java persistence</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:41Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:3Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Understanding Java persistence" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BABCAHIC" name="BABCAHIC"></a></p>
<div class="sect1">
<h1>Understanding Java persistence</h1>
-<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>
+<p><a id="sthref20" name="sthref20"></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="sthref21" name="sthref21"></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 -->
@@ -31,11 +31,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
index 7a140b7e90..a8dece56ce 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
@@ -3,22 +3,22 @@
<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>Concepts</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:41Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:3Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content=" Concepts" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Concepts" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="sthref18" name="sthref18"></a></p>
+<p><a id="sthref19" name="sthref19"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</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>
@@ -29,7 +29,7 @@
<p><a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a></p>
</li>
<li>
-<p><a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></p>
+<p><a href="concepts001.htm#BABBGFJG">Understanding Java Persistence API</a></p>
</li>
</ul>
<p>In addition to these sections, you should review the following resources for additional information:</p>
@@ -53,11 +53,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
index 5104da12ef..4026bdb7c9 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
@@ -3,41 +3,42 @@
<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>Understanding EJB 3.0 Java Persistence API</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:41Z" />
+<title>Understanding Java Persistence API</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:3Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Understanding EJB 3.0 Java Persistence API" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Understanding Java Persistence API" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BABBGFJG" name="BABBGFJG"></a></p>
<div class="sect1">
-<h1>Understanding EJB 3.0 Java Persistence API</h1>
-<p>The Java 2 Enterprise Edition(J2EE) Enterprise JavaBeans (EJB) are a component architecture that you use to develop and deploy object-oriented, distributed, enterprise-scale applications. An application written according to the Enterprise JavaBeans architecture is scalable, transactional, and secure.</p>
-<p>The EJB 3.0 Java Persistence API (JPA) improves the EJB architecture by reducing its complexity through the use of metadata (annotations) and specifying programmatic defaults of that metadata.</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<h1>Understanding Java Persistence API</h1>
+<p>The Java Persistence API (JPA) part of the Java EE EJB 3.0 specification, simplifies Java persistence. It provides an object-relational mapping approach that lets you declaratively define how to map Java objects to relational database tables in a standard, portable way. JPA works both inside a Java EE application server and outside an EJB container in a Java Standard Edition (Java SE) application. An application written according to the Enterprise JavaBeans architecture is scalable, transactional, and secure.</p>
+<a id="sthref25" name="sthref25"></a>
+<p class="subhead2">Related tasks</p>
<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
+<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a><a id="sthref26" name="sthref26"></a>
+<p class="subhead2">Related concepts</p>
+<p>Java Persistence Architecture 2.0 specification (<code><a href="http://jcp.org/en/jsr/detail?id=317">http://jcp.org/en/jsr/detail?id=317</a></code>)</p>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
index 99f1e4397b..49a0251dae 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
@@ -3,25 +3,26 @@
<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>The persistence.xml file</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:41Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:3Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="The persistence.xml file" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CHDHAGIH" name="CHDHAGIH"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<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>
+<h1><a id="sthref27" name="sthref27"></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.</p>
+<p>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">
@@ -29,17 +30,30 @@
<tr>
<td align="left">
<p class="notep1">Tip:</p>
-To work with multiple persistence units, comment out all but one persistence unit in <code>persistence.xml</code>.</td>
+<p>To work with multiple persistence units, comment out all but one persistence unit in <code>persistence.xml</code>.</p>
+</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblnotealso" --></div>
-<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><br />
-<a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a>
-<p>&nbsp;</p>
+<a id="sthref28" name="sthref28"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a></p>
+</li>
+<li>
+<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
+</li>
+</ul>
+<a id="sthref29" name="sthref29"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p>Section 8.2.1 "persistence.xml file" in the <a href="http://jcp.org/en/jsr/detail?id=317">JPA Specification</a></p>
+</li>
+</ul>
</div>
<!-- class="sect2" -->
<!-- Start Footer -->
@@ -48,11 +62,11 @@ To work with multiple persistence units, comment out all but one persistence uni
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
index 9c887a7984..5f13ff6b59 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
@@ -3,25 +3,25 @@
<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>The orm.xml file</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:41Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:3Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="The orm.xml file" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CHDBIJAC" name="CHDBIJAC"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<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>
+<h1><a id="sthref30" name="sthref30"></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="reference007.htm#CIAIJCCE">Create ORM 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">
@@ -29,18 +29,24 @@
<tr>
<td align="left">
<p class="notep1">Note:</p>
-The metadata must match the XSD specification of your selected JPA implementation.</td>
+<p>The metadata must match the XSD specification of your selected JPA implementation.</p>
+</td>
</tr>
</tbody>
</table>
<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>
-<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 />
-<a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a><br />
-<p>&nbsp;</p>
+<a id="sthref31" name="sthref31"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_manage_orm.htm#CIHDGDCD">Managing the orm.xml file</a></p>
+</li>
+<li>
+<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
+</li>
+</ul>
</div>
<!-- class="sect2" -->
<!-- class="sect1" -->
@@ -50,11 +56,11 @@ The metadata must match the XSD specification of your selected JPA implementatio
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml b/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml
index a7a661aa44..751d8dd672 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml
@@ -1,646 +1,633 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<contexts>
- <context id="entity_accessType">
- <description>Specify how the variable is accessed: Property (default) or Field.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="entity_name">
- <description>The name of this entity. By default, the class name is used as the entity name.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="entity_table">
- <description>The database table assigned to this entity. By default, the class name is used as the database table name.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
- <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="entity_attributeOverrides">
- <description>Specify a property or field to be overridden (from the default mappings).</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="entity_attributeOverridesName">
- <description>Name of the database column.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="entity_attributeOverridesColumn">
- <description>The database column that overrides a property or field.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="entity_attributeOverridesInsertable">
- <description>Specifies if the column is always included in SQL INSERT statements.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="entity_attributeOverridesUpdatable">
- <description>Specifies if the column is always included in SQL UPDATE statements.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="mapping_mapAs">
- <description>Specify how this attribute maps to the database.</description>
- <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="mapping_column">
- <description>The database column that contains the value for the attribute.</description>
- <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="mapping_columnTable">
- <description>Name of the database table that contains the selected column.</description>
- <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="mapping_columnInsertable">
- <description>Specifies if the column is always included in SQL INSERT statements.</description>
- <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="mapping_columnUpdatable">
- <description>Specifies if the column is always included in SQL UPDATE statements.</description>
- <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="mapping_fetchType">
- <description>Defines how data is loaded from the database: Eager (default) or Lazy</description>
- <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="mapping_optional">
- <description>Specifies if this field is can be null.</description>
- <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="mapping_generatedValueStrategy">
- <description>Determines how the primary key is generated: Auto (default), Sequence, Identity, or Table.</description>
- <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="mapping_generatedValueGeneratorName">
- <description>Unique name of the generator.</description>
- <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="mapping_targetEntity">
- <description>The entity to which this attribute is mapped. </description>
- <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="mapping_cascadeType">
- <description>Specify which operations are propagated throughout the entity: All, Persist, Merge, or Move.</description>
- <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="mapping_mappedBy">
- <description>The field in the database table that owns the relationship.</description>
- <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="mapping_joinColumnName">
- <description>The name of the database column that contains the foreign key reference for the entity association.</description>
- <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="mapping_joinReferencedColumn">
- <description>Name of the join table that contains the foreign key column.</description>
- <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="mapping_embeddedAttributeOverrides">
- <description>Specify to override the default mapping of an entity’s attribute.</description>
- <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="mapping_embeddedAttributeOverridesColumn">
- <description>The database column that is being mapped to the entity’s attribute.</description>
- <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="entity_mapAs">
- <description>Specify the type of persistent domain object for the Java class: Persistent, Embedded, or Mapped Superclass.</description>
- <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="entity_inheritanceStrategy">
- <description>Specify how an entity may inherit properties from other entities: Single table, One table per class, or Joined tables.</description>
- <topic label="Specifying inheritance" href="task_inheritance.htm"/>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- </context>
- <context id="entity_inheritanceDiscriminatorColumn">
- <description>Use to specify the name of the discriminator column when using a Single or Joined inheritance strategy.</description>
- <topic label="Specifying inheritance" href="task_inheritance.htm"/>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- </context>
- <context id="entity_inheritanceDiscriminatorType">
- <description>Use this field to set the discriminator type to CHAR or INTEGER (instead of its default: String). The discriminator value must conform to this type.</description>
- <topic label="Specifying inheritance" href="task_inheritance.htm"/>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- </context>
- <context id="entity_inheritanceDiscriminatorValue">
- <description>Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified discriminator type.</description>
- <topic label="Specifying inheritance" href="task_inheritance.htm"/>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- </context>
- <context id="mapping_orderBy">
- <description>Specify the default order for objects returned from a query.
-orderby_list::= orderby_item [,orderby_item]
-orderby_item::= [property_or_field_name] [ASC | DESC]
-For example: "lastName ASC ,salary DESC" </description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Mapping an Entity" href="task_mapping.htm"/>
- </context>
- <context id="mapping_joinTableName">
- <description>Specify the name of the database table that defines the foreign key for a many-to-many or a unidirectional one-to-many association. You can configure the join table with a specific catalog or schema, configure one or more join table columns with a unique constraint, and use multiple join columns per entity.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="mapping_joinTableJoinColumns">
- <description>Specify two or more join columns (that is, a composite primary key).</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="mapping_joinTableInverseJoinColumns">
- <description>Specify the join column on the owned (or inverse side) of the association: the owned entity's primary key column. </description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="properties_javaPersistence">
- <description>Use the Java Persistence options on the Properties page to select the database connection to use with the project.</description>
- <topic label="Project properties" href="ref_project_properties"/>
- <topic label="Adding persistence" href="ref_add_persistence.htm"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="properties_javaPersistenceConnection">
- <description>The database connection used to map the persistent entities.</description>
- <topic label="Project properties" href="ref_project_properties"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="properties_javaPersistenceSchema">
- <description>The database schema used to map the persistent entities.</description>
- <topic label="Project properties" href="ref_project_properties"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="dialog_addPersistence">
- <description>Use the Add Persistence dialog to define the database connection use to store the persistence entities.</description>
- <topic label="Adding persistence" href="ref_add_persistence.htm"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="persistenceOutline">
- <description>The JPA Structure view displays an outline of the structure (its attributes and mappings) of the entity that is currently selected or opened in the editor.</description>
- <topic label="JPA Structure view" href="ref_persistence_outline.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="dialog_generateEntities">
- <description>Use the Generate Entities dialog to create Java persistent entities based on your database tables.</description>
- <topic label="Generating entities from tables" href="task_generate_entities.htm.htm" />
- <topic label="Project properties" href="ref_project_properties"/>
- </context>
- <context id="dialog_generateEntities_source">
- <description>The project folder name in which to generate the Java persistent entities. Click Browse to select an existing folder.</description>
- <topic label="Generating entities from tables" href="task_generate_entities.htm"/>
- </context>
- <context id="dialog_generateEntities_package">
- <description>The package in which to generate the Java persistent entities, or click Browse to select an existing package.</description>
- <topic label="Generating entities from tables" href="task_generate_entities.htm"/>
- </context>
- <context id="dialog_generateEntities_tables">
- <description>Select the tables from which to create Java persistent entities.</description>
- <topic label="Generating entities from tables" href="task_generate_entities.htm"/>
- <topic label="Project properties" href="ref_project_properties"/>
- </context>
- <context id="dialog_addJavaPersistence">
- <description>Use this dialog to define the database connection used to store the persistence entities and to create the persistence.xml file.</description>
- <topic label="Add Persistence dialog" href="ref_add_persistence.htm" />
- <topic label="Adding persistence to a project" href="task_add_persistence" />
- <topic label="Managing the persistence.xml file" href="task_manage_persistence.htm" />
- </context>
- <context id="dialog_newJPAProject">
- <description>Use this dialog to define the new JPA project name, its location, target runtime, and other configuration settings.</description>
- <topic label="New JPA Project page" href="ref_new_jpa_project.htm" />
- <topic label="New JPA Project wizard" href="ref_new_jpa_project_wizard" />
- <topic label="Adding persistence to a project" href="task_add_persistence" />
- <topic label="Creating a new JPA project" href="task_create_new_project.htm" />
- </context>
- <context id="dialog_addJavaPersistence_database">
- <description>Use these fields to define the database connection used to store the persistent entities.</description>
- <topic label="Add Persistence dialog" href="ref_add_persistence.htm" />
- <topic label="Adding persistence to a project" href="task_add_persistence" />
- </context>
- <context id="dialog_addJavaPersistence_classpath">
- <description>Use this option to add libraries or JARs that contain the Java Persistence API (JPA) and entities to the project’s Java Build Path.</description>
- <topic label="Add Persistence dialog" href="ref_add_persistence.htm" />
- <topic label="Adding persistence to a project" href="task_add_persistence" />
- </context>
- <context id="dialog_addJavaPersistence_packaging">
- <description>Use these fields to create the persistence.xml file. Select the persistence version, the name of the JPA provider, and a unique name to identify the persistence unit.</description>
- <topic label="Add Persistence dialog" href="ref_add_persistence.htm" />
- <topic label="Managing the persistence.xml file" href="task_manage_persistence.htm" />
- </context>
- <context id="wizard_generateDDL_options ">
- <description>Use this page to select which script options will be included in the generated script.</description>
- <topic label="Generating tables (DDL) from entities " href="task_generate_ddl.htm" />
- <topic label="Options page " href="ref_options.htm" />
- </context>
- <context id="wizard_generateDDL_objects ">
- <description>Use this page to select which elements will be included in the generated script.</description>
- <topic label="Generating tables (DDL) from entities " href="task_generate_ddl.htm" />
- <topic label="Objects page " href="ref_objects.htm" />
- </context>
- <context id="wizard_generateDDL_save ">
- <description>Use this page to select the filename and location of the generated script. You can also preview the script and specify to run or continue editing the script after generation.</description>
- <topic label="Generating tables (DDL) from entities " href="task_generate_ddl.htm" />
- <topic label="Save and Run DDL page " href="ref_save_and_run.htm" />
- </context>
- <context id="wizard_generateDDL_summary ">
- <description>This page shows the settings that you selected for the generated DDL. To change any option click "Back" or click "Finish" to continue.</description>
- <topic label="Generating tables (DDL) from entities " href="task_generate_ddl.htm" />
- </context>
- <context id="mapping_tableGeneratorName">
- <description>The name of the table sequence generator. This name is global to to the persistence unit (across all generator types).</description>
- <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="mapping_tableGeneratorTable">
- <description>The database table that stores the generated ID values. </description>
- <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="mapping_tableGeneratorPrimaryKeyColumn">
- <description>The database column of the generator table that stores the generated ID values.</description>
- <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="mapping_tableGeneratorValueColumn">
- <description>The name for the column that stores the generated ID values.</description>
- <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="mapping_tableGeneratorPrimaryKeyColumnValue">
- <description>The database column of the generator table that defines the primary key value.</description>
- <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="dialog_databaseAuthorization">
- <description>Use to connect (log in) to a database connection to use with your Java persistent entities.
- You must have a defined database connection (and be connected) to add persistence. </description>
- <topic label="Add persistence to a Java project" href="task_add_persistence_project.htm"/>
- </context>
- <context id="mapping_temporal">
- <description>Specify if the mapped field contains a Date (java.sql.Date), Time (java.sql.Time), or Timestamp (java.sql.Timestamp) value.</description>
- <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="mapping_primaryKeyGeneration">
- <description>Define how the primary key is generated</description>
- <topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
- <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="mapping_tableGenerator">
- <description>Specify to use a specific database table for generating the primary key.</description>
- <topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
- <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="mapping_sequenceGenerator">
- <description>Specify to use a specific sequence for generating the primary key.</description>
- <topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
- <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="mapping_sequenceGeneratorName">
- <description>Name of the sequence.</description>
- <topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
- <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="mapping_sequenceGeneratorSequence">
- <description> </description>
- <topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
- <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="mapping_lob">
- <description>Specify if the field is mapped to java.sql.Clob or java.sql.Blob.</description>
- <topic label="General information" href="ref_mapping_general.htm"/>
- <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="mapping_enumerated">
- <description>Specify how to persist enumerated constraints if the String value suits your application requirements or to match an existing database schema.</description>
- <topic label="General information" href="ref_mapping_general.htm"/>
- <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="dialog_editInverseJoinColumn">
- <description>.</description>
- <topic label="Mapping an entity" href="task_mapping.htm"/>
- </context>
- <context id="entity_catalog">
- <description>The database catalog that contains the Table. This field overrides the defaults in the orm.xml file.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="entity_schema">
- <description>The database schema that contains the Table. This field overrides the defaults in the orm.xml file.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="orm_package">
- <description>The Java package that contains the persistent entities to which the orm.xml file applies.</description>
- <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
- <topic label="JPA Details" href="ref_details_orm.htm"/>
- </context>
- <context id="orm_schema">
- <description>The database schema to use as the default for all entities managed by this persistence unit.</description>
- <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
- <topic label="JPA Details" href="ref_details_orm.htm"/>
- </context>
- <context id="orm_catalog">
- <description>The database catalog to use as the default for all entities managed by this persistence unit.</description>
- <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
- <topic label="JPA Details" href="ref_details_orm.htm"/>
- </context>
- <context id="orm_access">
- <description>The default access method for variables in this project: Property or Field.</description>
- <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
- <topic label="JPA Details" href="ref_details_orm.htm"/>
- </context>
- <context id="orm_cascade">
- <description>Adds cascade-persist to the set of cascade options in entity relationships of the persistence unit.</description>
- <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
- <topic label="JPA Details" href="ref_details_orm.htm"/>
- </context>
- <context id="orm_xml">
- <description>Specifies that the Java classes in this persistence unit are fully specified by their metadata. Any annotations will be ignored.</description>
- <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
- <topic label="JPA Details" href="ref_details_orm.htm"/>
- </context>
- <context id="dialog_JPAPlatform">
- <description>Specify the vendor-specific JPA implementation.Default is Generic..</description>
- <topic label="JPA Facet page" href="ref_jpa_facet.htm"/>
- </context>
- <context id="dialog_createORM">
- <description>Create an initial orm.xml file. Use this file to specify project and persistence unit defaults.</description>
- <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
- <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 Soft 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="dialog_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>
-
-<!-- Added for 2.3 -->
- <context id="properties_canonicalMetamodel">
- <description>Specifies if the project model uses the Canonical Metamodel. </description>
- <topic label="Project properties" href="ref_project_properties"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="entity_cacheable">
- <description>Specify if the entity uses the @Cachable annotation. Default is @Cachable(false).</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Understanding persistence" href="concept_persistence.htm"/>
- </context>
- <context id="entity_primaryKeyClass">
- <description>Click Browse and select the primary key for the entity. Clicking the field name, which is represented as a hyperlink, allows you to create a new class.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- <topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
- </context>
- <context id="wizard_jaxbschema_classes">
- <description>Select the project, package, or classes from which to generate the XML schema. Click Finish to generate the schema</description>
- <topic label="Generate Schema from JAXB Classes wizard" href="ref_jaxb_schema_wizard.htm"/>
- <topic label="Generating schema from classes" href="task_generating_schema_from_classes.htm"/>
- </context>
- <context id="configure_jaxb_class_generation_dialog">
- <description>Enter the JAXB class generation settings and click Finish to generate classes. All fields are optional except for the source folder.</description>
- <topic label="Configure JAXB Class Generation dialog" href="ref_configure_jaxb_class_generation_dialog.htm"/>
- <topic label="Generating JAXB Classes from a Schema" href="task_generate_classes_from_schema.htm"/>
- </context>
-
-
-
-
-
-</contexts>
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.contexts"?>
+<contexts>
+ <context id="entity_accessType">
+ <description>Specify how the variable is accessed: Property (default) or Field.</description>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="entity_name">
+ <description>The name of this entity. By default, the class name is used as the entity name.</description>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="entity_table">
+ <description>The database table assigned to this entity. By default, the class name is used as the database table name.</description>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
+ <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="entity_attributeOverrides">
+ <description>Specify a property or field to be overridden (from the default mappings).</description>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="entity_attributeOverridesName">
+ <description>Name of the database column.</description>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="entity_attributeOverridesColumn">
+ <description>The database column that overrides a property or field.</description>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="entity_attributeOverridesInsertable">
+ <description>Specifies if the column is always included in SQL INSERT statements.</description>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="entity_attributeOverridesUpdatable">
+ <description>Specifies if the column is always included in SQL UPDATE statements.</description>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="mapping_mapAs">
+ <description>Specify how this attribute maps to the database.</description>
+ <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="mapping_column">
+ <description>The database column that contains the value for the attribute.</description>
+ <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="mapping_columnTable">
+ <description>Name of the database table that contains the selected column.</description>
+ <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="mapping_columnInsertable">
+ <description>Specifies if the column is always included in SQL INSERT statements.</description>
+ <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="mapping_columnUpdatable">
+ <description>Specifies if the column is always included in SQL UPDATE statements.</description>
+ <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="mapping_fetchType">
+ <description>Defines how data is loaded from the database: Eager (default) or Lazy</description>
+ <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="mapping_optional">
+ <description>Specifies if this field is can be null.</description>
+ <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="mapping_generatedValueStrategy">
+ <description>Determines how the primary key is generated: Auto (default), Sequence, Identity, or Table.</description>
+ <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="mapping_generatedValueGeneratorName">
+ <description>Unique name of the generator.</description>
+ <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="mapping_targetEntity">
+ <description>The entity to which this attribute is mapped. </description>
+ <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="mapping_cascadeType">
+ <description>Specify which operations are propagated throughout the entity: All, Persist, Merge, or Move.</description>
+ <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="mapping_mappedBy">
+ <description>The field in the database table that owns the relationship.</description>
+ <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="mapping_joinColumnName">
+ <description>The name of the database column that contains the foreign key reference for the entity association.</description>
+ <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="mapping_joinReferencedColumn">
+ <description>Name of the join table that contains the foreign key column.</description>
+ <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="mapping_embeddedAttributeOverrides">
+ <description>Specify to override the default mapping of an entity’s attribute.</description>
+ <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="mapping_embeddedAttributeOverridesColumn">
+ <description>The database column that is being mapped to the entity’s attribute.</description>
+ <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="entity_mapAs">
+ <description>Specify the type of persistent domain object for the Java class: Persistent, Embedded, or Mapped Superclass.</description>
+ <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="entity_inheritanceStrategy">
+ <description>Specify how an entity may inherit properties from other entities: Single table, One table per class, or Joined tables.</description>
+ <topic label="Specifying inheritance" href="task_inheritance.htm"/>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ </context>
+ <context id="entity_inheritanceDiscriminatorColumn">
+ <description>Use to specify the name of the discriminator column when using a Single or Joined inheritance strategy.</description>
+ <topic label="Specifying inheritance" href="task_inheritance.htm"/>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ </context>
+ <context id="entity_inheritanceDiscriminatorType">
+ <description>Use this field to set the discriminator type to CHAR or INTEGER (instead of its default: String). The discriminator value must conform to this type.</description>
+ <topic label="Specifying inheritance" href="task_inheritance.htm"/>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ </context>
+ <context id="entity_inheritanceDiscriminatorValue">
+ <description>Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified discriminator type.</description>
+ <topic label="Specifying inheritance" href="task_inheritance.htm"/>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ </context>
+ <context id="mapping_orderBy">
+ <description>Specify the default order for objects returned from a query.</description>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Mapping an Entity" href="task_mapping.htm"/>
+ </context>
+ <context id="mapping_joinTableName">
+ <description>Specify the name of the database table that defines the foreign key for a many-to-many or a unidirectional one-to-many association. You can configure the join table with a specific catalog or schema, configure one or more join table columns with a unique constraint, and use multiple join columns per entity.</description>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="mapping_joinTableJoinColumns">
+ <description>Specify two or more join columns (that is, a composite primary key).</description>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="mapping_joinTableInverseJoinColumns">
+ <description>Specify the join column on the owned (or inverse side) of the association: the owned entity's primary key column. </description>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="properties_javaPersistence">
+ <description>Use the Java Persistence options on the Properties page to select the database connection to use with the project.</description>
+ <topic label="Project properties" href="ref_project_properties"/>
+ <topic label="Adding persistence" href="ref_add_persistence.htm"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="properties_javaPersistenceConnection">
+ <description>The database connection used to map the persistent entities.</description>
+ <topic label="Project properties" href="ref_project_properties"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="properties_javaPersistenceSchema">
+ <description>The database schema used to map the persistent entities.</description>
+ <topic label="Project properties" href="ref_project_properties"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="dialog_addPersistence">
+ <description>Use the Add Persistence dialog to define the database connection use to store the persistence entities.</description>
+ <topic label="Adding persistence" href="ref_add_persistence.htm"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="persistenceOutline">
+ <description>The JPA Structure view displays an outline of the structure (its attributes and mappings) of the entity that is currently selected or opened in the editor.</description>
+ <topic label="JPA Structure view" href="ref_persistence_outline.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="dialog_generateEntities">
+ <description>Use the Generate Entities dialog to create Java persistent entities based on your database tables.</description>
+ <topic label="Generating entities from tables" href="task_generate_entities.htm.htm" />
+ <topic label="Project properties" href="ref_project_properties"/>
+ </context>
+ <context id="dialog_generateEntities_source">
+ <description>The project folder name in which to generate the Java persistent entities. Click Browse to select an existing folder.</description>
+ <topic label="Generating entities from tables" href="task_generate_entities.htm"/>
+ </context>
+ <context id="dialog_generateEntities_package">
+ <description>The package in which to generate the Java persistent entities, or click Browse to select an existing package.</description>
+ <topic label="Generating entities from tables" href="task_generate_entities.htm"/>
+ </context>
+ <context id="dialog_generateEntities_tables">
+ <description>Select the tables from which to create Java persistent entities.</description>
+ <topic label="Generating entities from tables" href="task_generate_entities.htm"/>
+ <topic label="Project properties" href="ref_project_properties"/>
+ </context>
+ <context id="dialog_addJavaPersistence">
+ <description>Use this dialog to define the database connection used to store the persistence entities and to create the persistence.xml file.</description>
+ <topic label="Add Persistence dialog" href="ref_add_persistence.htm" />
+ <topic label="Adding persistence to a project" href="task_add_persistence" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence.htm" />
+ </context>
+ <context id="dialog_newJPAProject">
+ <description>Use this dialog to define the new JPA project name, its location, target runtime, and other configuration settings.</description>
+ <topic label="New JPA Project page" href="ref_new_jpa_project.htm" />
+ <topic label="New JPA Project wizard" href="ref_new_jpa_project_wizard" />
+ <topic label="Adding persistence to a project" href="task_add_persistence" />
+ <topic label="Creating a new JPA project" href="task_create_new_project.htm" />
+ </context>
+ <context id="dialog_addJavaPersistence_database">
+ <description>Use these fields to define the database connection used to store the persistent entities.</description>
+ <topic label="Add Persistence dialog" href="ref_add_persistence.htm" />
+ <topic label="Adding persistence to a project" href="task_add_persistence" />
+ </context>
+ <context id="dialog_addJavaPersistence_classpath">
+ <description>Use this option to add libraries or JARs that contain the Java Persistence API (JPA) and entities to the project’s Java Build Path.</description>
+ <topic label="Add Persistence dialog" href="ref_add_persistence.htm" />
+ <topic label="Adding persistence to a project" href="task_add_persistence" />
+ </context>
+ <context id="dialog_addJavaPersistence_packaging">
+ <description>Use these fields to create the persistence.xml file. Select the persistence version, the name of the JPA provider, and a unique name to identify the persistence unit.</description>
+ <topic label="Add Persistence dialog" href="ref_add_persistence.htm" />
+ <topic label="Managing the persistence.xml file" href="task_manage_persistence.htm" />
+ </context>
+ <context id="wizard_generateDDL_options ">
+ <description>Use this page to select which script options will be included in the generated script.</description>
+ <topic label="Generating tables (DDL) from entities " href="task_generate_ddl.htm" />
+ <topic label="Options page " href="ref_options.htm" />
+ </context>
+ <context id="wizard_generateDDL_objects ">
+ <description>Use this page to select which elements will be included in the generated script.</description>
+ <topic label="Generating tables (DDL) from entities " href="task_generate_ddl.htm" />
+ <topic label="Objects page " href="ref_objects.htm" />
+ </context>
+ <context id="wizard_generateDDL_save ">
+ <description>Use this page to select the filename and location of the generated script. You can also preview the script and specify to run or continue editing the script after generation.</description>
+ <topic label="Generating tables (DDL) from entities " href="task_generate_ddl.htm" />
+ <topic label="Save and Run DDL page " href="ref_save_and_run.htm" />
+ </context>
+ <context id="wizard_generateDDL_summary ">
+ <description>This page shows the settings that you selected for the generated DDL. To change any option click "Back" or click "Finish" to continue.</description>
+ <topic label="Generating tables (DDL) from entities " href="task_generate_ddl.htm" />
+ </context>
+ <context id="mapping_tableGeneratorName">
+ <description>The name of the table sequence generator. This name is global to to the persistence unit (across all generator types).</description>
+ <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="mapping_tableGeneratorTable">
+ <description>The database table that stores the generated ID values. </description>
+ <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="mapping_tableGeneratorPrimaryKeyColumn">
+ <description>The database column of the generator table that stores the generated ID values.</description>
+ <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="mapping_tableGeneratorValueColumn">
+ <description>The name for the column that stores the generated ID values.</description>
+ <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="mapping_tableGeneratorPrimaryKeyColumnValue">
+ <description>The database column of the generator table that defines the primary key value.</description>
+ <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="dialog_databaseAuthorization">
+ <description>Use to connect (log in) to a database connection to use with your Java persistent entities.
+ You must have a defined database connection (and be connected) to add persistence. </description>
+ <topic label="Add persistence to a Java project" href="task_add_persistence_project.htm"/>
+ </context>
+ <context id="mapping_temporal">
+ <description>Specify if the mapped field contains a Date (java.sql.Date), Time (java.sql.Time), or Timestamp (java.sql.Timestamp) value.</description>
+ <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="mapping_primaryKeyGeneration">
+ <description>Define how the primary key is generated</description>
+ <topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
+ <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="mapping_tableGenerator">
+ <description>Specify to use a specific database table for generating the primary key.</description>
+ <topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
+ <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="mapping_sequenceGenerator">
+ <description>Specify to use a specific sequence for generating the primary key.</description>
+ <topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
+ <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="mapping_sequenceGeneratorName">
+ <description>Name of the sequence.</description>
+ <topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
+ <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="mapping_sequenceGeneratorSequence">
+ <description> </description>
+ <topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
+ <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="mapping_lob">
+ <description>Specify if the field is mapped to java.sql.Clob or java.sql.Blob.</description>
+ <topic label="General information" href="ref_mapping_general.htm"/>
+ <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="mapping_enumerated">
+ <description>Specify how to persist enumerated constraints if the String value suits your application requirements or to match an existing database schema.</description>
+ <topic label="General information" href="ref_mapping_general.htm"/>
+ <topic label="JPA Details" href="ref_persistence_map_view.htm"/>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="dialog_editInverseJoinColumn">
+ <description>.</description>
+ <topic label="Mapping an entity" href="task_mapping.htm"/>
+ </context>
+ <context id="entity_catalog">
+ <description>The database catalog that contains the Table. This field overrides the defaults in the orm.xml file.</description>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="entity_schema">
+ <description>The database schema that contains the Table. This field overrides the defaults in the orm.xml file.</description>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Adding persistence to a class" href="task_add_persistence.htm"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="orm_package">
+ <description>The Java package that contains the persistent entities to which the orm.xml file applies.</description>
+ <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
+ <topic label="JPA Details" href="ref_details_orm.htm"/>
+ </context>
+ <context id="orm_schema">
+ <description>The database schema to use as the default for all entities managed by this persistence unit.</description>
+ <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
+ <topic label="JPA Details" href="ref_details_orm.htm"/>
+ </context>
+ <context id="orm_catalog">
+ <description>The database catalog to use as the default for all entities managed by this persistence unit.</description>
+ <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
+ <topic label="JPA Details" href="ref_details_orm.htm"/>
+ </context>
+ <context id="orm_access">
+ <description>The default access method for variables in this project: Property or Field.</description>
+ <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
+ <topic label="JPA Details" href="ref_details_orm.htm"/>
+ </context>
+ <context id="orm_cascade">
+ <description>Adds cascade-persist to the set of cascade options in entity relationships of the persistence unit.</description>
+ <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
+ <topic label="JPA Details" href="ref_details_orm.htm"/>
+ </context>
+ <context id="orm_xml">
+ <description>Specifies that the Java classes in this persistence unit are fully specified by their metadata. Any annotations will be ignored.</description>
+ <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
+ <topic label="JPA Details" href="ref_details_orm.htm"/>
+ </context>
+ <context id="dialog_JPAPlatform">
+ <description>Specify the vendor-specific JPA implementation.Default is Generic..</description>
+ <topic label="JPA Facet page" href="ref_jpa_facet.htm"/>
+ </context>
+ <context id="dialog_createORM">
+ <description>Create an initial orm.xml file. Use this file to specify project and persistence unit defaults.</description>
+ <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
+ <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 Soft 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="dialog_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>
+
+<!-- Added for 3.0 -->
+ <context id="properties_canonicalMetamodel">
+ <description>Specifies if the project model uses the Canonical Metamodel. </description>
+ <topic label="Project properties" href="ref_project_properties"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="entity_cachable">
+ <description>Specify if the entity uses the @Cachable annotation. Default is @Cachable(false).</description>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Understanding persistence" href="concept_persistence.htm"/>
+ </context>
+ <context id="entity_primaryKeyClass">
+ <description>Click Browse and select the primary key for the entity. Clicking the field name, which is represented as a hyperlink, allows you to create a new class.</description>
+ <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <topic label="Primary Key Generation information" href="ref_primary_key.htm"/>
+ </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 c993ad7ac6..4370eb967a 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm
@@ -3,22 +3,22 @@
<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>Getting started</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:41Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:3Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content=" Getting started" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Getting started" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
<p><a id="sthref2" name="sthref2"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<h1>Getting started</h1>
<p>This section provides information on getting started with the Java Persistence Tools.</p>
<ul>
@@ -30,18 +30,18 @@
</li>
</ul>
<p>For additional information, please visit the Dali home page at:</p>
-<p><code><a href="http://www.eclipse.org/webtools/dali">http://www.eclipse.org/webtools/dali</a></code>.</p>
+<p><code><a href="http://www.eclipse.org/webtools/dali/">http://www.eclipse.org/webtools/dali/</a></code>.</p>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 21cf961743..18b44dd3ab 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm
@@ -3,41 +3,41 @@
<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>Requirements and installation</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:41Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:3Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Requirements and installation" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BABEFHCD" name="BABEFHCD"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>Requirements and installation<a id="sthref3" name="sthref3"></a><a id="sthref4" name="sthref4"></a></h1>
<p>Before installing Dali, ensure that your environment meets the following <span class="italic">minimum</span> requirements:</p>
<ul>
<li>
-<p>Eclipse 3.6 (<code><a href="http://www.eclipse.org/downloads">http://www.eclipse.org/downloads</a></code>)</p>
+<p>Eclipse 3.7 (<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.2 (<code><a href="http://www.eclipse.org/webtools">http://www.eclipse.org/webtools</a></code>)</p>
+<p>Eclipse Web Tools Platform (WTP) 3.3 (<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. 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>
<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><a id="sthref5" name="sthref5"></a>Dali is included as part of WTP 3.2. No additional installation or configuration is required.</p>
+<p><a id="sthref5" name="sthref5"></a>Dali is included as part of WTP 3.4. 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>
@@ -70,11 +70,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 3285315b65..22afee9cda 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm
@@ -3,21 +3,21 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<title>Dali quick start</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:41Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:3Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Dali quick start" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BABIGCJA" name="BABIGCJA"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>Dali quick start</h1>
@@ -30,20 +30,27 @@
<p><a href="getting_started004.htm#BABFGDDG">Creating a Java persistent entity with persistent fields</a></p>
</li>
</ul>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="tips_and_tricks.htm#CHDHGHBF">Tips and tricks</a><br />
+<a id="sthref9" name="sthref9"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="tips_and_tricks.htm#CHDHGHBF">Tips and tricks</a></p>
+</li>
+<li>
+<p><a href="whats_new.htm#CEGIAIGD">What's new</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, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 2cbac78532..9dc8db4ccd 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm
@@ -3,25 +3,25 @@
<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 new JPA project</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:41Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:3Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Creating a new JPA project" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<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="sthref9" name="sthref9"></a>This quick start shows how to create a new JPA project.</p>
+<p><a id="sthref10" name="sthref10"></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>
@@ -32,7 +32,8 @@
<tr>
<td align="left">
<p class="notep1">Tip:</p>
-You can also select the JPA perspective and then select <span class="bold">File &gt; New &gt; JPA Project</span>.</td>
+<p>You can also select the JPA perspective and then select <span class="bold">File &gt; New &gt; JPA Project</span>.</p>
+</td>
</tr>
</tbody>
</table>
@@ -46,7 +47,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 Java source page 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">Default Configuration for Apache Tomcat</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">
@@ -54,7 +55,8 @@ You can also select the JPA perspective and then select <span class="bold">File
<tr>
<td align="left">
<p class="notep1">Note:</p>
-The Target Runtime is not required for Java SE development.</td>
+<p>The Target Runtime is not required for Java SE development.</p>
+</td>
</tr>
</tbody>
</table>
@@ -65,7 +67,7 @@ The Target Runtime is not required for Java SE development.</td>
<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>
+<p>On the JPA Facet dialog, select your vendor-specific JPA platform (or select <span class="bold">Generic 2.0</span>), JPA implementation library (such as EclipseLink), database connection (or create a new connection), define how Dali should manage persistent classes, and then click <span class="bold">Finish</span>.</p>
<div align="center">
<div class="inftblnotealso"><br />
<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0">
@@ -73,7 +75,8 @@ The Target Runtime is not required for Java SE development.</td>
<tr>
<td align="left">
<p class="notep1">Tip:</p>
-Select <span class="bold">Override the Default Schema for Connection</span> if you require a schema other than the one that Dali derives from the connection information, which may be incorrect in some cases. Using this option, you can select a development time schema for defaults and validation.</td>
+<p>Select <span class="bold">Override the Default Schema for Connection</span> if you require a schema other than the one that Dali derives from the connection information, which may be incorrect in some cases. Using this option, you can select a development time schema for defaults and validation.</p>
+</td>
</tr>
</tbody>
</table>
@@ -82,7 +85,7 @@ 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="sthref10" name="sthref10"></a>
+<div class="figure"><a id="sthref11" name="sthref11"></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" -->
@@ -95,11 +98,11 @@ Select <span class="bold">Override the Default Schema for Connection</span> if y
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 249ea76a96..51517dc5b8 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm
@@ -3,25 +3,25 @@
<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 Java persistent entity with persistent fields</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:41Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:3Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Creating a Java persistent entity with persistent fields" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BABFGDDG" name="BABFGDDG"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Creating a Java persistent entity with persistent fields</h1>
-<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>
+<p><a id="sthref12" name="sthref12"></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 Project Explorer and then click <span class="bold">New &gt; Other</span>. The Select a Wizard dialog appears.</p>
@@ -33,7 +33,7 @@
<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="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>
+<p><a id="sthref13" name="sthref13"></a><a id="sthref14" name="sthref14"></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;
@@ -49,7 +49,7 @@ private String street;
<tr>
<td align="left">
<p class="notep1">Note:</p>
-You will also need to add the following columns to the ADDRESS database table:
+<p>You will also need to add the following columns to the <code>ADDRESS</code> database table:</p>
<pre xml:space="preserve" class="oac_no_warn">
NUMBER(10,0) ADDRESS_ID (primary key)
VARCHAR2(80) PROVINCE
@@ -57,8 +57,6 @@ VARCHAR2(80) COUNTRY
VARCHAR2(20) P_CODE
VARCHAR2(80) STREET
VARCHAR2(80) CITY
-</pre>
-<pre xml:space="preserve" class="oac_no_warn">
</pre></td>
</tr>
</tbody>
@@ -67,25 +65,30 @@ VARCHAR2(80) CITY
<!-- class="inftblnote" --></div>
</li>
<li>
-<p>Click <span class="bold">Finish</span>. With the Create JPA Entity completed, Eclipse displays the <span class="bold">Address</span> entity in the JPA Structure view.</p>
-<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>
+<p>Click <span class="bold">Finish</span>. With the Create JPA Entity wizard completed, Eclipse displays the <span class="bold">Address</span> entity in the JPA Structure view.</p>
</li>
</ol>
-<div class="figure"><a id="sthref14" name="sthref14"></a>
+<p><code>Address.java</code> 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>
+<div class="figure"><a id="sthref15" name="sthref15"></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="sthref15" name="sthref15"></a>
+<p>Eclipse also displays the <span class="bold">Address</span> entity in the JPA Structure view.</p>
+<div class="figure"><a id="sthref16" name="sthref16"></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" -->
+<p>After creating the entity, you must associate it with a database table.</p>
<ol>
<li>
<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>
+<p>In the <span class="gui-object-title">JPA Details</span> view, notice that Dali has automatically associated the <code>ADDRESS</code> database table with the entity because they are named identically.</p>
+<div class="figure"><a id="sthref17" name="sthref17"></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" -->
<div align="center">
<div class="inftblnote"><br />
<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
@@ -93,16 +96,14 @@ VARCHAR2(80) CITY
<tr>
<td align="left">
<p class="notep1">Note:</p>
-Depending on your database connection type, you may need to specify the <span class="bold">Schema</span>.</td>
+<p>Depending on your database connection type, you may need to specify the <span class="bold">Schema</span>.</p>
+</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblnote" --></div>
-<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>
+</li>
</ol>
<div align="center">
<div class="inftblnotealso"><br />
@@ -111,7 +112,7 @@ Depending on your database connection type, you may need to specify the <span cl
<tr>
<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>After associating the entity with the database table, you should update the <code>persistence.xml</code> file to include this JPA entity.</p>
<p>Right-click the <code>persistence.xml</code> file in the Project Explorer and select <span class="bold">JPA Tools &gt; Synchronize Class List</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>
@@ -126,11 +127,11 @@ After associating the entity with the database table, you should update the <cod
<p>Select the <span class="gui-object-action">id</span> field in the JPA Details view.</p>
</li>
<li>
-<p>Right click id and then select <span class="bold">Map As &gt; id</span>.</p>
+<p>Right-click id and then select <span class="bold">Map As &gt; id</span>.</p>
</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="sthref17" name="sthref17"></a>
+<div class="figure"><a id="sthref18" name="sthref18"></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" -->
@@ -142,7 +143,7 @@ After associating the entity with the database table, you should update the <cod
<li>
<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">
+<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="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="*" />
<col width="33%" />
<col width="33%" />
@@ -155,36 +156,66 @@ After associating the entity with the database table, you should update the <cod
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t8" headers="r1c1-t8">city</td>
-<td align="left" headers="r2c1-t8 r1c2-t8">Basic</td>
-<td align="left" headers="r2c1-t8 r1c3-t8">CITY</td>
+<td align="left" id="r2c1-t8" headers="r1c1-t8">
+<p><code>city</code></p>
+</td>
+<td align="left" headers="r2c1-t8 r1c2-t8">
+<p>Basic</p>
+</td>
+<td align="left" headers="r2c1-t8 r1c3-t8">
+<p><code>CITY</code></p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t8" headers="r1c1-t8">country</td>
-<td align="left" headers="r3c1-t8 r1c2-t8">Basic</td>
-<td align="left" headers="r3c1-t8 r1c3-t8">COUNTRY</td>
+<td align="left" id="r3c1-t8" headers="r1c1-t8">
+<p><code>country</code></p>
+</td>
+<td align="left" headers="r3c1-t8 r1c2-t8">
+<p>Basic</p>
+</td>
+<td align="left" headers="r3c1-t8 r1c3-t8">
+<p><code>COUNTRY</code></p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t8" headers="r1c1-t8">postalCode</td>
-<td align="left" headers="r4c1-t8 r1c2-t8">Basic</td>
-<td align="left" headers="r4c1-t8 r1c3-t8">P_CODE</td>
+<td align="left" id="r4c1-t8" headers="r1c1-t8">
+<p><code>postalCode</code></p>
+</td>
+<td align="left" headers="r4c1-t8 r1c2-t8">
+<p>Basic</p>
+</td>
+<td align="left" headers="r4c1-t8 r1c3-t8">
+<p><code>P_CODE</code></p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t8" headers="r1c1-t8">provinceOrState</td>
-<td align="left" headers="r5c1-t8 r1c2-t8">Basic</td>
-<td align="left" headers="r5c1-t8 r1c3-t8">PROVINCE</td>
+<td align="left" id="r5c1-t8" headers="r1c1-t8">
+<p><code>provinceOrState</code></p>
+</td>
+<td align="left" headers="r5c1-t8 r1c2-t8">
+<p>Basic</p>
+</td>
+<td align="left" headers="r5c1-t8 r1c3-t8">
+<p><code>PROVINCE</code></p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t8" headers="r1c1-t8">street</td>
-<td align="left" headers="r6c1-t8 r1c2-t8">Basic</td>
-<td align="left" headers="r6c1-t8 r1c3-t8">STREET</td>
+<td align="left" id="r6c1-t8" headers="r1c1-t8">
+<p><code>street</code></p>
+</td>
+<td align="left" headers="r6c1-t8 r1c2-t8">
+<p>Basic</p>
+</td>
+<td align="left" headers="r6c1-t8 r1c3-t8">
+<p><code>STREET</code></p>
+</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblhruleinformal" --></li>
</ol>
-<p>Dali automatically maps some fields to the correct database column (such as the city field to the City column) if the names are identical.</p>
+<p>Dali automatically maps some fields to the correct database column (such as the <code>city</code> field to the <code>City</code> column) if the names are identical.</p>
</div>
<!-- class="sect2" -->
<!-- class="sect1" -->
@@ -194,11 +225,11 @@ After associating the entity with the database table, you should update the <cod
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/MakePersistentMenu.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/MakePersistentMenu.png
new file mode 100644
index 0000000000..7dd59d6bed
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/MakePersistentMenu.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/add_query.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/add_query.png
new file mode 100644
index 0000000000..9ea343ae48
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/add_query.png
Binary files differ
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 bdcf00838f..565126f050 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/address_id_details_quickstart.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/address_id_details_quickstart.png
index 7ef40cf6c6..2b8fcaa4e6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/address_id_details_quickstart.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/address_id_details_quickstart.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
index 9567616b7c..0c4d5fb139 100644
--- 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
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/customize_default_entity_generation_dynamic.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/customize_default_entity_generation_dynamic.png
new file mode 100644
index 0000000000..7553ca0403
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/customize_default_entity_generation_dynamic.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/customize_individual_entities_dynamic.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/customize_individual_entities_dynamic.png
new file mode 100644
index 0000000000..bc86335835
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/customize_individual_entities_dynamic.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/details_entitymappings.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/details_entitymappings.png
index d66300e421..49befb6170 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/details_entitymappings.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/details_entitymappings.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_dynamic_entities.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_dynamic_entities.png
new file mode 100644
index 0000000000..5b18ec3335
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_dynamic_entities.png
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 4daa25c7c5..761b2fee2b 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/generate_tables.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_tables.png
new file mode 100644
index 0000000000..a0a52358f6
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_tables.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_tables_from_entities.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_tables_from_entities.png
new file mode 100644
index 0000000000..764287f646
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_tables_from_entities.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_arraymapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_arraymapping.png
new file mode 100644
index 0000000000..b96fdeb879
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_arraymapping.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_elementcollection.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_elementcollection.png
new file mode 100644
index 0000000000..37a4a47a96
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_elementcollection.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details.manytomany.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details.manytomany.png
new file mode 100644
index 0000000000..d39a1dfb7f
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details.manytomany.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_basic.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_basic.png
new file mode 100644
index 0000000000..9472eaa231
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_basic.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_elementcollection.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_elementcollection.png
new file mode 100644
index 0000000000..cc59cc0b3e
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_elementcollection.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_embedded.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_embedded.png
new file mode 100644
index 0000000000..e03c0c6b51
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_embedded.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_idmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_idmapping.png
new file mode 100644
index 0000000000..ff264cabf0
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_idmapping.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_joiningstrategy.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_joiningstrategy.png
new file mode 100644
index 0000000000..ddf331a6f2
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_joiningstrategy.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_manytoone.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_manytoone.png
new file mode 100644
index 0000000000..68d99e0295
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_manytoone.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_multitenancy.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_multitenancy.png
new file mode 100644
index 0000000000..7c7555c6ff
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_multitenancy.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_onetomany.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_onetomany.png
new file mode 100644
index 0000000000..af170d17dc
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_onetomany.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_onetoone.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_onetoone.png
new file mode 100644
index 0000000000..6c6aa9d421
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_onetoone.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_primarykeygeneration.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_primarykeygeneration.png
new file mode 100644
index 0000000000..7035fb7dff
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_primarykeygeneration.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_query_1.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_query_1.png
new file mode 100644
index 0000000000..c83700b248
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_query_1.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_query_2.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_query_2.png
new file mode 100644
index 0000000000..ce43447b87
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_query_2.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_version.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_version.png
new file mode 100644
index 0000000000..81f34fed0b
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_version.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_perspective.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_perspective.png
new file mode 100644
index 0000000000..961d181c5c
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_perspective.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/make_persistence_dialog.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/make_persistence_dialog.png
new file mode 100644
index 0000000000..f11ca858b5
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/make_persistence_dialog.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 2b616033dd..06f1b68841 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/mapping_file_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_file_new.png
index 3355741af7..80b026e871 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_file_new.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_file_new.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/move_to_xml.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/move_to_xml.png
new file mode 100644
index 0000000000..6395b36f3a
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/move_to_xml.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 7607808317..67120941f8 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_source.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_source.png
new file mode 100644
index 0000000000..1a2919ffb3
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_source.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 ab079c2484..a0c4b735d3 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/new_mapping_file_options.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_mapping_file_options.png
new file mode 100644
index 0000000000..5bb5af3286
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_mapping_file_options.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_connection.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_connection.png
new file mode 100644
index 0000000000..9a3144b6e1
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_connection.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_customization.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_customization.png
new file mode 100644
index 0000000000..900586a6b2
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_customization.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_general.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_general.png
new file mode 100644
index 0000000000..59cc72baeb
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_general.png
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 97557ee963..9ed91e3953 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/properties_jpa_eclipselink.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/properties_jpa_eclipselink.png
new file mode 100644
index 0000000000..600d6e8be3
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/properties_jpa_eclipselink.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 48ca05099b..035f4ca1db 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/select_a_wizard_entity.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_entity.png
index 2cebe90add..1266331574 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_entity.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_entity.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_jpa_project.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_jpa_project.png
index 182350246d..a3a3a18ddd 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_jpa_project.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_jpa_project.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 049c9d15b5..0a0192dfc2 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
index a57c9314c7..f08724b42b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/select_tables.png
+++ 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/select_tables_dynamic.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_tables_dynamic.png
new file mode 100644
index 0000000000..03dc3d4378
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_tables_dynamic.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 a359f64651..be68b3348f 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_dynamic.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/table_associations_dynamic.png
new file mode 100644
index 0000000000..04e91404c9
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/table_associations_dynamic.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/xmlpath_validation.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/xmlpath_validation.png
new file mode 100644
index 0000000000..83e6972c8f
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/xmlpath_validation.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 acf9beb953..a570cd9b1c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/index.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/index.xml
@@ -1,668 +1,328 @@
<?xml version='1.0' encoding='iso-8859-1'?>
<index version="1.0">
- <entry keyword="@Basic">
- <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref116" /></entry>
- </entry>
+<entry keyword="@Basic, Basic mapping"><topic href="tasks010.htm#sthref156" /></entry>
<entry keyword="@Column">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref245" /></entry>
- </entry>
- <entry keyword="@DiscriminatorColumn">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref96" /></entry>
- <entry keyword="Inheritance information"><topic href="reference009.htm#sthref239" /></entry>
- </entry>
- <entry keyword="@DiscriminatorValue">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref98" /></entry>
- <entry keyword="Inheritance information"><topic href="reference009.htm#sthref237" /></entry>
- </entry>
- <entry keyword="@Embeddable">
- <entry keyword="Embeddable"><topic href="tasks007.htm#sthref81" /></entry>
- </entry>
- <entry keyword="@Embedded">
- <entry keyword="Embedded mapping"><topic href="tasks011.htm#sthref120" /></entry>
- </entry>
- <entry keyword="@EmbeddedId">
- <entry keyword="Embedded ID mapping"><topic href="tasks012.htm#sthref124" /></entry>
- </entry>
- <entry keyword="@Entity">
- <entry keyword="Entity"><topic href="tasks006.htm#sthref74" /></entry>
- </entry>
- <entry keyword="@Enumerated">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref255" /></entry>
- </entry>
- <entry keyword="@GeneratedValue">
- <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref265" /></entry>
- </entry>
- <entry keyword="@Id">
- <entry keyword="ID mapping"><topic href="tasks013.htm#sthref128" /></entry>
- </entry>
- <entry keyword="@Inheritance">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref94" /></entry>
- </entry>
- <entry keyword="@JoinColumn">
- <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref139" /></entry>
- <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref149" /></entry>
- <entry keyword="Join Table Information"><topic href="reference011.htm#sthref261" /></entry>
- <entry keyword="Join Columns Information"><topic href="reference012.htm#sthref264" /></entry>
- </entry>
- <entry keyword="@Lob">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref250" /></entry>
- </entry>
- <entry keyword="@ManyToMany">
- <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref132" /></entry>
- </entry>
- <entry keyword="@ManyToOne">
- <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref137" /></entry>
- </entry>
- <entry keyword="@MappedSuperclass">
- <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref88" /></entry>
- </entry>
- <entry keyword="@NamedQuery">
- <entry keyword="Creating Named Queries"><topic href="tasks009.htm#sthref108" /></entry>
- </entry>
- <entry keyword="@OneToMany">
- <entry keyword="One-to-many mapping"><topic href="tasks016.htm#sthref142" /></entry>
- </entry>
- <entry keyword="@OneToOne">
- <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref146" /></entry>
- </entry>
- <entry keyword="@OrderBy">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref259" /></entry>
- </entry>
+<entry keyword="Basic Mapping"><topic href="reference025.htm#sthref407" /></entry>
+<entry keyword="ID Mapping"><topic href="reference029.htm#sthref412" /></entry>
+<entry keyword="Version Mapping"><topic href="reference034.htm#sthref414" /></entry>
+ </entry>
+<entry keyword="@DiscriminatorColumn, Inheritance"><topic href="reference018.htm#sthref369" /></entry>
+<entry keyword="@DiscriminatorValue, Inheritance"><topic href="reference018.htm#sthref367" /></entry>
+<entry keyword="@Embeddable, Embeddable"><topic href="tasks003.htm#sthref80" /></entry>
+<entry keyword="@Embedded, Embedded mapping"><topic href="tasks012.htm#sthref168" /></entry>
+<entry keyword="@EmbeddedId, Embedded ID mapping"><topic href="tasks013.htm#sthref176" /></entry>
+<entry keyword="@Entity, Entity"><topic href="tasks002.htm#sthref72" /></entry>
+<entry keyword="@Enumerated, Type information"><topic href="reference035.htm#sthref421" /></entry>
+<entry keyword="@GeneratedValue, Primary Key Generation information"><topic href="ref_primary_key.htm#sthref428" /></entry>
+<entry keyword="@Id, ID mapping"><topic href="tasks014.htm#sthref184" /></entry>
+<entry keyword="@Inheritance, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref133" /></entry>
+<entry keyword="@JoinColumn, Joining Strategy"><topic href="reference039.htm#sthref427" /></entry>
+<entry keyword="@Lob, Type information"><topic href="reference035.htm#sthref416" /></entry>
+<entry keyword="@ManyToMany, Many-to-many mapping"><topic href="tasks015.htm#sthref193" /></entry>
+<entry keyword="@ManyToOne, Many-to-one mapping"><topic href="tasks016.htm#sthref203" /></entry>
+<entry keyword="@MappedSuperclass, Mapped superclass"><topic href="tasks004.htm#sthref88" /></entry>
+<entry keyword="@NamedQuery, Creating queries"><topic href="tasks009.htm#sthref145" /></entry>
+<entry keyword="@OneToMany, One-to-many mapping"><topic href="tasks017.htm#sthref210" /></entry>
+<entry keyword="@OneToOne, One-to-one mapping"><topic href="tasks018.htm#sthref218" /></entry>
+<entry keyword="@OrderBy, Ordering"><topic href="reference038.htm#sthref425" /></entry>
<entry keyword="@SequenceGenerator">
- <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref267" /></entry>
- </entry>
- <entry keyword="@Temporal">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref252" /></entry>
- </entry>
- <entry keyword="@Transient">
- <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref152" /></entry>
- </entry>
- <entry keyword="@Version">
- <entry keyword="Version mapping"><topic href="tasks019.htm#sthref156" /></entry>
- </entry>
- <entry keyword="architecture of Dali feature">
- <entry keyword="Dali Developer Documentation"><topic href="reference033.htm#sthref303" /></entry>
- </entry>
- <entry keyword="association tables">
- <entry keyword="Create New Association"><topic href="ref_create_new_association_wizard.htm#sthref221" /></entry>
- </entry>
- <entry keyword="attribute overrides">
- <entry keyword="Attribute overrides"><topic href="reference007.htm#sthref228" /></entry>
- </entry>
- <entry keyword="Attribute Overrides - in Java Details view">
- <entry keyword="Attribute overrides"><topic href="reference007.htm#sthref230" /></entry>
- </entry>
+<entry keyword="Primary Key Generation"><topic href="reference021.htm#sthref380" /></entry>
+<entry keyword="Primary Key Generation"><topic href="reference021.htm#sthref382" /></entry>
+<entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref430" /></entry>
+ </entry>
+<entry keyword="@Temporal, Type information"><topic href="reference035.htm#sthref418" /></entry>
+<entry keyword="@Transient, Transient mapping"><topic href="tasks019.htm#sthref226" /></entry>
+<entry keyword="@Version, Version mapping"><topic href="tasks020.htm#sthref233" /></entry>
+<entry keyword="Advanced - in Java Details view, Advanced"><topic href="reference024.htm#sthref392" /></entry>
+<entry keyword="architecture of Dali feature, Dali Developer Documentation"><topic href="reference071.htm#sthref485" /></entry>
+<entry keyword="association tables, Create New Association wizard"><topic href="ref_create_new_association_wizard.htm#sthref341" /></entry>
+<entry keyword="attribute overrides, Attribute Overrides"><topic href="reference019.htm#sthref373" /></entry>
+<entry keyword="Attribute Overrides - in Java Details view, Attribute Overrides"><topic href="reference019.htm#sthref375" /></entry>
<entry keyword="attributes">
- <entry keyword="JPA Details view">
- <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref244" /></entry>
- </entry>
- <entry keyword="mapping">
- <entry keyword="Understanding OR mappings"><topic href="concept_mapping.htm#sthref21" /></entry>
- </entry>
+<entry keyword="JPA Details view, JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref404" /></entry>
+<entry keyword="mapping, Understanding OR mappings"><topic href="concept_mapping.htm#sthref22" /></entry>
</entry>
<entry keyword="basic mapping">
- <entry keyword="@Basic">
- <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref117" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref115" /></entry>
- </entry>
+<entry keyword="@Basic, Basic mapping"><topic href="tasks010.htm#sthref157" /></entry>
+<entry keyword="about, Basic mapping"><topic href="tasks010.htm#sthref155" /></entry>
<entry keyword="(See also mappings)"></entry>
</entry>
- <entry keyword="caching">
- <entry keyword="Caching"><topic href="reference020.htm#sthref278" /></entry>
- </entry>
- <entry keyword="canonical metamodel">
- <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref298" /></entry>
- </entry>
- <entry keyword="cardinality - association tables">
- <entry keyword="Association Cardinality"><topic href="ref_association_cardinality.htm#sthref224" /></entry>
- </entry>
+<entry keyword="caching, Caching"><topic href="reference048.htm#sthref450" /></entry>
+<entry keyword="canonical metamodel, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref463" /></entry>
+<entry keyword="cardinality - association tables, Association Cardinality"><topic href="ref_association_cardinality.htm#sthref348" /></entry>
+<entry keyword="change tracking, Advanced"><topic href="reference024.htm#sthref397" /></entry>
<entry keyword="classes">
- <entry keyword="adding persistence to">
- <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref69" /></entry>
- </entry>
- <entry keyword="embeddable">
- <entry keyword="Embeddable"><topic href="tasks007.htm#sthref80" /></entry>
- </entry>
- <entry keyword="entity">
- <entry keyword="Entity"><topic href="tasks006.htm#sthref72" /></entry>
- </entry>
- <entry keyword="generating schema from">
- <entry keyword="Generating Schema from Classes"><topic href="task_generating_schema_from_classes.htm#sthref190" /></entry>
- <entry keyword="Generating JAXB Classes from a Schema"><topic href="task_generate_classes_from_schema.htm#sthref198" /></entry>
- </entry>
- <entry keyword="managed">
- <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref50" /></entry>
- </entry>
- <entry keyword="managing persistent classes">
- <entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref207" /></entry>
- </entry>
- <entry keyword="mapped superclass">
- <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref86" /></entry>
- </entry>
- <entry keyword="synchronizing">
- <entry keyword="Synchronizing classes"><topic href="tasks002.htm#sthref52" /></entry>
- </entry>
+<entry keyword="adding persistence to, Adding persistence to a class"><topic href="task_add_persistence.htm#sthref64" /></entry>
+<entry keyword="embeddable, Embeddable"><topic href="tasks003.htm#sthref79" /></entry>
+<entry keyword="entity, Entity"><topic href="tasks002.htm#sthref70" /></entry>
+<entry keyword="managed, General"><topic href="ref_persistence_general.htm#sthref448" /></entry>
+<entry keyword="managing persistent classes, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref335" /></entry>
+<entry keyword="mapped superclass, Mapped superclass"><topic href="tasks004.htm#sthref86" /></entry>
+<entry keyword="synchronizing, Synchronizing classes"><topic href="tasks006.htm#sthref104" /></entry>
</entry>
<entry keyword="columns">
- <entry keyword="discriminator">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref97" /></entry>
- <entry keyword="Inheritance information"><topic href="reference009.htm#sthref240" /></entry>
- </entry>
- <entry keyword="join">
- <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref138" /></entry>
- <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref148" /></entry>
- <entry keyword="Join Table Information"><topic href="reference011.htm#sthref260" /></entry>
- <entry keyword="Join Columns Information"><topic href="reference012.htm#sthref263" /></entry>
- </entry>
+<entry keyword="discriminator, Inheritance"><topic href="reference018.htm#sthref370" /></entry>
+<entry keyword="join, Joining Strategy"><topic href="reference039.htm#sthref426" /></entry>
<entry keyword="mapping to">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref246" /></entry>
- </entry>
- <entry keyword="value">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref99" /></entry>
- <entry keyword="Inheritance information"><topic href="reference009.htm#sthref238" /></entry>
+<entry keyword="Basic Mapping"><topic href="reference025.htm#sthref408" /></entry>
+<entry keyword="ID Mapping"><topic href="reference029.htm#sthref413" /></entry>
+<entry keyword="Version Mapping"><topic href="reference034.htm#sthref415" /></entry>
</entry>
+<entry keyword="value, Inheritance"><topic href="reference018.htm#sthref368" /></entry>
</entry>
- <entry keyword="connection pool">
- <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref51" /></entry>
- </entry>
- <entry keyword="converting Java project to JPA">
- <entry keyword="Converting a Java Project to a JPA Project"><topic href="tasks001.htm#sthref37" /></entry>
- </entry>
- <entry keyword="Create a JPA Project Wizard">
- <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref29" /></entry>
- <entry keyword="Generating Schema from Classes"><topic href="task_generating_schema_from_classes.htm#sthref194" /></entry>
- <entry keyword="Generating JAXB Classes from a Schema"><topic href="task_generate_classes_from_schema.htm#sthref202" /></entry>
- </entry>
- <entry keyword="Create New JPA Project wizard">
- <entry keyword="Create New JPA Project wizard"><topic href="ref_new_jpa_project_wizard.htm#sthref204" /></entry>
- </entry>
+<entry keyword="connection pool, The persistence.xml Editor"><topic href="task_manage_persistence.htm#sthref98" /></entry>
+<entry keyword="converting Java project to JPA, Converting a Java project to a JPA project"><topic href="tasks001.htm#sthref46" /></entry>
+<entry keyword="Create a JPA Project Wizard, Creating a new JPA project"><topic href="task_create_new_project.htm#sthref36" /></entry>
+<entry keyword="Create New JPA Project wizard, Create New JPA Project wizard"><topic href="ref_new_jpa_project_wizard.htm#sthref328" /></entry>
+<entry keyword="customizer class - for entities, Advanced"><topic href="reference024.htm#sthref395" /></entry>
<entry keyword="database tables">
- <entry keyword="generating entities from">
- <entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref161" /></entry>
- </entry>
+<entry keyword="generating entities from, Generating entities from tables"><topic href="tasks021.htm#sthref242" /></entry>
</entry>
<entry keyword="database - persistence">
- <entry keyword="connection">
- <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref293" /></entry>
- </entry>
- <entry keyword="schema">
- <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref295" /></entry>
- </entry>
- </entry>
- <entry keyword="derived ID">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref257" /></entry>
- </entry>
- <entry keyword="developer documentation - Dali">
- <entry keyword="Dali Developer Documentation"><topic href="reference033.htm#sthref302" /></entry>
- </entry>
- <entry keyword="eager fetch">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref248" /></entry>
+<entry keyword="connection, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref458" /></entry>
+<entry keyword="schema, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref460" /></entry>
</entry>
+<entry keyword="developer documentation - Dali, Dali Developer Documentation"><topic href="reference071.htm#sthref484" /></entry>
+<entry keyword="eager fetch, Basic Mapping"><topic href="reference025.htm#sthref410" /></entry>
+<entry keyword="EclipseLink XML mapping file, General"><topic href="ref_persistence_general.htm#sthref449" /></entry>
<entry keyword="embeddable class">
- <entry keyword="@Embeddable">
- <entry keyword="Embeddable"><topic href="tasks007.htm#sthref82" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Embeddable"><topic href="tasks007.htm#sthref79" /></entry>
- </entry>
+<entry keyword="@Embeddable, Embeddable"><topic href="tasks003.htm#sthref81" /></entry>
+<entry keyword="about, Embeddable"><topic href="tasks003.htm#sthref78" /></entry>
</entry>
<entry keyword="embedded ID mapping">
- <entry keyword="@EmbeddedId">
- <entry keyword="Embedded ID mapping"><topic href="tasks012.htm#sthref125" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Embedded ID mapping"><topic href="tasks012.htm#sthref123" /></entry>
- </entry>
+<entry keyword="@EmbeddedId, Embedded ID mapping"><topic href="tasks013.htm#sthref177" /></entry>
+<entry keyword="about, Embedded ID mapping"><topic href="tasks013.htm#sthref175" /></entry>
</entry>
<entry keyword="embedded mapping">
- <entry keyword="@Embedded">
- <entry keyword="Embedded mapping"><topic href="tasks011.htm#sthref121" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Embedded mapping"><topic href="tasks011.htm#sthref119" /></entry>
- </entry>
+<entry keyword="@Embedded, Embedded mapping"><topic href="tasks012.htm#sthref169" /></entry>
+<entry keyword="about, Embedded mapping"><topic href="tasks012.htm#sthref167" /></entry>
</entry>
<entry keyword="entities">
- <entry keyword="@Entity annotation">
- <entry keyword="Entity"><topic href="tasks006.htm#sthref75" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Understanding Java persistence"><topic href="concept_persistence.htm#sthref20" /></entry>
- </entry>
- <entry keyword="creating">
- <entry keyword="Creating a JPA Entity"><topic href="task_create_jpa_entity.htm#sthref40" /></entry>
- </entry>
+<entry keyword="@Entity annotation, Entity"><topic href="tasks002.htm#sthref73" /></entry>
+<entry keyword="about, Understanding Java persistence"><topic href="concept_persistence.htm#sthref21" /></entry>
+<entry keyword="creating, Creating a JPA entity"><topic href="task_create_jpa_entity.htm#sthref52" /></entry>
+<entry keyword="customer class, Advanced"><topic href="reference024.htm#sthref396" /></entry>
<entry keyword="customizing">
- <entry keyword="Customize Individual Entities"><topic href="ref_customizIndividualEntities.htm#sthref220" /></entry>
- </entry>
- <entry keyword="embeddable">
- <entry keyword="Embeddable"><topic href="tasks007.htm#sthref83" /></entry>
+<entry keyword="Customize Individual Entities"><topic href="ref_customizIndividualEntities.htm#sthref301" /></entry>
+<entry keyword="Customize Individual Entities"><topic href="reference006.htm#sthref315" /></entry>
</entry>
+<entry keyword="embeddable, Embeddable"><topic href="tasks003.htm#sthref82" /></entry>
<entry keyword="from tables">
- <entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref158" /></entry>
- <entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref216" /></entry>
+<entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref239" /></entry>
+<entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref291" /></entry>
+<entry keyword="Select Tables"><topic href="reference003.htm#sthref305" /></entry>
</entry>
<entry keyword="generating">
- <entry keyword="Customize Default Entity Generation"><topic href="ref_customizeDefaultEntityGeneration.htm#sthref219" /></entry>
- </entry>
- <entry keyword="JPA Details view">
- <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref227" /></entry>
- </entry>
- <entry keyword="mapped superclass">
- <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref89" /></entry>
- </entry>
- <entry keyword="mapping">
- <entry keyword="Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref13" /></entry>
- </entry>
- <entry keyword="persistence">
- <entry keyword="Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref11" /></entry>
+<entry keyword="Customize Default Entity Generation"><topic href="ref_customizeDefaultEntityGeneration.htm#sthref298" /></entry>
+<entry keyword="Customize Default Entity Generation"><topic href="reference005.htm#sthref312" /></entry>
</entry>
+<entry keyword="JPA Details view, JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref353" /></entry>
+<entry keyword="mapped superclass, Mapped superclass"><topic href="tasks004.htm#sthref89" /></entry>
+<entry keyword="mapping, Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref14" /></entry>
+<entry keyword="persistence, Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref12" /></entry>
<entry keyword="persistent">
- <entry keyword="Entity"><topic href="tasks006.htm#sthref70" /></entry>
- <entry keyword="Entity"><topic href="tasks006.htm#sthref76" /></entry>
- </entry>
- <entry keyword="secondary tables">
- <entry keyword="Secondary table information"><topic href="reference008.htm#sthref233" /></entry>
+<entry keyword="Entity"><topic href="tasks002.htm#sthref68" /></entry>
+<entry keyword="Entity"><topic href="tasks002.htm#sthref74" /></entry>
</entry>
+<entry keyword="read-only, Advanced"><topic href="reference024.htm#sthref394" /></entry>
+<entry keyword="secondary tables, Secondary tables"><topic href="reference022.htm#sthref387" /></entry>
+<entry keyword="tracking changes, Advanced"><topic href="reference024.htm#sthref400" /></entry>
</entry>
- <entry keyword="Entity Class page">
- <entry keyword="Selecting the Create a JPA Entity Wizard"><topic href="task_create_jpa_entity.htm#sthref43" /></entry>
- </entry>
- <entry keyword="Entity Properties page">
- <entry keyword="&lt;a id=&quot;sthref43&quot; name=&quot;sthref43&quot;&gt;&lt;/a&gt;The Entity Class Page"><topic href="task_create_jpa_entity.htm#sthref45" /></entry>
- </entry>
+<entry keyword="Entity Class page, Selecting the Create a JPA Entity Wizard"><topic href="task_create_jpa_entity.htm#sthref55" /></entry>
+<entry keyword="Entity Properties page, &lt;a id=&quot;sthref55&quot; name=&quot;sthref55&quot;&gt;&lt;/a&gt;The Entity Class Page"><topic href="task_create_jpa_entity.htm#sthref57" /></entry>
<entry keyword="enumerated">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref254" /></entry>
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref256" /></entry>
+<entry keyword="Type information"><topic href="reference035.htm#sthref420" /></entry>
+<entry keyword="Type information"><topic href="reference035.htm#sthref422" /></entry>
</entry>
<entry keyword="error messages - Dali">
- <entry keyword="Validating mappings and reporting problems"><topic href="tasks023.htm#sthref167" /></entry>
- <entry keyword="Error messages"><topic href="tasks024.htm#sthref172" /></entry>
- </entry>
- <entry keyword="extension points - Dali feature">
- <entry keyword="Dali Developer Documentation"><topic href="reference033.htm#sthref304" /></entry>
- </entry>
- <entry keyword="fetch type">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref247" /></entry>
+<entry keyword="Validating mappings and reporting problems"><topic href="tasks024.htm#sthref257" /></entry>
+<entry keyword="Error messages"><topic href="tasks025.htm#sthref264" /></entry>
</entry>
+<entry keyword="extension points - Dali feature, Dali Developer Documentation"><topic href="reference071.htm#sthref486" /></entry>
+<entry keyword="fetch type, Basic Mapping"><topic href="reference025.htm#sthref409" /></entry>
<entry keyword="Generate Entities from Tables dialog">
- <entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref160" /></entry>
- <entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref215" /></entry>
- </entry>
- <entry keyword="Generate Schema from Classes wizard">
- <entry keyword="Generating Schema from Classes"><topic href="task_generating_schema_from_classes.htm#sthref192" /></entry>
- <entry keyword="Generating JAXB Classes from a Schema"><topic href="task_generate_classes_from_schema.htm#sthref200" /></entry>
+<entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref241" /></entry>
+<entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref290" /></entry>
+<entry keyword="Select Tables"><topic href="reference003.htm#sthref304" /></entry>
</entry>
<entry keyword="generated values">
- <entry keyword="ID mappings">
- <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref266" /></entry>
- </entry>
+<entry keyword="ID mappings, Primary Key Generation information"><topic href="ref_primary_key.htm#sthref429" /></entry>
<entry keyword="sequence">
- <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref268" /></entry>
+<entry keyword="Primary Key Generation"><topic href="reference021.htm#sthref381" /></entry>
+<entry keyword="Primary Key Generation"><topic href="reference021.htm#sthref383" /></entry>
+<entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref431" /></entry>
</entry>
</entry>
- <entry keyword="hints - query">
- <entry keyword="Creating Named Queries"><topic href="tasks009.htm#sthref110" /></entry>
- </entry>
+<entry keyword="hints - query, Add Query Dialog"><topic href="tasks009.htm#sthref150" /></entry>
<entry keyword="ID mapping">
- <entry keyword="@Id">
- <entry keyword="ID mapping"><topic href="tasks013.htm#sthref129" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="ID mapping"><topic href="tasks013.htm#sthref127" /></entry>
- </entry>
+<entry keyword="@Id, ID mapping"><topic href="tasks014.htm#sthref185" /></entry>
+<entry keyword="about, ID mapping"><topic href="tasks014.htm#sthref183" /></entry>
</entry>
<entry keyword="inheritance">
<entry keyword="entity">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref93" /></entry>
- <entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref209" /></entry>
- <entry keyword="Inheritance information"><topic href="reference009.htm#sthref236" /></entry>
- </entry>
- <entry keyword="joined tables">
- <entry keyword="Single Table Inheritance"><topic href="task_inheritance.htm#sthref105" /></entry>
- </entry>
- <entry keyword="single table">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref100" /></entry>
- </entry>
- </entry>
- <entry keyword="Inheritance - in Java Details view">
- <entry keyword="Inheritance information"><topic href="reference009.htm#sthref235" /></entry>
- </entry>
- <entry keyword="installation - Dali">
- <entry keyword="Requirements and installation"><topic href="getting_started001.htm#sthref3" /></entry>
- </entry>
- <entry keyword="Java project - converting to JPA">
- <entry keyword="Converting a Java Project to a JPA Project"><topic href="tasks001.htm#sthref35" /></entry>
- </entry>
- <entry keyword="JAXB">
- <entry keyword="Generating Schema from Classes"><topic href="task_generating_schema_from_classes.htm#sthref191" /></entry>
- <entry keyword="Generating JAXB Classes from a Schema"><topic href="task_generate_classes_from_schema.htm#sthref199" /></entry>
- </entry>
- <entry keyword="join columns">
- <entry keyword="Join Columns"><topic href="ref_join_columns.htm#sthref223" /></entry>
- <entry keyword="Join Columns Information"><topic href="reference012.htm#sthref262" /></entry>
- </entry>
- <entry keyword="joined tables - inheritance">
- <entry keyword="Single Table Inheritance"><topic href="task_inheritance.htm#sthref106" /></entry>
- </entry>
+<entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref132" /></entry>
+<entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref318" /></entry>
+<entry keyword="Inheritance"><topic href="reference018.htm#sthref366" /></entry>
+ </entry>
+<entry keyword="joined tables, Single Table Inheritance"><topic href="task_inheritance.htm#sthref140" /></entry>
+<entry keyword="single table, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref135" /></entry>
+ </entry>
+<entry keyword="Inheritance - in Java Details view, Inheritance"><topic href="reference018.htm#sthref365" /></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#sthref44" /></entry>
+<entry keyword="join columns, Join Columns"><topic href="ref_join_columns.htm#sthref345" /></entry>
+<entry keyword="joined tables - inheritance, Single Table Inheritance"><topic href="task_inheritance.htm#sthref141" /></entry>
<entry keyword="JPA Details view">
- <entry keyword="attributes">
- <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref242" /></entry>
- </entry>
- <entry keyword="entities">
- <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref225" /></entry>
- </entry>
- </entry>
- <entry keyword="JPA Development perspective">
- <entry keyword="JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref300" /></entry>
- </entry>
- <entry keyword="JPA Facet page">
- <entry keyword="The Java Source Page"><topic href="task_create_new_project.htm#sthref34" /></entry>
+<entry keyword="attributes, JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref402" /></entry>
+<entry keyword="entities, JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref351" /></entry>
</entry>
+<entry keyword="JPA Development perspective, JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref478" /></entry>
+<entry keyword="JPA Facet page, The Java Source Page"><topic href="task_create_new_project.htm#sthref40" /></entry>
<entry keyword="JPA project">
- <entry keyword="converting from Java">
- <entry keyword="Converting a Java Project to a JPA Project"><topic href="tasks001.htm#sthref36" /></entry>
- </entry>
- <entry keyword="creating new">
- <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref27" /></entry>
- </entry>
- <entry keyword="implementation">
- <entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref205" /></entry>
- </entry>
- <entry keyword="page">
- <entry keyword="&lt;a id=&quot;sthref29&quot; name=&quot;sthref29&quot;&gt;&lt;/a&gt;Selecting the Create a JPA Project wizard"><topic href="task_create_new_project.htm#sthref31" /></entry>
- <entry keyword="&lt;a id=&quot;sthref194&quot; name=&quot;sthref194&quot;&gt;&lt;/a&gt;Selecting the Schema from JAXB Classes wizard"><topic href="task_generating_schema_from_classes.htm#sthref196" /></entry>
- </entry>
- <entry keyword="platform">
- <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref292" /></entry>
- </entry>
- </entry>
- <entry keyword="JPA Structure view">
- <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref270" /></entry>
- </entry>
- <entry keyword="lazy fetch">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref249" /></entry>
- </entry>
- <entry keyword="library - JPA">
- <entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref206" /></entry>
- </entry>
+<entry keyword="converting from Java, Converting a Java project to a JPA project"><topic href="tasks001.htm#sthref45" /></entry>
+<entry keyword="creating new, Creating a new JPA project"><topic href="task_create_new_project.htm#sthref34" /></entry>
+<entry keyword="implementation, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref333" /></entry>
+<entry keyword="page, &lt;a id=&quot;sthref36&quot; name=&quot;sthref36&quot;&gt;&lt;/a&gt;Selecting the Create a JPA Project wizard"><topic href="task_create_new_project.htm#sthref38" /></entry>
+<entry keyword="platform, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref457" /></entry>
+ </entry>
+<entry keyword="JPA Structure view, JPA Structure view"><topic href="ref_persistence_outline.htm#sthref444" /></entry>
+<entry keyword="lazy fetch, Basic Mapping"><topic href="reference025.htm#sthref411" /></entry>
+<entry keyword="library - JPA, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref334" /></entry>
<entry keyword="many-to-many mapping">
- <entry keyword="@ManyToMany">
- <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref133" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref131" /></entry>
- </entry>
+<entry keyword="@ManyToMany, Many-to-many mapping"><topic href="tasks015.htm#sthref194" /></entry>
+<entry keyword="about, Many-to-many mapping"><topic href="tasks015.htm#sthref192" /></entry>
</entry>
<entry keyword="many-to-one mapping">
- <entry keyword="@ManyToOne">
- <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref136" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref135" /></entry>
- </entry>
+<entry keyword="@ManyToOne, Many-to-one mapping"><topic href="tasks016.htm#sthref202" /></entry>
+<entry keyword="about, Many-to-one mapping"><topic href="tasks016.htm#sthref201" /></entry>
</entry>
<entry keyword="mapped superclass">
- <entry keyword="@MappedSuperclass">
- <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref87" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref85" /></entry>
- </entry>
- </entry>
- <entry keyword="mapping entities">
- <entry keyword="Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref12" /></entry>
+<entry keyword="@MappedSuperclass, Mapped superclass"><topic href="tasks004.htm#sthref87" /></entry>
+<entry keyword="about, Mapped superclass"><topic href="tasks004.htm#sthref85" /></entry>
</entry>
+<entry keyword="mapping entities, Creating a Java persistent entity with persistent fields"><topic href="getting_started004.htm#sthref13" /></entry>
<entry keyword="mapping file">
- <entry keyword="&lt;a id=&quot;sthref58&quot; name=&quot;sthref58&quot;&gt;&lt;/a&gt;Managing the orm.xml file"><topic href="tasks004.htm#sthref61" /></entry>
- <entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref210" /></entry>
+<entry keyword="Creating an orm.xml file"><topic href="tasks007.htm#sthref116" /></entry>
+<entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref319" /></entry>
</entry>
<entry keyword="mappings">
- <entry keyword="about">
- <entry keyword="Understanding OR mappings"><topic href="concept_mapping.htm#sthref22" /></entry>
- </entry>
- <entry keyword="basic">
- <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref114" /></entry>
- </entry>
- <entry keyword="embedded">
- <entry keyword="Embedded mapping"><topic href="tasks011.htm#sthref118" /></entry>
- </entry>
- <entry keyword="embedded ID">
- <entry keyword="Embedded ID mapping"><topic href="tasks012.htm#sthref122" /></entry>
- </entry>
- <entry keyword="ID">
- <entry keyword="ID mapping"><topic href="tasks013.htm#sthref126" /></entry>
- </entry>
- <entry keyword="many-to-many">
- <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref130" /></entry>
- </entry>
- <entry keyword="many-to-one">
- <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref134" /></entry>
- </entry>
- <entry keyword="one-to-many">
- <entry keyword="One-to-many mapping"><topic href="tasks016.htm#sthref140" /></entry>
- </entry>
- <entry keyword="one-to-one">
- <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref144" /></entry>
- </entry>
- <entry keyword="problems">
- <entry keyword="Validating mappings and reporting problems"><topic href="tasks023.htm#sthref170" /></entry>
- </entry>
- <entry keyword="transient">
- <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref150" /></entry>
- </entry>
- <entry keyword="version">
- <entry keyword="Version mapping"><topic href="tasks019.htm#sthref154" /></entry>
- </entry>
- </entry>
- <entry keyword="metamodel - canonical">
- <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref299" /></entry>
- </entry>
+<entry keyword="about, Understanding OR mappings"><topic href="concept_mapping.htm#sthref23" /></entry>
+<entry keyword="basic, Basic mapping"><topic href="tasks010.htm#sthref154" /></entry>
+<entry keyword="embedded, Embedded mapping"><topic href="tasks012.htm#sthref166" /></entry>
+<entry keyword="embedded ID, Embedded ID mapping"><topic href="tasks013.htm#sthref174" /></entry>
+<entry keyword="ID, ID mapping"><topic href="tasks014.htm#sthref182" /></entry>
+<entry keyword="many-to-many, Many-to-many mapping"><topic href="tasks015.htm#sthref191" /></entry>
+<entry keyword="many-to-one, Many-to-one mapping"><topic href="tasks016.htm#sthref200" /></entry>
+<entry keyword="one-to-many, One-to-many mapping"><topic href="tasks017.htm#sthref208" /></entry>
+<entry keyword="one-to-one, One-to-one mapping"><topic href="tasks018.htm#sthref216" /></entry>
+<entry keyword="problems, Validating mappings and reporting problems"><topic href="tasks024.htm#sthref260" /></entry>
+<entry keyword="transient, Transient mapping"><topic href="tasks019.htm#sthref224" /></entry>
+<entry keyword="version, Version mapping"><topic href="tasks020.htm#sthref231" /></entry>
+ </entry>
+<entry keyword="metamodel - canonical, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref464" /></entry>
+<entry keyword="multitenancy, Multitenancy"><topic href="reference020.htm#sthref378" /></entry>
<entry keyword="named queries">
- <entry keyword="entity">
- <entry keyword="Creating Named Queries"><topic href="tasks009.htm#sthref107" /></entry>
- </entry>
- <entry keyword="hints">
- <entry keyword="Creating Named Queries"><topic href="tasks009.htm#sthref111" /></entry>
- </entry>
- </entry>
- <entry keyword="native queries">
- <entry keyword="Creating Named Queries"><topic href="tasks009.htm#sthref112" /></entry>
+<entry keyword="entity, Creating queries"><topic href="tasks009.htm#sthref144" /></entry>
+<entry keyword="hints, Add Query Dialog"><topic href="tasks009.htm#sthref151" /></entry>
</entry>
+<entry keyword="native queries, Add Query Dialog"><topic href="tasks009.htm#sthref152" /></entry>
<entry keyword="nonpersistent">
- <entry keyword="classes">
- <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref68" /></entry>
- </entry>
+<entry keyword="classes, Adding persistence to a class"><topic href="task_add_persistence.htm#sthref63" /></entry>
<entry keyword="fields. See transient"></entry>
</entry>
+<entry keyword="ObjectChangePolicy, Advanced"><topic href="reference024.htm#sthref399" /></entry>
<entry keyword="one-to-many mapping">
- <entry keyword="@OneToMany">
- <entry keyword="One-to-many mapping"><topic href="tasks016.htm#sthref143" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="One-to-many mapping"><topic href="tasks016.htm#sthref141" /></entry>
- </entry>
+<entry keyword="@OneToMany, One-to-many mapping"><topic href="tasks017.htm#sthref211" /></entry>
+<entry keyword="about, One-to-many mapping"><topic href="tasks017.htm#sthref209" /></entry>
</entry>
<entry keyword="one-to-one mapping">
- <entry keyword="@OneToOne">
- <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref147" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref145" /></entry>
- </entry>
- </entry>
- <entry keyword="ordering">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref258" /></entry>
+<entry keyword="@OneToOne, One-to-one mapping"><topic href="tasks018.htm#sthref219" /></entry>
+<entry keyword="about, One-to-one mapping"><topic href="tasks018.htm#sthref217" /></entry>
</entry>
+<entry keyword="ordering, Ordering"><topic href="reference038.htm#sthref424" /></entry>
<entry keyword="orm.xml file">
- <entry keyword="about">
- <entry keyword="The orm.xml file"><topic href="concepts003.htm#sthref24" /></entry>
- </entry>
- <entry keyword="creating">
- <entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref208" /></entry>
- </entry>
- <entry keyword="managing">
- <entry keyword="Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref58" /></entry>
- </entry>
- <entry keyword="sample">
- <entry keyword="Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref59" /></entry>
- </entry>
- </entry>
- <entry keyword="overrides - JPA attributes">
- <entry keyword="Attribute overrides"><topic href="reference007.htm#sthref229" /></entry>
+<entry keyword="about, The orm.xml file"><topic href="concepts003.htm#sthref30" /></entry>
+<entry keyword="creating, JPA Facet page"><topic href="ref_jpa_facet.htm#sthref336" /></entry>
+<entry keyword="managing, Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref110" /></entry>
+<entry keyword="sample, Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref111" /></entry>
</entry>
+<entry keyword="overrides - JPA attributes, Attribute Overrides"><topic href="reference019.htm#sthref374" /></entry>
<entry keyword="persistence">
- <entry keyword="about">
- <entry keyword="Understanding Java persistence"><topic href="concept_persistence.htm#sthref19" /></entry>
- </entry>
- <entry keyword="database connection">
- <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref294" /></entry>
- </entry>
- <entry keyword="database schema">
- <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref297" /></entry>
- </entry>
- <entry keyword="entity class">
- <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref67" /></entry>
- </entry>
- <entry keyword="options">
- <entry keyword="Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref287" /></entry>
- <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref289" /></entry>
- </entry>
- <entry keyword="provider">
- <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref49" /></entry>
- </entry>
+<entry keyword="about, Understanding Java persistence"><topic href="concept_persistence.htm#sthref20" /></entry>
+<entry keyword="database connection, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref459" /></entry>
+<entry keyword="database schema, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref462" /></entry>
+<entry keyword="entity class, Adding persistence to a class"><topic href="task_add_persistence.htm#sthref62" /></entry>
+<entry keyword="options, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref454" /></entry>
+<entry keyword="provider, General"><topic href="ref_persistence_general.htm#sthref447" /></entry>
</entry>
<entry keyword="persistence.xml file">
- <entry keyword="about">
- <entry keyword="The persistence.xml file"><topic href="concepts002.htm#sthref23" /></entry>
- </entry>
+<entry keyword="about, The persistence.xml file"><topic href="concepts002.htm#sthref27" /></entry>
<entry keyword="managing">
- <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref47" /></entry>
- <entry keyword="Working with orm.xml file"><topic href="tasks005.htm#sthref65" /></entry>
- </entry>
- <entry keyword="sample">
- <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref48" /></entry>
+<entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref93" /></entry>
+<entry keyword="Working with orm.xml file"><topic href="tasks008.htm#sthref124" /></entry>
</entry>
- <entry keyword="synchronizing with classes">
- <entry keyword="Synchronizing classes"><topic href="tasks002.htm#sthref53" /></entry>
- </entry>
- </entry>
- <entry keyword="persistent entity">
- <entry keyword="Entity"><topic href="tasks006.htm#sthref71" /></entry>
- </entry>
- <entry keyword="perspective - JPA Development">
- <entry keyword="JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref301" /></entry>
- </entry>
- <entry keyword="platform - JPA">
- <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref291" /></entry>
- </entry>
- <entry keyword="problems">
- <entry keyword="Validating mappings and reporting problems"><topic href="tasks023.htm#sthref169" /></entry>
+<entry keyword="sample, Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref94" /></entry>
+<entry keyword="synchronizing with classes, Synchronizing classes"><topic href="tasks006.htm#sthref105" /></entry>
</entry>
+<entry keyword="persistent entity, Entity"><topic href="tasks002.htm#sthref69" /></entry>
+<entry keyword="perspective - JPA Development, JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref479" /></entry>
+<entry keyword="platform - JPA, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref456" /></entry>
+<entry keyword="problems, Validating mappings and reporting problems"><topic href="tasks024.htm#sthref259" /></entry>
<entry keyword="projects - JPA">
<entry keyword="creating new">
- <entry keyword="Creating a new JPA project"><topic href="getting_started003.htm#sthref9" /></entry>
- <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref26" /></entry>
- </entry>
- <entry keyword="options">
- <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref290" /></entry>
+<entry keyword="Creating a new JPA project"><topic href="getting_started003.htm#sthref10" /></entry>
+<entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref33" /></entry>
</entry>
- <entry keyword="validation preferences">
- <entry keyword="Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref288" /></entry>
- </entry>
- </entry>
- <entry keyword="query hints">
- <entry keyword="Creating Named Queries"><topic href="tasks009.htm#sthref109" /></entry>
- </entry>
- <entry keyword="quick start - Dali">
- <entry keyword="Dali quick start"><topic href="getting_started002.htm#sthref8" /></entry>
+<entry keyword="options, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref455" /></entry>
</entry>
+<entry keyword="query hints, Add Query Dialog"><topic href="tasks009.htm#sthref149" /></entry>
+<entry keyword="quick start - Dali, Dali quick start"><topic href="getting_started002.htm#sthref8" /></entry>
+<entry keyword="read-only entities, Advanced"><topic href="reference024.htm#sthref393" /></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#sthref73" /></entry>
- </entry>
- </entry>
- <entry keyword="schema">
- <entry keyword="from classes">
- <entry keyword="Generating Schema from Classes"><topic href="task_generating_schema_from_classes.htm#sthref189" /></entry>
- <entry keyword="Generating JAXB Classes from a Schema"><topic href="task_generate_classes_from_schema.htm#sthref197" /></entry>
- </entry>
- </entry>
- <entry keyword="schema - database">
- <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref296" /></entry>
- </entry>
- <entry keyword="secondary tables">
- <entry keyword="Secondary table information"><topic href="reference008.htm#sthref231" /></entry>
- </entry>
- <entry keyword="Secondary Tables - in Java Details view">
- <entry keyword="Secondary table information"><topic href="reference008.htm#sthref234" /></entry>
- </entry>
- <entry keyword="single table inheritance">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref101" /></entry>
- </entry>
- <entry keyword="superclass">
- <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref90" /></entry>
- </entry>
- <entry keyword="synchronizing classes with persistence.xml file">
- <entry keyword="Synchronizing classes"><topic href="tasks002.htm#sthref54" /></entry>
- </entry>
+<entry keyword="Dali Java Persistence Tools, Requirements and installation"><topic href="getting_started001.htm#sthref4" /></entry>
+<entry keyword="persistent entities, Entity"><topic href="tasks002.htm#sthref71" /></entry>
+ </entry>
+<entry keyword="schema - database, Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref461" /></entry>
+<entry keyword="secondary tables, Secondary tables"><topic href="reference022.htm#sthref385" /></entry>
+<entry keyword="Secondary Tables - in Java Details view, Secondary tables"><topic href="reference022.htm#sthref388" /></entry>
+<entry keyword="single table inheritance, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref136" /></entry>
+<entry keyword="superclass, Mapped superclass"><topic href="tasks004.htm#sthref90" /></entry>
+<entry keyword="synchronizing classes with persistence.xml file, Synchronizing classes"><topic href="tasks006.htm#sthref106" /></entry>
<entry keyword="tables">
<entry keyword="associations">
- <entry keyword="Table Associations"><topic href="ref_tableAssociations.htm#sthref218" /></entry>
- <entry keyword="Create New Association"><topic href="ref_create_new_association_wizard.htm#sthref222" /></entry>
+<entry keyword="Table Associations"><topic href="ref_tableAssociations.htm#sthref295" /></entry>
+<entry keyword="Table Associations"><topic href="reference004.htm#sthref309" /></entry>
+<entry keyword="Create New Association wizard"><topic href="ref_create_new_association_wizard.htm#sthref342" /></entry>
</entry>
<entry keyword="creating entities from">
- <entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref159" /></entry>
- <entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref217" /></entry>
- </entry>
- <entry keyword="inheritance">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref102" /></entry>
- </entry>
- <entry keyword="secondary">
- <entry keyword="Secondary table information"><topic href="reference008.htm#sthref232" /></entry>
+<entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref240" /></entry>
+<entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref292" /></entry>
+<entry keyword="Select Tables"><topic href="reference003.htm#sthref306" /></entry>
</entry>
+<entry keyword="inheritance, Specifying entity inheritance"><topic href="task_inheritance.htm#sthref137" /></entry>
+<entry keyword="secondary, Secondary tables"><topic href="reference022.htm#sthref386" /></entry>
</entry>
<entry keyword="temporal">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref251" /></entry>
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref253" /></entry>
+<entry keyword="Type information"><topic href="reference035.htm#sthref417" /></entry>
+<entry keyword="Type information"><topic href="reference035.htm#sthref419" /></entry>
</entry>
+<entry keyword="tracking changes, Advanced"><topic href="reference024.htm#sthref398" /></entry>
<entry keyword="transient mapping">
- <entry keyword="@Transient">
- <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref153" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref151" /></entry>
- </entry>
+<entry keyword="@Transient, Transient mapping"><topic href="tasks019.htm#sthref227" /></entry>
+<entry keyword="about, Transient mapping"><topic href="tasks019.htm#sthref225" /></entry>
</entry>
<entry keyword="version mapping">
- <entry keyword="@Version">
- <entry keyword="Version mapping"><topic href="tasks019.htm#sthref157" /></entry>
- </entry>
- <entry keyword="about">
- <entry keyword="Version mapping"><topic href="tasks019.htm#sthref155" /></entry>
- </entry>
+<entry keyword="@Version, Version mapping"><topic href="tasks020.htm#sthref234" /></entry>
+<entry keyword="about, Version mapping"><topic href="tasks020.htm#sthref232" /></entry>
</entry>
<entry keyword="views">
<entry keyword="JPA Details view">
- <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref226" /></entry>
- <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref243" /></entry>
- </entry>
- <entry keyword="JPA Structure view">
- <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref269" /></entry>
+<entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref352" /></entry>
+<entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref403" /></entry>
</entry>
+<entry keyword="JPA Structure view, JPA Structure view"><topic href="ref_persistence_outline.htm#sthref443" /></entry>
</entry>
- <entry keyword="warning messages - Dali">
- <entry keyword="Validating mappings and reporting problems"><topic href="tasks023.htm#sthref168" /></entry>
- </entry>
- <entry keyword="Web Tools Platform (WTP)">
- <entry keyword="Requirements and installation"><topic href="getting_started001.htm#sthref5" /></entry>
- </entry>
- <entry keyword="XML editor">
- <entry keyword="Working with orm.xml file"><topic href="tasks005.htm#sthref64" /></entry>
- </entry>
-</index>
+<entry keyword="warning messages - Dali, Validating mappings and reporting problems"><topic href="tasks024.htm#sthref258" /></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="tasks008.htm#sthref123" /></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 a771471f44..39fd7e7381 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm
@@ -8,16 +8,17 @@
<title>Legal</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-08-28T11:53:10Z" />
+<meta name="date" content="2012-09-11T7:44:9Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content=" Legal" />
<meta name="relnum" content="Release 3.2" />
-<meta name="partnum" content="" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p><a id="sthref481" name="sthref481"></a></p>
+<p><a id="sthref487" name="sthref487"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<h1>Legal</h1>
<p>Copyright &copy; 2011, 2012, Oracle. All rights reserved.</p>
<p>This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at:</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml b/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
index 38d0ac1a27..7efde27bf5 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
@@ -1,25 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <!-- =========== -->
- <!-- Define TOC -->
- <!-- =========== -->
- <extension point="org.eclipse.help.toc">
- <toc file="toc.xml" primary="true"/>
- </extension>
- <!-- =========== -->
- <!-- Define F1 -->
- <!-- =========== -->
- <extension point="org.eclipse.help.contexts">
- <contexts file="contexts.xml" plugin="org.eclipse.jpt.jpa.ui"/>
- </extension>
- <!-- ==================== -->
- <!-- Define Keyword Index -->
- <!-- ==================== -->
- <extension point="org.eclipse.help.index">
- <index file="index.xml"/>
- </extension>
- <!-- =========== -->
- <!-- Cheatsheets -->
- <!-- =========== -->
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin name="JPA Documentation Plug-in" id="org.eclipse.jpt.doc.user" version="3.0.2" provider-name="Oracle">
+ <!-- =========== -->
+ <!-- Define TOC -->
+ <!-- =========== -->
+ <extension point="org.eclipse.help.toc">
+ <toc file="toc.xml" primary="true"/>
+ </extension>
+ <!-- =========== -->
+ <!-- Define F1 -->
+ <!-- =========== -->
+ <extension point="org.eclipse.help.contexts">
+ <contexts file="contexts.xml" plugin="org.eclipse.jpt.jpa.ui"/>
+ </extension>
+ <!-- ==================== -->
+ <!-- Define Keyword Index -->
+ <!-- ==================== -->
+ <extension point="org.eclipse.help.index">
+ <index file="index.xml"/>
+ </extension>
+ <!-- =========== -->
+ <!-- Cheatsheets -->
+ <!-- =========== -->
+ <extension point="org.eclipse.ui.cheatsheets.cheatSheetContent">
+ <category name="JPA Development" id="com.jpa.category"/>
+ <cheatsheet name="Create a JPA Project" category="com.jpa.category" contentFile="$nl$/cheatsheets/add_persistence.xml" id="org.eclipse.jpa.cheatsheet.createproject1">
+ <description>Learn how to create a JPA project.</description>
+ </cheatsheet>
+ <cheatsheet name="Create a Persistent Entity" category="com.jpa.category" contentFile="$nl$/cheatsheets/create_entity.xml" id="org.eclipse.jpa.cheatsheet.addentity">
+ <description>Learn how to add a persistent entity to a Java project.</description>
+ </cheatsheet>
+ <cheatsheet name="Map a Persistent Entity" category="com.jpa.category" contentFile="$nl$/cheatsheets/map_entity.xml" id="org.eclipse.jpa.cheatsheet.mapentity">
+ <description>Learn how to map a persistent entity to a database.</description>
+ </cheatsheet>
+ </extension>
+</plugin>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm
index f4578f1bd3..0755695bfb 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityClassPage.htm
@@ -3,101 +3,138 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:46Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Entity Class page" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<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">
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="Options on the Entity Class page of the Create JPA Entity wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" 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>
+<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>
</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>
+<td align="left" id="r2c1-t10" headers="r1c1-t10">
+<p>Project</p>
+</td>
+<td align="left" headers="r2c1-t10 r1c2-t10">
+<p>The name of the JPA project.</p>
+</td>
+<td align="left" headers="r2c1-t10 r1c3-t10"><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>
+<td align="left" id="r3c1-t10" headers="r1c1-t10">
+<p>Source Folder</p>
+</td>
+<td align="left" headers="r3c1-t10 r1c2-t10">
+<p>The location of the JPA project's src folder.</p>
+</td>
+<td align="left" headers="r3c1-t10 r1c3-t10">
+<p><code>src</code></p>
+</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>
+<td align="left" id="r4c1-t10" headers="r1c1-t10">
+<p>Java Package</p>
+</td>
+<td align="left" headers="r4c1-t10 r1c2-t10">
+<p>The name of the class package.</p>
+</td>
+<td align="left" headers="r4c1-t10 r1c3-t10"><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>
+<td align="left" id="r5c1-t10" headers="r1c1-t10">
+<p>Class name</p>
+</td>
+<td align="left" headers="r5c1-t10 r1c2-t10">
+<p>The name of the Java class.</p>
+</td>
+<td align="left" headers="r5c1-t10 r1c3-t10"><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>
+<td align="left" id="r6c1-t10" headers="r1c1-t10">
+<p>Superclass</p>
+</td>
+<td align="left" headers="r6c1-t10 r1c2-t10">
+<p>Select the superclass.</p>
+</td>
+<td align="left" headers="r6c1-t10 r1c3-t10"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t5" headers="r1c1-t5"><a id="sthref195" name="sthref195"></a>Inheritance</td>
-<td align="left" headers="r7c1-t5 r1c2-t5">Because the wizard creates a Java class with an <code>@Entity</code> notation, the <span class="bold">Entity</span> option is selected by default.
+<td align="left" id="r7c1-t10" headers="r1c1-t10">
+<p><a id="sthref318" name="sthref318"></a>Inheritance</p>
+</td>
+<td align="left" headers="r7c1-t10 r1c2-t10">
+<p>Because the wizard creates a Java class with an <code>@Entity</code> notation, the <span class="bold">Entity</span> option is selected by default.</p>
<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>
+<p><code>SINGLE_TABLE</code> -- 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>
+<p><code>TABLE_PER_CLASS</code> -- 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>
+<p><code>JOINED</code> -- 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>
+<td align="left" headers="r7c1-t10 r1c3-t10">
+<p>Entity</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t5" headers="r1c1-t5"><a id="sthref196" name="sthref196"></a>XML Entity Mappings</td>
-<td align="left" headers="r8c1-t5 r1c2-t5">Select <span class="bold">Add to entity mappings in XML</span> to create XML mappings in <code>orm.xml</code>, rather than annotations.
+<td align="left" id="r8c1-t10" headers="r1c1-t10">
+<p><a id="sthref319" name="sthref319"></a>XML Entity Mappings</p>
+</td>
+<td align="left" headers="r8c1-t10 r1c2-t10">
+<p>Select <span class="bold">Add to entity mappings in XML</span> to create XML mappings in <code>orm.xml</code>, rather than annotations.</p>
<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>
+<td align="left" headers="r8c1-t10 r1c3-t10"><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="inftblhruleinformal" -->
+<a id="sthref320" name="sthref320"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
+</li>
+</ul>
+<a id="sthref321" name="sthref321"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_create_jpa_entity_wizard.htm#CIAGGGDF">Create JPA Entity wizard</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -105,11 +142,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm
index 8914f86c92..accb10031c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_EntityPropertiesPage.htm
@@ -3,75 +3,74 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:46Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Entity Properties page" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<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="sthref197" name="sthref197"></a><a id="sthref198" name="sthref198"></a>
-<p class="titleintable">&nbsp;</p>
-<table class="Formal" title="" summary="This table to be converted to informal." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<col width="24%" />
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="This table lists the properties of the Entity Properties page of the Create JPA Entity wizard." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="25%" />
<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>
+<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>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t6" headers="r1c1-t6">
-<p>Entity Name</p>
+<td align="left" id="r2c1-t11" headers="r1c1-t11">
+<p>Entity name</p>
</td>
-<td align="left" headers="r2c1-t6 r1c2-t6">
+<td align="left" headers="r2c1-t11 r1c2-t11">
<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">
+<td align="left" headers="r2c1-t11 r1c3-t11">
<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 align="left" id="r3c1-t11" headers="r1c1-t11">
+<p>Table name</p>
</td>
-<td align="left" headers="r3c1-t6 r1c2-t6">
+<td align="left" headers="r3c1-t11 r1c2-t11">
<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">
+<td align="left" headers="r3c1-t11 r1c3-t11">
<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 align="left" id="r4c1-t11" headers="r1c1-t11">
+<p>Entity fields</p>
</td>
-<td align="left" headers="r4c1-t6 r1c2-t6">
+<td align="left" headers="r4c1-t11 r1c2-t11">
<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>
+<td align="left" headers="r4c1-t11 r1c3-t11"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t6" headers="r1c1-t6">
-<p>Access Type</p>
+<td align="left" id="r5c1-t11" headers="r1c1-t11">
+<p>Access type</p>
</td>
-<td align="left" headers="r5c1-t6 r1c2-t6">
+<td align="left" headers="r5c1-t11 r1c2-t11">
<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>
@@ -82,23 +81,32 @@
</li>
</ul>
</td>
-<td align="left" headers="r5c1-t6 r1c3-t6">
+<td align="left" headers="r5c1-t11 r1c3-t11">
<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="inftblhruleinformal" -->
+<a id="sthref322" name="sthref322"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
+</li>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+</ul>
+<a id="sthref323" name="sthref323"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- class="sect2" -->
<!-- Start Footer -->
@@ -107,11 +115,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_add_converter.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_add_converter.htm
index f992258622..1f23ac5e64 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_add_converter.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_add_converter.htm
@@ -3,43 +3,50 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:49Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Add Converter dialog" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<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">
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="This table lists the options on the New EclipseLink Mapping File dialog." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="24%" />
<col width="*" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t40">Property</th>
-<th align="left" valign="bottom" id="r1c2-t40">Description</th>
+<th align="left" valign="bottom" id="r1c1-t70">Property</th>
+<th align="left" valign="bottom" id="r1c2-t70">Description</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t40" headers="r1c1-t40">Name</td>
-<td align="left" headers="r2c1-t40 r1c2-t40">Enter the name for this converter</td>
+<td align="left" id="r2c1-t70" headers="r1c1-t70">
+<p>Name</p>
+</td>
+<td align="left" headers="r2c1-t70 r1c2-t70">
+<p>Enter the name for this converter</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t40" headers="r1c1-t40">Type</td>
-<td align="left" headers="r3c1-t40 r1c2-t40">Select the converter type:
+<td align="left" id="r3c1-t70" headers="r1c1-t70">
+<p>Type</p>
+</td>
+<td align="left" headers="r3c1-t70 r1c2-t70">
+<p>Select the converter type:</p>
<ul>
<li>
<p>Custom</p>
@@ -59,20 +66,27 @@
</tbody>
</table>
<br /></div>
-<!-- class="inftblhruleinformalmax" --></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref471" name="sthref471"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="reference023.htm#CACJGDAJ">Converters</a></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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_cardinality.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_cardinality.htm
index 17b8e5d990..f8fa43f063 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_cardinality.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_cardinality.htm
@@ -3,25 +3,25 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:47Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Association Cardinality" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CIAFIIFH" name="CIAFIIFH"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Association Cardinality</h1>
-<p><a id="sthref210" name="sthref210"></a>Use this dialog to specify cardinality of an association table. Depending on the <span class="bold">Association Kind</span> and <span class="bold">Join Columns</span> that you selected previously, some associations may not be available.</p>
+<p><a id="sthref348" name="sthref348"></a>Use this dialog to specify cardinality of an association table. Depending on the <span class="bold">Association Kind</span> and <span class="bold">Join Columns</span> that you selected previously, some associations may not be available.</p>
<ul>
<li>
<p>Many to one</p>
@@ -36,16 +36,27 @@
<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="tasks021.htm#BABBAGFI">Generating entities from tables</a><br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables Wizard</a></div>
+<a id="sthref349" name="sthref349"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association wizard</a></p>
+</li>
+<li>
+<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+</li>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+</ul>
+<a id="sthref350" name="sthref350"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables wizard</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- class="sect2" -->
<!-- class="sect1" -->
@@ -55,11 +66,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_table.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_table.htm
index 78197f6367..8a96a7fdb7 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_table.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_association_table.htm
@@ -3,60 +3,78 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:47Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Association Tables" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<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">
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" 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="hsides" rules="rows" 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>
+<th align="left" valign="bottom" id="r1c1-t19">Property</th>
+<th align="left" valign="bottom" id="r1c2-t19">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>
+<td align="left" id="r2c1-t19" headers="r1c1-t19">
+<p>Association kind</p>
+</td>
+<td align="left" headers="r2c1-t19 r1c2-t19">
+<p>Specify if the association is <span class="bold">Simple</span> (1:M) or <span class="bold">Many to Many</span> (M:M).</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-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.
+<td align="left" id="r3c1-t19" headers="r1c1-t19">
+<p>Association tables</p>
+</td>
+<td align="left" headers="r3c1-t19 r1c2-t19">
+<p>Click <span class="bold">Table Selection</span>, then select the two tables to associate.</p>
<p>When creating a <span class="bold">Many to Many</span> association, you can select a <span class="bold">Join Table</span> for the association.</p>
</td>
</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="tasks021.htm#BABBAGFI">Generating entities from tables</a><br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables Wizard</a></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref343" name="sthref343"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association wizard</a></p>
+</li>
+<li>
+<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+</li>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+</ul>
+<a id="sthref344" name="sthref344"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables wizard</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -64,11 +82,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_custom_entities_wizard.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_custom_entities_wizard.htm
index 6b5694a7a6..00714eab95 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_custom_entities_wizard.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_custom_entities_wizard.htm
@@ -3,25 +3,25 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:46Z" />
+<title>Generate Entities from Tables wizard</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Generate Entities from Tables Wizard" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Generate Entities from Tables wizard" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<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>
+<h1>Generate Entities from Tables wizard</h1>
+<p>Use the Generate Custom Entities Wizard to create JPA entities from your database tables.</p>
<p>The wizard consists of the following pages:</p>
<ul>
<li>
@@ -43,11 +43,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_jpa_entity_wizard.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_jpa_entity_wizard.htm
index 12da7476c9..a6735802b3 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_jpa_entity_wizard.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_jpa_entity_wizard.htm
@@ -3,21 +3,21 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:46Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Create JPA Entity wizard" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CIAGGGDF" name="CIAGGGDF"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Create JPA Entity wizard</h1>
@@ -36,11 +36,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_new_association_wizard.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_new_association_wizard.htm
index b74aa5a71a..6c1d0a7931 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_new_association_wizard.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_create_new_association_wizard.htm
@@ -3,25 +3,25 @@
<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 New Association</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:47Z" />
+<title>Create New Association wizard</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Create New Association" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Create New Association wizard" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CIAFGHIF" name="CIAFGHIF"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Create New Association</h1>
-<p><a id="sthref207" name="sthref207"></a><a id="sthref208" name="sthref208"></a>Use the Create New Association wizard to specify association tables when generating an entity.</p>
+<h1>Create New Association wizard</h1>
+<p><a id="sthref341" name="sthref341"></a><a id="sthref342" name="sthref342"></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>
@@ -40,11 +40,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizIndividualEntities.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizIndividualEntities.htm
index e847da34fd..b811cc41c5 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizIndividualEntities.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizIndividualEntities.htm
@@ -3,73 +3,107 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:46Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Customize Individual Entities" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CIACIGEE" name="CIACIGEE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Customize Individual Entities</h1>
-<p><a id="sthref206" name="sthref206"></a>Use this page to customize each generated entity. Select an item in the Table and columns area, then complete the following fields for each item.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Individual Entities dialog." summary="This table describes the options on the Individual Entities dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<p><a id="sthref301" name="sthref301"></a>Use this page to customize each generated entity. Select an item in the <span class="bold">Table and columns</span> area, then complete the following fields for each item.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="Options on the Customize Entities page of the Generate Entities from Tables wizard" summary="Options on the Customize Entities page of the Generate Entities from Tables wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="32%" />
<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>
+<th align="left" valign="bottom" id="r1c1-t5">Property</th>
+<th align="left" valign="bottom" id="r1c2-t5">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>
+<td align="left" id="r2c1-t5" headers="r1c1-t5">
+<p><span class="bold">Mapping defaults</span></p>
+</td>
+<td align="left" headers="r2c1-t5 r1c2-t5">
+<p>Use these options to define the table mapping information for the entity.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t5" headers="r1c1-t5">
+<p>Class name</p>
+</td>
+<td align="left" headers="r3c1-t5 r1c2-t5"><br /></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>
+<td align="left" id="r4c1-t5" headers="r1c1-t5">
+<p>Key&nbsp;generator</p>
+</td>
+<td align="left" headers="r4c1-t5 r1c2-t5">
+<p>Select the generator used for this mapping.</p>
+</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.
+<td align="left" id="r5c1-t5" headers="r1c1-t5">
+<p>Sequence&nbsp;name</p>
+</td>
+<td align="left" headers="r5c1-t5 r1c2-t5">
+<p>Enter a name for the sequence.</p>
<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>
+<td align="left" id="r6c1-t5" headers="r1c1-t5">
+<p>Entity&nbsp;access</p>
+</td>
+<td align="left" headers="r6c1-t5 r1c2-t5">
+<p>Specify the default entity access method: <span class="bold">Field</span> (default) or <span class="bold">Property</span>.</p>
+</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>
+<td align="left" id="r7c1-t5" headers="r1c1-t5">
+<p><span class="bold">Domain Java Class</span></p>
+</td>
+<td align="left" headers="r7c1-t5 r1c2-t5">
+<p>Use these options to define the class information (<span class="bold">Superclass</span> and <span class="bold">Interfaces</span>) for the entity.</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="tasks021.htm#BABBAGFI">Generating entities from tables</a><br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables Wizard</a>
-<p>&nbsp;</p>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref302" name="sthref302"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
+</li>
+<li>
+<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+</li>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+</ul>
+<a id="sthref303" name="sthref303"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables wizard</a></p>
+</li>
+</ul>
</div>
<!-- class="sect3" -->
<!-- class="sect2" -->
@@ -79,11 +113,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm
index 578801a58e..000533ad29 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_customizeDefaultEntityGeneration.htm
@@ -3,82 +3,125 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:46Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Customize Default Entity Generation" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CIAEJDBE" name="CIAEJDBE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Customize Default Entity Generation</h1>
-<p><a id="sthref205" name="sthref205"></a>Use this page to specify the default information Dali will use when generating the entities from the database tables. You will be able to override this information for specific entities.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Generate Entities dialog." summary="This table describes the options on the Custom Default Entity Generation dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<p><a id="sthref298" name="sthref298"></a>Use this page to specify the default information Dali will use when generating the entities from the database tables. You will be able to override this information for specific entities.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="Options on the Customize Defautl Entity page of the Generate Entities from Tables wizard" summary="Options on the Customize Defautl Entity page of the Generate Entities from Tables wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="32%" />
<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>
+<th align="left" valign="bottom" id="r1c1-t4">Property</th>
+<th align="left" valign="bottom" id="r1c2-t4">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>
+<td align="left" id="r2c1-t4" headers="r1c1-t4">
+<p>Mapping defaults</p>
+</td>
+<td align="left" headers="r2c1-t4 r1c2-t4">
+<p>Use these options to define the table mapping information for the entity.</p>
+</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>
+<td align="left" id="r3c1-t4" headers="r1c1-t4">
+<p>Key&nbsp;generator</p>
+</td>
+<td align="left" headers="r3c1-t4 r1c2-t4">
+<p>Select the generator used for this mapping.</p>
+</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.
+<td align="left" id="r4c1-t4" headers="r1c1-t4">
+<p>Sequence&nbsp;name</p>
+</td>
+<td align="left" headers="r4c1-t4 r1c2-t4">
+<p>Enter a name for the sequence.</p>
<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>
+<td align="left" id="r5c1-t4" headers="r1c1-t4">
+<p>Entity&nbsp;access</p>
+</td>
+<td align="left" headers="r5c1-t4 r1c2-t4">
+<p>Specify the default entity access method: <span class="bold">Field</span> (default) or <span class="bold">Property</span>.</p>
+</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>
+<td align="left" id="r6c1-t4" headers="r1c1-t4">
+<p>Associations&nbsp;fetch</p>
+</td>
+<td align="left" headers="r6c1-t4 r1c2-t4">
+<p>Specify the default fetch mode for associations: <span class="bold">Default</span>, as defined by the application (default), or <span class="bold">Lazy</span>.</p>
+</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>.
+<td align="left" id="r7c1-t4" headers="r1c1-t4">
+<p>Collection properties type</p>
+</td>
+<td align="left" headers="r7c1-t4 r1c2-t4">
+<p>Specify if the collection properties are a <span class="bold">Set</span> or <span class="bold">List</span>.</p>
<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>
+<td align="left" id="r8c1-t4" headers="r1c1-t4">
+<p>Always generate optional JPA annotations and DDL parameters</p>
+</td>
+<td align="left" headers="r8c1-t4 r1c2-t4"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t4" headers="r1c1-t4">
+<p><span class="bold">Domain Java class</span></p>
+</td>
+<td align="left" headers="r9c1-t4 r1c2-t4">
+<p>Use these options to define the <span class="bold">Source folder</span> and class information (<span class="bold">Package</span>, <span class="bold">Superclass</span>, and <span class="bold">Interfaces</span>) for the entity.</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="tasks021.htm#BABBAGFI">Generating entities from tables</a><br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables Wizard</a></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref299" name="sthref299"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
+</li>
+<li>
+<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+</li>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+</ul>
+<a id="sthref300" name="sthref300"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables wizard</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -86,11 +129,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 018594b103..6cfc77d4e8 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
@@ -3,40 +3,40 @@
<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>JPA Details view (for orm.xml)</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Details view (for orm.xml)" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CACGDGHC" name="CACGDGHC"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>JPA Details view (for orm.xml)</h1>
<p>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="reference013.htm#CACCACGH">General information</a></p>
+<p><a href="reference041.htm#CACCACGH">Entity Mappings</a></p>
</li>
<li>
-<p><a href="reference014.htm#CACEAGBG">Persistence Unit information</a></p>
+<p><a href="reference042.htm#CACEAGBG">Persistence Unit</a></p>
</li>
<li>
-<p><a href="reference015.htm#CIAFGAIJ">Generators</a></p>
+<p><a href="reference043.htm#CIAFGAIJ">Generators</a></p>
</li>
<li>
-<p><a href="reference016.htm#CIAIBAAJ">Queries</a></p>
+<p><a href="reference044.htm#CIAIBAAJ">Queries</a></p>
</li>
<li>
-<p><a href="reference017.htm#CIADGCID">Converters</a> (when using EclipseLink)</p>
+<p><a href="reference045.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>
@@ -46,11 +46,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_eclipselink_mapping_file.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_eclipselink_mapping_file.htm
index 18a6305077..5c4fe23642 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_eclipselink_mapping_file.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_eclipselink_mapping_file.htm
@@ -3,67 +3,96 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="New EclipseLink Mapping File dialog" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<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">
+<p>Specify the location and properties of the EclipseLink mapping file (<code>eclipselink-orm.xml</code>).</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="This table lists the options on the New EclipseLink Mapping File dialog." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="24%" />
<col width="*" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t39">Property</th>
-<th align="left" valign="bottom" id="r1c2-t39">Description</th>
+<th align="left" valign="bottom" id="r1c1-t69">Property</th>
+<th align="left" valign="bottom" id="r1c2-t69">Description</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t39" headers="r1c1-t39">Project</td>
-<td align="left" headers="r2c1-t39 r1c2-t39">Select the project in which to add the mapping file.</td>
+<td align="left" id="r2c1-t69" headers="r1c1-t69">
+<p>Project</p>
+</td>
+<td align="left" headers="r2c1-t69 r1c2-t69">
+<p>Select the project in which to add the mapping file.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t39" headers="r1c1-t39">Source folder</td>
-<td align="left" headers="r3c1-t39 r1c2-t39">Click <span class="bold">Browse</span> and select the source file in which to add the mapping file. The default is <code>../</code><code><span class="codeinlineitalic">&lt;PROJECT&gt;</span></code><code>/src</code>.</td>
+<td align="left" id="r3c1-t69" headers="r1c1-t69">
+<p>Source folder</p>
+</td>
+<td align="left" headers="r3c1-t69 r1c2-t69">
+<p>Click <span class="bold">Browse</span> and select the source file in which to add the mapping file. The default is <code>../</code><code><span class="codeinlineitalic">&lt;PROJECT&gt;</span></code><code>/src</code>.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t39" headers="r1c1-t39">File path</td>
-<td align="left" headers="r4c1-t39 r1c2-t39">Enter the filename and path of the mapping file. The default is <code>META-INF/eclipselink-orm.xml</code>.</td>
+<td align="left" id="r4c1-t69" headers="r1c1-t69">
+<p>File path</p>
+</td>
+<td align="left" headers="r4c1-t69 r1c2-t69">
+<p>Enter the filename and path of the mapping file. The default is <code>META-INF/eclipselink-orm.xml</code>.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t39" headers="r1c1-t39">Default access</td>
-<td align="left" headers="r5c1-t39 r1c2-t39">Select whether the entity's access to instance variables is <span class="bold">field</span>-based or <span class="bold">property</span>-based, as defined in the JPA specification.</td>
+<td align="left" id="r5c1-t69" headers="r1c1-t69">
+<p>Default access</p>
+</td>
+<td align="left" headers="r5c1-t69 r1c2-t69">
+<p>Select whether the entity's access to instance variables is <span class="bold">field</span>-based or <span class="bold">property</span>-based, as defined in the JPA specification.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t39" headers="r1c1-t39">Add to persistence unit</td>
-<td align="left" headers="r6c1-t39 r1c2-t39">Specify if this mapping file should be added to the persistence unit (<code>persistence.xml</code>).</td>
+<td align="left" id="r6c1-t69" headers="r1c1-t69">
+<p>Add to persistence unit</p>
+</td>
+<td align="left" headers="r6c1-t69 r1c2-t69">
+<p>Specify if this mapping file should be added to the persistence unit (<code>persistence.xml</code>).</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t39" headers="r1c1-t39">&nbsp;&nbsp;Persistence&nbsp;Unit</td>
-<td align="left" headers="r7c1-t39 r1c2-t39">Select the persistence unit in which to add the mapping file.</td>
+<td align="left" id="r7c1-t69" headers="r1c1-t69">
+<p>&nbsp;&nbsp;Persistence&nbsp;Unit</p>
+</td>
+<td align="left" headers="r7c1-t69 r1c2-t69">
+<p>Select the persistence unit in which to add the mapping file.</p>
+</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="inftblhruleinformal" -->
+<a id="sthref470" name="sthref470"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="reference008.htm#CIAJEIDJ">Mapping File Location</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
@@ -71,11 +100,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_java_page.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_java_page.htm
index ffbf3fdaff..6499bbe95c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_java_page.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_java_page.htm
@@ -3,60 +3,79 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:46Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Java Page" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<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">
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="Options on the Java page of the New JPA Project wizard" summary="Options on the Java page of the New JPA Project wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="24%" />
<col width="*" />
<col width="25%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-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-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-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>
+<td align="left" id="r2c1-t15" headers="r1c1-t15">
+<p>Source folders on build path</p>
+</td>
+<td align="left" headers="r2c1-t15 r1c2-t15">
+<p>Click <span class="bold">Add Folder</span> to select an existing Java source folder to add to this project.</p>
+</td>
+<td align="left" headers="r2c1-t15 r1c3-t15">
+<p><code>src</code></p>
+</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>
+<td align="left" id="r3c1-t15" headers="r1c1-t15">
+<p>Default output folder</p>
+</td>
+<td align="left" headers="r3c1-t15 r1c2-t15">
+<p>Specify the location of the&nbsp;<code>.class</code> files.</p>
+</td>
+<td align="left" headers="r3c1-t15 r1c3-t15">
+<p><code>build\classes</code></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_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="inftblhruleinformal" -->
+<a id="sthref331" name="sthref331"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
+</li>
+</ul>
+<a id="sthref332" name="sthref332"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -64,11 +83,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_join_columns.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_join_columns.htm
index 8632cbfec4..d0845ef5d4 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_join_columns.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_join_columns.htm
@@ -3,36 +3,47 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:47Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Join Columns" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CIAEGEEG" name="CIAEGEEG"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Join Columns</h1>
-<p><a id="sthref209" name="sthref209"></a>Use this dialog to specify the join columns of an association table.</p>
+<p><a id="sthref345" name="sthref345"></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="tasks021.htm#BABBAGFI">Generating entities from tables</a><br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables Wizard</a></div>
+<a id="sthref346" name="sthref346"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association wizard</a></p>
+</li>
+<li>
+<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+</li>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+</ul>
+<a id="sthref347" name="sthref347"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables wizard</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -40,11 +51,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 89e4ff8a71..8ca0b7522a 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
@@ -3,107 +3,156 @@
<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>JPA Facet page</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:46Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Facet page" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CACIFDIF" name="CACIFDIF"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>JPA Facet page</h1>
<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">
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="Options on the Java Facet page of the New JPA Project wizard" summary="Options on the Java Facet page of the New JPA Project wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="24%" />
<col width="*" />
<col width="25%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-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-t16">Property</th>
+<th align="left" valign="bottom" id="r1c2-t16">Description</th>
+<th align="left" valign="bottom" id="r1c3-t16">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-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>
+<td align="left" id="r2c1-t16" headers="r1c1-t16">
+<p><span class="bold">Platform</span></p>
+</td>
+<td align="left" headers="r2c1-t16 r1c2-t16">
+<p>Vendor-specific JPA implementation.</p>
+</td>
+<td align="left" headers="r2c1-t16 r1c3-t16">
+<p>Generic</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t4" headers="r1c1-t4"><a id="sthref191" name="sthref191"></a><a id="sthref192" name="sthref192"></a>JPA Implementation</td>
-<td align="left" headers="r3c1-t4 r1c2-t4">Select a specific JPA library configuration.
+<td align="left" id="r3c1-t16" headers="r1c1-t16">
+<p><a id="sthref333" name="sthref333"></a><a id="sthref334" name="sthref334"></a><span class="bold">JPA Implementation</span></p>
+</td>
+<td align="left" headers="r3c1-t16 r1c2-t16">
+<p>Select a specific JPA library configuration.</p>
<p>Click <span class="bold">Manage libraries</span> to create or update a user library.</p>
<p>Click <span class="bold">Download libraries</span> to download a specific library configuration.</p>
+<p>Depending on your JPA implementation (for example, Generic or EclipseLink), different options may be available when working with JPA projects</p>
</td>
-<td align="left" headers="r3c1-t4 r1c3-t4"><br /></td>
+<td align="left" headers="r3c1-t16 r1c3-t16"><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 align="left" id="r4c1-t16" headers="r1c1-t16">
+<p>Type</p>
+</td>
+<td align="left" headers="r4c1-t16 r1c2-t16">
+<p>Select <span class="bold">User Library</span> to select from the available user-defined or downloaded libraries.</p>
+<p>If you select <span class="bold">Disable</span>, you must manually include the JPA implementation library on the project classpath.</p>
+</td>
+<td align="left" headers="r4c1-t16 r1c3-t16">
+<p>User Library</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>
+<td align="left" id="r5c1-t16" headers="r1c1-t16">
+<p>Include libraries with this application</p>
+</td>
+<td align="left" headers="r5c1-t16 r1c2-t16">
+<p>Specify if the selected libraries are included when deploying the application.</p>
+</td>
+<td align="left" headers="r5c1-t16 r1c3-t16">
+<p>Selected</p>
+</td>
</tr>
<tr align="left" valign="top">
-<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.
+<td align="left" id="r6c1-t16" headers="r1c1-t16">
+<p><span class="bold">Connection</span></p>
+</td>
+<td align="left" headers="r6c1-t16 r1c2-t16">
+<p>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>
<p>Click <span class="bold">Add connection</span> to create a new database connection.</p>
</td>
-<td align="left" headers="r6c1-t4 r1c3-t4"><br /></td>
+<td align="left" headers="r6c1-t16 r1c3-t16"><br /></td>
</tr>
<tr align="left" valign="top">
-<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>
+<td align="left" id="r7c1-t16" headers="r1c1-t16">
+<p>Add driver library to build path</p>
+</td>
+<td align="left" headers="r7c1-t16 r1c2-t16">
+<p>Specify if the connection driver libraries are included when deploying the application.</p>
+</td>
+<td align="left" headers="r7c1-t16 r1c3-t16"><br /></td>
</tr>
<tr align="left" valign="top">
-<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 align="left" id="r8c1-t16" headers="r1c1-t16">
+<p>Override&nbsp;default schema from connection</p>
+</td>
+<td align="left" headers="r8c1-t16 r1c2-t16">
+<p>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.</p>
+</td>
+<td align="left" headers="r8c1-t16 r1c3-t16">
+<p>The value calculated by Dali.</p>
</td>
-<td align="left" headers="r8c1-t4 r1c3-t4">Determined by server.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t4" headers="r1c1-t4"><a id="sthref193" name="sthref193"></a>Persistent class management</td>
-<td align="left" headers="r9c1-t4 r1c2-t4">Specify if Dali will <span class="bold">discover annotated classes automatically</span>, or if the <span class="bold">annotated classes must be listed in the persistence.xml</span> file.
+<td align="left" id="r9c1-t16" headers="r1c1-t16">
+<p><a id="sthref335" name="sthref335"></a><span class="bold">Persistent class management</span></p>
+</td>
+<td align="left" headers="r9c1-t16 r1c2-t16">
+<p>Specify if Dali will <span class="bold">discover annotated classes automatically</span>, or if the <span class="bold">annotated classes must be listed in the persistence.xml</span> file.</p>
<p><span class="bold">Note</span>: To insure application portability, you should explicitly list the managed persistence classes that are included in the persistence unit.</p>
</td>
-<td align="left" headers="r9c1-t4 r1c3-t4">Determined by server.</td>
+<td align="left" headers="r9c1-t16 r1c3-t16">
+<p>Determined by server.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r10c1-t4" headers="r1c1-t4"><a id="sthref194" name="sthref194"></a>Create <code>orm.xml</code></td>
-<td align="left" headers="r10c1-t4 r1c2-t4">Specify if Dali should create a default <code>orm.xml</code> file for your entity mappings and persistence unit defaults.</td>
-<td align="left" headers="r10c1-t4 r1c3-t4">Selected</td>
+<td align="left" id="r10c1-t16" headers="r1c1-t16">
+<p><a id="sthref336" name="sthref336"></a><span class="bold">Create mapping file (orm.xml)</span></p>
+</td>
+<td align="left" headers="r10c1-t16 r1c2-t16">
+<p>Specify if Dali should create a default <code>orm.xml</code> file for your entity mappings and persistence unit defaults.</p>
+</td>
+<td align="left" headers="r10c1-t16 r1c3-t16">
+<p>Selected</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_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="inftblhruleinformal" -->
+<a id="sthref337" name="sthref337"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
+</li>
+</ul>
+<a id="sthref338" name="sthref338"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- class="sect2" -->
<!-- Start Footer -->
@@ -112,11 +161,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 2a576e6eba..858bcd9380 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
@@ -3,90 +3,131 @@
<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 JPA Project page</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:46Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="New JPA Project page" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CACBJAGC" name="CACBJAGC"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>New JPA Project page</h1>
<p>This table lists the properties available on the New JPA Project page of the <a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a>.</p>
-<div class="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">
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="Options on the New JPA Project page of the New JPA Project wizard" summary="Options on the New JPA Project page of the New JPA Project wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="24%" />
<col width="*" />
<col width="25%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t2">Property</th>
-<th align="left" valign="bottom" id="r1c2-t2">Description</th>
-<th align="left" valign="bottom" id="r1c3-t2">Default</th>
+<th align="left" valign="bottom" id="r1c1-t14">Property</th>
+<th align="left" valign="bottom" id="r1c2-t14">Description</th>
+<th align="left" valign="bottom" id="r1c3-t14">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t2" headers="r1c1-t2">Project name</td>
-<td align="left" headers="r2c1-t2 r1c2-t2">Name of the Eclipse JPA project.</td>
-<td align="left" headers="r2c1-t2 r1c3-t2"><br /></td>
+<td align="left" id="r2c1-t14" headers="r1c1-t14">
+<p>Project name</p>
+</td>
+<td align="left" headers="r2c1-t14 r1c2-t14">
+<p>Name of the Eclipse JPA project.</p>
+</td>
+<td align="left" headers="r2c1-t14 r1c3-t14"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t2" headers="r1c1-t2">Project contents</td>
-<td align="left" headers="r3c1-t2 r1c2-t2">Location of the workspace in which to save the project.
-<p>Unselect The <span class="bold">Use Default</span> option and click <span class="bold">Browse</span> to select a new location.</p>
+<td align="left" id="r3c1-t14" headers="r1c1-t14">
+<p>Project location</p>
+</td>
+<td align="left" headers="r3c1-t14 r1c2-t14">
+<p>Location of the workspace in which to save the project.</p>
+<p>Unselect the <span class="bold">Use default location</span> option and click <span class="bold">Browse</span> to select a new location.</p>
+</td>
+<td align="left" headers="r3c1-t14 r1c3-t14">
+<p>Current workspace</p>
</td>
-<td align="left" headers="r3c1-t2 r1c3-t2">Current workspace</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t2" headers="r1c1-t2">Target runtime</td>
-<td align="left" headers="r4c1-t2 r1c2-t2">Select a pre-defined target for the project.
-<p>Click <span class="bold">New</span> to create a new environment with the New Server Runtime wizard.</p>
+<td align="left" id="r4c1-t14" headers="r1c1-t14">
+<p>Target runtime</p>
+</td>
+<td align="left" headers="r4c1-t14 r1c2-t14">
+<p>Select a pre-defined target for the project.</p>
+<p>Click <span class="bold">New Runtime</span> to create a new environment with the New Server Runtime wizard.</p>
+</td>
+<td align="left" headers="r4c1-t14 r1c3-t14">
+<p>&lt;None&gt;</p>
</td>
-<td align="left" headers="r4c1-t2 r1c3-t2"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t2" headers="r1c1-t2">Configurations</td>
-<td align="left" headers="r5c1-t2 r1c2-t2">Select a project configuration with pre-defined facets.
-<p>Select <span class="bold">&lt;custom&gt;</span> to manually select the facets for this project.</p>
+<td align="left" id="r5c1-t14" headers="r1c1-t14">
+<p>JPA Version</p>
+</td>
+<td align="left" headers="r5c1-t14 r1c2-t14">
+<p>Select the Java Persistence API version for the project.</p>
+</td>
+<td align="left" headers="r5c1-t14 r1c3-t14">
+<p>2.0</p>
</td>
-<td align="left" headers="r5c1-t2 r1c3-t2">Utility JPA project with Java 5.0</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t2" headers="r1c1-t2">EAR membership</td>
-<td align="left" headers="r6c1-t2 r1c2-t2">Specify if this project should be included in an EAR file for deployment.
-<p>Select the <span class="bold">EAR Project Name</span>, or click <span class="bold">New</span> to create a new EAR project.</p>
+<td align="left" id="r6c1-t14" headers="r1c1-t14">
+<p>Configurations</p>
</td>
-<td align="left" headers="r6c1-t2 r1c3-t2"><br /></td>
+<td align="left" headers="r6c1-t14 r1c2-t14">
+<p>Select a project configuration with pre-defined facets.</p>
+<p>Select <span class="bold">Modify</span> to manually select the facets for this project.</p>
+</td>
+<td align="left" headers="r6c1-t14 r1c3-t14"><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 align="left" id="r7c1-t14" headers="r1c1-t14">
+<p>EAR membership</p>
+</td>
+<td align="left" headers="r7c1-t14 r1c2-t14">
+<p>Specify if this project should be included in an EAR file for deployment.</p>
+<p>Select the <span class="bold">EAR Project Name</span>, or click <span class="bold">New Project</span> to create a new EAR project.</p>
</td>
-<td align="left" headers="r7c1-t2 r1c3-t2"><br /></td>
+<td align="left" headers="r7c1-t14 r1c3-t14"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t14" headers="r1c1-t14">
+<p>Working sets</p>
+</td>
+<td align="left" headers="r8c1-t14 r1c2-t14">
+<p>Specify if this project should be included in an existing working set. The drop down field shows a list of previous selected working sets.</p>
+<p>Select <span class="bold">Add project to working sets</span>, then select a <span class="bold">Working set</span> in which to add this project.</p>
+</td>
+<td align="left" headers="r8c1-t14 r1c3-t14"><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="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="inftblhruleinformal" -->
+<a id="sthref329" name="sthref329"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
+</li>
+</ul>
+<a id="sthref330" name="sthref330"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -94,11 +135,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 b59320be77..65b61db2cd 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
@@ -3,25 +3,25 @@
<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 New JPA Project wizard</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:46Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Create New JPA Project wizard" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CACBJGBG" name="CACBJGBG"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Create New JPA Project wizard</h1>
-<p><a id="sthref190" name="sthref190"></a>The Create New JPA Project wizard allows you to create a new Java project using JPA. The wizard consists of the following pages:</p>
+<p><a id="sthref328" name="sthref328"></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>
@@ -39,11 +39,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_general.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_general.htm
index ea6f099cfc..01e6d3316f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_general.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_general.htm
@@ -3,112 +3,159 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="General" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<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="sthref258" name="sthref258"></a><a id="sthref259" name="sthref259"></a>
-<p class="titleintable">Properties of the General Page</p>
-<table class="Formal" title="Properties of the General Page" summary="This table describes the properties of the persistence.xml&rsquo;s General page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="The following table lists properties available in the General page of the persistence.xml Editor." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="24%" />
<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>
+<th align="left" valign="bottom" id="r1c1-t49">Property</th>
+<th align="left" valign="bottom" id="r1c2-t49">Description</th>
+<th align="left" valign="bottom" id="r1c3-t49">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t24" headers="r1c1-t24">
+<td align="left" id="r2c1-t49" headers="r1c1-t49">
+<p><span class="bold">General</span></p>
+</td>
+<td align="left" headers="r2c1-t49 r1c2-t49"><br /></td>
+<td align="left" headers="r2c1-t49 r1c3-t49"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t49" headers="r1c1-t49">
<p>Name</p>
</td>
-<td align="left" headers="r2c1-t24 r1c2-t24">
+<td align="left" headers="r3c1-t49 r1c2-t49">
<p>Enter the name of the persistence unit.</p>
+<p>Defines the <code>&lt;persistence-unit name&gt;</code> element.</p>
</td>
-<td align="left" headers="r2c1-t24 r1c3-t24">
-<p>The project name.</p>
+<td align="left" headers="r3c1-t49 r1c3-t49">
+<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 align="left" id="r4c1-t49" headers="r1c1-t49">
+<p><a id="sthref447" name="sthref447"></a>Persistence provider</p>
</td>
-<td align="left" headers="r3c1-t24 r1c2-t24">
+<td align="left" headers="r4c1-t49 r1c2-t49">
<p>Enter the name of the persistence provider.</p>
+<p>Defines the <code>&lt;provider&gt;</code> element.</p>
</td>
-<td align="left" headers="r3c1-t24 r1c3-t24">
-<p>Determined by the server.</p>
+<td align="left" headers="r4c1-t49 r1c3-t49">
+<p>Determined by the server</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t24" headers="r1c1-t24">
+<td align="left" id="r5c1-t49" headers="r1c1-t49">
<p>Description</p>
</td>
-<td align="left" headers="r4c1-t24 r1c2-t24">
+<td align="left" headers="r5c1-t49 r1c2-t49">
<p>Enter a description for this persistence unit. This is an optional property.</p>
+<p>Defines the <code>&lt;description&gt;</code> element.</p>
+</td>
+<td align="left" headers="r5c1-t49 r1c3-t49"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t49" headers="r1c1-t49">
+<p><a id="sthref448" name="sthref448"></a><span class="bold">Managed Classes</span></p>
</td>
-<td align="left" headers="r4c1-t24 r1c3-t24"><br /></td>
+<td align="left" headers="r6c1-t49 r1c2-t49"><br /></td>
+<td align="left" headers="r6c1-t49 r1c3-t49"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t24" headers="r1c1-t24">
-<p>Managed Classes</p>
+<td align="left" id="r7c1-t49" headers="r1c1-t49">
+<p>Classes</p>
</td>
-<td align="left" headers="r5c1-t24 r1c2-t24">
-<p>Add or remove the classes managed through the persistence unit.</p>
+<td align="left" headers="r7c1-t49 r1c2-t49">
+<p>Click <span class="bold">Add</span> to add a new class, or select an existing class and click <span class="bold">Remove</span>, to add or remove the classes managed through the persistence unit.</p>
+<p>Defines the <code>&lt;class&gt;</code> element.</p>
+<p>Select a class and click <span class="bold">Open</span> to modify the class in the editor.</p>
</td>
-<td align="left" headers="r5c1-t24 r1c3-t24"><br /></td>
+<td align="left" headers="r7c1-t49 r1c3-t49"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t24" headers="r1c1-t24">
+<td align="left" id="r8c1-t49" headers="r1c1-t49">
<p>Exclude Unlisted Classes</p>
</td>
-<td align="left" headers="r6c1-t24 r1c2-t24">
+<td align="left" headers="r8c1-t49 r1c2-t49">
<p>Select to include all annotated entity classes in the root of the persistence unit.</p>
+<p>Defines the <code>&lt;exclude-unlisted-classes&gt;</code> element.</p>
</td>
-<td align="left" headers="r6c1-t24 r1c3-t24">
+<td align="left" headers="r8c1-t49 r1c3-t49">
<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 align="left" id="r9c1-t49" headers="r1c1-t49">
+<p><a id="sthref449" name="sthref449"></a><span class="bold">XML Mapping Files</span></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 align="left" headers="r9c1-t49 r1c2-t49"><br /></td>
+<td align="left" headers="r9c1-t49 r1c3-t49"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t49" headers="r1c1-t49">
+<p>Files</p>
</td>
-<td align="left" headers="r7c1-t24 r1c3-t24">
-<p>Meta-INF\orm.xml</p>
+<td align="left" headers="r10c1-t49 r1c2-t49">
+<p>Click <span class="bold">Add</span> to select an XML mapping file, or select an existing file and click <span class="bold">Remove</span>, to add or remove an object/relational mapping XML files that define the classes to be managed by the persistence unit.</p>
+<p>Defines the <code>&lt;mapping-file&gt;</code> element.</p>
+</td>
+<td align="left" headers="r10c1-t49 r1c3-t49">
+<p><code>Meta-INF\orm.xml</code></p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t24" headers="r1c1-t24">
-<p>JAR Files</p>
+<td align="left" id="r11c1-t49" headers="r1c1-t49">
+<p>Exclude unlisted EclipseLink XML mapping file</p>
+</td>
+<td align="left" headers="r11c1-t49 r1c2-t49">
+<p>Select to include all annotated EclipseLink mapping files. Defines the <code>eclipselink.exclude-eclipselink-orm property</code> element.<span class="bold">Note</span>: This field applies only when using EclipseLink JPA implementation</p>
+</td>
+<td align="left" headers="r11c1-t49 r1c3-t49">
+<p>False</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t49" headers="r1c1-t49">
+<p><span class="bold">JAR Files</span></p>
+</td>
+<td align="left" headers="r12c1-t49 r1c2-t49"><br /></td>
+<td align="left" headers="r12c1-t49 r1c3-t49"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r13c1-t49" headers="r1c1-t49">
+<p>Files</p>
+</td>
+<td align="left" headers="r13c1-t49 r1c2-t49">
+<p>Click <span class="bold">Add</span> to select a JAR file, or select an existing file and click <span class="bold">Remove</span>, to add or remove JAR files and libraries in the persistence unit.</p>
</td>
-<td align="left" headers="r8c1-t24 r1c2-t24"><br /></td>
-<td align="left" headers="r8c1-t24 r1c3-t24"><br /></td>
+<td align="left" headers="r13c1-t49 r1c3-t49"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="tblformal" --></div>
+<!-- class="inftblhruleinformal" --></div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -116,11 +163,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 40d2673812..aab3b1d17d 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
@@ -3,34 +3,80 @@
<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>JPA Details view (for attributes)</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:47Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Details view (for attributes)" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BABIFBAF" name="BABIFBAF"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>JPA Details view (for attributes)</h1>
-<p><a id="sthref228" name="sthref228"></a><a id="sthref229" name="sthref229"></a><a id="sthref230" name="sthref230"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected mapped attribute and contains the following areas:</p>
+<p><a id="sthref402" name="sthref402"></a><a id="sthref403" name="sthref403"></a><a id="sthref404" name="sthref404"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected mapped attribute and contains the following areas:</p>
+<a id="sthref405" name="sthref405"></a>
+<p class="subhead2">Mapping Type</p>
<ul>
<li>
-<p><a href="ref_mapping_general.htm#CACBHFIJ">General information</a></p>
+<p><a href="reference025.htm#CACCGGCG">Basic Mapping</a></p>
</li>
<li>
-<p><a href="reference011.htm#CACBAEBC">Join Table Information</a></p>
+<p><a href="reference026.htm#CACBCGDI">Element Collection Mapping</a></p>
</li>
<li>
-<p><a href="reference012.htm#CACFCEJC">Join Columns Information</a></p>
+<p><a href="reference027.htm#CACBJBFD">Embedded Mapping</a></p>
+</li>
+<li>
+<p><a href="reference028.htm#CACDIDIA">Embedded ID Mapping</a></p>
+</li>
+<li>
+<p><a href="reference029.htm#CACIAEFI">ID Mapping</a></p>
+</li>
+<li>
+<p><a href="reference030.htm#CACIHGCE">Many-to-Many Mapping</a></p>
+</li>
+<li>
+<p><a href="reference031.htm#CACHAEDB">Many-to-One Mapping</a></p>
+</li>
+<li>
+<p><a href="reference032.htm#CACHGGHH">One-to-Many Mapping</a></p>
+</li>
+<li>
+<p><a href="reference033.htm#CACGGHDD">One-to-One Mapping</a></p>
+</li>
+<li>
+<p><a href="reference034.htm#CACHAEBB">Version Mapping</a></p>
+</li>
+</ul>
+<a id="sthref406" name="sthref406"></a>
+<p class="subhead2">Additional Information</p>
+<p>Depending on the mapping type, the following additional areas will be available:</p>
+<ul>
+<li>
+<p><a href="reference036.htm#CACJBFEA">Value</a></p>
+</li>
+<li>
+<p><a href="reference035.htm#CACIHAAF">Type information</a></p>
+</li>
+<li>
+<p><a href="reference037.htm#CACJCHJB">Converters</a></p>
+</li>
+<li>
+<p><a href="reference038.htm#CACBIJFD">Ordering</a></p>
+</li>
+<li>
+<p><a href="reference039.htm#CACIJEGI">Joining Strategy</a></p>
+</li>
+<li>
+<p><a href="reference040.htm#CACGHHGB">Derived Identity</a></p>
</li>
<li>
<p><a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a></p>
@@ -42,11 +88,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 abdafce3b3..bd093445ba 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
@@ -3,34 +3,36 @@
<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>JPA Structure view</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Structure view" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BABEGGFE" name="BABEGGFE"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>JPA Structure view</h1>
-<p><a id="sthref255" name="sthref255"></a><a id="sthref256" name="sthref256"></a>The <span class="gui-object-title">JPA Structure</span> view displays an outline of the structure (its attributes and mappings) of the entity that is currently selected or opened in the editor. The structural elements shown in the outline are the entity and its fields.</p>
-<div class="figure"><a id="sthref257" name="sthref257"></a>
+<p><a id="sthref443" name="sthref443"></a><a id="sthref444" name="sthref444"></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="sthref445" name="sthref445"></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" -->
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a>
-<p>&nbsp;</p>
+<a id="sthref446" name="sthref446"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a></p>
+</li>
+</ul>
</div>
<!-- class="sect2" -->
<!-- Start Footer -->
@@ -39,11 +41,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 0be8caf0d2..fa9c5d99b1 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
@@ -3,25 +3,25 @@
<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>JPA Development perspective</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:49Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Development perspective" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BABIFBDB" name="BABIFBDB"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>JPA Development perspective</h1>
-<p><a id="sthref286" name="sthref286"></a><a id="sthref287" name="sthref287"></a>The <span class="bold">JPA Development perspective</span> defines the initial set and layout of views in the Workbench window when using Dali. By default, the <span class="gui-object-title">JPA Development perspective</span> includes the following views:</p>
+<p><a id="sthref478" name="sthref478"></a><a id="sthref479" name="sthref479"></a>The <span class="bold">JPA Development perspective</span> defines the initial set and layout of views in the Workbench window when using Dali. By default, the <span class="gui-object-title">JPA Development perspective</span> includes the following views:</p>
<ul>
<li>
<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
@@ -36,8 +36,17 @@
<p><a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
</li>
</ul>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
+<div class="figure"><a id="sthref480" name="sthref480"></a>
+<p class="titleinfigure">Sample JPA Development Perspective</p>
+<img src="img/jpa_perspective.png" alt="JPA Development perspective with the JPA Structure and JPA Details views." title="JPA Development perspective with the JPA Structure and JPA Details views." /><br /></div>
+<!-- class="figure" -->
+<a id="sthref481" name="sthref481"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
<p><a href="../org.eclipse.platform.doc.user/concepts/concepts-4.htm">Perspectives</a></p>
+</li>
+</ul>
</div>
<!-- class="sect1" -->
<!-- Start Footer -->
@@ -46,11 +55,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 408e016a11..4a6910a1e3 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
@@ -3,37 +3,69 @@
<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>JPA Details view (for entities)</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:47Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="JPA Details view (for entities)" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BABFAEBB" name="BABFAEBB"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>JPA Details view (for entities)</h1>
-<p><a id="sthref211" name="sthref211"></a><a id="sthref212" name="sthref212"></a><a id="sthref213" name="sthref213"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected entity and contains the following tabs:</p>
+<p><a id="sthref351" name="sthref351"></a><a id="sthref352" name="sthref352"></a><a id="sthref353" name="sthref353"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected entity and contains the following tabs:</p>
+<a id="sthref354" name="sthref354"></a>
+<p class="subhead2">Entity Type</p>
+<p>Clicking the name of the mapping type, which is represented as a hyperlink, invokes the Mapping Type Selection dialog. Use this dialog to specify the type of entity: Mapped Superclass, Embeddable or the default mapping type.</p>
<ul>
<li>
-<p><a href="reference006.htm#CACCAGGC">General information</a></p>
+<p><a href="reference013.htm#CACCAGGC">Entity</a></p>
</li>
<li>
-<p><a href="reference007.htm#CACIJBGH">Attribute overrides</a></p>
+<p><a href="reference014.htm#CACHJEJH">Embeddable</a></p>
</li>
<li>
-<p><a href="reference008.htm#CACBHIDA">Secondary table information</a></p>
+<p><a href="reference015.htm#CACGIEFD">Mapped Superclass</a></p>
+</li>
+</ul>
+<a id="sthref355" name="sthref355"></a>
+<p class="subhead2">Additional Information</p>
+<p>Depending on the entity type, the following additional areas will be available:</p>
+<ul>
+<li>
+<p><a href="reference016.htm#CACJBBCA">Caching</a></p>
+</li>
+<li>
+<p><a href="reference017.htm#CACBICGJ">Queries</a></p>
+</li>
+<li>
+<p><a href="reference018.htm#CACFHGHE">Inheritance</a></p>
+</li>
+<li>
+<p><a href="reference019.htm#CACIJBGH">Attribute Overrides</a></p>
+</li>
+<li>
+<p><a href="reference020.htm#CACDIJEE">Multitenancy</a></p>
+</li>
+<li>
+<p><a href="reference021.htm#CACCJJDC">Primary Key Generation</a></p>
+</li>
+<li>
+<p><a href="reference023.htm#CACJGDAJ">Converters</a></p>
+</li>
+<li>
+<p><a href="reference022.htm#CACBHIDA">Secondary tables</a></p>
</li>
<li>
-<p><a href="reference009.htm#CACFHGHE">Inheritance information</a></p>
+<p><a href="reference024.htm#CACJEEDE">Advanced</a></p>
</li>
</ul>
<!-- Start Footer -->
@@ -42,11 +74,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_xmll_editor.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_xmll_editor.htm
index 027900047f..f8ec581d73 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_xmll_editor.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_xmll_editor.htm
@@ -3,21 +3,21 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="persistence.xml Editor" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CIACCHID" name="CIACCHID"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>persistence.xml Editor</h1>
@@ -27,28 +27,28 @@
<p><a href="ref_persistence_general.htm#CIACIFGJ">General</a></p>
</li>
<li>
-<p><a href="reference018.htm#CIAFFJIE">Connection</a></p>
+<p><a href="reference046.htm#CIAFFJIE">Connection</a></p>
</li>
<li>
-<p><a href="reference019.htm#CIAJAFEG">Customization</a></p>
+<p><a href="reference047.htm#CIAJAFEG">Customization</a></p>
</li>
<li>
-<p><a href="reference020.htm#CIABEDCH">Caching</a></p>
+<p><a href="reference048.htm#CIABEDCH">Caching</a></p>
</li>
<li>
-<p><a href="reference021.htm#CIABGHHI">Logging</a></p>
+<p><a href="reference049.htm#CIABGHHI">Logging</a></p>
</li>
<li>
-<p><a href="reference022.htm#CIAFJCHE">Options</a></p>
+<p><a href="reference050.htm#CIAFJCHE">Options</a></p>
</li>
<li>
-<p><a href="reference023.htm#CIACCFCB">Schema Generation</a></p>
+<p><a href="reference051.htm#CIACCFCB">Schema Generation</a></p>
</li>
<li>
-<p><a href="reference024.htm#CIAHJDFF">Properties</a></p>
+<p><a href="reference052.htm#CIAHJDFF">Properties</a></p>
</li>
<li>
-<p><a href="reference025.htm#CIAHCJAH">Source</a></p>
+<p><a href="reference053.htm#CIAHCJAH">Source</a></p>
</li>
</ul>
<p>For projects using the Generic platform, the following subset of these pages is available:</p>
@@ -57,13 +57,13 @@
<p><a href="ref_persistence_general.htm#CIACIFGJ">General</a></p>
</li>
<li>
-<p><a href="reference018.htm#CIAFFJIE">Connection</a></p>
+<p><a href="reference046.htm#CIAFFJIE">Connection</a></p>
</li>
<li>
-<p><a href="reference024.htm#CIAHJDFF">Properties</a></p>
+<p><a href="reference052.htm#CIAHJDFF">Properties</a></p>
</li>
<li>
-<p><a href="reference025.htm#CIAHCJAH">Source</a></p>
+<p><a href="reference053.htm#CIAHCJAH">Source</a></p>
</li>
</ul>
<!-- Start Footer -->
@@ -72,11 +72,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 78ae018537..e5ac8108d1 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
@@ -3,127 +3,240 @@
<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>Primary Key Generation information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:47Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Primary Key Generation information" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<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>
-<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">
+<p>This table lists the fields available in the <span class="gui-object-title">Primary Key Generation</span> area in JPA Details view for <a href="tasks014.htm#BABGCBHG">ID mapping</a> types.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="This table describes the options on the Join Columns tab." summary="This table describes the options on the Join Columns tab." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="26%" />
<col width="*" />
<col width="34%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t19">Property</th>
-<th align="left" valign="bottom" id="r1c2-t19">Description</th>
-<th align="left" valign="bottom" id="r1c3-t19">Default</th>
+<th align="left" valign="bottom" id="r1c1-t44">Property</th>
+<th align="left" valign="bottom" id="r1c2-t44">Description</th>
+<th align="left" valign="bottom" id="r1c3-t44">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t19" headers="r1c1-t19"><a id="CACBAJBC" name="CACBAJBC"></a>Primary Key Generation</td>
-<td align="left" headers="r2c1-t19 r1c2-t19"><a id="sthref251" name="sthref251"></a><a id="sthref252" name="sthref252"></a>These fields define how the primary key is generated. These fields correspond to the <code>@GeneratedValue</code> annotation.</td>
-<td align="left" headers="r2c1-t19 r1c3-t19">Generated Value</td>
+<td align="left" id="r2c1-t44" headers="r1c1-t44"><a id="CACBAJBC" name="CACBAJBC"></a>
+<p><span class="bold">Primary Key Generation</span></p>
+</td>
+<td align="left" headers="r2c1-t44 r1c2-t44">
+<p><a id="sthref428" name="sthref428"></a><a id="sthref429" name="sthref429"></a>These fields define how the primary key is generated. These fields correspond to the <code>@GeneratedValue</code> annotation.</p>
+</td>
+<td align="left" headers="r2c1-t44 r1c3-t44">
+<p>Generated Value</p>
+</td>
</tr>
<tr align="left" valign="top">
-<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">
+<td align="left" id="r3c1-t44" headers="r1c1-t44"><a id="CACJEEEC" name="CACJEEEC"></a>
+<p>Strategy</p>
+</td>
+<td align="left" headers="r3c1-t44 r1c2-t44">
<ul>
-<li>Auto</li>
+<li>
+<p>Auto</p>
+</li>
<li>
<p>Identity &ndash; Values are assigned by the database's <span class="bold">Identity</span> column.</p>
</li>
<li>
-<p>Sequence &ndash; Values are assigned by a sequence table (see <a href="#CACFFHEH">Sequence&nbsp;Generator</a>).</p>
+<p>Sequence &ndash; Values are assigned by a sequence table (see <a href="#CACFFHEH"><span class="bold">Sequence&nbsp;Generator</span></a>).</p>
</li>
<li>
-<p>Table &ndash; Values are assigned by a database table (see <a href="#CACGFEAH">Table Generator</a>).</p>
+<p>Table &ndash; Values are assigned by a database table (see <a href="#CACGFEAH"><span class="bold">Table Generator</span></a>).</p>
</li>
</ul>
</td>
-<td align="left" headers="r3c1-t19 r1c3-t19">Auto</td>
+<td align="left" headers="r3c1-t44 r1c3-t44">
+<p>Auto</p>
+</td>
</tr>
<tr align="left" valign="top">
-<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>
+<td align="left" id="r4c1-t44" headers="r1c1-t44"><a id="BABEEAHJ" name="BABEEAHJ"></a>
+<p>Generator Name</p>
+</td>
+<td align="left" headers="r4c1-t44 r1c2-t44">
+<p>Unique name of the generated value.</p>
+</td>
+<td align="left" headers="r4c1-t44 r1c3-t44"><br /></td>
</tr>
<tr align="left" valign="top">
-<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.
+<td align="left" id="r5c1-t44" headers="r1c1-t44"><a id="CACGFEAH" name="CACGFEAH"></a>
+<p><span class="bold">Table Generator</span></p>
+</td>
+<td align="left" headers="r5c1-t44 r1c2-t44">
+<p>These fields define the database table used for generating the primary key and correspond to the <code>@TableGenerator</code> annotation.</p>
<p>These fields apply only when <span class="bold">Strategy</span>&nbsp;=&nbsp;<span class="bold">Table</span>.</p>
</td>
-<td align="left" headers="r5c1-t19 r1c3-t19"><br /></td>
+<td align="left" headers="r5c1-t44 r1c3-t44"><br /></td>
</tr>
<tr align="left" valign="top">
-<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>
+<td align="left" id="r6c1-t44" headers="r1c1-t44">
+<p>Name</p>
+</td>
+<td align="left" headers="r6c1-t44 r1c2-t44">
+<p>Unique name of the generator.</p>
+</td>
+<td align="left" headers="r6c1-t44 r1c3-t44"><br /></td>
</tr>
<tr align="left" valign="top">
-<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>
+<td align="left" id="r7c1-t44" headers="r1c1-t44">
+<p>Table</p>
+</td>
+<td align="left" headers="r7c1-t44 r1c2-t44">
+<p>Database table that stores the generated ID values.</p>
+</td>
+<td align="left" headers="r7c1-t44 r1c3-t44"><br /></td>
</tr>
<tr align="left" valign="top">
-<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>
+<td align="left" id="r8c1-t44" headers="r1c1-t44">
+<p>Schema</p>
+</td>
+<td align="left" headers="r8c1-t44 r1c2-t44"><br /></td>
+<td align="left" headers="r8c1-t44 r1c3-t44"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t44" headers="r1c1-t44">
+<p>Catalog</p>
+</td>
+<td align="left" headers="r9c1-t44 r1c2-t44"><br /></td>
+<td align="left" headers="r9c1-t44 r1c3-t44"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t44" headers="r1c1-t44">
+<p>Primary Key Column</p>
+</td>
+<td align="left" headers="r10c1-t44 r1c2-t44">
+<p>The column in the table generator's <span class="bold">Table</span> that contains the primary key.</p>
+</td>
+<td align="left" headers="r10c1-t44 r1c3-t44"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t44" headers="r1c1-t44">
+<p>Value Column</p>
+</td>
+<td align="left" headers="r11c1-t44 r1c2-t44">
+<p>The column that stores the generated ID values.</p>
+</td>
+<td align="left" headers="r11c1-t44 r1c3-t44"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t44" headers="r1c1-t44">
+<p>Primary Key Column Value</p>
+</td>
+<td align="left" headers="r12c1-t44 r1c2-t44">
+<p>The value for the <span class="bold">Primary Key Column</span> in the generator table.</p>
+</td>
+<td align="left" headers="r12c1-t44 r1c3-t44"><br /></td>
</tr>
<tr align="left" valign="top">
-<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>
+<td align="left" id="r13c1-t44" headers="r1c1-t44">
+<p>Allocation size</p>
+</td>
+<td align="left" headers="r13c1-t44 r1c2-t44"><br /></td>
+<td align="left" headers="r13c1-t44 r1c3-t44"><br /></td>
</tr>
<tr align="left" valign="top">
-<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>
+<td align="left" id="r14c1-t44" headers="r1c1-t44">
+<p>Initial value</p>
+</td>
+<td align="left" headers="r14c1-t44 r1c2-t44"><br /></td>
+<td align="left" headers="r14c1-t44 r1c3-t44"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r11c1-t19" headers="r1c1-t19"><a id="CACFFHEH" name="CACFFHEH"></a>Sequence&nbsp;Generator</td>
-<td align="left" headers="r11c1-t19 r1c2-t19"><a id="sthref253" name="sthref253"></a><a id="sthref254" name="sthref254"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.
+<td align="left" id="r15c1-t44" headers="r1c1-t44"><a id="CACFFHEH" name="CACFFHEH"></a>
+<p><span class="bold">Sequence&nbsp;Generator</span></p>
+</td>
+<td align="left" headers="r15c1-t44 r1c2-t44">
+<p><a id="sthref430" name="sthref430"></a><a id="sthref431" name="sthref431"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.</p>
<p>These fields apply only when <span class="bold">Strategy</span> = <span class="bold">Sequence</span>.</p>
</td>
-<td align="left" headers="r11c1-t19 r1c3-t19"><br /></td>
+<td align="left" headers="r15c1-t44 r1c3-t44"><br /></td>
</tr>
<tr align="left" valign="top">
-<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>
+<td align="left" id="r16c1-t44" headers="r1c1-t44">
+<p>Name</p>
+</td>
+<td align="left" headers="r16c1-t44 r1c2-t44">
+<p>Name of the sequence table to use for defining primary key values.</p>
+</td>
+<td align="left" headers="r16c1-t44 r1c3-t44"><br /></td>
</tr>
<tr align="left" valign="top">
-<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>
+<td align="left" id="r17c1-t44" headers="r1c1-t44">
+<p>Sequence</p>
+</td>
+<td align="left" headers="r17c1-t44 r1c2-t44">
+<p>Unique name of the sequence.</p>
+</td>
+<td align="left" headers="r17c1-t44 r1c3-t44"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r18c1-t44" headers="r1c1-t44">
+<p>Schema</p>
+</td>
+<td align="left" headers="r18c1-t44 r1c2-t44"><br /></td>
+<td align="left" headers="r18c1-t44 r1c3-t44"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r19c1-t44" headers="r1c1-t44">
+<p>Catalog</p>
+</td>
+<td align="left" headers="r19c1-t44 r1c2-t44"><br /></td>
+<td align="left" headers="r19c1-t44 r1c3-t44"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r20c1-t44" headers="r1c1-t44">
+<p>Allocation size</p>
+</td>
+<td align="left" headers="r20c1-t44 r1c2-t44"><br /></td>
+<td align="left" headers="r20c1-t44 r1c3-t44"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r21c1-t44" headers="r1c1-t44">
+<p>Initial value</p>
+</td>
+<td align="left" headers="r21c1-t44 r1c2-t44"><br /></td>
+<td align="left" headers="r21c1-t44 r1c3-t44"><br /></td>
</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="tasks013.htm#BABGCBHG">ID mapping</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref432" name="sthref432"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="tasks014.htm#BABGCBHG">ID mapping</a></p>
+</li>
+</ul>
+<a id="sthref433" name="sthref433"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- class="sect2" -->
<!-- Start Footer -->
@@ -132,11 +245,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 7a6aa85241..02b717f25d 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
@@ -3,84 +3,137 @@
<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>Project Properties page &ndash; Java Persistence Options</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Project Properties page &ndash; JPA Options</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Project Properties page &ndash; Java Persistence Options" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Project Properties page &ndash; JPA Options" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BABJHBCI" name="BABJHBCI"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Project Properties page &ndash; Java Persistence Options</h1>
-<p><a id="sthref273" name="sthref273"></a><a id="sthref274" name="sthref274"></a>Use the <span class="gui-object-title">Errors/Warnings</span> options on the <span class="gui-object-title">Properties</span> page to specify the validation options to use with the project.</p>
+<h1>Project Properties page &ndash; JPA Options</h1>
+<p><a id="sthref454" name="sthref454"></a><a id="sthref455" name="sthref455"></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">
+<table class="Informal" title="Options on the Java Persistence Preferences page &gt; JPA Options" summary="Options on the Java Persistence Preferences page &gt; JPA Options" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
<col width="32%" />
<col width="*" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t36">Property</th>
-<th align="left" valign="bottom" id="r1c2-t36">Description</th>
+<th align="left" valign="bottom" id="r1c1-t63">Property</th>
+<th align="left" valign="bottom" id="r1c2-t63">Description</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t36" headers="r1c1-t36">Enable project specific settings</td>
-<td align="left" headers="r2c1-t36 r1c2-t36">Select the to override the general settings for this project.</td>
+<td align="left" id="r2c1-t63" headers="r1c1-t63">
+<p><a id="sthref456" name="sthref456"></a><a id="sthref457" name="sthref457"></a><a id="sthref458" name="sthref458"></a><a id="sthref459" name="sthref459"></a><span class="bold">Platform</span></p>
+</td>
+<td align="left" headers="r2c1-t63 r1c2-t63">
+<p>Select the vendor-specific platform.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Project level</td>
-<td align="left" headers="r3c1-t36 r1c2-t36">Select the warning level to report.</td>
+<td align="left" id="r3c1-t63" headers="r1c1-t63">
+<p><span class="bold">JPA Implementation</span></p>
+</td>
+<td align="left" headers="r3c1-t63 r1c2-t63"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Persistent unit level</td>
-<td align="left" headers="r4c1-t36 r1c2-t36">Select the warning level to report.</td>
+<td align="left" id="r4c1-t63" headers="r1c1-t63">
+<p>Type</p>
+</td>
+<td align="left" headers="r4c1-t63 r1c2-t63">
+<p>Select <span class="bold">User Library</span> to select from the available user-defined or downloaded libraries.</p>
+<p>If you select Disable, you must manually include the JPA implementation library on the project classpath.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Type level</td>
-<td align="left" headers="r5c1-t36 r1c2-t36">Select the warning level to report.</td>
+<td align="left" id="r5c1-t63" headers="r1c1-t63">
+<p>Library</p>
+</td>
+<td align="left" headers="r5c1-t63 r1c2-t63">
+<p>Select a specific JPA library configuration.</p>
+<p>Click <span class="bold">Manage libraries</span> to create or update a user library.</p>
+<p>Click <span class="bold">Download libraries</span> to download a specific library configuration.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Attribute level</td>
-<td align="left" headers="r6c1-t36 r1c2-t36">Select the warning level to report.</td>
+<td align="left" id="r6c1-t63" headers="r1c1-t63">
+<p>Include&nbsp;libraries&nbsp;with&nbsp;this&nbsp;application</p>
+</td>
+<td align="left" headers="r6c1-t63 r1c2-t63">
+<p>Specify if the selected libraries are included when deploying the application.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Schema mapping</td>
-<td align="left" headers="r7c1-t36 r1c2-t36">Select the warning level to report.</td>
+<td align="left" id="r7c1-t63" headers="r1c1-t63">
+<p><a id="sthref460" name="sthref460"></a><a id="sthref461" name="sthref461"></a><a id="sthref462" name="sthref462"></a><span class="bold">Connection</span></p>
+</td>
+<td align="left" headers="r7c1-t63 r1c2-t63">
+<p>The database connection used to map the persistent entities.</p>
+<ul>
+<li>
+<p>To create a new connection, click <span class="bold">Add Connections</span>.</p>
+</li>
+<li>
+<p>To reconnect to an existing connection, click <span class="bold">Reconnect</span>.</p>
+</li>
+</ul>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Implied&nbsp;attributes</td>
-<td align="left" headers="r8c1-t36 r1c2-t36">Select the warning level to report.</td>
+<td align="left" id="r8c1-t63" headers="r1c1-t63">
+<p>Override default catalog from connection</p>
+</td>
+<td align="left" headers="r8c1-t63 r1c2-t63">
+<p>Select a catalog other than the default one derived from the connection information. Use this option if the default catalog is incorrect or cannot be used.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Implied&nbsp;associations</td>
-<td align="left" headers="r9c1-t36 r1c2-t36">Select the warning level to report.</td>
+<td align="left" id="r9c1-t63" headers="r1c1-t63">
+<p>Override default schema from connection</p>
+</td>
+<td align="left" headers="r9c1-t63 r1c2-t63">
+<p>Select a schema other than the default one derived from the connection information. Use this option if the default schema is incorrect or cannot be used. For example, use this option when the deployment login differs from the design-time login.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r10c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Inheritance</td>
-<td align="left" headers="r10c1-t36 r1c2-t36">Select the warning level to report.</td>
+<td align="left" id="r10c1-t63" headers="r1c1-t63">
+<p><span class="bold">Persistent Class Management</span></p>
+</td>
+<td align="left" headers="r10c1-t63 r1c2-t63">
+<p>Specify if Dali will <span class="bold">discover annotated classes automatically</span>, or if the <span class="bold">annotated classes must be listed in the persistence.xml</span> file.</p>
+<p><span class="bold">Note</span>: To insure application portability, you should explicitly list the managed persistence classes that are included in the persistence unit.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r11c1-t36" headers="r1c1-t36">&nbsp;&nbsp;Queries&nbsp;and&nbsp;generators</td>
-<td align="left" headers="r11c1-t36 r1c2-t36">Select the warning level to report.</td>
+<td align="left" id="r11c1-t63" headers="r1c1-t63">
+<p><a id="sthref463" name="sthref463"></a><a id="sthref464" name="sthref464"></a><span class="bold">Canonical Metamodel</span></p>
+</td>
+<td align="left" headers="r11c1-t63 r1c2-t63"><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="tasks026.htm#BABDBCBI">Modifying persistent project properties</a></div>
+<a id="sthref465" name="sthref465"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="tasks027.htm#BABDBCBI">Modifying persistent project properties</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
@@ -88,11 +141,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm
index ea7d3c1a7f..c9f46dc675 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_selectTables.htm
@@ -3,65 +3,90 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:46Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Select Tables" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CIAHCGEE" name="CIAHCGEE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Select Tables</h1>
-<p><a id="sthref201" name="sthref201"></a><a id="sthref202" name="sthref202"></a><a id="sthref203" name="sthref203"></a>Use the <span class="gui-object-title">Select Tables</span> dialog to specify the database connection and tables from which to create entities.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Generate Entities dialog." summary="This table describes the options on the Generate Entities dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<p><a id="sthref290" name="sthref290"></a><a id="sthref291" name="sthref291"></a><a id="sthref292" name="sthref292"></a>Use the <span class="gui-object-title">Select Tables</span> dialog to specify the database connection and tables from which to create entities.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="Options on the Select Tables page of the Generate Entities from Tables wizard" summary="Options on the Select Tables page of the Generate Entities from Tables wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="32%" />
<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>
+<th align="left" valign="bottom" id="r1c1-t2">Property</th>
+<th align="left" valign="bottom" id="r1c2-t2">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>
+<td align="left" id="r2c1-t2" headers="r1c1-t2">
+<p>Connection</p>
+</td>
+<td align="left" headers="r2c1-t2 r1c2-t2">
+<p>Select a database connection or click <span class="bold">Add Connection</span> to create a new connection.</p>
+</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>
+<td align="left" id="r3c1-t2" headers="r1c1-t2">
+<p>Schema</p>
+</td>
+<td align="left" headers="r3c1-t2 r1c2-t2">
+<p>Select the database schema from which to select tables.</p>
+</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>
+<td align="left" id="r4c1-t2" headers="r1c1-t2">
+<p>Tables</p>
+</td>
+<td align="left" headers="r4c1-t2 r1c2-t2">
+<p>Select the tables from which to create Java persistent entities. The tables shown are determined by the database connection and schema selections.</p>
+</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>
+<td align="left" id="r5c1-t2" headers="r1c1-t2">
+<p>Update class list in persistence.xml</p>
+</td>
+<td align="left" headers="r5c1-t2 r1c2-t2">
+<p>Specify if Dali should update the <code>persistence.xml</code> file to include the generated classes.</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="tasks021.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="inftblhruleinformal" -->
+<a id="sthref293" name="sthref293"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
+</li>
+<li>
+<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+</li>
+</ul>
+<a id="sthref294" name="sthref294"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables wizard</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -69,11 +94,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_select_cascade_dialog.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_select_cascade_dialog.htm
index 317bf1e1f0..5250da806e 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_select_cascade_dialog.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_select_cascade_dialog.htm
@@ -3,21 +3,21 @@
<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 Cascade dialog</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Select Cascade dialog" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CIAFDGIJ" name="CIAFDGIJ"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Select Cascade dialog</h1>
@@ -30,11 +30,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm
index 507ef3adaa..7cf31c10f5 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_tableAssociations.htm
@@ -3,64 +3,86 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:46Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Table Associations" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CIACDICB" name="CIACDICB"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<h1>Table Associations</h1>
-<p><a id="sthref204" name="sthref204"></a>Use this page to create or edit the association between the database table and entity.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Generate Entities dialog." summary="This table describes the options on the Table Associations dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<p><a id="sthref295" name="sthref295"></a>Use this page to create or edit the association between the database table and entity.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="This table describes the options on the Generate Entities dialog." summary="Options on the Table Associations page of the Generate Entities from Tables wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
<col width="32%" />
<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>
+<th align="left" valign="bottom" id="r1c1-t3">Property</th>
+<th align="left" valign="bottom" id="r1c2-t3">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>
+<td align="left" id="r2c1-t3" headers="r1c1-t3">
+<p>Table associations</p>
+</td>
+<td align="left" headers="r2c1-t3 r1c2-t3">
+<p>Select an association to modify or click <span class="bold">New Association</span> to create a new table association with the <a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association wizard</a> wizard.</p>
+</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>
+<td align="left" id="r3c1-t3" headers="r1c1-t3">
+<p>Generate this association</p>
+</td>
+<td align="left" headers="r3c1-t3 r1c2-t3">
+<p>Specify if Dali should create the selected association. If enabled, you can specify the <span class="bold">Cardinality</span> and <span class="bold">Table join</span> for the table association.</p>
+</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.
+<td align="left" id="r4c1-t3" headers="r1c1-t3">
+<p>Generate a reference to <span class="italic">&lt;ROW&gt;</span> in <span class="italic">&lt;TABLE&gt;</span></p>
+</td>
+<td align="left" headers="r4c1-t3 r1c2-t3">
+<p>Specify if the entity should contain a reference to the specified table.</p>
<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="tasks021.htm#BABBAGFI">Generating entities from tables</a><br />
-<a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables Wizard</a></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref296" name="sthref296"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
+</li>
+<li>
+<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+</li>
+<li>
+<p><a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association wizard</a></p>
+</li>
+</ul>
+<a id="sthref297" name="sthref297"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables wizard</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -68,11 +90,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
index edb027d6f3..889e3eefa5 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
@@ -3,22 +3,22 @@
<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>Reference</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:46Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content=" Reference" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Reference" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="sthref189" name="sthref189"></a></p>
+<p><a id="sthref289" name="sthref289"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<h1>Reference</h1>
<p>This section includes detailed help information for each of the following elements in the Dali OR Mapping Tool:</p>
<ul>
@@ -26,22 +26,22 @@
<p><a href="reference001.htm#CACJJJJH">Wizards</a></p>
</li>
<li>
-<p><a href="reference005.htm#CACDJIIG">Property pages</a></p>
+<p><a href="reference012.htm#CACDJIIG">Property pages</a></p>
</li>
<li>
-<p><a href="reference026.htm#CACDEIEE">Preferences</a></p>
+<p><a href="reference054.htm#CACDEIEE">Preferences</a></p>
</li>
<li>
-<p><a href="reference028.htm#CACGEJDA">Dialogs</a></p>
+<p><a href="reference060.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="reference030.htm#CACDHCIA">Icons and buttons</a></p>
+<p><a href="reference068.htm#CACDHCIA">Icons and buttons</a></p>
</li>
<li>
-<p><a href="reference033.htm#CACBBDIB">Dali Developer Documentation</a></p>
+<p><a href="reference071.htm#CACBBDIB">Dali Developer Documentation</a></p>
</li>
</ul>
<!-- Start Footer -->
@@ -50,11 +50,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm
index be40229799..83af7d03a3 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm
@@ -3,43 +3,46 @@
<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>Wizards</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-06-04T19:33:3Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Wizards" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CACJJJJH" name="CACJJJJH"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>Wizards</h1>
<p>This section includes information on the following wizards:</p>
<ul>
<li>
-<p><a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></p>
+<p><a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables wizard</a></p>
+</li>
+<li>
+<p><a href="reference002.htm#CACGDFDJ">Generate Dynamic Entities from Tables wizard</a></p>
</li>
<li>
<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>
+<p><a href="reference007.htm#CIAIJCCE">Create ORM Mapping File wizard</a></p>
</li>
<li>
-<p><a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables Wizard</a></p>
+<p><a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></p>
</li>
<li>
-<p><a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association</a></p>
+<p><a href="reference010.htm#CIAGHCGA">Generate Tables from Entities wizard</a></p>
</li>
<li>
-<p><a href="ref_jaxb_schema_wizard.htm#CACGADFH">Generate Schema from JAXB Classes Wizard</a></p>
+<p><a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association wizard</a></p>
</li>
</ul>
<!-- Start Footer -->
@@ -48,11 +51,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
index a636406aa6..e907a4bf1c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
@@ -3,37 +3,51 @@
<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>Mapping File Wizard</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:46Z" />
+<title>Generate Dynamic Entities from Tables wizard</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Mapping File Wizard" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Generate Dynamic Entities from Tables wizard" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIAIJCCE" name="CIAIJCCE"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACGDFDJ" name="CACGDFDJ"></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>
+<h1>Generate Dynamic Entities from Tables wizard</h1>
+<p>Use the Generate Dynamic Custom Entities wizard to create dynamic EclipseLink JPA entities from your database tables.</p>
+<p>The wizard consists of the following pages:</p>
+<ul>
+<li>
+<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, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
index 80773ce3bd..4498da42c3 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
@@ -3,132 +3,102 @@
<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>Mapping File</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:46Z" />
+<title>Select Tables</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Mapping File" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Select Tables" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIAJEIDJ" name="CIAJEIDJ"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACFGHJF" name="CACFGHJF"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Mapping File</h1>
-<p>This table lists the properties of the <a href="reference002.htm#CIAIJCCE">Mapping File Wizard</a>.</p>
-<div class="tblformal"><a id="sthref199" name="sthref199"></a><a id="sthref200" name="sthref200"></a>
-<p class="titleintable">Mapping File Wizard Properties</p>
-<table class="Formal" title="Mapping File Wizard Properties" summary="This table lists the properties of the Mapping File Wizard." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<col width="24%" />
+<h1>Select Tables</h1>
+<p><a id="sthref304" name="sthref304"></a><a id="sthref305" name="sthref305"></a><a id="sthref306" name="sthref306"></a>Use the <span class="gui-object-title">Select Tables</span> dialog to specify the database connection and tables from which to create entities.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="Options on the Select Tables page of the Generate Entities from Tables wizard" summary="Options on the Select Tables page of the Generate Entities from Tables wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="32%" />
<col width="*" />
-<col width="24%" />
<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="r1c1-t6">Property</th>
+<th align="left" valign="bottom" id="r1c2-t6">Description</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t7" headers="r1c1-t7">
-<p>Project</p>
+<td align="left" id="r2c1-t6" headers="r1c1-t6">
+<p>Connection</p>
</td>
-<td align="left" headers="r2c1-t7 r1c2-t7">
-<p>The name of the JPA project.</p>
-</td>
-<td align="left" headers="r2c1-t7 r1c3-t7">
-<p>Selected.</p>
+<td align="left" headers="r2c1-t6 r1c2-t6">
+<p>Select a database connection or click <span class="bold">Add Connection</span> to create a new connection.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t7" headers="r1c1-t7">
-<p>Source folder</p>
-</td>
-<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 align="left" id="r3c1-t6" headers="r1c1-t6">
+<p>Schema</p>
</td>
-<td align="left" headers="r3c1-t7 r1c3-t7">
-<p>Selected.</p>
+<td align="left" headers="r3c1-t6 r1c2-t6">
+<p>Select the database schema from which to select tables.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t7" headers="r1c1-t7">
-<p>File Path</p>
-</td>
-<td align="left" headers="r4c1-t7 r1c2-t7">
-<p>The location for the new <code>orm.xml</code> file.</p>
+<td align="left" id="r4c1-t6" headers="r1c1-t6">
+<p>Tables</p>
</td>
-<td align="left" headers="r4c1-t7 r1c3-t7">
-<p>Selected.</p>
+<td align="left" headers="r4c1-t6 r1c2-t6">
+<p>Select the tables from which to create Java persistent entities. The tables shown are determined by the database connection and schema selections.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t7" headers="r1c1-t7">
-<p>Default Access</p>
+<td align="left" id="r5c1-t6" headers="r1c1-t6">
+<p>Update class list in persistence.xml</p>
</td>
-<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>
+<td align="left" headers="r5c1-t6 r1c2-t6">
+<p>Specify if Dali should update the <code>persistence.xml</code> file to include the generated classes.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref307" name="sthref307"></a>
+<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p>None &ndash; No access type specified.</p>
+<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></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>
+<p><a href="tasks023.htm#CIHHFGIG">Generating dynamic entities from tables</a></p>
</li>
+</ul>
+<a id="sthref308" name="sthref308"></a>
+<p class="subhead2">Related reference</p>
+<ul>
<li>
-<p><span class="bold">Field-based</span> &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
+<p><a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables wizard</a></p>
</li>
</ul>
-</td>
-<td align="left" headers="r5c1-t7 r1c3-t7">
-<p>None</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<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="r6c1-t7 r1c3-t7">
-<p>Selected.</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_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>
+</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, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
index 8a00cd0882..6d95c34542 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
@@ -3,47 +3,98 @@
<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 Tables from Entities Wizard</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:46Z" />
+<title>Table Associations</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Generate Tables from Entities Wizard" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Table Associations" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<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="tasks021.htm#BABBAGFI">Generating entities from tables</a><br />
-<a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a><br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<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><br /></div>
-<!-- class="sect2" -->
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACBDJAC" name="CACBDJAC"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Table Associations</h1>
+<p><a id="sthref309" name="sthref309"></a>Use this page to create or edit the association between the database table and entity.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="Options on the Table Associations page of the Generate Entities from Tables wizard" summary="Options on the Table Associations page of the Generate Entities from Tables wizard." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
+<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>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t7" headers="r1c1-t7">
+<p>Table associations</p>
+</td>
+<td align="left" headers="r2c1-t7 r1c2-t7">
+<p>Select an association to modify or click <span class="bold">New Association</span> to create a new table association with the <a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association wizard</a> wizard.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t7" headers="r1c1-t7">
+<p>Generate this association</p>
+</td>
+<td align="left" headers="r3c1-t7 r1c2-t7">
+<p>Specify if Dali should create the selected association. If enabled, you can specify the <span class="bold">Cardinality</span> and <span class="bold">Table join</span> for the table association.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t7" headers="r1c1-t7">
+<p>Generate a reference to <span class="italic">&lt;ROW&gt;</span> in <span class="italic">&lt;TABLE&gt;</span></p>
+</td>
+<td align="left" headers="r4c1-t7 r1c2-t7">
+<p>Specify if the entity should contain a reference to the specified table.</p>
+<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="inftblhruleinformal" -->
+<a id="sthref310" name="sthref310"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
+</li>
+<li>
+<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+</li>
+<li>
+<p><a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association wizard</a></p>
+</li>
+</ul>
+<a id="sthref311" name="sthref311"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables wizard</a></p>
+</li>
+</ul>
+</div>
+<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
index a11400d263..32998cfb47 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
@@ -3,50 +3,121 @@
<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>Property pages</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:47Z" />
+<title>Customize Default Entity Generation</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Property pages" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Customize Default Entity Generation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- 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>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACHHEEH" name="CACHHEEH"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Customize Default Entity Generation</h1>
+<p><a id="sthref312" name="sthref312"></a>Use this page to specify the default information Dali will use when generating the entities from the database tables. You will be able to override this information for specific entities.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="ptions on the Customize Default Entity page of the Generate Entities from Tables wizard" summary="Options on the Customize Default Entity page of the Generate Entities from Tables wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<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">
+<p>XML Mapping File</p>
+</td>
+<td align="left" headers="r2c1-t8 r1c2-t8"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t8" headers="r1c1-t8">
+<p><span class="bold">Dynamic Class Defaults</span></p>
+</td>
+<td align="left" headers="r3c1-t8 r1c2-t8"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t8" headers="r1c1-t8">
+<p>Package</p>
+</td>
+<td align="left" headers="r4c1-t8 r1c2-t8"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t8" headers="r1c1-t8">
+<p><span class="bold">Mapping defaults</span></p>
+</td>
+<td align="left" headers="r5c1-t8 r1c2-t8"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t8" headers="r1c1-t8">
+<p>Key generator</p>
+</td>
+<td align="left" headers="r6c1-t8 r1c2-t8"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t8" headers="r1c1-t8">
+<p>Sequence name</p>
+</td>
+<td align="left" headers="r7c1-t8 r1c2-t8"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t8" headers="r1c1-t8">
+<p>Associations fetch</p>
+</td>
+<td align="left" headers="r8c1-t8 r1c2-t8"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t8" headers="r1c1-t8">
+<p>Collection properties type</p>
+</td>
+<td align="left" headers="r9c1-t8 r1c2-t8"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref313" name="sthref313"></a>
+<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
</li>
<li>
-<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
+<p><a href="tasks023.htm#CIHHFGIG">Generating dynamic entities from tables</a></p>
</li>
<li>
-<p><a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
+</ul>
+<a id="sthref314" name="sthref314"></a>
+<p class="subhead2">Related reference</p>
+<ul>
<li>
-<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
+<p><a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables wizard</a></p>
</li>
</ul>
+</div>
+<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
index 31bc24dbb3..51eaf2c862 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
@@ -3,120 +3,121 @@
<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 information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:47Z" />
+<title>Customize Individual Entities</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="General information" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Customize Individual Entities" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CACCAGGC" name="CACCAGGC"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACDGDIC" name="CACDGDIC"></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%" />
+<h1>Customize Individual Entities</h1>
+<p><a id="sthref315" name="sthref315"></a>Use this page to customize each generated entity. Select an item in the <span class="bold">Table and columns</span> area, then complete the following fields for each item.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="Options on the Individual Entities page of the Generate Entities from Tables wizard" summary="Options on the Individual Entities page of the Generate Entities from Tables wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="32%" />
<col width="*" />
-<col width="17%" />
-<col width="25%" />
<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="r1c4-t13">Available for Entity&nbsp;Type</th>
+<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-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="tasks006.htm#BABGBIEE">Entity</a>, <a href="tasks007.htm#BABFEICE">Embeddable</a>, and <a href="tasks008.htm#BABDAGCI">Mapped superclass</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t13" headers="r1c1-t13">Table</td>
-<td align="left" headers="r3c1-t13 r1c2-t13">The default database table information for this entity. These fields can be overridden by the information in the <a href="reference007.htm#CACIJBGH">Attribute overrides</a> area.</td>
-<td align="left" headers="r3c1-t13 r1c3-t13"><br /></td>
-<td align="left" headers="r3c1-t13 r1c4-t13"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Name</td>
-<td align="left" headers="r4c1-t13 r1c2-t13">The name of the primary database table associated with the entity.</td>
-<td align="left" headers="r4c1-t13 r1c3-t13"><br /></td>
-<td align="left" headers="r4c1-t13 r1c4-t13"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Catalog</td>
-<td align="left" headers="r5c1-t13 r1c2-t13">The database catalog that contains the <span class="bold">Table</span>.</td>
-<td align="left" headers="r5c1-t13 r1c3-t13">As defined in <code>orm.xml</code>.</td>
-<td align="left" headers="r5c1-t13 r1c4-t13"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" id="r2c1-t9" headers="r1c1-t9">
+<p><span class="bold">Mapping defaults</span></p>
+</td>
+<td align="left" headers="r2c1-t9 r1c2-t9">
+<p>Use these options to define the table mapping information for the entity.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t13" headers="r1c1-t13">&nbsp;&nbsp;Schema</td>
-<td align="left" headers="r6c1-t13 r1c2-t13">The database schema that contains the <span class="bold">Table</span>.</td>
-<td align="left" headers="r6c1-t13 r1c3-t13">As defined in <code>orm.xml</code>.</td>
-<td align="left" headers="r6c1-t13 r1c4-t13"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" id="r3c1-t9" headers="r1c1-t9">
+<p>Class name</p>
+</td>
+<td align="left" headers="r3c1-t9 r1c2-t9"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t13" headers="r1c1-t13">Name</td>
-<td align="left" headers="r7c1-t13 r1c2-t13">The name of this entity. By default, the class name is used as the entity name.</td>
-<td align="left" headers="r7c1-t13 r1c3-t13"><br /></td>
-<td align="left" headers="r7c1-t13 r1c4-t13"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" id="r4c1-t9" headers="r1c1-t9">
+<p>Key&nbsp;generator</p>
+</td>
+<td align="left" headers="r4c1-t9 r1c2-t9">
+<p>Select the generator used for this mapping.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t13" headers="r1c1-t13">Access</td>
-<td align="left" headers="r8c1-t13 r1c2-t13">The access method for this entity.</td>
-<td align="left" headers="r8c1-t13 r1c3-t13">Field</td>
-<td align="left" headers="r8c1-t13 r1c4-t13"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
+<td align="left" id="r5c1-t9" headers="r1c1-t9">
+<p>Sequence&nbsp;name</p>
+</td>
+<td align="left" headers="r5c1-t9 r1c2-t9">
+<p>Enter a name for the sequence.</p>
+<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="r9c1-t13" headers="r1c1-t13">Primary&nbsp;key&nbsp;class</td>
-<td align="left" headers="r9c1-t13 r1c2-t13">Click <span class="bold">Browse</span> and select the primary key for the entity. Clicking the field name, which is represented as a hyperlink, allows you to create a new class.</td>
-<td align="left" headers="r9c1-t13 r1c3-t13"><br /></td>
-<td align="left" headers="r9c1-t13 r1c4-t13"><br /></td>
+<td align="left" id="r6c1-t9" headers="r1c1-t9">
+<p>Entity&nbsp;access</p>
+</td>
+<td align="left" headers="r6c1-t9 r1c2-t9">
+<p>Specify the default entity access method: <span class="bold">Field</span> (default) or <span class="bold">Property</span>.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r10c1-t13" headers="r1c1-t13">Cachable</td>
-<td align="left" headers="r10c1-t13 r1c2-t13">Specifies if the entity is cachable.
-<p>This field corresponds to the <code>@Cachable</code> annotation.</p>
+<td align="left" id="r7c1-t9" headers="r1c1-t9">
+<p><span class="bold">Domain Java Class</span></p>
+</td>
+<td align="left" headers="r7c1-t9 r1c2-t9">
+<p>Use these options to define the class information (<span class="bold">Superclass</span> and <span class="bold">Interfaces</span>) for the entity.</p>
</td>
-<td align="left" headers="r10c1-t13 r1c3-t13">@Cachable(false)</td>
-<td align="left" headers="r10c1-t13 r1c4-t13"><a href="tasks006.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="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="inftblhruleinformal" -->
+<a id="sthref316" name="sthref316"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
+</li>
+<li>
+<p><a href="tasks023.htm#CIHHFGIG">Generating dynamic entities from tables</a></p>
+</li>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+</ul>
+<a id="sthref317" name="sthref317"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="reference002.htm#CACGDFDJ">Generate Dynamic Entities from Tables wizard</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
+<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
index 3100acd390..cd684ec5cc 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
@@ -3,78 +3,45 @@
<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>Attribute overrides</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:47Z" />
+<title>Create ORM Mapping File wizard</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Attribute overrides" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Create ORM Mapping File wizard" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- 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="sthref214" name="sthref214"></a><a id="sthref215" name="sthref215"></a><a id="sthref216" name="sthref216"></a>Use the <span class="gui-object-title">Attribute Overrides</span> area in the <span class="gui-object-title">JPA Details</span> view to override the default settings specified in the <a href="reference006.htm#CACCAGGC">General information</a> area of an attribute. Attribute overrides generally override/configure attributes that are inherited or embedded.</p>
-<p>This table lists the Attribute override fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<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="tasks006.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t14" headers="r1c1-t14">Join Columns</td>
-<td align="left" headers="r3c1-t14 r1c2-t14">Specify the joining strategy. Select <span class="bold">Override Default</span> to add a different joining strategy.</td>
-<td align="left" headers="r3c1-t14 r1c3-t14">Join columns</td>
-<td align="left" headers="r3c1-t14 r1c4-t14"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-</tbody>
-</table>
-<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" -->
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIAIJCCE" name="CIAIJCCE"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Create ORM Mapping File wizard</h1>
+<p>The New Mapping File wizard enables you to add an <code>orm.xml</code> file to a JPA project if no object map exists at the location specified. For example, if you cleared the <span class="bold">Create orm.xml</span> option on the <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a>, you can later add the <code>orm.xml</code> file to the src file of the project using this wizard.</p>
+<p>The <a href="#CIAIJCCE">Create ORM Mapping File wizard</a> consists of the following pages:</p>
+<ul>
+<li>
+<p><a href="reference008.htm#CIAJEIDJ">Mapping File Location</a></p>
+</li>
+<li>
+<p><a href="reference009.htm#CACDFCDB">Mapping File 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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
index edd0f9f932..09c7dbfd71 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
@@ -3,34 +3,107 @@
<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>Secondary table information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:47Z" />
+<title>Mapping File Location</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Secondary table information" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Mapping File Location" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CACBHIDA" name="CACBHIDA"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIAJEIDJ" name="CIAJEIDJ"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Secondary table information</h1>
-<p><a id="sthref217" name="sthref217"></a><a id="sthref218" name="sthref218"></a><a id="sthref219" name="sthref219"></a><a id="sthref220" name="sthref220"></a>Use the <span class="gui-object-title">Secondary Tables</span> area in the <span class="gui-object-title">JPA Details</span> view to associate additional tables with an entity. Use this area if the data associated with an entity is spread across multiple tables.</p>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<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>
+<h1>Mapping File Location</h1>
+<p>Use this page of the <a href="reference007.htm#CIAIJCCE">Create ORM Mapping File wizard</a> to specify the location of the ORM mapping file.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="Options on the Mapping File Location page of the the Mapping File wizard" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="23%" />
+<col width="*" />
+<col width="24%" />
+<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>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t12" headers="r1c1-t12">
+<p>Project</p>
+</td>
+<td align="left" headers="r2c1-t12 r1c2-t12">
+<p>The name of the JPA project.</p>
+</td>
+<td align="left" headers="r2c1-t12 r1c3-t12">
+<p>Selected.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t12" headers="r1c1-t12">
+<p>Source folder</p>
+</td>
+<td align="left" headers="r3c1-t12 r1c2-t12">
+<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-t12 r1c3-t12">
+<p>Selected.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t12" headers="r1c1-t12">
+<p>File Path</p>
+</td>
+<td align="left" headers="r4c1-t12 r1c2-t12">
+<p>The location for the new <code>orm.xml</code> file.</p>
+</td>
+<td align="left" headers="r4c1-t12 r1c3-t12">
+<p>Selected.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t12" headers="r1c1-t12">
+<p>File name</p>
+</td>
+<td align="left" headers="r5c1-t12 r1c2-t12">
+<p>Name of the OR mapping file.</p>
+</td>
+<td align="left" headers="r5c1-t12 r1c3-t12">
+<p><code>orm.xml</code></p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref324" name="sthref324"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="tasks007.htm#CIHDEFCA">Creating an orm.xml file</a></p>
+</li>
+<li>
+<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
+</li>
+<li>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
+</li>
+</ul>
+<a id="sthref325" name="sthref325"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="reference007.htm#CIAIJCCE">Create ORM Mapping File wizard</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -38,11 +111,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
index b905385cad..f1c0578d52 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
@@ -3,111 +3,109 @@
<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>Inheritance information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:47Z" />
+<title>Mapping File Options</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Inheritance information" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Mapping File Options" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CACFHGHE" name="CACFHGHE"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACDFCDB" name="CACDFCDB"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Inheritance information</h1>
-<p><a id="sthref221" name="sthref221"></a><a id="sthref222" name="sthref222"></a>This table lists the fields available on the <span class="gui-object-title">Inheritance</span> area in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, Inheritance tab." summary="This table describes the options on the Persistence Properties view, Inheritance tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<h1>Mapping File Options</h1>
+<p>Use this page of the <a href="reference007.htm#CIAIJCCE">Create ORM Mapping File wizard</a> to specify additional options for the ORM mapping file.</p>
+<div class="inftblinformal">
+<table class="Informal" summary="Options on the Mapping File Options page of the 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="23%" />
+<col width="24%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t15">Property</th>
-<th align="left" valign="bottom" id="r1c2-t15">Description</th>
-<th align="left" valign="bottom" id="r1c3-t15">Default</th>
+<th align="left" valign="bottom" id="r1c1-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-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:
+<td align="left" id="r2c1-t13" headers="r1c1-t13">
+<p>Default Access</p>
+</td>
+<td align="left" headers="r2c1-t13 r1c2-t13">
+<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 &ndash; All classes in the hierarchy are mapped to a single table.</p>
+<p><span class="bold">None</span> &ndash; No access type specified.</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>
+<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>Table per class &ndash; Each class is mapped to a separate 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>
-<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-t15" headers="r1c1-t15"><a id="sthref223" name="sthref223"></a><a id="sthref224" name="sthref224"></a>Discriminator Value</td>
-<td align="left" headers="r3c1-t15 r1c2-t15">Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified <span class="bold">Discriminator Type</span>.</td>
-<td align="left" headers="r3c1-t15 r1c3-t15"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t15" headers="r1c1-t15"><a id="sthref225" name="sthref225"></a><a id="sthref226" name="sthref226"></a>Discriminator Column</td>
-<td align="left" headers="r4c1-t15 r1c2-t15">These fields are available when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.
-<p>This field corresponds to the <code>@DiscriminatorColumn</code> annotation.</p>
-<p>Use the <span class="bold">Details</span> area to define the <span class="bold">Length</span> and <span class="bold">Column definition</span> of this Discriminator Column.</p>
+<td align="left" headers="r2c1-t13 r1c3-t13">
+<p>None</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">&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-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-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 align="left" id="r3c1-t13" headers="r1c1-t13">
+<p>Add to persistence unit</p>
+</td>
+<td align="left" headers="r3c1-t13 r1c2-t13">
+<p>Designates the persistence unit for this object map file.</p>
+</td>
+<td align="left" headers="r3c1-t13 r1c3-t13">
+<p>Selected.</p>
</td>
-<td align="left" headers="r7c1-t15 r1c3-t15"><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_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 />
-<br />
-<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
+<!-- class="inftblinformal" -->
+<a id="sthref326" name="sthref326"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="tasks007.htm#CIHDEFCA">Creating an orm.xml file</a></p>
+</li>
+<li>
+<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
+</li>
+<li>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
+</li>
+</ul>
+<a id="sthref327" name="sthref327"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="reference007.htm#CIAIJCCE">Create ORM Mapping File wizard</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
+<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
index f4b3e9ab36..58b64d8586 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
@@ -3,45 +3,51 @@
<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>Queries</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:47Z" />
+<title>Generate Tables from Entities wizard</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Queries" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Generate Tables from Entities wizard" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<div class="sect3"><!-- infolevel="all" infotype="General" --><a id="sthref227" name="sthref227"></a>
-<h1>Queries</h1>
-<p>Use the queries area of the JPA Details view to create named queries and named native queries. Refer to <a href="tasks009.htm#BABIGBGG">"Creating Named Queries"</a> for additional information.</p>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="tasks009.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" -->
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<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>
+<div align="center">
+<div class="inftblnotewarn"><br />
+<table class="NoteWarn oac_no_warn" summary="" cellpadding="3" cellspacing="0">
+<tbody>
+<tr>
+<td align="left">
+<p class="notep1">WARNING:</p>
+<p class="warnsp">Generating tables will <code>DROP</code> any existing tables and <code>CREATE</code> new tables, based on the entities in your project.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblnotewarn" --></div>
+<p>The <a href="#CIAGHCGA">Generate Tables from Entities wizard</a> consists of the Schema Generation 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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
index 25cdce9134..d4bd8184de 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
@@ -3,80 +3,98 @@
<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 Table Information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:47Z" />
+<title>Schema Generation</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Join Table Information" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Schema Generation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CACBAEBC" name="CACBAEBC"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACHAJEG" name="CACHAJEG"></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>
-<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%" />
+<h1>Schema Generation</h1>
+<p>This table lists the properties of the <a href="#CACHAJEG">Schema Generation</a> page.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="This table lists the properties of the Mapping File Wizard." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="23%" />
<col width="*" />
-<col width="34%" />
+<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-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-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="sthref246" name="sthref246"></a><a id="sthref247" name="sthref247"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
-<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
+<td align="left" id="r2c1-t18" headers="r1c1-t18">
+<p>Generation Output Mode</p>
+</td>
+<td align="left" headers="r2c1-t18 r1c2-t18">
+<p>Specify how Dali should generate the DDL:</p>
+<ul>
+<li>
+<p>Database</p>
+</li>
+<li>
+<p>SQL-script</p>
+</li>
+<li>
+<p>Both</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r2c1-t18 r1c3-t18">
+<p>Database</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_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="reference029.htm#CACCGEHC">Edit Join Columns Dialog</a></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref339" name="sthref339"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
+</li>
+<li>
+<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
+</li>
+<li>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
+</li>
+</ul>
+<a id="sthref340" name="sthref340"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="reference007.htm#CIAIJCCE">Create ORM Mapping File wizard</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
+<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
index 619907782d..c814656e39 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
@@ -3,69 +3,50 @@
<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 Information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:47Z" />
+<title>Property pages</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Join Columns Information" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Property pages" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CACFCEJC" name="CACFCEJC"></a></p>
-<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1>Join Columns Information</h1>
-<p><a id="sthref248" name="sthref248"></a>This table lists the fields available in the <span class="gui-object-title">Join Table</span> area in <span class="gui-object-title">JPA Details</span> view for <a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a> mapping types.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Join Columns tab." summary="This table describes the options on the Join Columns tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="26%" />
-<col width="*" />
-<col width="34%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t18">Property</th>
-<th align="left" valign="bottom" id="r1c2-t18">Description</th>
-<th align="left" valign="bottom" id="r1c3-t18">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t18" headers="r1c1-t18">Join Column</td>
-<td align="left" headers="r2c1-t18 r1c2-t18"><a id="sthref249" name="sthref249"></a><a id="sthref250" name="sthref250"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
-<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
-</td>
-<td align="left" headers="r2c1-t18 r1c3-t18">By default, the mapping is assumed to have a single join.</td>
-</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_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="reference029.htm#CACCGEHC">Edit Join Columns Dialog</a></div>
-<!-- class="sect3" -->
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</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 each property page in the following views:</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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
index 0b08922f60..7ff407ca40 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
@@ -3,30 +3,30 @@
<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 information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Entity</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="General information" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Entity" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CACCACGH" name="CACCACGH"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<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="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%" />
+<h1>Entity</h1>
+<p>This table lists the Entity information fields available in the <span class="gui-object-title">JPA Details</span> view for an <a href="tasks002.htm#BABGBIEE">Entity</a>.</p>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" title="JPA Details, Entity page" summary="JPA Details, Entity page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="20%" />
<col width="*" />
-<col width="22%" />
+<col width="24%" />
<thead>
<tr align="left" valign="top">
<th align="left" valign="bottom" id="r1c1-t20">Property</th>
@@ -36,51 +36,102 @@
</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" id="r2c1-t20" headers="r1c1-t20">
+<p><span class="bold">Table</span></p>
+</td>
+<td align="left" headers="r2c1-t20 r1c2-t20">
+<p>The default database table information for this entity. These fields can be overridden by the information in the <a href="reference019.htm#CACIJBGH">Attribute Overrides</a> area.</p>
+</td>
<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 align="left" id="r3c1-t20" headers="r1c1-t20">
+<p>Name</p>
+</td>
+<td align="left" headers="r3c1-t20 r1c2-t20">
+<p>The name of the primary database table associated with the entity.</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 align="left" id="r4c1-t20" headers="r1c1-t20">
+<p>Catalog</p>
+</td>
+<td align="left" headers="r4c1-t20 r1c2-t20">
+<p>The database catalog that contains the <span class="bold">Table</span>.</p>
+</td>
+<td align="left" headers="r4c1-t20 r1c3-t20">
+<p>As defined in <code>orm.xml</code>.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t20" headers="r1c1-t20">
+<p>Schema</p>
</td>
-<td align="left" headers="r4c1-t20 r1c3-t20"><br /></td>
+<td align="left" headers="r5c1-t20 r1c2-t20">
+<p>The database schema that contains the <span class="bold">Table</span>.</p>
+</td>
+<td align="left" headers="r5c1-t20 r1c3-t20">
+<p>As defined in <code>orm.xml</code>.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t20" headers="r1c1-t20">
+<p><span class="bold">Name</span></p>
+</td>
+<td align="left" headers="r6c1-t20 r1c2-t20">
+<p>The name of this entity. By default, the class name is used as the entity name.</p>
+</td>
+<td align="left" headers="r6c1-t20 r1c3-t20"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="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:
+<td align="left" id="r7c1-t20" headers="r1c1-t20">
+<p><span class="bold">Access</span></p>
+</td>
+<td align="left" headers="r7c1-t20 r1c2-t20">
+<p>Specify how the entity its access instance variables.</p>
<ul>
<li>
-<p>Property</p>
+<p>Property &ndash; Persistent state accessed through the property accessor methods. The property accessor methods must be <span class="bold">public</span> or <span class="bold">private</span>.</p>
</li>
<li>
-<p>Field</p>
+<p>Field &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
</li>
</ul>
-<p>This field corresponds to the <code>&lt;access&gt;</code> element in the <code>orm.xml</code> file.</p>
+<p><span class="bold">Note</span>: This field is for display only, based on the properties in the <code>orm.xml</code>: If only the methods of the class are annotated, <span class="bold">property</span> access type is used. In all other cases, <span class="bold">field</span> access type is used.</p>
</td>
-<td align="left" headers="r5c1-t20 r1c3-t20"><br /></td>
+<td align="left" headers="r7c1-t20 r1c3-t20">
+<p>Field</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t20" headers="r1c1-t20">
+<p><span class="bold">ID class</span></p>
+</td>
+<td align="left" headers="r8c1-t20 r1c2-t20">
+<p>Click <span class="bold">Browse</span> and select the primary key for the entity. Clicking the field name, which is represented as a hyperlink, allows you to create a new class.</p>
+</td>
+<td align="left" headers="r8c1-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="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="inftblhruleinformalwide" -->
+<a id="sthref356" name="sthref356"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+</ul>
+<a id="sthref357" name="sthref357"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -88,11 +139,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
index e824d3fab2..cfe782f3db 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
@@ -3,30 +3,30 @@
<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 Unit information</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Embeddable</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Persistence Unit information" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Embeddable" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CACEAGBG" name="CACEAGBG"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACHJEJH" name="CACHJEJH"></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">
-<col width="21%" />
+<h1>Embeddable</h1>
+<p>This table lists the Embeddable information fields available in the <span class="gui-object-title">JPA Details</span> view for <a href="tasks003.htm#BABFEICE">Embeddable</a> entity type.</p>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" summary="JPA Details view, Embeddable page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="19%" />
<col width="*" />
-<col width="22%" />
+<col width="19%" />
<thead>
<tr align="left" valign="top">
<th align="left" valign="bottom" id="r1c1-t21">Property</th>
@@ -36,36 +36,11 @@
</thead>
<tbody>
<tr align="left" valign="top">
-<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 align="left" id="r2c1-t21" headers="r1c1-t21">
+<p>Access</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">Cascade Persist</td>
-<td align="left" headers="r3c1-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="r3c1-t21 r1c3-t21"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t21" headers="r1c1-t21">Schema</td>
-<td align="left" headers="r4c1-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="r4c1-t21 r1c3-t21"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t21" headers="r1c1-t21">Catalog</td>
-<td align="left" headers="r5c1-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="r5c1-t21 r1c3-t21"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t21" headers="r1c1-t21">Access</td>
-<td align="left" headers="r6c1-t21 r1c2-t21">Specify how the entity its access instance variables.
+<td align="left" headers="r2c1-t21 r1c2-t21">
+<p>Specify how the entity its access instance variables.</p>
<ul>
<li>
<p>Property &ndash; Persistent state accessed through the property accessor methods. The property accessor methods must be <span class="bold">public</span> or <span class="bold">private</span>.</p>
@@ -74,21 +49,31 @@
<p>Field &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
</li>
</ul>
+<p><span class="bold">Note</span>: This field is for display only, based on the properties in the <code>orm.xml</code>: If only the methods of the class are annotated, <span class="bold">property</span> access type is used. In all other cases, <span class="bold">field</span> access type is used.</p>
+</td>
+<td align="left" headers="r2c1-t21 r1c3-t21">
+<p>Field</p>
</td>
-<td align="left" headers="r6c1-t21 r1c3-t21">Property</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_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="inftblhruleinformalwide" -->
+<a id="sthref358" name="sthref358"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+</ul>
+<a id="sthref359" name="sthref359"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -96,11 +81,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
index dd0c88a4e0..cb877e2d1e 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
@@ -3,102 +3,86 @@
<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>Generators</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Mapped Superclass</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Generators" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Mapped Superclass" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIAFGAIJ" name="CIAFGAIJ"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACGIEFD" name="CACGIEFD"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<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 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%" />
+<h1>Mapped Superclass</h1>
+<p>This table lists the Embeddable information fields available in the <span class="gui-object-title">JPA Details</span> view for <a href="tasks004.htm#BABDAGCI">Mapped superclass</a> entity type.</p>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" summary="JPA Details view, Mapped Superclass page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="19%" />
<col width="*" />
+<col width="19%" />
<thead>
<tr align="left" valign="top">
<th align="left" valign="bottom" id="r1c1-t22">Property</th>
<th align="left" valign="bottom" id="r1c2-t22">Description</th>
+<th align="left" valign="bottom" id="r1c3-t22">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<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>
+<td align="left" id="r2c1-t22" headers="r1c1-t22">
+<p>Access</p>
+</td>
+<td align="left" headers="r2c1-t22 r1c2-t22">
+<p>Specify how the entity its access instance variables.</p>
<ul>
<li>
-<p>Name</p>
-</li>
-<li>
-<p>Sequence</p>
-</li>
-<li>
-<p>Schema</p>
+<p>Property &ndash; Persistent state accessed through the property accessor methods. The property accessor methods must be <span class="bold">public</span> or <span class="bold">private</span>.</p>
</li>
<li>
-<p>Catalog</p>
-</li>
-<li>
-<p>Allocation size</p>
-</li>
-<li>
-<p>Initial value</p>
+<p>Field &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
</li>
</ul>
-<p>For table generators, you must complete the following fields:</p>
+<p><span class="bold">Note</span>: This field is for display only, based on the properties in the <code>orm.xml</code>: If only the methods of the class are annotated, <span class="bold">property</span> access type is used. In all other cases, <span class="bold">field</span> access type is used.</p>
+</td>
+<td align="left" headers="r2c1-t22 r1c3-t22">
+<p>Field</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t22" headers="r1c1-t22">
+<p>ID class</p>
+</td>
+<td align="left" headers="r3c1-t22 r1c2-t22">
+<p>Click <span class="bold">Browse</span> and select the primary key for the entity. Clicking the field name, which is represented as a hyperlink, allows you to create a new class.</p>
+</td>
+<td align="left" headers="r3c1-t22 r1c3-t22"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformalwide" -->
+<a id="sthref360" name="sthref360"></a>
+<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p>Name</p>
-</li>
-<li>
-<p>Table</p>
-</li>
-<li>
-<p>Schema</p>
-</li>
-<li>
-<p>Catalog</p>
-</li>
-<li>
-<p>Primary key column</p>
-</li>
-<li>
-<p>Value column</p>
-</li>
-<li>
-<p>Primary key column value</p>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
</li>
+</ul>
+<a id="sthref361" name="sthref361"></a>
+<p class="subhead2">Related reference</p>
+<ul>
<li>
-<p>Allocation size</p>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
</ul>
-</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_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_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></div>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -106,11 +90,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
index 227a2b3ec2..8e502d2e9f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
@@ -3,62 +3,251 @@
<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>Queries</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Caching</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Queries" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Caching" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIAIBAAJ" name="CIAIBAAJ"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACJBBCA" name="CACJBBCA"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<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%" />
+<h1>Caching</h1>
+<p>This table lists the Caching information fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="16%" />
<col width="*" />
+<col width="16%" />
+<col width="20%" />
<thead>
<tr align="left" valign="top">
<th align="left" valign="bottom" id="r1c1-t23">Property</th>
<th align="left" valign="bottom" id="r1c2-t23">Description</th>
+<th align="left" valign="bottom" id="r1c3-t23">Default</th>
+<th align="left" valign="bottom" id="r1c4-t23">Available for Entity&nbsp;Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t23" headers="r1c1-t23">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 align="left" id="r2c1-t23" headers="r1c1-t23">
+<p><span class="bold">Cachable</span></p>
+</td>
+<td align="left" headers="r2c1-t23 r1c2-t23">
+<p>Specifies if the entity is cachable.</p>
+<p>This field corresponds to the <code>@Cachable</code> annotation.</p>
+</td>
+<td align="left" headers="r2c1-t23 r1c3-t23">
+<p>True</p>
+</td>
+<td align="left" headers="r2c1-t23 r1c4-t23">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t23" headers="r1c1-t23">
+<p>Type</p>
+</td>
+<td align="left" headers="r3c1-t23 r1c2-t23">
+<p>Select one of the following as the Default Cache Type:</p>
+<ul>
+<li>
+<p><span class="bold">Weak with Soft Subcache</span>&ndash;This option is similar to <span class="bold">Weak with Hard Subcache</span> except that it maintains a most frequently used subcache that uses soft references. The size of the subcache is proportional to the size of the identity map. The subcache uses soft references to ensure that these objects are garbage-collected only if the system is low on memory.</p>
+<p>Use this identity map in most circumstances as a means to control memory used by the cache.</p>
+</li>
+<li>
+<p><span class="bold">Weak with Hard Subcache</span>&ndash;This option is similar to <span class="bold">Soft with Weak</span> subcache except that it maintains a most frequently used subcache that uses hard references. Use this identity map if soft references are not suitable for your platform.</p>
+</li>
+<li>
+<p><span class="bold">Weak</span>&ndash;This option is similar to <span class="bold">Full</span>, except that objects are referenced using weak references. This option uses less memory than <span class="bold">Full</span>, allows complete garbage collection and provides full caching and guaranteed identity.</p>
+<p>Use this identity map for transactions that, once started, stay on the server side.</p>
+</li>
+<li>
+<p><span class="bold">Soft</span>&ndash;This option is similar to <span class="bold">Weak</span> except that the map holds the objects using soft references. This identity map enables full garbage collection when memory is low. It provides full caching and guaranteed identity.</p>
+</li>
+<li>
+<p><span class="bold">Full</span>&ndash;This option provides full caching and guaranteed identity: all objects are cached and not removed.</p>
+<p>Note: This process may be memory-intensive when many objects are read.</p>
+</li>
+<li>
+<p><span class="bold">None</span>&ndash;This option does not preserve object identity and does not cache objects.This option is not recommended.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r3c1-t23 r1c3-t23">
+<p>Weak with Soft Subcache</p>
+</td>
+<td align="left" headers="r3c1-t23 r1c4-t23">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="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 align="left" id="r4c1-t23" headers="r1c1-t23">
+<p>Size</p>
+</td>
+<td align="left" headers="r4c1-t23 r1c2-t23">
+<p>Defines the size of cache to use (number of objects).</p>
+</td>
+<td align="left" headers="r4c1-t23 r1c3-t23">
+<p>100</p>
+</td>
+<td align="left" headers="r4c1-t23 r1c4-t23">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t23" headers="r1c1-t23">
+<p><span class="bold">Advanced</span></p>
+</td>
+<td align="left" headers="r5c1-t23 r1c2-t23"><br /></td>
+<td align="left" headers="r5c1-t23 r1c3-t23"><br /></td>
+<td align="left" headers="r5c1-t23 r1c4-t23">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t23" headers="r1c1-t23">
+<p>Expiry</p>
+</td>
+<td align="left" headers="r6c1-t23 r1c2-t23">
+<p>Enables the expiration of the cached instance after a fixed period of time (milliseconds). Queries executed against the cache after this will be forced back to the database for a refreshed copy.</p>
+</td>
+<td align="left" headers="r6c1-t23 r1c3-t23">
+<p>No expiry</p>
+</td>
+<td align="left" headers="r6c1-t23 r1c4-t23">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t23" headers="r1c1-t23">
+<p>Always refresh</p>
+</td>
+<td align="left" headers="r7c1-t23 r1c2-t23">
+<p>Specifies if all queries that go to the database should always refresh the cache.</p>
+</td>
+<td align="left" headers="r7c1-t23 r1c3-t23">
+<p>False</p>
+</td>
+<td align="left" headers="r7c1-t23 r1c4-t23">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t23" headers="r1c1-t23">
+<p>Refresh only if newer</p>
+</td>
+<td align="left" headers="r8c1-t23 r1c2-t23">
+<p>Specifies if all queries that go to the database should refresh the cache only if the data received from the database by a query is newer than the data in the cache (as determined by the optimistic locking field).</p>
+<p><span class="bold">Note</span>s:</p>
+<ul>
+<li>
+<p>This option only applies if one of the other refreshing options, such as alwaysRefresh, is already enabled.</p>
+</li>
+<li>
+<p>A version field is necessary to apply this feature.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r8c1-t23 r1c3-t23">
+<p>False</p>
+</td>
+<td align="left" headers="r8c1-t23 r1c4-t23">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t23" headers="r1c1-t23">
+<p>Disable hits</p>
+</td>
+<td align="left" headers="r9c1-t23 r1c2-t23">
+<p>Specifies if all queries should bypass the cache for hits, but still resolve against the cache for identity. This forces all queries to hit the database.</p>
+</td>
+<td align="left" headers="r9c1-t23 r1c3-t23">
+<p>False</p>
+</td>
+<td align="left" headers="r9c1-t23 r1c4-t23">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t23" headers="r1c1-t23">
+<p>Coordination type</p>
+</td>
+<td align="left" headers="r10c1-t23 r1c2-t23">
+<ul>
+<li>
+<p>Send Object Changes</p>
+</li>
+<li>
+<p>Invalidate Changed Objects</p>
+</li>
+<li>
+<p>Send New Objects with Changes</p>
+</li>
+<li>
+<p>None</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r10c1-t23 r1c3-t23">
+<p>Send Object Changes</p>
+</td>
+<td align="left" headers="r10c1-t23 r1c4-t23">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t23" headers="r1c1-t23">
+<p><span class="bold">Existence checking</span></p>
+</td>
+<td align="left" headers="r11c1-t23 r1c2-t23">
+<ul>
+<li>
+<p>Check Cache</p>
+</li>
+<li>
+<p>Check Cache then Database</p>
+</li>
+<li>
+<p>Assume Existence</p>
+</li>
+<li>
+<p>Assume Non-existence</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r11c1-t23 r1c3-t23">
+<p>Check Cache then Database</p>
+</td>
+<td align="left" headers="r11c1-t23 r1c4-t23">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
</td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="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>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></div>
+<!-- class="inftblhruleinformalwide" -->
+<a id="sthref362" name="sthref362"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+<li>
+<p>"Cache" in <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span>&nbsp;<br />
+<code><a href="http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_cache.htm">http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_cache.htm</a></code></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -66,11 +255,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
index a9a21aad29..ee504b8747 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
@@ -3,44 +3,208 @@
<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>Converters</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Queries</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Converters" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Queries" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIADGCID" name="CIADGCID"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACBICGJ" name="CACBICGJ"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<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>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></div>
+<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 queries"</a> for additional information.</p>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" title="This table describes the options on the Persistence Properties view, Inheritance tab." summary="This table describes the options on the Persistence Properties view, Inheritance tab." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="16%" />
+<col width="*" />
+<col width="16%" />
+<col width="19%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t24">Property</th>
+<th align="left" valign="bottom" id="r1c2-t24">Description</th>
+<th align="left" valign="bottom" id="r1c3-t24">Default</th>
+<th align="left" valign="bottom" id="r1c4-t24">Available for Entity&nbsp;Type</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t24" headers="r1c1-t24">
+<p><span class="bold">Queries</span></p>
+</td>
+<td align="left" headers="r2c1-t24 r1c2-t24">
+<p>Displays the existing Named and Native queries.</p>
+<p>Click <span class="bold">Add</span> to add a named or named native query by using the <a href="reference066.htm#CACJIFEG">Add Query dialog</a>.</p>
+</td>
+<td align="left" headers="r2c1-t24 r1c3-t24"><br /></td>
+<td align="left" headers="r2c1-t24 r1c4-t24">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t24" headers="r1c1-t24">
+<p><span class="bold">Named Queries</span></p>
+</td>
+<td align="left" headers="r3c1-t24 r1c2-t24"><br /></td>
+<td align="left" headers="r3c1-t24 r1c3-t24"><br /></td>
+<td align="left" headers="r3c1-t24 r1c4-t24"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t24" headers="r1c1-t24">
+<p>Name</p>
+</td>
+<td align="left" headers="r4c1-t24 r1c2-t24">
+<p>Name of the query.</p>
+</td>
+<td align="left" headers="r4c1-t24 r1c3-t24"><br /></td>
+<td align="left" headers="r4c1-t24 r1c4-t24">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t24" headers="r1c1-t24">
+<p>Query</p>
+</td>
+<td align="left" headers="r5c1-t24 r1c2-t24"><br /></td>
+<td align="left" headers="r5c1-t24 r1c3-t24"><br /></td>
+<td align="left" headers="r5c1-t24 r1c4-t24">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t24" headers="r1c1-t24">
+<p>Lock mode</p>
+</td>
+<td align="left" headers="r6c1-t24 r1c2-t24">
+<ul>
+<li>
+<p>None</p>
+</li>
+<li>
+<p>Optimistic</p>
+</li>
+<li>
+<p>Optimistic Force Increment</p>
+</li>
+<li>
+<p>Pessimistic Force Increment</p>
+</li>
+<li>
+<p>Pessimistic Read</p>
+</li>
+<li>
+<p>Pessimistic Write</p>
+</li>
+<li>
+<p>Read</p>
+</li>
+<li>
+<p>Write</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r6c1-t24 r1c3-t24">
+<p>None</p>
+</td>
+<td align="left" headers="r6c1-t24 r1c4-t24">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t24" headers="r1c1-t24">
+<p><span class="bold">Native Queries</span></p>
+</td>
+<td align="left" headers="r7c1-t24 r1c2-t24"><br /></td>
+<td align="left" headers="r7c1-t24 r1c3-t24"><br /></td>
+<td align="left" headers="r7c1-t24 r1c4-t24"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t24" headers="r1c1-t24">
+<p>Name</p>
+</td>
+<td align="left" headers="r8c1-t24 r1c2-t24">
+<p>Name of the query.</p>
+</td>
+<td align="left" headers="r8c1-t24 r1c3-t24"><br /></td>
+<td align="left" headers="r8c1-t24 r1c4-t24">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t24" headers="r1c1-t24">
+<p>Result class</p>
+</td>
+<td align="left" headers="r9c1-t24 r1c2-t24">
+<p><span class="bold">Note</span>: This field appears for Native Named Queries only.</p>
+</td>
+<td align="left" headers="r9c1-t24 r1c3-t24"><br /></td>
+<td align="left" headers="r9c1-t24 r1c4-t24">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t24" headers="r1c1-t24">
+<p>Query</p>
+</td>
+<td align="left" headers="r10c1-t24 r1c2-t24"><br /></td>
+<td align="left" headers="r10c1-t24 r1c3-t24"><br /></td>
+<td align="left" headers="r10c1-t24 r1c4-t24">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t24" headers="r1c1-t24">
+<p><span class="bold">Query hints</span></p>
+</td>
+<td align="left" headers="r11c1-t24 r1c2-t24">
+<p>Displays the existing query hints (Name and Value).</p>
+<p>Click Add to add a new query hint.</p>
+</td>
+<td align="left" headers="r11c1-t24 r1c3-t24"><br /></td>
+<td align="left" headers="r11c1-t24 r1c4-t24">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformalwide" -->
+<a id="sthref363" name="sthref363"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="tasks009.htm#BABIGBGG">Creating queries</a></p>
+</li>
+</ul>
+<a id="sthref364" name="sthref364"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
-<!-- class="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, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
index 8f35b73150..b5ab46130f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
@@ -3,169 +3,177 @@
<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>Connection</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Inheritance</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Connection" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Inheritance" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIAFFJIE" name="CIAFFJIE"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACFHGHE" name="CACFHGHE"></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="sthref260" name="sthref260"></a><a id="sthref261" name="sthref261"></a>
-<p class="titleintable">Properties of the Connection Page</p>
-<table class="Formal" title="Properties of the Connection Page" summary="This table lists the properties for the persistence.xml editor&rsquo;s connection page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<col width="24%" />
+<h1>Inheritance</h1>
+<p><a id="sthref365" name="sthref365"></a><a id="sthref366" name="sthref366"></a>This table lists the fields available on the <span class="gui-object-title">Inheritance</span> area in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="This table describes the options on the Persistence Properties view, Inheritance tab." summary="This table describes the options on the Persistence Properties view, Inheritance tab." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="16%" />
<col width="*" />
-<col width="24%" />
+<col width="15%" />
+<col width="20%" />
<thead>
<tr align="left" valign="top">
<th align="left" valign="bottom" id="r1c1-t25">Property</th>
<th align="left" valign="bottom" id="r1c2-t25">Description</th>
<th align="left" valign="bottom" id="r1c3-t25">Default</th>
+<th align="left" valign="bottom" id="r1c4-t25">Available for Entity Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
<td align="left" id="r2c1-t25" headers="r1c1-t25">
-<p>Transaction Type</p>
+<p>Strategy</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>
+<p>Specify the strategy to use when mapping a class or class hierarchy:</p>
<ul>
<li>
-<p><span class="bold">Default</span> -- Select to use the container used by the container.</p>
+<p><span class="bold">Single table</span> &ndash; All classes in the hierarchy are mapped to a single table.</p>
</li>
<li>
-<p><span class="bold">JTA</span> (Java Transaction API) -- Transactions of the Java EE server.</p>
+<p><span class="bold">Joined</span> &ndash; The root of the hierarchy is mapped to a single table; each child maps to its own table.</p>
</li>
<li>
-<p><span class="bold">Resource Local</span> -- Native actions of a JDBC driver that are referenced by a persistence unit.</p>
+<p><span class="bold">Table per class</span> &ndash; Each class is mapped to a separate table.</p>
</li>
</ul>
+<p>This field corresponds to the <code>@Inheritance</code> annotation.</p>
</td>
-<td align="left" headers="r2c1-t25 r1c3-t25"><br /></td>
+<td align="left" headers="r2c1-t25 r1c3-t25">
+<p>Single table</p>
+</td>
+<td align="left" headers="r2c1-t25 r1c4-t25">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r3c1-t25" headers="r1c1-t25">
-<p>Batch Writing</p>
+<p><a id="sthref367" name="sthref367"></a><a id="sthref368" name="sthref368"></a>Discriminator Value</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><span class="bold">JDBC</span>&ndash;Use JDBC batch writing.</p>
-</li>
-<li>
-<p><span class="bold">Buffered</span>&ndash;Do not use either JDBC batch writing nor native platform batch writing.</p>
-</li>
-<li>
-<p><span class="bold">OracleJDBC</span>&ndash;Use both JDBC batch writing and Oracle native platform batch writing.</p>
-</li>
-<li>
-<p><span class="bold">None</span>&ndash;Do not use batch writing (turn it off).</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r3c1-t25 r1c3-t25">
-<p>None</p>
+<p>Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified <span class="bold">Discriminator Type</span>.</p>
</td>
+<td align="left" headers="r3c1-t25 r1c3-t25"><br /></td>
+<td align="left" headers="r3c1-t25 r1c4-t25">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r4c1-t25" headers="r1c1-t25">
-<p>Statement caching</p>
+<p><a id="sthref369" name="sthref369"></a><a id="sthref370" name="sthref370"></a><span class="bold">Discriminator Column</span></p>
+</td>
+<td align="left" headers="r4c1-t25 r1c2-t25">
+<p>These fields are available when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.</p>
+<p>This field corresponds to the <code>@DiscriminatorColumn</code> annotation.</p>
+<p>Use the <span class="bold">Details</span> area to define the <span class="bold">Length</span> and <span class="bold">Column definition</span> of this Discriminator Column.</p>
</td>
-<td align="left" headers="r4c1-t25 r1c2-t25"><br /></td>
<td align="left" headers="r4c1-t25 r1c3-t25"><br /></td>
+<td align="left" headers="r4c1-t25 r1c4-t25"><br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r5c1-t25" headers="r1c1-t25">
-<p>Native SQL</p>
+<p>Name</p>
</td>
-<td align="left" headers="r5c1-t25 r1c2-t25"><br /></td>
-<td align="left" headers="r5c1-t25 r1c3-t25">
-<p>False</p>
+<td align="left" headers="r5c1-t25 r1c2-t25">
+<p>Name of the discriminator column</p>
</td>
+<td align="left" headers="r5c1-t25 r1c3-t25"><br /></td>
+<td align="left" headers="r5c1-t25 r1c4-t25">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r6c1-t25" headers="r1c1-t25">
-<p>JTA Data Source Name</p>
+<p>Type</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>
+<p>Set this field to set the discriminator type to <code>Char</code> or <code>Integer</code> (instead of its default: <code>String</code>). The <span class="bold">Discriminator Value</span> must conform to this type.</p>
+</td>
+<td align="left" headers="r6c1-t25 r1c3-t25">
+<p>String</p>
</td>
-<td align="left" headers="r6c1-t25 r1c3-t25"><br /></td>
+<td align="left" headers="r6c1-t25 r1c4-t25">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r7c1-t25" headers="r1c1-t25">
-<p>Non-JTA Data Source Name</p>
+<p>Length</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 align="left" headers="r7c1-t25 r1c2-t25"><br /></td>
+<td align="left" headers="r7c1-t25 r1c3-t25">
+<p>0</p>
</td>
-<td align="left" headers="r7c1-t25 r1c3-t25"><br /></td>
+<td align="left" headers="r7c1-t25 r1c4-t25">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r8c1-t25" headers="r1c1-t25">
-<p>&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>
+<p>Column definition</p>
</td>
+<td align="left" headers="r8c1-t25 r1c2-t25"><br /></td>
<td align="left" headers="r8c1-t25 r1c3-t25"><br /></td>
+<td align="left" headers="r8c1-t25 r1c4-t25">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r9c1-t25" headers="r1c1-t25">
-<p>EclipseLink Connection Pool</p>
+<p><span class="bold">Primary Key Join Columns</span></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>
+<p>Use to override the default primary key join columns. Select <span class="bold">Override Default</span>, then click <span class="bold">Add</span> to select new Join Column with the <a href="reference067.htm#CACDGGDB">Add Primary Key Join Column dialog</a>.</p>
+<p>This field corresponds with @<code>PrimaryKeyJoinColum</code>n annotation.</p>
</td>
<td align="left" headers="r9c1-t25 r1c3-t25"><br /></td>
-</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>
+<td align="left" headers="r9c1-t25 r1c4-t25">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="tblformal" --></div>
+<!-- class="inftblhruleinformal" -->
+<p>Refer to <a href="task_inheritance.htm#CIHCCCJD">"Specifying entity inheritance"</a> for additional information.</p>
+<a id="sthref371" name="sthref371"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></p>
+</li>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+</ul>
+<a id="sthref372" name="sthref372"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+<li>
+<p><a href="reference067.htm#CACDGGDB">Add Primary Key Join Column dialog</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -173,11 +181,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm
index 2a13dba748..95265cb8ab 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm
@@ -3,206 +3,84 @@
<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>Customization</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Attribute Overrides</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Customization" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Attribute Overrides" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIAJAFEG" name="CIAJAFEG"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACIJBGH" name="CACIJBGH"></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="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div class="tblformal"><a id="sthref262" name="sthref262"></a><a id="sthref263" name="sthref263"></a>
-<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%" />
+<h1>Attribute Overrides</h1>
+<p><a id="sthref373" name="sthref373"></a><a id="sthref374" name="sthref374"></a><a id="sthref375" name="sthref375"></a>Use the <span class="gui-object-title">Attribute Overrides</span> area in the <span class="gui-object-title">JPA Details</span> view to override the default settings specified in the <a href="reference013.htm#CACCAGGC">Entity</a> area of an attribute. Attribute overrides generally override/configure attributes that are inherited or embedded.</p>
+<p>This table lists the Attribute override fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="16%" />
<col width="*" />
-<col width="23%" />
+<col width="17%" />
+<col width="25%" />
<thead>
<tr align="left" valign="top">
<th align="left" valign="bottom" id="r1c1-t26">Property</th>
<th align="left" valign="bottom" id="r1c2-t26">Description</th>
<th align="left" valign="bottom" id="r1c3-t26">Default</th>
+<th align="left" valign="bottom" id="r1c4-t26">Available for Entity&nbsp;Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
<td align="left" id="r2c1-t26" headers="r1c1-t26">
-<p>Weaving</p>
+<p>Attribute Overrides</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>
+<p>Specify a property or field to be overridden (from the default mappings). Select <span class="bold">Override Default</span>.</p>
</td>
+<td align="left" headers="r2c1-t26 r1c3-t26"><br /></td>
+<td align="left" headers="r2c1-t26 r1c4-t26">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
<td align="left" id="r3c1-t26" headers="r1c1-t26">
-<p>&nbsp;&nbsp;Weaving&nbsp;Lazy</p>
-</td>
-<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>
+<p>Join Columns</p>
</td>
+<td align="left" headers="r3c1-t26 r1c2-t26"><br /></td>
+<td align="left" headers="r3c1-t26 r1c3-t26"><br /></td>
+<td align="left" headers="r3c1-t26 r1c4-t26">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
-<tr align="left" valign="top">
-<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>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformalwide" -->
+<a id="sthref376" name="sthref376"></a>
+<p class="subhead2">Related tasks</p>
<ul>
<li>
-<p>There is no weaving.</p>
+<p><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></p>
</li>
<li>
-<p>Classes should not be changed during weaving (for example, when debugging).</p>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></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>
-</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="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="r6c1-t26" headers="r1c1-t26">
-<p>Weaving&nbsp;eager</p>
-</td>
-<td align="left" headers="r6c1-t26 r1c2-t26"><br /></td>
-<td align="left" headers="r6c1-t26 r1c3-t26">
-<p>False</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t26" headers="r1c1-t26">
-<p>&nbsp;&nbsp;Weaving&nbsp;Change&nbsp;Tracking</p>
-</td>
-<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>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t26" headers="r1c1-t26">
-<p>&nbsp;&nbsp;Throw&nbsp;Exceptions</p>
-</td>
-<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="r8c1-t26 r1c3-t26">
-<p>True</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r9c1-t26" headers="r1c1-t26">
-<p>Exception handler</p>
-</td>
-<td align="left" headers="r9c1-t26 r1c2-t26">
-<p>Select (or create) a Java class to handle exceptions.</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="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">
+<a id="sthref377" name="sthref377"></a>
+<p class="subhead2">Related reference</p>
<ul>
<li>
-<p>No Profiler</p>
-</li>
-<li>
-<p>Performance Profiler</p>
-</li>
-<li>
-<p>Query Monitor</p>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
</ul>
-</td>
-<td align="left" headers="r13c1-t26 r1c3-t26">
-<p>NoProfiler</p>
-</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>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblnote" --></div>
</div>
<!-- class="sect3" -->
<!-- Start Footer -->
@@ -211,11 +89,11 @@ This page is not available for projects using the <span class="bold">Generic</sp
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm
index 769e6de077..17a16e4e71 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm
@@ -3,170 +3,184 @@
<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>Caching</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Multitenancy</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Caching" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Multitenancy" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIABEDCH" name="CIABEDCH"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACDIJEE" name="CACDIJEE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref264" name="sthref264"></a>Caching</h1>
-<p>This table lists the properties of the Caching page of the <a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>.</p>
-<div class="tblformal"><a id="sthref265" name="sthref265"></a><a id="sthref266" name="sthref266"></a>
-<p class="titleintable">Properties of the Caching Page</p>
-<table class="Formal" title="Properties of the Caching Page" summary="This table lists the properties of the persistence.xml&rsquo;s Caching page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<col width="24%" />
+<h1>Multitenancy</h1>
+<p><a id="sthref378" name="sthref378"></a>Use the <span class="gui-object-title">Multitenancy</span> area in the <span class="gui-object-title">JPA Details</span> view to specify that a given entity is shared among multiple tenants of an application.</p>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" title="JPA Details view, Multienancy page" summary="JPA Details view, Multienancy page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="16%" />
<col width="*" />
-<col width="24%" />
+<col width="17%" />
+<col width="25%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t28">Property</th>
-<th align="left" valign="bottom" id="r1c2-t28">Description</th>
-<th align="left" valign="bottom" id="r1c3-t28">Default</th>
+<th align="left" valign="bottom" id="r1c1-t27">Property</th>
+<th align="left" valign="bottom" id="r1c2-t27">Description</th>
+<th align="left" valign="bottom" id="r1c3-t27">Default</th>
+<th align="left" valign="bottom" id="r1c4-t27">Available for Entity&nbsp;Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t28" headers="r1c1-t28">
-<p>Default Cache Type</p>
+<td align="left" id="r2c1-t27" headers="r1c1-t27">
+<p>Multitenancy strategy</p>
</td>
-<td align="left" headers="r2c1-t28 r1c2-t28">
-<p>Select one of the following as the Default Cache Type:</p>
+<td align="left" headers="r2c1-t27 r1c2-t27">
+<p>Specify the multitenant strategy to use:</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>
+<p>Single table</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>
+<p>Table per tenant</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>
+<p>VPD</p>
</li>
</ul>
</td>
-<td align="left" headers="r2c1-t28 r1c3-t28">
-<p>Weak with soft subcache</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<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 align="left" headers="r2c1-t27 r1c3-t27">
+<p>Single table</p>
</td>
-<td align="left" headers="r3c1-t28 r1c3-t28">
-<p>100</p>
+<td align="left" headers="r2c1-t27 r1c4-t27">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t28" headers="r1c1-t28">
-<p>Default Shared Cache</p>
+<td align="left" id="r3c1-t27" headers="r1c1-t27">
+<p>Include criteria</p>
</td>
-<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 align="left" headers="r3c1-t27 r1c2-t27">
+<p>Specify if the database requires the tenant criteria to be added to the <code>SELECT</code>, <code>UPDATE</code>, and <code>DELETE</code> queries.</p>
</td>
-<td align="left" headers="r4c1-t28 r1c3-t28">
+<td align="left" headers="r3c1-t27 r1c3-t27">
<p>True</p>
</td>
+<td align="left" headers="r3c1-t27 r1c4-t27">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t28" headers="r1c1-t28">
-<p>Entity Caching</p>
+<td align="left" id="r4c1-t27" headers="r1c1-t27">
+<p><span class="bold">Tenant descriptor columns</span></p>
</td>
-<td align="left" headers="r5c1-t28 r1c2-t28">
-<p>Specify the entity-specific caching information.</p>
+<td align="left" headers="r4c1-t27 r1c2-t27"><br /></td>
+<td align="left" headers="r4c1-t27 r1c3-t27"><br /></td>
+<td align="left" headers="r4c1-t27 r1c4-t27">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r5c1-t28 r1c3-t28"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t28" headers="r1c1-t28">
-<p>&nbsp;&nbsp;Cache&nbsp;Type</p>
-</td>
-<td align="left" headers="r6c1-t28 r1c2-t28">
-<p>See <span class="italic">Default Cache Type.</span></p>
+<td align="left" id="r5c1-t27" headers="r1c1-t27">
+<p>Override default</p>
</td>
-<td align="left" headers="r6c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r5c1-t27 r1c2-t27"><br /></td>
+<td align="left" headers="r5c1-t27 r1c3-t27"><br /></td>
+<td align="left" headers="r5c1-t27 r1c4-t27"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t28" headers="r1c1-t28">
-<p>&nbsp;&nbsp;Cache&nbsp;Size</p>
+<td align="left" id="r6c1-t27" headers="r1c1-t27">
+<p>Name</p>
</td>
-<td align="left" headers="r7c1-t28 r1c2-t28">
-<p>See <span class="italic">Default Cache Size.</span></p>
-</td>
-<td align="left" headers="r7c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r6c1-t27 r1c2-t27"><br /></td>
+<td align="left" headers="r6c1-t27 r1c3-t27"><br /></td>
+<td align="left" headers="r6c1-t27 r1c4-t27"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t28" headers="r1c1-t28">
-<p>&nbsp;&nbsp;Shared&nbsp;Cache</p>
+<td align="left" id="r7c1-t27" headers="r1c1-t27">
+<p>Table</p>
</td>
-<td align="left" headers="r8c1-t28 r1c2-t28">
-<p>See <span class="italic">Default Shared Cache</span>.</p>
+<td align="left" headers="r7c1-t27 r1c2-t27"><br /></td>
+<td align="left" headers="r7c1-t27 r1c3-t27"><br /></td>
+<td align="left" headers="r7c1-t27 r1c4-t27"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t27" headers="r1c1-t27">
+<p>Context property</p>
</td>
-<td align="left" headers="r8c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r8c1-t27 r1c2-t27"><br /></td>
+<td align="left" headers="r8c1-t27 r1c3-t27"><br /></td>
+<td align="left" headers="r8c1-t27 r1c4-t27"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t28" headers="r1c1-t28">
-<p>Flush clear cache</p>
+<td align="left" id="r9c1-t27" headers="r1c1-t27">
+<p>Discriminator type</p>
</td>
-<td align="left" headers="r9c1-t28 r1c2-t28">
-<p>Select one of the following as the Default Cache Type:</p>
+<td align="left" headers="r9c1-t27 r1c2-t27">
<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>
+<p>Character</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>
+<p>Integer</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>
+<p>String</p>
</li>
</ul>
</td>
-<td align="left" headers="r9c1-t28 r1c3-t28">
-<p>Drop Invalidate</p>
+<td align="left" headers="r9c1-t27 r1c3-t27">
+<p>String</p>
</td>
+<td align="left" headers="r9c1-t27 r1c4-t27"><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="r10c1-t27" headers="r1c1-t27">
+<p>Length</p>
+</td>
+<td align="left" headers="r10c1-t27 r1c2-t27"><br /></td>
+<td align="left" headers="r10c1-t27 r1c3-t27"><br /></td>
+<td align="left" headers="r10c1-t27 r1c4-t27"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t27" headers="r1c1-t27">
+<p>Column definition</p>
+</td>
+<td align="left" headers="r11c1-t27 r1c2-t27"><br /></td>
+<td align="left" headers="r11c1-t27 r1c3-t27"><br /></td>
+<td align="left" headers="r11c1-t27 r1c4-t27"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t27" headers="r1c1-t27">
+<p>Primary key</p>
+</td>
+<td align="left" headers="r12c1-t27 r1c2-t27"><br /></td>
+<td align="left" headers="r12c1-t27 r1c3-t27">
+<p>False</p>
+</td>
+<td align="left" headers="r12c1-t27 r1c4-t27"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblnote" --></div>
+<!-- class="inftblhruleinformalwide" -->
+<a id="sthref379" name="sthref379"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+<li>
+<p>"Multitenant" in <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span>&nbsp;<br />
+<code><a href="http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_multitenant.htm">http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_multitenant.htm</a></code></p>
+</li>
+</ul>
</div>
<!-- class="sect3" -->
<!-- Start Footer -->
@@ -175,11 +189,11 @@ This page is not available for projects using the <span class="bold">Generic</sp
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm
index c92c362700..b30979728c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm
@@ -3,227 +3,241 @@
<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>Logging</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Primary Key Generation</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Logging" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Primary Key Generation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIABGHHI" name="CIABGHHI"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACCJJDC" name="CACCJJDC"></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="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 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%" />
+<h1>Primary Key Generation</h1>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" title="JPA Details view, Primary key page" summary="JPA Details view, Primary key page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="16%" />
<col width="*" />
-<col width="24%" />
+<col width="17%" />
+<col width="25%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t31">Property</th>
-<th align="left" valign="bottom" id="r1c2-t31">Description</th>
-<th align="left" valign="bottom" id="r1c3-t31">Default</th>
+<th align="left" valign="bottom" id="r1c1-t28">Property</th>
+<th align="left" valign="bottom" id="r1c2-t28">Description</th>
+<th align="left" valign="bottom" id="r1c3-t28">Default</th>
+<th align="left" valign="bottom" id="r1c4-t28">Available for Entity&nbsp;Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t31" headers="r1c1-t31">
-<p>Logging Level</p>
+<td align="left" id="r2c1-t28" headers="r1c1-t28">
+<p><span class="bold">Table Generator</span></p>
</td>
-<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">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">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>
-</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-t31 r1c3-t31">
-<p>Info</p>
+<td align="left" headers="r2c1-t28 r1c2-t28">
+<p>These fields define the database table used for generating the primary key and correspond to the <code>@TableGenerator</code> annotation.</p>
</td>
+<td align="left" headers="r2c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r2c1-t28 r1c4-t28">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t31" headers="r1c1-t31">
-<p>&nbsp;&nbsp;Timestamp</p>
+<td align="left" id="r3c1-t28" headers="r1c1-t28">
+<p>Name</p>
</td>
-<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 align="left" headers="r3c1-t28 r1c2-t28">
+<p>Unique name of the generator.</p>
</td>
+<td align="left" headers="r3c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r3c1-t28 r1c4-t28">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t31" headers="r1c1-t31">
-<p>&nbsp;&nbsp;Thread</p>
+<td align="left" id="r4c1-t28" headers="r1c1-t28">
+<p>Table</p>
</td>
-<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><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>
-</li>
-</ul>
+<td align="left" headers="r4c1-t28 r1c2-t28">
+<p>Database table that stores the generated ID values.</p>
+</td>
+<td align="left" headers="r4c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r4c1-t28 r1c4-t28">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t28" headers="r1c1-t28">
+<p>Schema</p>
</td>
-<td align="left" headers="r4c1-t31 r1c3-t31">
-<p>true</p>
+<td align="left" headers="r5c1-t28 r1c2-t28"><br /></td>
+<td align="left" headers="r5c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r5c1-t28 r1c4-t28">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t28" headers="r1c1-t28">
+<p>Catalog</p>
</td>
+<td align="left" headers="r6c1-t28 r1c2-t28"><br /></td>
+<td align="left" headers="r6c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r6c1-t28 r1c4-t28">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t31" headers="r1c1-t31">
-<p>&nbsp;&nbsp;Session</p>
+<td align="left" id="r7c1-t28" headers="r1c1-t28">
+<p>Primary key column</p>
</td>
-<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 align="left" headers="r7c1-t28 r1c2-t28">
+<p>The column in the table generator's <span class="bold">Table</span> that contains the primary key.</p>
</td>
+<td align="left" headers="r7c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r7c1-t28 r1c4-t28">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t31" headers="r1c1-t31">
-<p>&nbsp;&nbsp;Exceptions</p>
+<td align="left" id="r8c1-t28" headers="r1c1-t28">
+<p>Value column</p>
</td>
-<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 align="left" headers="r8c1-t28 r1c2-t28">
+<p>The column that stores the generated ID values.</p>
</td>
+<td align="left" headers="r8c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r8c1-t28 r1c4-t28">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t31" headers="r1c1-t31">
-<p>Log file</p>
+<td align="left" id="r9c1-t28" headers="r1c1-t28">
+<p>Allocation size</p>
+</td>
+<td align="left" headers="r9c1-t28 r1c2-t28">
+<p>The value for the <span class="bold">Primary Key Column</span> in the generator table.</p>
+</td>
+<td align="left" headers="r9c1-t28 r1c3-t28">
+<p>50</p>
</td>
-<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>
+<td align="left" headers="r9c1-t28 r1c4-t28">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t31" headers="r1c1-t31">
-<p>Logger</p>
+<td align="left" id="r10c1-t28" headers="r1c1-t28">
+<p>Initial value</p>
</td>
-<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 align="left" headers="r10c1-t28 r1c2-t28"><br /></td>
+<td align="left" headers="r10c1-t28 r1c3-t28">
+<p>0</p>
+</td>
+<td align="left" headers="r10c1-t28 r1c4-t28">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t28" headers="r1c1-t28">
+<p><span class="bold">Sequence Generator</span></p>
+</td>
+<td align="left" headers="r11c1-t28 r1c2-t28">
+<p><a id="sthref380" name="sthref380"></a><a id="sthref381" name="sthref381"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.</p>
+<p>These fields apply only when <span class="bold">Strategy</span> = <span class="bold">Sequence</span>.</p>
+</td>
+<td align="left" headers="r11c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r11c1-t28 r1c4-t28">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t28" headers="r1c1-t28">
+<p>Name</p>
+</td>
+<td align="left" headers="r12c1-t28 r1c2-t28">
+<p>Name of the sequence table to use for defining primary key values.</p>
</td>
+<td align="left" headers="r12c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r12c1-t28 r1c4-t28">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r13c1-t28" headers="r1c1-t28">
+<p>Sequence</p>
+</td>
+<td align="left" headers="r13c1-t28 r1c2-t28">
+<p>Unique name of the sequence.</p>
+</td>
+<td align="left" headers="r13c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r13c1-t28 r1c4-t28">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r14c1-t28" headers="r1c1-t28">
+<p>Schema</p>
+</td>
+<td align="left" headers="r14c1-t28 r1c2-t28"><br /></td>
+<td align="left" headers="r14c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r14c1-t28 r1c4-t28">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r15c1-t28" headers="r1c1-t28">
+<p>Catalog</p>
+</td>
+<td align="left" headers="r15c1-t28 r1c2-t28"><br /></td>
+<td align="left" headers="r15c1-t28 r1c3-t28"><br /></td>
+<td align="left" headers="r15c1-t28 r1c4-t28">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r16c1-t28" headers="r1c1-t28">
+<p>Allocation size</p>
+</td>
+<td align="left" headers="r16c1-t28 r1c2-t28">
+<p><a id="sthref382" name="sthref382"></a><a id="sthref383" name="sthref383"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.</p>
+<p>These fields apply only when <span class="bold">Strategy</span> = <span class="bold">Sequence</span>.</p>
+</td>
+<td align="left" headers="r16c1-t28 r1c3-t28">
+<p>50</p>
+</td>
+<td align="left" headers="r16c1-t28 r1c4-t28">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r17c1-t28" headers="r1c1-t28">
+<p>Initial value</p>
+</td>
+<td align="left" headers="r17c1-t28 r1c2-t28"><br /></td>
+<td align="left" headers="r17c1-t28 r1c3-t28">
+<p>1</p>
+</td>
+<td align="left" headers="r17c1-t28 r1c4-t28">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="tblformal" --></div>
+<!-- class="inftblhruleinformalwide" -->
+<a id="sthref384" name="sthref384"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -231,11 +245,11 @@ This page is not available for projects using the <span class="bold">Generic</sp
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm
index 111b7cbf21..f36c9d3f93 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm
@@ -3,156 +3,44 @@
<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>Options</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Secondary tables</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Options" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Secondary tables" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIAFJCHE" name="CIAFJCHE"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACBHIDA" name="CACBHIDA"></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="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="sthref269" name="sthref269"></a><a id="sthref270" name="sthref270"></a>
-<p class="titleintable">Properties of the Options Page</p>
-<table class="Formal" title="Properties of the Options Page" summary="Properties of the Options Page" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<col width="24%" />
-<col width="*" />
-<col width="24%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t33">Property</th>
-<th align="left" valign="bottom" id="r1c2-t33">Description</th>
-<th align="left" valign="bottom" id="r1c3-t33">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<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-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-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 class name 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>
-</tr>
-<tr align="left" valign="top">
-<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>
-</tr>
-<tr align="left" valign="top">
-<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-t33" headers="r1c1-t33">
-<p>Include Descriptor Queries</p>
-</td>
-<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-t33 r1c3-t33"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t33" headers="r1c1-t33">
-<p>Miscellaneous Options</p>
-</td>
-<td align="left" headers="r8c1-t33 r1c2-t33"><br /></td>
-<td align="left" headers="r8c1-t33 r1c3-t33"><br /></td>
-</tr>
-<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="tblformal" --></div>
+<h1>Secondary tables</h1>
+<p><a id="sthref385" name="sthref385"></a><a id="sthref386" name="sthref386"></a><a id="sthref387" name="sthref387"></a><a id="sthref388" name="sthref388"></a>Use the <span class="gui-object-title">Secondary Tables</span> area in the <span class="gui-object-title">JPA Details</span> view to associate additional tables with an entity. Use this area if the data associated with an entity is spread across multiple tables.</p>
+<p>Refer to <a href="task_additonal_tables.htm#CIHGBIEI">"Specifying additional tables"</a> for additional information.</p>
+<a id="sthref389" name="sthref389"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a></p>
+</li>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+</ul>
+<a id="sthref390" name="sthref390"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -160,11 +48,11 @@ This page is not available for projects using the <span class="bold">Generic</sp
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm
index 52ec40416d..521fc4f861 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm
@@ -3,129 +3,149 @@
<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>Schema Generation</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Converters</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Schema Generation" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Converters" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIACCFCB" name="CIACCFCB"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACJGDAJ" name="CACJGDAJ"></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="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="sthref271" name="sthref271"></a><a id="sthref272" name="sthref272"></a>
-<p class="titleintable">&nbsp;</p>
-<table class="Formal" title="" summary="This table lists the properties of the persistence.xml Editor&rsquo;s Schema Generation page." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<col width="24%" />
+<h1>Converters</h1>
+<p>Use the Converter area in the <span class="gui-object-title">JPA Details</span> view to specify a way to modify data value(s) during the reading and writing of a mapped attribute.</p>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" title="JPA Details view, Advanced page" summary="JPA Details view, Advanced page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="16%" />
<col width="*" />
-<col width="24%" />
+<col width="17%" />
+<col width="25%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t35">Property</th>
-<th align="left" valign="bottom" id="r1c2-t35">Description</th>
-<th align="left" valign="bottom" id="r1c3-t35">Default</th>
+<th align="left" valign="bottom" id="r1c1-t29">Property</th>
+<th align="left" valign="bottom" id="r1c2-t29">Description</th>
+<th align="left" valign="bottom" id="r1c3-t29">Default</th>
+<th align="left" valign="bottom" id="r1c4-t29">Available for Entity&nbsp;Type</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t35" headers="r1c1-t35">
-<p>DDL Generation Type</p>
+<td align="left" id="r2c1-t29" headers="r1c1-t29">
+<p>Converters</p>
</td>
-<td align="left" headers="r2c1-t35 r1c2-t35">
-<p>Select the type of DDL generation:</p>
+<td align="left" headers="r2c1-t29 r1c2-t29">
+<p>Click Add and use the <a href="ref_add_converter.htm#CIAGCGIJ">Add Converter dialog</a> to create a new converter.</p>
<ul>
<li>
-<p><span class="bold">None</span> -- Do not generate DDL; no schema is generated.</p>
+<p>Object Type</p>
+</li>
+<li>
+<p>Type</p>
</li>
<li>
-<p><span class="bold">Create Tables</span> -- Create DDL for non-existent tables; leave existing tables unchanged.</p>
+<p>Struct</p>
</li>
<li>
-<p><span class="bold">Drop and Create Tables</span> -- Create DDL for all tables; drop all existing tables.</p>
+<p>Custom</p>
</li>
</ul>
</td>
-<td align="left" headers="r2c1-t35 r1c3-t35">
-<p>None</p>
+<td align="left" headers="r2c1-t29 r1c3-t29"><br /></td>
+<td align="left" headers="r2c1-t29 r1c4-t29">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t35" headers="r1c1-t35">
-<p>Output Mode</p>
+<td align="left" id="r3c1-t29" headers="r1c1-t29">
+<p>Name</p>
</td>
-<td align="left" headers="r3c1-t35 r1c2-t35">
-<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 align="left" headers="r3c1-t29 r1c2-t29"><br /></td>
+<td align="left" headers="r3c1-t29 r1c3-t29"><br /></td>
+<td align="left" headers="r3c1-t29 r1c4-t29">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r3c1-t35 r1c3-t35"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t35" headers="r1c1-t35">
-<p>DDL Generation Location</p>
+<td align="left" id="r4c1-t29" headers="r1c1-t29">
+<p>Class</p>
</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 align="left" headers="r4c1-t29 r1c2-t29">
+<p>Appears for <span class="bold">Custom</span> and <span class="bold">Struct</span> converters only.</p>
+</td>
+<td align="left" headers="r4c1-t29 r1c3-t29"><br /></td>
+<td align="left" headers="r4c1-t29 r1c4-t29">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t29" headers="r1c1-t29">
+<p>Data type</p>
+</td>
+<td align="left" headers="r5c1-t29 r1c2-t29">
+<p>Appears for <span class="bold">Object Type</span> and <span class="bold">Type</span> converters only.</p>
+</td>
+<td align="left" headers="r5c1-t29 r1c3-t29"><br /></td>
+<td align="left" headers="r5c1-t29 r1c4-t29">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t29" headers="r1c1-t29">
+<p>Object type</p>
+</td>
+<td align="left" headers="r6c1-t29 r1c2-t29">
+<p>Appears for <span class="bold">Object Type</span> and <span class="bold">Type</span> converters only.</p>
+</td>
+<td align="left" headers="r6c1-t29 r1c3-t29"><br /></td>
+<td align="left" headers="r6c1-t29 r1c4-t29">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
</td>
-<td align="left" headers="r4c1-t35 r1c3-t35"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t35" headers="r1c1-t35">
-<p>Create DDL File Name</p>
+<td align="left" id="r7c1-t29" headers="r1c1-t29">
+<p>Conversion values</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 align="left" headers="r7c1-t29 r1c2-t29">
+<p>Appears for <span class="bold">Object Type</span> converters only.</p>
</td>
-<td align="left" headers="r5c1-t35 r1c3-t35">
-<p>createDDL.jdbc</p>
+<td align="left" headers="r7c1-t29 r1c3-t29"><br /></td>
+<td align="left" headers="r7c1-t29 r1c4-t29">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t35" headers="r1c1-t35">
-<p>Drop DDL File Name</p>
+<td align="left" id="r8c1-t29" headers="r1c1-t29">
+<p>Default object value</p>
</td>
-<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 align="left" headers="r8c1-t29 r1c2-t29">
+<p>Appears for <span class="bold">Object Type</span> converters only.</p>
</td>
-<td align="left" headers="r6c1-t35 r1c3-t35">
-<p>dropDDL.jdbc</p>
+<td align="left" headers="r8c1-t29 r1c3-t29"><br /></td>
+<td align="left" headers="r8c1-t29 r1c4-t29">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
</td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="tblformal" --></div>
+<!-- class="inftblhruleinformalwide" -->
+<a id="sthref391" name="sthref391"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p>"Converter" in <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span><br />
+<code><a href="http://eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_converter.htm">http://eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_converter.htm</a></code></p>
+</li>
+</ul>
+</div>
<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
@@ -133,11 +153,11 @@ This page is not available for projects using the <span class="bold">Generic</sp
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm
index 1830f01b1d..9aafc5e281 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm
@@ -3,39 +3,125 @@
<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>Properties</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Advanced</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Properties" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Advanced" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIAHJDFF" name="CIAHJDFF"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACJEEDE" name="CACJEEDE"></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 <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>
+<h1>Advanced</h1>
+<p><a id="sthref392" name="sthref392"></a><a id="sthref393" name="sthref393"></a><a id="sthref394" name="sthref394"></a><a id="sthref395" name="sthref395"></a><a id="sthref396" name="sthref396"></a><a id="sthref397" name="sthref397"></a><a id="sthref398" name="sthref398"></a><a id="sthref399" name="sthref399"></a><a id="sthref400" name="sthref400"></a>Use the <span class="gui-object-title">Advanced</span> area in the <span class="gui-object-title">JPA Details</span> view to configure additional settings for an entity.</p>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" title="JPA Details view, Advanced page" summary="JPA Details view, Advanced page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="16%" />
+<col width="*" />
+<col width="17%" />
+<col width="25%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t30">Property</th>
+<th align="left" valign="bottom" id="r1c2-t30">Description</th>
+<th align="left" valign="bottom" id="r1c3-t30">Default</th>
+<th align="left" valign="bottom" id="r1c4-t30">Available for Entity&nbsp;Type</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t30" headers="r1c1-t30">
+<p>Read-only</p>
+</td>
+<td align="left" headers="r2c1-t30 r1c2-t30">
+<p>Specifies if a class is read-only.</p>
+</td>
+<td align="left" headers="r2c1-t30 r1c3-t30">
+<p>False</p>
+</td>
+<td align="left" headers="r2c1-t30 r1c4-t30">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a> and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t30" headers="r1c1-t30">
+<p>Customizer class</p>
+</td>
+<td align="left" headers="r3c1-t30 r1c2-t30">
+<p>Specifies a class that implements <code>DescriptorCustomizer</code> and is to run against an entity's class descriptor after all metadata processing has been completed.</p>
+</td>
+<td align="left" headers="r3c1-t30 r1c3-t30">
+<p>True</p>
+</td>
+<td align="left" headers="r3c1-t30 r1c4-t30">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t30" headers="r1c1-t30">
+<p>Change tracking</p>
+</td>
+<td align="left" headers="r4c1-t30 r1c2-t30">
+<p>Specifies the <code>ObjectChangePolicy</code> to use:</p>
+<ul>
+<li>
+<p><span class="bold">Attribute</span> &ndash; Objects with changed attributes will be processed in the commit process to include any changes in the results of the commit. Unchanged objects will be ignored.</p>
+</li>
+<li>
+<p><span class="bold">Object</span> &ndash; Changed objects will be processed in the commit process to include any changes in the results of the commit. Unchanged objects will be ignored.</p>
+</li>
+<li>
+<p><span class="bold">Deferred</span> &ndash; Defers all change detection to the UnitOfWork's change detection process.</p>
+</li>
+<li>
+<p><span class="bold">Auto</span> &ndash; Does not set any change tracking policy; change tracking will be determined at runtime.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r4c1-t30 r1c3-t30">
+<p>Auto</p>
+</td>
+<td align="left" headers="r4c1-t30 r1c4-t30">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a>, <a href="tasks003.htm#BABFEICE">Embeddable</a>, and <a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformalwide" -->
+<a id="sthref401" name="sthref401"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+<li>
+<p>"Read Only" and "ChangeTracking" in <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span><br />
+<code><a href="http://eclipse.org/eclipselink/documentation/2.4/jpa/">http://eclipse.org/eclipselink/documentation/2.4/jpa/</a></code></p>
+</li>
+</ul>
</div>
<!-- class="sect3" -->
+<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm
index 47b984b01f..7aaa05d8d0 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm
@@ -3,44 +3,226 @@
<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>Source</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Basic Mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Source" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Basic Mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIAHCJAH" name="CIAHCJAH"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACCGGCG" name="CACCGGCG"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
-<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>
+<h1>Basic Mapping</h1>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="JPA Details view, Version page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="22%" />
+<col width="*" />
+<col width="31%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t31">Property</th>
+<th align="left" valign="bottom" id="r1c2-t31">Description</th>
+<th align="left" valign="bottom" id="r1c3-t31">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t31" headers="r1c1-t31">
+<p><span class="bold">Column</span></p>
+</td>
+<td align="left" headers="r2c1-t31 r1c2-t31">
+<p><a id="sthref407" name="sthref407"></a><a id="sthref408" name="sthref408"></a>The database column that contains the value for the attribute. This field corresponds to the <code>@Column</code> annotation.</p>
+</td>
+<td align="left" headers="r2c1-t31 r1c3-t31">
+<p>By default, the Column is assumed to be named identically to the attribute and always included in the <code>INSERT</code> and <code>UPDATE</code> statements.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t31" headers="r1c1-t31">
+<p>Name</p>
+</td>
+<td align="left" headers="r3c1-t31 r1c2-t31">
+<p>The database column that contains the value for the attribute.</p>
+</td>
+<td align="left" headers="r3c1-t31 r1c3-t31"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t31" headers="r1c1-t31">
+<p>Table</p>
+</td>
+<td align="left" headers="r4c1-t31 r1c2-t31">
+<p>Name of the database table that contains the selected column.</p>
+</td>
+<td align="left" headers="r4c1-t31 r1c3-t31"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t31" headers="r1c1-t31">
+<p><span class="bold">Details</span></p>
+</td>
+<td align="left" headers="r5c1-t31 r1c2-t31"><br /></td>
+<td align="left" headers="r5c1-t31 r1c3-t31"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t31" headers="r1c1-t31">
+<p>Insertable</p>
+</td>
+<td align="left" headers="r6c1-t31 r1c2-t31">
+<p>Specifies if the column is always included in <code>SQL INSERT</code> statements.</p>
+</td>
+<td align="left" headers="r6c1-t31 r1c3-t31">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t31" headers="r1c1-t31">
+<p>Updatable</p>
+</td>
+<td align="left" headers="r7c1-t31 r1c2-t31">
+<p>Specifies if this column is always included in <code>SQL UPDATE</code> statements.</p>
+</td>
+<td align="left" headers="r7c1-t31 r1c3-t31">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t31" headers="r1c1-t31">
+<p>Unique</p>
+</td>
+<td align="left" headers="r8c1-t31 r1c2-t31">
+<p>Sets the <code>UNIQUE</code> constraint for the column.</p>
+</td>
+<td align="left" headers="r8c1-t31 r1c3-t31">
+<p>False</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t31" headers="r1c1-t31">
+<p>Nullable</p>
+</td>
+<td align="left" headers="r9c1-t31 r1c2-t31">
+<p>Specifies if the column allows null values.</p>
+</td>
+<td align="left" headers="r9c1-t31 r1c3-t31">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t31" headers="r1c1-t31">
+<p>Length</p>
+</td>
+<td align="left" headers="r10c1-t31 r1c2-t31">
+<p>Sets the column length.</p>
+</td>
+<td align="left" headers="r10c1-t31 r1c3-t31">
+<p>255</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t31" headers="r1c1-t31">
+<p>Precision</p>
+</td>
+<td align="left" headers="r11c1-t31 r1c2-t31">
+<p>Sets the precision for the column values.</p>
+</td>
+<td align="left" headers="r11c1-t31 r1c3-t31">
+<p>0</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t31" headers="r1c1-t31">
+<p>Scale</p>
+</td>
+<td align="left" headers="r12c1-t31 r1c2-t31">
+<p>Sets the number of digits that appear to the right of the decimal point.</p>
+</td>
+<td align="left" headers="r12c1-t31 r1c3-t31">
+<p>0</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r13c1-t31" headers="r1c1-t31">
+<p>Column definition</p>
+</td>
+<td align="left" headers="r13c1-t31 r1c2-t31">
+<p>The SQL fragment that is used when generating the DDL for the column.</p>
+</td>
+<td align="left" headers="r13c1-t31 r1c3-t31"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r14c1-t31" headers="r1c1-t31">
+<p><a id="sthref409" name="sthref409"></a><a id="sthref410" name="sthref410"></a><a id="sthref411" name="sthref411"></a><span class="bold">Fetch</span></p>
+</td>
+<td align="left" headers="r14c1-t31 r1c2-t31">
+<p>Defines how data is loaded from the database:</p>
+<ul>
+<li>
+<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
+</li>
+<li>
+<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r14c1-t31 r1c3-t31">
+<p>Eager</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r15c1-t31" headers="r1c1-t31">
+<p><span class="bold">Optional</span></p>
+</td>
+<td align="left" headers="r15c1-t31 r1c2-t31">
+<p>Specifies if this field is can be null.</p>
+</td>
+<td align="left" headers="r15c1-t31 r1c3-t31">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r16c1-t31" headers="r1c1-t31">
+<p><span class="bold">Mutable</span></p>
+</td>
+<td align="left" headers="r16c1-t31 r1c2-t31">
+<p>Specify if the value of a complex field type can be changed (or not changed) instead of being replaced.</p>
+</td>
+<td align="left" headers="r16c1-t31 r1c3-t31">
+<p>True</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<p>Basic mappings also include the following areas:</p>
+<ul>
+<li>
+<p><a href="reference035.htm#CACIHAAF">Type information</a></p>
+</li>
+<li>
+<p><a href="reference037.htm#CACJCHJB">Converters</a></p>
+</li>
+</ul>
+</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, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm
index 235ba80757..88a0df6a28 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm
@@ -3,44 +3,161 @@
<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>Preferences</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Element Collection Mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Preferences" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Element Collection Mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- 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>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACBCGDI" name="CACBCGDI"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Element Collection Mapping</h1>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="JPA Details view, Version page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="29%" />
+<col width="*" />
+<col width="24%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t32">Property</th>
+<th align="left" valign="bottom" id="r1c2-t32">Description</th>
+<th align="left" valign="bottom" id="r1c3-t32">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t32" headers="r1c1-t32">
+<p>Target class</p>
+</td>
+<td align="left" headers="r2c1-t32 r1c2-t32"><br /></td>
+<td align="left" headers="r2c1-t32 r1c3-t32"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t32" headers="r1c1-t32">
+<p>Fetch</p>
+</td>
+<td align="left" headers="r3c1-t32 r1c2-t32">
+<p>Defines how data is loaded from the database:</p>
+<ul>
+<li>
+<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
+</li>
+<li>
+<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r3c1-t32 r1c3-t32">
+<p>Lazy</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t32" headers="r1c1-t32">
+<p>Join fetch</p>
+</td>
+<td align="left" headers="r4c1-t32 r1c2-t32">
+<p>The type of fetch to use:</p>
<ul>
<li>
-<p><a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; Java Persistence Options</a></p>
+<p>Inner &ndash; Provides the inner join fetching of the related object.</p>
+<p><span class="bold">Note</span>: Inner joining does not allow for null or empty values</p>
</li>
<li>
-<p><a href="reference027.htm#CACFBAEH">Project Properties page &ndash; Validation Preferences</a></p>
+<p>Outer &ndash; Provides the outer join fetching of the related object</p>
+<p><span class="bold">Note</span>: Outer joining allows for null or empty values.</p>
</li>
</ul>
+</td>
+<td align="left" headers="r4c1-t32 r1c3-t32">
+<p>None</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t32" headers="r1c1-t32">
+<p><span class="bold">Collection Table</span></p>
+</td>
+<td align="left" headers="r5c1-t32 r1c2-t32"><br /></td>
+<td align="left" headers="r5c1-t32 r1c3-t32"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t32" headers="r1c1-t32">
+<p>Name</p>
+</td>
+<td align="left" headers="r6c1-t32 r1c2-t32"><br /></td>
+<td align="left" headers="r6c1-t32 r1c3-t32"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t32" headers="r1c1-t32">
+<p>Schema</p>
+</td>
+<td align="left" headers="r7c1-t32 r1c2-t32"><br /></td>
+<td align="left" headers="r7c1-t32 r1c3-t32"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t32" headers="r1c1-t32">
+<p>Catalog</p>
+</td>
+<td align="left" headers="r8c1-t32 r1c2-t32"><br /></td>
+<td align="left" headers="r8c1-t32 r1c3-t32"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t32" headers="r1c1-t32">
+<p><span class="bold">Join Columns</span></p>
+</td>
+<td align="left" headers="r9c1-t32 r1c2-t32"><br /></td>
+<td align="left" headers="r9c1-t32 r1c3-t32">
+<p>0</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t32" headers="r1c1-t32">
+<p>Override default</p>
+</td>
+<td align="left" headers="r10c1-t32 r1c2-t32">
+<p>Click <span class="bold">Add</span> to create a new join column, by using the <a href="reference062.htm#CACJJBAD">Add Join Column dialog</a>.</p>
+</td>
+<td align="left" headers="r10c1-t32 r1c3-t32">
+<p>0</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<p>Element collection mappings also include the following areas:</p>
+<ul>
+<li>
+<p><a href="reference036.htm#CACJBFEA">Value</a></p>
+</li>
+<li>
+<p><a href="reference037.htm#CACJCHJB">Converters</a></p>
+</li>
+<li>
+<p><a href="reference038.htm#CACBIJFD">Ordering</a></p>
+</li>
+</ul>
+</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, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm
index f48d45b158..586ad60031 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm
@@ -3,106 +3,37 @@
<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>Project Properties page &ndash; Validation Preferences</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Embedded Mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Project Properties page &ndash; Validation Preferences" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Embedded Mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CACFBAEH" name="CACFBAEH"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Project Properties page &ndash; Validation Preferences</h1>
-<p><a id="sthref275" name="sthref275"></a><a id="sthref276" name="sthref276"></a>Use the <span class="gui-object-title">Java Persistence</span> options on the <span class="gui-object-title">Properties</span> page to select the database connection to use with the project.</p>
-<p>This table lists the properties available in the <span class="gui-object-title">JPA Details page</span>.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Persistence Properties page." summary="This table describes the options on the Persistence Properties page." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="32%" />
-<col width="*" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t37">Property</th>
-<th align="left" valign="bottom" id="r1c2-t37">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t37" headers="r1c1-t37"><a id="sthref277" name="sthref277"></a><a id="sthref278" name="sthref278"></a><a id="sthref279" name="sthref279"></a><a id="sthref280" name="sthref280"></a>Platform</td>
-<td align="left" headers="r2c1-t37 r1c2-t37">Select the vendor-specific platform.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t37" headers="r1c1-t37">Library</td>
-<td align="left" headers="r3c1-t37 r1c2-t37">Select a specific JPA library configuration.
-<p>Click <span class="bold">Manage libraries</span> to create or update a user library.</p>
-<p>Click <span class="bold">Download libraries</span> to download a specific library configuration.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t37" headers="r1c1-t37">&nbsp;&nbsp;Type</td>
-<td align="left" headers="r4c1-t37 r1c2-t37">Select <span class="bold">User Library</span> to select from the available user-defined or downloaded libraries.
-<p>If you select Disable, you must manually include the JPA implementation library on the project classpath.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t37" headers="r1c1-t37">&nbsp;&nbsp;Include&nbsp;libraries&nbsp;with&nbsp;this&nbsp;application</td>
-<td align="left" headers="r5c1-t37 r1c2-t37">Specify if the selected libraries are included when deploying the application.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t37" headers="r1c1-t37"><a id="sthref281" name="sthref281"></a><a id="sthref282" name="sthref282"></a><a id="sthref283" name="sthref283"></a>Connection</td>
-<td align="left" headers="r6c1-t37 r1c2-t37">The database connection used to map the persistent entities.
-<ul>
-<li>
-<p>To create a new connection, click <span class="bold">Add Connections</span>.</p>
-</li>
-<li>
-<p>To reconnect to an existing connection, click <span class="bold">Reconnect</span>.</p>
-</li>
-</ul>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t37" headers="r1c1-t37">&nbsp;&nbsp;Override&nbsp;default&nbsp;catalog&nbsp;from&nbsp;connection</td>
-<td align="left" headers="r7c1-t37 r1c2-t37">Select a catalog other than the default one derived from the connection information. Use this option if the default catalog is incorrect or cannot be used.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t37" headers="r1c1-t37">&nbsp;&nbsp;Override&nbsp;default&nbsp;schema&nbsp;from&nbsp;connection</td>
-<td align="left" headers="r8c1-t37 r1c2-t37">Select a schema other than the default one derived from the connection information. Use this option if the default schema is incorrect or cannot be used. For example, use this option when the deployment login differs from the design-time login.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r9c1-t37" headers="r1c1-t37">Persistent Class Management</td>
-<td align="left" headers="r9c1-t37 r1c2-t37">Specify if Dali will <span class="bold">discover annotated classes automatically</span>, or if the <span class="bold">annotated classes must be listed in the persistence.xml</span> file.
-<p><span class="bold">Note</span>: To insure application portability, you should explicitly list the managed persistence classes that are included in the persistence unit.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r10c1-t37" headers="r1c1-t37"><a id="sthref284" name="sthref284"></a><a id="sthref285" name="sthref285"></a>Canonical Metamodel</td>
-<td align="left" headers="r10c1-t37 r1c2-t37"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblinformal" --></div>
-<!-- class="sect2" -->
-<!-- class="sect1" -->
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACBJBFD" name="CACBJBFD"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Embedded Mapping</h1>
+</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, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm
index 7371b2503f..35cb98b41f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm
@@ -3,47 +3,37 @@
<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>Dialogs</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>Embedded ID Mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Dialogs" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Embedded ID Mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CACGEJDA" name="CACGEJDA"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Dialogs</h1>
-<p>This section includes information on the following preference pages:</p>
-<ul>
-<li>
-<p><a href="reference029.htm#CACCGEHC">Edit Join Columns Dialog</a></p>
-</li>
-<li>
-<p><a href="ref_select_cascade_dialog.htm#CIAFDGIJ">Select Cascade dialog</a></p>
-</li>
-<li>
-<p><a href="ref_eclipselink_mapping_file.htm#CIAEDEJF">New EclipseLink Mapping File dialog</a></p>
-</li>
-</ul>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACDIDIA" name="CACDIDIA"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Embedded ID Mapping</h1>
+</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, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm
index 9f66678703..4c709082e8 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm
@@ -3,65 +3,199 @@
<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>Edit Join Columns Dialog</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:48Z" />
+<title>ID Mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Edit Join Columns Dialog" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="ID Mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CACCGEHC" name="CACCGEHC"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Edit Join Columns Dialog</h1>
-<p>Use the <span class="gui-object-title">Join Columns</span> dialog to create or modify the join tables and columns in relationship mappings.</p>
-<p>This table lists the properties available in the <span class="gui-object-title">Join Columns</span> dialog.</p>
-<div class="inftblinformal">
-<table class="Informal" title="This table describes the options on the Join Columns dialog." summary="This table describes the options on the Join Columns dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="32%" />
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACIAEFI" name="CACIAEFI"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>ID Mapping</h1>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="JPA Details view, Version page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="29%" />
<col width="*" />
+<col width="24%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t38">Property</th>
-<th align="left" valign="bottom" id="r1c2-t38">Description</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-t38" headers="r1c1-t38">Name</td>
-<td align="left" headers="r2c1-t38 r1c2-t38">Name of the joint table column that contains the foreign key column.</td>
+<td align="left" id="r2c1-t33" headers="r1c1-t33">
+<p><span class="bold">Column</span></p>
+</td>
+<td align="left" headers="r2c1-t33 r1c2-t33">
+<p><a id="sthref412" name="sthref412"></a><a id="sthref413" name="sthref413"></a>The database column that contains the value for the attribute. This field corresponds to the <code>@Column</code> annotation.</p>
+</td>
+<td align="left" headers="r2c1-t33 r1c3-t33">
+<p>By default, the Column is assumed to be named identically to the attribute.</p>
+</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t38" headers="r1c1-t38">Referenced Column Name</td>
-<td align="left" headers="r3c1-t38 r1c2-t38">Name of the database column that contains the foreign key reference for the entity relationship.</td>
+<td align="left" id="r3c1-t33" headers="r1c1-t33">
+<p>Name</p>
+</td>
+<td align="left" headers="r3c1-t33 r1c2-t33">
+<p>The database column that contains the value for the attribute.</p>
+</td>
+<td align="left" headers="r3c1-t33 r1c3-t33"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t33" headers="r1c1-t33">
+<p>Table</p>
+</td>
+<td align="left" headers="r4c1-t33 r1c2-t33">
+<p>Name of the database table that contains the selected column.</p>
+</td>
+<td align="left" headers="r4c1-t33 r1c3-t33"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t33" headers="r1c1-t33">
+<p><span class="bold">Details</span></p>
+</td>
+<td align="left" headers="r5c1-t33 r1c2-t33"><br /></td>
+<td align="left" headers="r5c1-t33 r1c3-t33"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t33" headers="r1c1-t33">
+<p>Insertable</p>
+</td>
+<td align="left" headers="r6c1-t33 r1c2-t33">
+<p>Specifies if the column is always included in <code>SQL INSERT</code> statements.</p>
+</td>
+<td align="left" headers="r6c1-t33 r1c3-t33">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t33" headers="r1c1-t33">
+<p>Updatable</p>
+</td>
+<td align="left" headers="r7c1-t33 r1c2-t33">
+<p>Specifies if this column is always included in <code>SQL UPDATE</code> statements.</p>
+</td>
+<td align="left" headers="r7c1-t33 r1c3-t33">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t33" headers="r1c1-t33">
+<p>Unique</p>
+</td>
+<td align="left" headers="r8c1-t33 r1c2-t33">
+<p>Sets the <code>UNIQUE</code> constraint for the column.</p>
+</td>
+<td align="left" headers="r8c1-t33 r1c3-t33">
+<p>False</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t33" headers="r1c1-t33">
+<p>Nullable</p>
+</td>
+<td align="left" headers="r9c1-t33 r1c2-t33">
+<p>Specifies if the column allows null values.</p>
+</td>
+<td align="left" headers="r9c1-t33 r1c3-t33">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t33" headers="r1c1-t33">
+<p>Length</p>
+</td>
+<td align="left" headers="r10c1-t33 r1c2-t33">
+<p>Sets the column length.</p>
+</td>
+<td align="left" headers="r10c1-t33 r1c3-t33">
+<p>255</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t33" headers="r1c1-t33">
+<p>Precision</p>
+</td>
+<td align="left" headers="r11c1-t33 r1c2-t33">
+<p>Sets the precision for the column values.</p>
+</td>
+<td align="left" headers="r11c1-t33 r1c3-t33">
+<p>0</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t33" headers="r1c1-t33">
+<p>Scale</p>
+</td>
+<td align="left" headers="r12c1-t33 r1c2-t33">
+<p>Sets the number of digits that appear to the right of the decimal point.</p>
+</td>
+<td align="left" headers="r12c1-t33 r1c3-t33">
+<p>0</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r13c1-t33" headers="r1c1-t33">
+<p>Column definition</p>
+</td>
+<td align="left" headers="r13c1-t33 r1c2-t33">
+<p>The SQL fragment that is used when generating the DDL for the column.</p>
+</td>
+<td align="left" headers="r13c1-t33 r1c3-t33"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r14c1-t33" headers="r1c1-t33">
+<p><span class="bold">Mutable</span></p>
+</td>
+<td align="left" headers="r14c1-t33 r1c2-t33">
+<p>Specify if the value of a complex field type can be changed (or not changed) instead of being replaced.</p>
+</td>
+<td align="left" headers="r14c1-t33 r1c3-t33">
+<p>True</p>
+</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" -->
+<!-- class="inftblhruleinformal" -->
+<p>ID mappings also include the following areas:</p>
+<ul>
+<li>
+<p><a href="reference035.htm#CACIHAAF">Type information</a></p>
+</li>
+<li>
+<p><a href="reference037.htm#CACJCHJB">Converters</a></p>
+</li>
+<li>
+<p><a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a></p>
+</li>
+</ul>
+</div>
+<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm
index 70279780ba..2406532aaa 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm
@@ -3,44 +3,146 @@
<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>Icons and buttons</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:49Z" />
+<title>Many-to-Many Mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Icons and buttons" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Many-to-Many Mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- 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>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACIHGCE" name="CACIHGCE"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Many-to-Many Mapping</h1>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="JPA Details view, One-to-one page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="29%" />
+<col width="*" />
+<col width="24%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t34">Property</th>
+<th align="left" valign="bottom" id="r1c2-t34">Description</th>
+<th align="left" valign="bottom" id="r1c3-t34">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t34" headers="r1c1-t34">
+<p>Target entity</p>
+</td>
+<td align="left" headers="r2c1-t34 r1c2-t34">
+<p>The persistent entity to which the attribute is mapped.</p>
+</td>
+<td align="left" headers="r2c1-t34 r1c3-t34"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t34" headers="r1c1-t34">
+<p>Fetch</p>
+</td>
+<td align="left" headers="r3c1-t34 r1c2-t34">
+<p>Defines how data is loaded from the database:</p>
+<ul>
+<li>
+<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
+</li>
+<li>
+<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r3c1-t34 r1c3-t34">
+<p>Lazy</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t34" headers="r1c1-t34">
+<p>Join fetch</p>
+</td>
+<td align="left" headers="r4c1-t34 r1c2-t34">
+<p>The type of fetch to use:</p>
+<ul>
+<li>
+<p>Inner &ndash; Provides the inner join fetching of the related object.</p>
+<p><span class="bold">Note</span>: Inner joining does not allow for null or empty values</p>
+</li>
+<li>
+<p>Outer &ndash; Provides the outer join fetching of the related object</p>
+<p><span class="bold">Note</span>: Outer joining allows for null or empty values.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r4c1-t34 r1c3-t34">
+<p>None</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t34" headers="r1c1-t34">
+<p>Cascade</p>
+</td>
+<td align="left" headers="r5c1-t34 r1c2-t34">
+<p>Specify which operations are propagated throughout the entity.</p>
+<ul>
+<li>
+<p>All &ndash; All operations</p>
+</li>
+<li>
+<p>Persist</p>
+</li>
+<li>
+<p>Merge</p>
+</li>
+<li>
+<p>Move</p>
+</li>
+<li>
+<p>Remove</p>
+</li>
+<li>
+<p>Refresh</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r5c1-t34 r1c3-t34">
+<p>True</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<p>One-to-many mappings also include the following areas:</p>
<ul>
<li>
-<p><a href="reference031.htm#CACGEACG">Icons</a></p>
+<p><a href="reference039.htm#CACIJEGI">Joining Strategy</a></p>
+</li>
+<li>
+<p><a href="reference037.htm#CACJCHJB">Converters</a></p>
</li>
<li>
-<p><a href="reference032.htm#CACDJCEI">Buttons</a></p>
+<p><a href="reference038.htm#CACBIJFD">Ordering</a></p>
</li>
</ul>
+</div>
+<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm
index 35760eef4f..42567d5031 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm
@@ -3,123 +3,155 @@
<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>Icons</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:49Z" />
+<title>Many-to-One Mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Icons" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Many-to-One Mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CACGEACG" name="CACGEACG"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Icons</h1>
-<p>The following icons are used throughout the Dali OR Mapping Tool.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the icons used in the Dali plug-in." summary="This table describes the icons used in the Dali plug-in." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="23%" />
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACHAEDB" name="CACHAEDB"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Many-to-One Mapping</h1>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="JPA Details view, One-to-one page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="29%" />
<col width="*" />
+<col width="24%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t41">Icon</th>
-<th align="left" valign="bottom" id="r1c2-t41">Description</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-t41" headers="r1c1-t41"><img src="img/new_icon_mappedentity.png" alt="" title="" /><br /></td>
-<td align="left" headers="r2c1-t41 r1c2-t41"><a href="tasks006.htm#BABGBIEE">Entity</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t41" headers="r1c1-t41"><img src="img/new_icon_embeddableentitymapping.png" alt="Embeddable entity icon" title="Embeddable entity icon" /><br /></td>
-<td align="left" headers="r3c1-t41 r1c2-t41"><a href="tasks007.htm#BABFEICE">Embeddable</a> entity</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t41" headers="r1c1-t41"><img src="img/new_icon_mappedsuperclass.png" alt="Mapped superclass icon" title="Mapped superclass icon" /><br /></td>
-<td align="left" headers="r4c1-t41 r1c2-t41"><a href="tasks008.htm#BABDAGCI">Mapped superclass</a></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t41" headers="r1c1-t41"><img src="img/new_icon_basicmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
-<td align="left" headers="r5c1-t41 r1c2-t41"><a href="tasks010.htm#BABBABCE">Basic mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t41" headers="r1c1-t41"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
-<td align="left" headers="r6c1-t41 r1c2-t41">Basic collection mapping</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t41" headers="r1c1-t41"><img src="img/icon_basicmapping.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
-<td align="left" headers="r7c1-t41 r1c2-t41">Basic map mapping</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t41" headers="r1c1-t41"><img src="img/new_icon_embeddedidmapping.png" alt="Embedded mapping icon" title="Embedded mapping icon" /><br /></td>
-<td align="left" headers="r8c1-t41 r1c2-t41"><a href="tasks011.htm#BABCBHDF">Embedded mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r9c1-t41" headers="r1c1-t41"><img src="img/new_icon_embeddedmapping.png" alt="Embedded ID mapping icon" title="Embedded ID mapping icon" /><br /></td>
-<td align="left" headers="r9c1-t41 r1c2-t41"><a href="tasks012.htm#CIHDIAEE">Embedded ID mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r10c1-t41" headers="r1c1-t41"><img src="img/new_icon_idmapping.png" alt="ID mapping icon" title="ID mapping icon" /><br /></td>
-<td align="left" headers="r10c1-t41 r1c2-t41"><a href="tasks013.htm#BABGCBHG">ID mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r11c1-t41" headers="r1c1-t41"><img src="img/new_icon_manytomanymapping.png" alt="Many-to-many mapping icon" title="Many-to-many mapping icon" /><br /></td>
-<td align="left" headers="r11c1-t41 r1c2-t41"><a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r12c1-t41" headers="r1c1-t41"><img src="img/new_icon_manytoonemapping.png" alt="Many-to-one mapping icon." title="Many-to-one mapping icon." /><br /></td>
-<td align="left" headers="r12c1-t41 r1c2-t41"><a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r13c1-t41" headers="r1c1-t41"><img src="img/new_icon_onetomanymapping.png" alt="One-to-many mapping icon" title="One-to-many mapping icon" /><br /></td>
-<td align="left" headers="r13c1-t41 r1c2-t41"><a href="tasks016.htm#BABHGEBD">One-to-many mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r14c1-t41" headers="r1c1-t41"><img src="img/new_icon_onetoonemapping.png" alt="One-to-one mapping icon." title="One-to-one mapping icon." /><br /></td>
-<td align="left" headers="r14c1-t41 r1c2-t41"><a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r15c1-t41" headers="r1c1-t41"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
-<td align="left" headers="r15c1-t41 r1c2-t41">Transformation mappings</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r16c1-t41" headers="r1c1-t41"><img src="img/new_icon_transientmapping.png" alt="Transient mapping icon." title="Transient mapping icon." /><br /></td>
-<td align="left" headers="r16c1-t41 r1c2-t41"><a href="tasks018.htm#BABHFHEI">Transient mapping</a><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r17c1-t41" headers="r1c1-t41"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
-<td align="left" headers="r17c1-t41 r1c2-t41">Variable one-to-one mappings</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r18c1-t41" headers="r1c1-t41"><img src="img/new_icon_versionmapping.png" alt="Version mapping icon." title="Version mapping icon." /><br /></td>
-<td align="left" headers="r18c1-t41 r1c2-t41"><a href="tasks019.htm#BABHIBII">Version mapping</a><br /></td>
+<td align="left" id="r2c1-t35" headers="r1c1-t35">
+<p>Target entity</p>
+</td>
+<td align="left" headers="r2c1-t35 r1c2-t35">
+<p>The persistent entity to which the attribute is mapped.</p>
+<p>You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.</p>
+</td>
+<td align="left" headers="r2c1-t35 r1c3-t35">
+<p>null</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t35" headers="r1c1-t35">
+<p>Fetch</p>
+</td>
+<td align="left" headers="r3c1-t35 r1c2-t35">
+<p>Defines how data is loaded from the database:</p>
+<ul>
+<li>
+<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
+</li>
+<li>
+<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r3c1-t35 r1c3-t35">
+<p>Lazy</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t35" headers="r1c1-t35">
+<p>Join fetch</p>
+</td>
+<td align="left" headers="r4c1-t35 r1c2-t35">
+<p>The type of fetch to use:</p>
+<ul>
+<li>
+<p>Inner &ndash; Provides the inner join fetching of the related object.</p>
+<p><span class="bold">Note</span>: Inner joining does not allow for null or empty values</p>
+</li>
+<li>
+<p>Outer &ndash; Provides the outer join fetching of the related object</p>
+<p><span class="bold">Note</span>: Outer joining allows for null or empty values.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r4c1-t35 r1c3-t35"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t35" headers="r1c1-t35">
+<p>Optional</p>
+</td>
+<td align="left" headers="r5c1-t35 r1c2-t35">
+<p>Specifies if this field is can be null.</p>
+</td>
+<td align="left" headers="r5c1-t35 r1c3-t35">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t35" headers="r1c1-t35">
+<p>Cascade</p>
+</td>
+<td align="left" headers="r6c1-t35 r1c2-t35">
+<p>Specify which operations are propagated throughout the entity.</p>
+<ul>
+<li>
+<p>All &ndash; All operations</p>
+</li>
+<li>
+<p>Persist</p>
+</li>
+<li>
+<p>Merge</p>
+</li>
+<li>
+<p>Move</p>
+</li>
+<li>
+<p>Remove</p>
+</li>
+<li>
+<p>Refresh</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r6c1-t35 r1c3-t35">
+<p>True</p>
+</td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblruleinformal" -->
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<p><a href="reference030.htm#CACDHCIA">Icons and buttons</a></p>
+<!-- class="inftblhruleinformal" -->
+<p>Many-to-one mappings also include the following areas:</p>
+<ul>
+<li>
+<p><a href="reference039.htm#CACIJEGI">Joining Strategy</a></p>
+</li>
+<li>
+<p><a href="reference040.htm#CACGHHGB">Derived Identity</a></p>
+</li>
+</ul>
</div>
-<!-- class="sect2" -->
+<!-- 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, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm
index 36db5405f8..7bcc69be59 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm
@@ -3,60 +3,162 @@
<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>Buttons</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:49Z" />
+<title>One-to-Many Mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Buttons" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="One-to-Many Mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- 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">
-<col width="27%" />
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACHGGHH" name="CACHGGHH"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>One-to-Many Mapping</h1>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="JPA Details view, One-to-one page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="29%" />
<col width="*" />
+<col width="24%" />
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t42">Icon</th>
-<th align="left" valign="bottom" id="r1c2-t42">Description</th>
+<th align="left" valign="bottom" id="r1c1-t36">Property</th>
+<th align="left" valign="bottom" id="r1c2-t36">Description</th>
+<th align="left" valign="bottom" id="r1c3-t36">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t42" headers="r1c1-t42"><img src="img/new_jpa_perspective_button.png" alt="The JPA Perspective icon" title="The JPA Perspective icon" /><br /></td>
-<td align="left" headers="r2c1-t42 r1c2-t42">JPA Development perspective</td>
+<td align="left" id="r2c1-t36" headers="r1c1-t36">
+<p>Target entity</p>
+</td>
+<td align="left" headers="r2c1-t36 r1c2-t36">
+<p>The persistent entity to which the attribute is mapped.</p>
+</td>
+<td align="left" headers="r2c1-t36 r1c3-t36"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t36" headers="r1c1-t36">
+<p>Fetch</p>
+</td>
+<td align="left" headers="r3c1-t36 r1c2-t36">
+<p>Defines how data is loaded from the database:</p>
+<ul>
+<li>
+<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
+</li>
+<li>
+<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r3c1-t36 r1c3-t36">
+<p>Lazy</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t36" headers="r1c1-t36">
+<p>Join fetch</p>
+</td>
+<td align="left" headers="r4c1-t36 r1c2-t36">
+<p>The type of fetch to use:</p>
+<ul>
+<li>
+<p>Inner &ndash; Provides the inner join fetching of the related object.</p>
+<p><span class="bold">Note</span>: Inner joining does not allow for null or empty values</p>
+</li>
+<li>
+<p>Outer &ndash; Provides the outer join fetching of the related object</p>
+<p><span class="bold">Note</span>: Outer joining allows for null or empty values.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r4c1-t36 r1c3-t36"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t36" headers="r1c1-t36">
+<p>Private owned</p>
+</td>
+<td align="left" headers="r5c1-t36 r1c2-t36">
+<p>Specify that a relationship is privately owned; target object is a dependent part of the source object and is not referenced by any other object and cannot exist on its own.</p>
+</td>
+<td align="left" headers="r5c1-t36 r1c3-t36"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t36" headers="r1c1-t36">
+<p>Orphan removal</p>
+</td>
+<td align="left" headers="r6c1-t36 r1c2-t36"><br /></td>
+<td align="left" headers="r6c1-t36 r1c3-t36">
+<p>False</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t36" headers="r1c1-t36">
+<p>Cascade</p>
+</td>
+<td align="left" headers="r7c1-t36 r1c2-t36">
+<p>Specify which operations are propagated throughout the entity.</p>
+<ul>
+<li>
+<p>All &ndash; All operations</p>
+</li>
+<li>
+<p>Persist</p>
+</li>
+<li>
+<p>Merge</p>
+</li>
+<li>
+<p>Move</p>
+</li>
+<li>
+<p>Remove</p>
+</li>
+<li>
+<p>Refresh</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r7c1-t36 r1c3-t36">
+<p>True</p>
+</td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblruleinformal" -->
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<p><a href="reference030.htm#CACDHCIA">Icons and buttons</a></p>
+<!-- class="inftblhruleinformal" -->
+<p>One-to-many mappings also include the following areas:</p>
+<ul>
+<li>
+<p><a href="reference039.htm#CACIJEGI">Joining Strategy</a></p>
+</li>
+<li>
+<p><a href="reference037.htm#CACJCHJB">Converters</a></p>
+</li>
+<li>
+<p><a href="reference038.htm#CACBIJFD">Ordering</a></p>
+</li>
+</ul>
</div>
-<!-- class="sect2" -->
-<!-- class="sect1" -->
+<!-- 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, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm
index 9a706b9f2d..4136869c52 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm
@@ -3,51 +3,172 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Dali Developer Documentation</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:49Z" />
+<title>One-to-One Mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Dali Developer Documentation" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="One-to-One Mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CACBBDIB" name="CACBBDIB"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Dali Developer Documentation</h1>
-<p><a id="sthref288" name="sthref288"></a><a id="sthref289" name="sthref289"></a><a id="sthref290" name="sthref290"></a>Additional Dali documentation is available online at:</p>
-<p><code><a href="http://wiki.eclipse.org/index.php/Dali_Developer_Documentation">http://wiki.eclipse.org/index.php/Dali_Developer_Documentation</a></code></p>
-<p>This developer documentation includes information about:</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACGGHDD" name="CACGGHDD"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>One-to-One Mapping</h1>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="JPA Details view, One-to-one page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="29%" />
+<col width="*" />
+<col width="24%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t37">Property</th>
+<th align="left" valign="bottom" id="r1c2-t37">Description</th>
+<th align="left" valign="bottom" id="r1c3-t37">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t37" headers="r1c1-t37">
+<p>Target entity</p>
+</td>
+<td align="left" headers="r2c1-t37 r1c2-t37">
+<p>The persistent entity to which the attribute is mapped.</p>
+</td>
+<td align="left" headers="r2c1-t37 r1c3-t37"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t37" headers="r1c1-t37">
+<p>Fetch</p>
+</td>
+<td align="left" headers="r3c1-t37 r1c2-t37">
+<p>Defines how data is loaded from the database:</p>
+<ul>
+<li>
+<p>Eager &ndash; Data is loaded in before it is actually needed.</p>
+</li>
+<li>
+<p>Lazy &ndash; Data is loaded only when required by the transaction.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r3c1-t37 r1c3-t37">
+<p>Eager</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t37" headers="r1c1-t37">
+<p>Join fetch</p>
+</td>
+<td align="left" headers="r4c1-t37 r1c2-t37">
+<p>The type of fetch to use:</p>
+<ul>
+<li>
+<p>Inner &ndash; Provides the inner join fetching of the related object.</p>
+<p><span class="bold">Note</span>: Inner joining does not allow for null or empty values</p>
+</li>
+<li>
+<p>Outer &ndash; Provides the outer join fetching of the related object</p>
+<p><span class="bold">Note</span>: Outer joining allows for null or empty values.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r4c1-t37 r1c3-t37"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t37" headers="r1c1-t37">
+<p>Optional</p>
+</td>
+<td align="left" headers="r5c1-t37 r1c2-t37">
+<p>Specifies if this field is can be null.</p>
+</td>
+<td align="left" headers="r5c1-t37 r1c3-t37">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t37" headers="r1c1-t37">
+<p>Private owned</p>
+</td>
+<td align="left" headers="r6c1-t37 r1c2-t37">
+<p>Specify that a relationship is privately owned; target object is a dependent part of the source object and is not referenced by any other object and cannot exist on its own.</p>
+</td>
+<td align="left" headers="r6c1-t37 r1c3-t37">
+<p>False</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t37" headers="r1c1-t37">
+<p>Orphan removal</p>
+</td>
+<td align="left" headers="r7c1-t37 r1c2-t37"><br /></td>
+<td align="left" headers="r7c1-t37 r1c3-t37">
+<p>False</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t37" headers="r1c1-t37">
+<p>Cascade</p>
+</td>
+<td align="left" headers="r8c1-t37 r1c2-t37">
+<p>Specify which operations are propagated throughout the entity.</p>
<ul>
<li>
-<p>Dali architecture</p>
+<p>All &ndash; All operations</p>
+</li>
+<li>
+<p>Persist</p>
+</li>
+<li>
+<p>Merge</p>
+</li>
+<li>
+<p>Move</p>
</li>
<li>
-<p>Plugins that comprise the Dali JPA Eclipse feature</p>
+<p>Remove</p>
+</li>
+<li>
+<p>Refresh</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r8c1-t37 r1c3-t37">
+<p>True</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<p>One-to-one mappings also include the following areas:</p>
+<ul>
+<li>
+<p><a href="reference040.htm#CACGHHGB">Derived Identity</a></p>
</li>
<li>
-<p>Extension points</p>
+<p><a href="reference039.htm#CACIJEGI">Joining Strategy</a></p>
</li>
</ul>
</div>
-<!-- class="sect1" -->
+<!-- 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, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm
new file mode 100644
index 0000000000..1307893acc
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm
@@ -0,0 +1,199 @@
+<!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>Version Mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Version Mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACHAEBB" name="CACHAEBB"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Version Mapping</h1>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="JPA Details view, Version page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="29%" />
+<col width="*" />
+<col width="24%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t38">Property</th>
+<th align="left" valign="bottom" id="r1c2-t38">Description</th>
+<th align="left" valign="bottom" id="r1c3-t38">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t38" headers="r1c1-t38">
+<p><span class="bold">Column</span></p>
+</td>
+<td align="left" headers="r2c1-t38 r1c2-t38">
+<p><a id="sthref414" name="sthref414"></a><a id="sthref415" name="sthref415"></a>The database column that contains the value for the attribute. This field corresponds to the <code>@Column</code> annotation.</p>
+</td>
+<td align="left" headers="r2c1-t38 r1c3-t38">
+<p>By default, the Column is assumed to be named identically to the attribute.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t38" headers="r1c1-t38">
+<p>Name</p>
+</td>
+<td align="left" headers="r3c1-t38 r1c2-t38">
+<p>The database column mapped to the entity attribute.</p>
+<p>By default, the Column is assumed to be named identically to the attribute and always included in the <code>INSERT</code> and <code>UPDATE</code> statements.</p>
+</td>
+<td align="left" headers="r3c1-t38 r1c3-t38"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t38" headers="r1c1-t38">
+<p>Table</p>
+</td>
+<td align="left" headers="r4c1-t38 r1c2-t38">
+<p>Name of the database table that contains the selected column.</p>
+</td>
+<td align="left" headers="r4c1-t38 r1c3-t38"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t38" headers="r1c1-t38">
+<p><span class="bold">Details</span></p>
+</td>
+<td align="left" headers="r5c1-t38 r1c2-t38"><br /></td>
+<td align="left" headers="r5c1-t38 r1c3-t38"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t38" headers="r1c1-t38">
+<p>Insertable</p>
+</td>
+<td align="left" headers="r6c1-t38 r1c2-t38">
+<p>Specifies if the column is always included in <code>SQL INSERT</code> statements.</p>
+</td>
+<td align="left" headers="r6c1-t38 r1c3-t38">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t38" headers="r1c1-t38">
+<p>Updatable</p>
+</td>
+<td align="left" headers="r7c1-t38 r1c2-t38">
+<p>Specifies if this column is always included in <code>SQL UPDATE</code> statements.</p>
+</td>
+<td align="left" headers="r7c1-t38 r1c3-t38">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t38" headers="r1c1-t38">
+<p>Unique</p>
+</td>
+<td align="left" headers="r8c1-t38 r1c2-t38">
+<p>Sets the <code>UNIQUE</code> constraint for the column.</p>
+</td>
+<td align="left" headers="r8c1-t38 r1c3-t38">
+<p>False</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t38" headers="r1c1-t38">
+<p>Nullable</p>
+</td>
+<td align="left" headers="r9c1-t38 r1c2-t38">
+<p>Specifies if the column allows null values.</p>
+</td>
+<td align="left" headers="r9c1-t38 r1c3-t38">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t38" headers="r1c1-t38">
+<p>Length</p>
+</td>
+<td align="left" headers="r10c1-t38 r1c2-t38">
+<p>Sets the column length.</p>
+</td>
+<td align="left" headers="r10c1-t38 r1c3-t38">
+<p>255</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t38" headers="r1c1-t38">
+<p>Precision</p>
+</td>
+<td align="left" headers="r11c1-t38 r1c2-t38">
+<p>Sets the precision for the column values.</p>
+</td>
+<td align="left" headers="r11c1-t38 r1c3-t38">
+<p>0</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t38" headers="r1c1-t38">
+<p>Scale</p>
+</td>
+<td align="left" headers="r12c1-t38 r1c2-t38">
+<p>Sets the number of digits that appear to the right of the decimal point.</p>
+</td>
+<td align="left" headers="r12c1-t38 r1c3-t38">
+<p>0</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r13c1-t38" headers="r1c1-t38">
+<p>Column definition</p>
+</td>
+<td align="left" headers="r13c1-t38 r1c2-t38">
+<p>The SQL fragment that is used when generating the DDL for the column.</p>
+</td>
+<td align="left" headers="r13c1-t38 r1c3-t38"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r14c1-t38" headers="r1c1-t38">
+<p><span class="bold">Mutable</span></p>
+</td>
+<td align="left" headers="r14c1-t38 r1c2-t38">
+<p>Specify if the value of a complex field type can be changed (or not changed) instead of being replaced.</p>
+</td>
+<td align="left" headers="r14c1-t38 r1c3-t38">
+<p>True</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<p>Version mappings also include the following areas:</p>
+<ul>
+<li>
+<p><a href="reference035.htm#CACIHAAF">Type information</a></p>
+</li>
+<li>
+<p><a href="reference037.htm#CACJCHJB">Converters</a></p>
+</li>
+</ul>
+</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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference035.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference035.htm
new file mode 100644
index 0000000000..1448f5f50d
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference035.htm
@@ -0,0 +1,141 @@
+<!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>Type information</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Type information" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACIHAAF" name="CACIHAAF"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Type information</h1>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="JPA Details view, Type page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="29%" />
+<col width="*" />
+<col width="24%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t39">Property</th>
+<th align="left" valign="bottom" id="r1c2-t39">Description</th>
+<th align="left" valign="bottom" id="r1c3-t39">Available for Mapping Type</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t39" headers="r1c1-t39">
+<p>Default</p>
+</td>
+<td align="left" headers="r2c1-t39 r1c2-t39"><br /></td>
+<td align="left" headers="r2c1-t39 r1c3-t39">
+<p><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks014.htm#BABGCBHG">ID mapping</a>, and <a href="tasks020.htm#BABHIBII">Version mapping</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t39" headers="r1c1-t39">
+<p><a id="sthref416" name="sthref416"></a>LOB</p>
+</td>
+<td align="left" headers="r3c1-t39 r1c2-t39">
+<p>Specify if the field is mapped to <code>java.sql.Clob</code> or <code>java.sql.Blob</code>.</p>
+<p>This field corresponds to the <code>@Lob</code> annotation.</p>
+</td>
+<td align="left" headers="r3c1-t39 r1c3-t39">
+<p><a href="tasks010.htm#BABBABCE">Basic mapping</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t39" headers="r1c1-t39">
+<p><a id="sthref417" name="sthref417"></a><a id="sthref418" name="sthref418"></a><a id="sthref419" name="sthref419"></a>Temporal</p>
+</td>
+<td align="left" headers="r4c1-t39 r1c2-t39">
+<p>Specifies if this field is one of the following:</p>
+<ul>
+<li>
+<p>Date &ndash; <code>java.sql.Date</code></p>
+</li>
+<li>
+<p>Time &ndash; <code>java.sql.Time</code></p>
+</li>
+<li>
+<p>Timestamp &ndash; <code>java.sql.Timestamp</code></p>
+</li>
+</ul>
+<p>This field corresponds to the <code>@Temporal</code> annotation.</p>
+</td>
+<td align="left" headers="r4c1-t39 r1c3-t39">
+<p><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks014.htm#BABGCBHG">ID mapping</a>, and <a href="tasks020.htm#BABHIBII">Version mapping</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t39" headers="r1c1-t39">
+<p><a id="sthref420" name="sthref420"></a><a id="sthref421" name="sthref421"></a><a id="sthref422" name="sthref422"></a>Enumerated</p>
+</td>
+<td align="left" headers="r5c1-t39 r1c2-t39">
+<p>Specify how to persist enumerated constraints if the <code>String</code> value suits your application requirements or to match an existing database schema.</p>
+<ul>
+<li>
+<p><code>ordinal</code></p>
+</li>
+<li>
+<p><code>String</code></p>
+</li>
+</ul>
+<p>This field corresponds to the <code>@Enumerated</code> annotation.</p>
+</td>
+<td align="left" headers="r5c1-t39 r1c3-t39">
+<p><a href="tasks010.htm#BABBABCE">Basic mapping</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t39" headers="r1c1-t39">
+<p>Converted</p>
+</td>
+<td align="left" headers="r6c1-t39 r1c2-t39">
+<p>Converter name:</p>
+<ul>
+<li>
+<p>None (default) &ndash;</p>
+</li>
+<li>
+<p>class-instance &ndash;</p>
+</li>
+<li>
+<p>serialized &ndash;</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r6c1-t39 r1c3-t39">
+<p><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks014.htm#BABGCBHG">ID mapping</a>, and <a href="tasks020.htm#BABHIBII">Version mapping</a></p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" --></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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference036.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference036.htm
new file mode 100644
index 0000000000..57cda1402d
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference036.htm
@@ -0,0 +1,39 @@
+<!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>Value</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Value" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACJBFEA" name="CACJBFEA"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Value</h1>
+</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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference037.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference037.htm
new file mode 100644
index 0000000000..f80bc0afea
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference037.htm
@@ -0,0 +1,152 @@
+<!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>Converters</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Converters" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACJCHJB" name="CACJCHJB"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Converters</h1>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" title="JPA Details view, Advanced page" summary="JPA Details view, Advanced page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="16%" />
+<col width="*" />
+<col width="17%" />
+<col width="25%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t40">Property</th>
+<th align="left" valign="bottom" id="r1c2-t40">Description</th>
+<th align="left" valign="bottom" id="r1c3-t40">Default</th>
+<th align="left" valign="bottom" id="r1c4-t40">Available for Entity&nbsp;Type</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t40" headers="r1c1-t40">
+<p>Converters</p>
+</td>
+<td align="left" headers="r2c1-t40 r1c2-t40">
+<p>Click Add and use the <a href="ref_add_converter.htm#CIAGCGIJ">Add Converter dialog</a> to create a new converter.</p>
+<ul>
+<li>
+<p>Object Type</p>
+</li>
+<li>
+<p>Type</p>
+</li>
+<li>
+<p>Struct</p>
+</li>
+<li>
+<p>Custom</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r2c1-t40 r1c3-t40"><br /></td>
+<td align="left" headers="r2c1-t40 r1c4-t40">
+<p><a href="tasks010.htm#BABBABCE">Basic mapping</a>, <a href="tasks011.htm#CIHHJEBJ">Element collection mapping</a>, <a href="tasks014.htm#BABGCBHG">ID mapping</a>, <a href="tasks015.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks017.htm#BABHGEBD">One-to-many mapping</a>, and <a href="tasks020.htm#BABHIBII">Version mapping</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t40" headers="r1c1-t40">
+<p>Name</p>
+</td>
+<td align="left" headers="r3c1-t40 r1c2-t40">
+<p>Name of the converter.</p>
+</td>
+<td align="left" headers="r3c1-t40 r1c3-t40"><br /></td>
+<td align="left" headers="r3c1-t40 r1c4-t40"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t40" headers="r1c1-t40">
+<p>Class</p>
+</td>
+<td align="left" headers="r4c1-t40 r1c2-t40">
+<p>Appears for <span class="bold">Custom</span> and <span class="bold">Struct</span> converters only.</p>
+</td>
+<td align="left" headers="r4c1-t40 r1c3-t40"><br /></td>
+<td align="left" headers="r4c1-t40 r1c4-t40"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t40" headers="r1c1-t40">
+<p>Data type</p>
+</td>
+<td align="left" headers="r5c1-t40 r1c2-t40">
+<p>Appears for <span class="bold">Object Type</span> and <span class="bold">Type</span> converters only.</p>
+</td>
+<td align="left" headers="r5c1-t40 r1c3-t40"><br /></td>
+<td align="left" headers="r5c1-t40 r1c4-t40"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t40" headers="r1c1-t40">
+<p>Object type</p>
+</td>
+<td align="left" headers="r6c1-t40 r1c2-t40">
+<p>Appears for <span class="bold">Object Type</span> and <span class="bold">Type</span> converters only.</p>
+</td>
+<td align="left" headers="r6c1-t40 r1c3-t40"><br /></td>
+<td align="left" headers="r6c1-t40 r1c4-t40"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t40" headers="r1c1-t40">
+<p>Conversion values</p>
+</td>
+<td align="left" headers="r7c1-t40 r1c2-t40">
+<p>Appears for <span class="bold">Object Type</span> converters only.</p>
+</td>
+<td align="left" headers="r7c1-t40 r1c3-t40"><br /></td>
+<td align="left" headers="r7c1-t40 r1c4-t40"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t40" headers="r1c1-t40">
+<p>Default object value</p>
+</td>
+<td align="left" headers="r8c1-t40 r1c2-t40">
+<p>Appears for <span class="bold">Object Type</span> converters only.</p>
+</td>
+<td align="left" headers="r8c1-t40 r1c3-t40"><br /></td>
+<td align="left" headers="r8c1-t40 r1c4-t40"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformalwide" -->
+<a id="sthref423" name="sthref423"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p>"Converter" in <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span><br />
+<code><a href="http://eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_converter.htm">http://eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_converter.htm</a></code></p>
+</li>
+</ul>
+</div>
+<!-- class="sect3" -->
+<!-- Start Footer -->
+<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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference038.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference038.htm
new file mode 100644
index 0000000000..d802789bd7
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference038.htm
@@ -0,0 +1,130 @@
+<!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>Ordering</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Ordering" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACBIJFD" name="CACBIJFD"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Ordering</h1>
+<p><a id="sthref424" name="sthref424"></a><a id="sthref425" name="sthref425"></a>Specify the default order for objects returned from a query. These options correspond to the <code>@OrderBy</code> annotation.</p>
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" title="JPA Details view, Advanced page" summary="JPA Details view, Advanced page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="16%" />
+<col width="*" />
+<col width="17%" />
+<col width="25%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t41">Property</th>
+<th align="left" valign="bottom" id="r1c2-t41">Description</th>
+<th align="left" valign="bottom" id="r1c3-t41">Default</th>
+<th align="left" valign="bottom" id="r1c4-t41">Available for Entity&nbsp;Type</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t41" headers="r1c1-t41">
+<p><span class="bold">None</span></p>
+</td>
+<td align="left" headers="r2c1-t41 r1c2-t41"><br /></td>
+<td align="left" headers="r2c1-t41 r1c3-t41"><br /></td>
+<td align="left" headers="r2c1-t41 r1c4-t41">
+<p><a href="tasks011.htm#CIHHJEBJ">Element collection mapping</a>, <a href="tasks015.htm#BABEIEGD">Many-to-many mapping</a>, and <a href="tasks017.htm#BABHGEBD">One-to-many mapping</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t41" headers="r1c1-t41">
+<p><span class="bold">Primary key</span></p>
+</td>
+<td align="left" headers="r3c1-t41 r1c2-t41"><br /></td>
+<td align="left" headers="r3c1-t41 r1c3-t41"><br /></td>
+<td align="left" headers="r3c1-t41 r1c4-t41"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t41" headers="r1c1-t41">
+<p><span class="bold">Custom</span></p>
+</td>
+<td align="left" headers="r4c1-t41 r1c2-t41"><br /></td>
+<td align="left" headers="r4c1-t41 r1c3-t41"><br /></td>
+<td align="left" headers="r4c1-t41 r1c4-t41"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t41" headers="r1c1-t41">
+<p><span class="bold">Order column</span></p>
+</td>
+<td align="left" headers="r5c1-t41 r1c2-t41"><br /></td>
+<td align="left" headers="r5c1-t41 r1c3-t41"><br /></td>
+<td align="left" headers="r5c1-t41 r1c4-t41"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t41" headers="r1c1-t41">
+<p>Insertable</p>
+</td>
+<td align="left" headers="r6c1-t41 r1c2-t41"><br /></td>
+<td align="left" headers="r6c1-t41 r1c3-t41">
+<p>True</p>
+</td>
+<td align="left" headers="r6c1-t41 r1c4-t41"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t41" headers="r1c1-t41">
+<p>Updatable</p>
+</td>
+<td align="left" headers="r7c1-t41 r1c2-t41"><br /></td>
+<td align="left" headers="r7c1-t41 r1c3-t41">
+<p>True</p>
+</td>
+<td align="left" headers="r7c1-t41 r1c4-t41"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t41" headers="r1c1-t41">
+<p>Nullable</p>
+</td>
+<td align="left" headers="r8c1-t41 r1c2-t41"><br /></td>
+<td align="left" headers="r8c1-t41 r1c3-t41">
+<p>True</p>
+</td>
+<td align="left" headers="r8c1-t41 r1c4-t41"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t41" headers="r1c1-t41">
+<p>Column definition</p>
+</td>
+<td align="left" headers="r9c1-t41 r1c2-t41"><br /></td>
+<td align="left" headers="r9c1-t41 r1c3-t41"><br /></td>
+<td align="left" headers="r9c1-t41 r1c4-t41"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformalwide" --></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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference039.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference039.htm
new file mode 100644
index 0000000000..6e4217eb58
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference039.htm
@@ -0,0 +1,146 @@
+<!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>Joining Strategy</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Joining Strategy" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACIJEGI" name="CACIJEGI"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Joining Strategy</h1>
+<p>Use this area to specify a mapped column for joining an entity association. By default, the mapping is assumed to have a single join.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="JPA Details view, Type page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="29%" />
+<col width="*" />
+<col width="24%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t42">Property</th>
+<th align="left" valign="bottom" id="r1c2-t42">Description</th>
+<th align="left" valign="bottom" id="r1c3-t42">Available for Mapping Type</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t42" headers="r1c1-t42">
+<p><span class="bold">Mapped by</span></p>
+</td>
+<td align="left" headers="r2c1-t42 r1c2-t42">
+<p>The field in the database table that "owns" the relationship. This field is required only on the non-owning side of the relationship.</p>
+</td>
+<td align="left" headers="r2c1-t42 r1c3-t42">
+<p><a href="tasks015.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks017.htm#BABHGEBD">One-to-many mapping</a>, and <a href="tasks018.htm#BABFHBCJ">One-to-one mapping</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t42" headers="r1c1-t42">
+<p>Attribute</p>
+</td>
+<td align="left" headers="r3c1-t42 r1c2-t42"><br /></td>
+<td align="left" headers="r3c1-t42 r1c3-t42"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t42" headers="r1c1-t42">
+<p><span class="bold">Primary key join columns</span></p>
+</td>
+<td align="left" headers="r4c1-t42 r1c2-t42"><br /></td>
+<td align="left" headers="r4c1-t42 r1c3-t42">
+<p><a href="tasks018.htm#BABFHBCJ">One-to-one mapping</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t42" headers="r1c1-t42">
+<p><span class="bold">Join columns</span></p>
+</td>
+<td align="left" headers="r5c1-t42 r1c2-t42">
+<p><a id="sthref426" name="sthref426"></a><a id="sthref427" name="sthref427"></a>By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</p>
+<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
+</td>
+<td align="left" headers="r5c1-t42 r1c3-t42">
+<p><a href="tasks016.htm#BABHFAFJ">Many-to-one mapping</a>, <a href="tasks017.htm#BABHGEBD">One-to-many mapping</a>, and <a href="tasks018.htm#BABFHBCJ">One-to-one mapping</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t42" headers="r1c1-t42">
+<p><span class="bold">Join table</span></p>
+</td>
+<td align="left" headers="r6c1-t42 r1c2-t42">
+<p>Name of the join table that contains the foreign key column.You must specify the join table on the owning side.</p>
+<p>By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</p>
+</td>
+<td align="left" headers="r6c1-t42 r1c3-t42">
+<p><a href="tasks015.htm#BABEIEGD">Many-to-many mapping</a>, <a href="tasks016.htm#BABHFAFJ">Many-to-one mapping</a>, <a href="tasks017.htm#BABHGEBD">One-to-many mapping</a>, and <a href="tasks018.htm#BABFHBCJ">One-to-one mapping</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t42" headers="r1c1-t42">
+<p>Name</p>
+</td>
+<td align="left" headers="r7c1-t42 r1c2-t42"><br /></td>
+<td align="left" headers="r7c1-t42 r1c3-t42"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t42" headers="r1c1-t42">
+<p>Schema</p>
+</td>
+<td align="left" headers="r8c1-t42 r1c2-t42"><br /></td>
+<td align="left" headers="r8c1-t42 r1c3-t42"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t42" headers="r1c1-t42">
+<p>Catalog</p>
+</td>
+<td align="left" headers="r9c1-t42 r1c2-t42"><br /></td>
+<td align="left" headers="r9c1-t42 r1c3-t42"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t42" headers="r1c1-t42">
+<p>Join columns</p>
+</td>
+<td align="left" headers="r10c1-t42 r1c2-t42">
+<p>Mapped by</p>
+</td>
+<td align="left" headers="r10c1-t42 r1c3-t42"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t42" headers="r1c1-t42">
+<p>Inverse join columns</p>
+</td>
+<td align="left" headers="r11c1-t42 r1c2-t42">
+<p>Mapped by</p>
+</td>
+<td align="left" headers="r11c1-t42 r1c3-t42"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" --></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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference040.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference040.htm
new file mode 100644
index 0000000000..26db0bdccb
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference040.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>Derived Identity</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Derived Identity" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACGHHGB" name="CACGHHGB"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Derived Identity</h1>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="JPA Details view, Type page" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="29%" />
+<col width="*" />
+<col width="24%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t43">Property</th>
+<th align="left" valign="bottom" id="r1c2-t43">Description</th>
+<th align="left" valign="bottom" id="r1c3-t43">Available for Mapping Type</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t43" headers="r1c1-t43">
+<p>None</p>
+</td>
+<td align="left" headers="r2c1-t43 r1c2-t43"><br /></td>
+<td align="left" headers="r2c1-t43 r1c3-t43">
+<p><a href="tasks016.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks018.htm#BABFHBCJ">One-to-one mapping</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t43" headers="r1c1-t43">
+<p>ID</p>
+</td>
+<td align="left" headers="r3c1-t43 r1c2-t43"><br /></td>
+<td align="left" headers="r3c1-t43 r1c3-t43">
+<p><a href="tasks016.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks018.htm#BABFHBCJ">One-to-one mapping</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t43" headers="r1c1-t43">
+<p>Maps ID</p>
+</td>
+<td align="left" headers="r4c1-t43 r1c2-t43"><br /></td>
+<td align="left" headers="r4c1-t43 r1c3-t43">
+<p><a href="tasks016.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks018.htm#BABFHBCJ">One-to-one mapping</a></p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" --></div>
+<!-- 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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference041.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference041.htm
new file mode 100644
index 0000000000..39ddaed3d7
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference041.htm
@@ -0,0 +1,118 @@
+<!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 Mappings</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Entity Mappings" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACCACGH" name="CACCACGH"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Entity Mappings</h1>
+<p>This table lists the Entity Mappings fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="21%" />
+<col width="*" />
+<col width="22%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t45">Property</th>
+<th align="left" valign="bottom" id="r1c2-t45">Description</th>
+<th align="left" valign="bottom" id="r1c3-t45">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t45" headers="r1c1-t45">
+<p>Package</p>
+</td>
+<td align="left" headers="r2c1-t45 r1c2-t45">
+<p>The Java package that contains the persistent entities. Click <span class="bold">Browse</span> and select the package</p>
+</td>
+<td align="left" headers="r2c1-t45 r1c3-t45"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t45" headers="r1c1-t45">
+<p>Schema</p>
+</td>
+<td align="left" headers="r3c1-t45 r1c2-t45">
+<p>The database schema that contains the <span class="bold">Table</span>.</p>
+<p>This field corresponds to the <code>&lt;schema&gt;</code> element in the <code>orm.xml</code> file.</p>
+</td>
+<td align="left" headers="r3c1-t45 r1c3-t45"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t45" headers="r1c1-t45">
+<p>Catalog</p>
+</td>
+<td align="left" headers="r4c1-t45 r1c2-t45">
+<p>The database catalog that contains the <span class="bold">Table</span>.</p>
+<p>This field corresponds to the <code>&lt;catalog&gt;</code> element in the <code>orm.xml</code> file.</p>
+</td>
+<td align="left" headers="r4c1-t45 r1c3-t45"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t45" headers="r1c1-t45">
+<p>Access</p>
+</td>
+<td align="left" headers="r5c1-t45 r1c2-t45">
+<p>Specify the default access method for the variables in the project:</p>
+<ul>
+<li>
+<p>Property</p>
+</li>
+<li>
+<p>Field</p>
+</li>
+</ul>
+<p>This field corresponds to the <code>&lt;access&gt;</code> element in the <code>orm.xml</code> file.</p>
+</td>
+<td align="left" headers="r5c1-t45 r1c3-t45"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref434" name="sthref434"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+</ul>
+<a id="sthref435" name="sthref435"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+</ul>
+</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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference042.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference042.htm
new file mode 100644
index 0000000000..2708b3d18e
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference042.htm
@@ -0,0 +1,135 @@
+<!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 Unit</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Persistence Unit" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACEAGBG" name="CACEAGBG"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Persistence Unit</h1>
+<p>This table lists the Persistence Unit information fields available in the <span class="gui-object-title">JPA Details</span> view for each entity type. These fields are contained in the <code>&lt;persistence-unit-metadata&gt;</code> element in the <code>orm.xml</code> file.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="21%" />
+<col width="*" />
+<col width="22%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t46">Property</th>
+<th align="left" valign="bottom" id="r1c2-t46">Description</th>
+<th align="left" valign="bottom" id="r1c3-t46">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t46" headers="r1c1-t46">
+<p>XML Mapping Data Complete</p>
+</td>
+<td align="left" headers="r2c1-t46 r1c2-t46">
+<p>Specifies that the Java classes in this persistence unit are fully specified by their metadata. Any annotations will be ignored.</p>
+<p>This field corresponds to the <code>&lt;xml-mapping-metadata-complete&gt;</code> element in the <code>orm.xml</code> file.</p>
+</td>
+<td align="left" headers="r2c1-t46 r1c3-t46"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t46" headers="r1c1-t46">
+<p>Cascade Persist</p>
+</td>
+<td align="left" headers="r3c1-t46 r1c2-t46">
+<p>Adds cascade-persist to the set of cascade options in entity relationships of the persistence unit.</p>
+<p>This field corresponds to the <code>&lt;cascade-persist&gt;</code> element in the <code>orm.xml</code> file.</p>
+</td>
+<td align="left" headers="r3c1-t46 r1c3-t46"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t46" headers="r1c1-t46">
+<p>Schema</p>
+</td>
+<td align="left" headers="r4c1-t46 r1c2-t46">
+<p>The database schema that contains the <span class="bold">Table</span>.</p>
+<p>This field corresponds to the <code>&lt;schema&gt;</code> element in the <code>orm.xml</code> file.</p>
+</td>
+<td align="left" headers="r4c1-t46 r1c3-t46"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t46" headers="r1c1-t46">
+<p>Catalog</p>
+</td>
+<td align="left" headers="r5c1-t46 r1c2-t46">
+<p>The database catalog that contains the <span class="bold">Table</span>.</p>
+<p>This field corresponds to the <code>&lt;catalog&gt;</code> element in the <code>orm.xml</code> file.</p>
+</td>
+<td align="left" headers="r5c1-t46 r1c3-t46"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t46" headers="r1c1-t46">
+<p>Access</p>
+</td>
+<td align="left" headers="r6c1-t46 r1c2-t46">
+<p>Specify how the entity its access instance variables.</p>
+<ul>
+<li>
+<p>Property &ndash; Persistent state accessed through the property accessor methods. The property accessor methods must be <span class="bold">public</span> or <span class="bold">private</span>.</p>
+</li>
+<li>
+<p>Field &ndash; Instance variables are accessed directly. All non-transient instance variables are persistent.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r6c1-t46 r1c3-t46"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t46" headers="r1c1-t46">
+<p>Deliminated identifiers</p>
+</td>
+<td align="left" headers="r7c1-t46 r1c2-t46"><br /></td>
+<td align="left" headers="r7c1-t46 r1c3-t46"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref436" name="sthref436"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+</ul>
+<a id="sthref437" name="sthref437"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
+</li>
+</ul>
+</div>
+<!-- class="sect3" -->
+<!-- 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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference043.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference043.htm
new file mode 100644
index 0000000000..4a85838be3
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference043.htm
@@ -0,0 +1,193 @@
+<!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>Generators</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Generators" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIAFGAIJ" name="CIAFGAIJ"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1>Generators</h1>
+<p>This table lists the Generator fields available in the <span class="gui-object-title">JPA Details</span> view for the <code>orm.xml</code> file.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="21%" />
+<col width="*" />
+<col width="24%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t47">Property</th>
+<th align="left" valign="bottom" id="r1c2-t47">Description</th>
+<th align="left" valign="bottom" id="r1c3-t47">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t47" headers="r1c1-t47">
+<p><span class="bold">Generators</span></p>
+</td>
+<td align="left" headers="r2c1-t47 r1c2-t47">
+<p>Click <span class="bold">Add</span> to create a new table or sequence generator, or select an existing generator and click <span class="bold">Remove</span>, to add or remove a generator.</p>
+</td>
+<td align="left" headers="r2c1-t47 r1c3-t47"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t47" headers="r1c1-t47">
+<p><span class="bold">Sequence Generators</span></p>
+</td>
+<td align="left" headers="r3c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r3c1-t47 r1c3-t47"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t47" headers="r1c1-t47">
+<p>Name</p>
+</td>
+<td align="left" headers="r4c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r4c1-t47 r1c3-t47"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t47" headers="r1c1-t47">
+<p>Sequence</p>
+</td>
+<td align="left" headers="r5c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r5c1-t47 r1c3-t47"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t47" headers="r1c1-t47">
+<p>Schema</p>
+</td>
+<td align="left" headers="r6c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r6c1-t47 r1c3-t47"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t47" headers="r1c1-t47">
+<p>Catalog</p>
+</td>
+<td align="left" headers="r7c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r7c1-t47 r1c3-t47"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t47" headers="r1c1-t47">
+<p>Allocation size</p>
+</td>
+<td align="left" headers="r8c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r8c1-t47 r1c3-t47">
+<p>50</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t47" headers="r1c1-t47">
+<p>Initial value</p>
+</td>
+<td align="left" headers="r9c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r9c1-t47 r1c3-t47">
+<p>1</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t47" headers="r1c1-t47">
+<p><span class="bold">Table Generators</span></p>
+</td>
+<td align="left" headers="r10c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r10c1-t47 r1c3-t47"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t47" headers="r1c1-t47">
+<p>Name</p>
+</td>
+<td align="left" headers="r11c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r11c1-t47 r1c3-t47"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t47" headers="r1c1-t47">
+<p>Table</p>
+</td>
+<td align="left" headers="r12c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r12c1-t47 r1c3-t47"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r13c1-t47" headers="r1c1-t47">
+<p>Schema</p>
+</td>
+<td align="left" headers="r13c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r13c1-t47 r1c3-t47"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r14c1-t47" headers="r1c1-t47">
+<p>Catalog</p>
+</td>
+<td align="left" headers="r14c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r14c1-t47 r1c3-t47"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r15c1-t47" headers="r1c1-t47">
+<p>Primary key column value</p>
+</td>
+<td align="left" headers="r15c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r15c1-t47 r1c3-t47"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r16c1-t47" headers="r1c1-t47">
+<p>Allocation size</p>
+</td>
+<td align="left" headers="r16c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r16c1-t47 r1c3-t47">
+<p>50</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r17c1-t47" headers="r1c1-t47">
+<p>Initial value</p>
+</td>
+<td align="left" headers="r17c1-t47 r1c2-t47"><br /></td>
+<td align="left" headers="r17c1-t47 r1c3-t47">
+<p>1</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref438" name="sthref438"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+</ul>
+<a id="sthref439" name="sthref439"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
+</li>
+</ul>
+</div>
+<!-- class="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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference044.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference044.htm
new file mode 100644
index 0000000000..82a28d475c
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference044.htm
@@ -0,0 +1,151 @@
+<!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>Queries</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Queries" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIAIBAAJ" name="CIAIBAAJ"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<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="inftblhruleinformal">
+<table class="HRuleInformal" title="This table describes the options on the Persistence Properties view, General tab." summary="This table describes the options on the Persistence Properties view, General tab." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="21%" />
+<col width="*" />
+<col width="23%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t48">Property</th>
+<th align="left" valign="bottom" id="r1c2-t48">Description</th>
+<th align="left" valign="bottom" id="r1c3-t48">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t48" headers="r1c1-t48">
+<p><span class="bold">Queries</span></p>
+</td>
+<td align="left" headers="r2c1-t48 r1c2-t48">
+<p>Displays the existing Named and Native queries.</p>
+<p>Click <span class="bold">Add</span> to add a named query, or <span class="bold">Add Native</span> for a native query.</p>
+<p>For named queries, enter the query in the Query field.</p>
+<p>For native queries, select a result class, then enter the query in the Query field.</p>
+</td>
+<td align="left" headers="r2c1-t48 r1c3-t48"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t48" headers="r1c1-t48">
+<p><span class="bold">Named Queries</span></p>
+</td>
+<td align="left" headers="r3c1-t48 r1c2-t48"><br /></td>
+<td align="left" headers="r3c1-t48 r1c3-t48"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t48" headers="r1c1-t48">
+<p>Name</p>
+</td>
+<td align="left" headers="r4c1-t48 r1c2-t48"><br /></td>
+<td align="left" headers="r4c1-t48 r1c3-t48"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t48" headers="r1c1-t48">
+<p>Query</p>
+</td>
+<td align="left" headers="r5c1-t48 r1c2-t48"><br /></td>
+<td align="left" headers="r5c1-t48 r1c3-t48"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t48" headers="r1c1-t48">
+<p>Lock mode</p>
+</td>
+<td align="left" headers="r6c1-t48 r1c2-t48"><br /></td>
+<td align="left" headers="r6c1-t48 r1c3-t48">
+<p>None</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t48" headers="r1c1-t48">
+<p><span class="bold">Native Queries</span></p>
+</td>
+<td align="left" headers="r7c1-t48 r1c2-t48"><br /></td>
+<td align="left" headers="r7c1-t48 r1c3-t48"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t48" headers="r1c1-t48">
+<p>Name</p>
+</td>
+<td align="left" headers="r8c1-t48 r1c2-t48"><br /></td>
+<td align="left" headers="r8c1-t48 r1c3-t48"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t48" headers="r1c1-t48">
+<p>Result class</p>
+</td>
+<td align="left" headers="r9c1-t48 r1c2-t48"><br /></td>
+<td align="left" headers="r9c1-t48 r1c3-t48"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t48" headers="r1c1-t48">
+<p>Query</p>
+</td>
+<td align="left" headers="r10c1-t48 r1c2-t48"><br /></td>
+<td align="left" headers="r10c1-t48 r1c3-t48"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t48" headers="r1c1-t48">
+<p><span class="bold">Query Hints</span></p>
+</td>
+<td align="left" headers="r11c1-t48 r1c2-t48">
+<p>Displays the existing query hints (Name and Value).</p>
+<p>Click <span class="bold">Add</span> to add a new query hint.</p>
+</td>
+<td align="left" headers="r11c1-t48 r1c3-t48"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref440" name="sthref440"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="tasks009.htm#BABIGBGG">Creating queries</a></p>
+</li>
+</ul>
+<a id="sthref441" name="sthref441"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
+</li>
+</ul>
+</div>
+<!-- class="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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference045.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference045.htm
new file mode 100644
index 0000000000..dddaac786d
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference045.htm
@@ -0,0 +1,49 @@
+<!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>Converters</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Converters" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIADGCID" name="CIADGCID"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<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>
+<a id="sthref442" name="sthref442"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
+</li>
+</ul>
+</div>
+<!-- class="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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference046.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference046.htm
new file mode 100644
index 0000000000..aa8bcd8f93
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference046.htm
@@ -0,0 +1,236 @@
+<!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>Connection</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Connection" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</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="inftblhruleinformal">
+<table class="HRuleInformal" summary="The following table lists the properties available in the Connection page of the persistence.xml Editor." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="25%" />
+<col width="*" />
+<col width="24%" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t50">Property</th>
+<th align="left" valign="bottom" id="r1c2-t50">Description</th>
+<th align="left" valign="bottom" id="r1c3-t50">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t50" headers="r1c1-t50">
+<p>Transaction type</p>
+</td>
+<td align="left" headers="r2c1-t50 r1c2-t50">
+<p>Specify if the connection for this persistence unit uses one of the following transaction types:</p>
+<ul>
+<li>
+<p><span class="bold">Default</span> -- Select to use the container used by the container.</p>
+</li>
+<li>
+<p><span class="bold">JTA</span> (Java Transaction API) -- Transactions of the Java EE server.</p>
+</li>
+<li>
+<p><span class="bold">Resource Local</span> -- Native actions of a JDBC driver that are referenced by a persistence unit.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r2c1-t50 r1c3-t50">
+<p>Default</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t50" headers="r1c1-t50">
+<p>Batch writing</p>
+</td>
+<td align="left" headers="r3c1-t50 r1c2-t50">
+<p>Specify the use of batch writing to optimize transactions with multiple write operations.</p>
+<p>Set the value of this property into the session at deployment time.</p>
+<p><span class="bold">Note</span>: This property applies when used both in a Java SE and Java EE environment.</p>
+<p>The following are the valid values for oracle.toplink.config.BatchWriting:</p>
+<ul>
+<li>
+<p><span class="bold">JDBC</span>&ndash;Use JDBC batch writing.</p>
+</li>
+<li>
+<p><span class="bold">Buffered</span>&ndash;Do not use either JDBC batch writing nor native platform batch writing.</p>
+</li>
+<li>
+<p><span class="bold">OracleJDBC</span>&ndash;Use both JDBC batch writing and Oracle native platform batch writing.</p>
+</li>
+<li>
+<p><span class="bold">None</span>&ndash;Do not use batch writing (turn it off).</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r3c1-t50 r1c3-t50">
+<p>None</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t50" headers="r1c1-t50">
+<p>Statement caching</p>
+</td>
+<td align="left" headers="r4c1-t50 r1c2-t50"><br /></td>
+<td align="left" headers="r4c1-t50 r1c3-t50">
+<p>50</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t50" headers="r1c1-t50">
+<p>Native SQL</p>
+</td>
+<td align="left" headers="r5c1-t50 r1c2-t50"><br /></td>
+<td align="left" headers="r5c1-t50 r1c3-t50">
+<p>False</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t50" headers="r1c1-t50">
+<p><span class="bold">Database</span></p>
+</td>
+<td align="left" headers="r6c1-t50 r1c2-t50"><br /></td>
+<td align="left" headers="r6c1-t50 r1c3-t50"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t50" headers="r1c1-t50">
+<p>JTA Data Source Name</p>
+</td>
+<td align="left" headers="r7c1-t50 r1c2-t50">
+<p>If you selected <span class="bold">JTA</span> as the transaction type, then enter the name of the default JTA data source for the persistence unit.</p>
+</td>
+<td align="left" headers="r7c1-t50 r1c3-t50"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t50" headers="r1c1-t50">
+<p>Non-JTA Data Source Name</p>
+</td>
+<td align="left" headers="r8c1-t50 r1c2-t50">
+<p>If you selected <span class="bold">Resource Local</span> as the transaction type, then enter the name of the non-JTA data source.</p>
+<p>This property is not available for projects using the <span class="bold">Generic</span> platform.</p>
+</td>
+<td align="left" headers="r8c1-t50 r1c3-t50"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t50" headers="r1c1-t50">
+<p><span class="bold">EclipseLink connection pool</span></p>
+</td>
+<td align="left" headers="r9c1-t50 r1c2-t50">
+<p>Define the connection pool driver, URL, user name and password.</p>
+<p>These properties are note available for projects using the Generic platform.</p>
+</td>
+<td align="left" headers="r9c1-t50 r1c3-t50"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t50" headers="r1c1-t50">
+<p>Bind parameters</p>
+</td>
+<td align="left" headers="r10c1-t50 r1c2-t50">
+<p>Control whether or not the query uses parameter binding.</p>
+<p>Note: This property applies when used in a Java SE environment.</p>
+<p>This property is not available for projects using the Generic platform.</p>
+</td>
+<td align="left" headers="r10c1-t50 r1c3-t50"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t50" headers="r1c1-t50">
+<p>Read Connection</p>
+</td>
+<td align="left" headers="r11c1-t50 r1c2-t50">
+<p>The maximum and minimum number of connections allowed in the JDBC read connection pool.</p>
+<p><span class="bold">Note</span>: These property apply when used in a Java SE environment.</p>
+<p>These properties are not available for projects using the Generic platform</p>
+</td>
+<td align="left" headers="r11c1-t50 r1c3-t50">
+<p>Minimum: 2</p>
+<p>Maximum 2</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t50" headers="r1c1-t50">
+<p>Write Connection</p>
+</td>
+<td align="left" headers="r12c1-t50 r1c2-t50">
+<p>The maximum and minimum number of connections allowed in the JDBC read connection pool.</p>
+<p><span class="bold">Note</span>: These property apply when used in a Java SE environment.</p>
+<p>These properties are not available for projects using the Generic platform</p>
+</td>
+<td align="left" headers="r12c1-t50 r1c3-t50">
+<p>Minimum: 5</p>
+<p>Maximum 10</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r13c1-t50" headers="r1c1-t50">
+<p><span class="bold">Exclusive connections</span></p>
+</td>
+<td align="left" headers="r13c1-t50 r1c2-t50"><br /></td>
+<td align="left" headers="r13c1-t50 r1c3-t50"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r14c1-t50" headers="r1c1-t50">
+<p>Exclusive connection mode</p>
+</td>
+<td align="left" headers="r14c1-t50 r1c2-t50">
+<ul>
+<li>
+<p>Always</p>
+</li>
+<li>
+<p>Isolated</p>
+</li>
+<li>
+<p>Transactional</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r14c1-t50 r1c3-t50">
+<p>Transactional</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r15c1-t50" headers="r1c1-t50">
+<p>Lazy connection acquisition</p>
+</td>
+<td align="left" headers="r15c1-t50 r1c2-t50"><br /></td>
+<td align="left" headers="r15c1-t50 r1c3-t50">
+<p>True</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" --></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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference047.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference047.htm
new file mode 100644
index 0000000000..0a68db3342
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference047.htm
@@ -0,0 +1,221 @@
+<!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>Customization</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Customization" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIAJAFEG" name="CIAJAFEG"></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="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="The following table lists the properties available in the Customization page of the persistence.xml Editor." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" 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-t51">Property</th>
+<th align="left" valign="bottom" id="r1c2-t51">Description</th>
+<th align="left" valign="bottom" id="r1c3-t51">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t51" headers="r1c1-t51">
+<p><span class="bold">Weaving</span></p>
+</td>
+<td align="left" headers="r2c1-t51 r1c2-t51">
+<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-t51 r1c3-t51">
+<p>Weave Dynamically</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t51" headers="r1c1-t51">
+<p>Lazy</p>
+</td>
+<td align="left" headers="r3c1-t51 r1c2-t51">
+<p>Select this option to enable lazy weaving.</p>
+</td>
+<td align="left" headers="r3c1-t51 r1c3-t51">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t51" headers="r1c1-t51">
+<p>Fetch&nbsp;Groups</p>
+</td>
+<td align="left" headers="r4c1-t51 r1c2-t51">
+<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-t51 r1c3-t51">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t51" headers="r1c1-t51">
+<p>Internal</p>
+</td>
+<td align="left" headers="r5c1-t51 r1c2-t51"><br /></td>
+<td align="left" headers="r5c1-t51 r1c3-t51">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t51" headers="r1c1-t51">
+<p>Eager</p>
+</td>
+<td align="left" headers="r6c1-t51 r1c2-t51"><br /></td>
+<td align="left" headers="r6c1-t51 r1c3-t51">
+<p>False</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t51" headers="r1c1-t51">
+<p>Change&nbsp;Tracking</p>
+</td>
+<td align="left" headers="r7c1-t51 r1c2-t51">
+<p>Select this option to use weaving to detect which fields or properties of the object change.</p>
+</td>
+<td align="left" headers="r7c1-t51 r1c3-t51">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t51" headers="r1c1-t51">
+<p><span class="bold">Validation only</span></p>
+</td>
+<td align="left" headers="r8c1-t51 r1c2-t51"><br /></td>
+<td align="left" headers="r8c1-t51 r1c3-t51">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t51" headers="r1c1-t51">
+<p><span class="bold">Mapping files schema validation</span></p>
+</td>
+<td align="left" headers="r9c1-t51 r1c2-t51"><br /></td>
+<td align="left" headers="r9c1-t51 r1c3-t51">
+<p>False</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t51" headers="r1c1-t51">
+<p><span class="bold">Throw&nbsp;exceptions</span></p>
+</td>
+<td align="left" headers="r10c1-t51 r1c2-t51">
+<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="r10c1-t51 r1c3-t51">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t51" headers="r1c1-t51">
+<p>Exception handler</p>
+</td>
+<td align="left" headers="r11c1-t51 r1c2-t51">
+<p>Select (or create) a Java class to handle exceptions.</p>
+</td>
+<td align="left" headers="r11c1-t51 r1c3-t51"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t51" headers="r1c1-t51">
+<p><span class="bold">Session Customizer</span></p>
+</td>
+<td align="left" headers="r12c1-t51 r1c2-t51">
+<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="r12c1-t51 r1c3-t51"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r13c1-t51" headers="r1c1-t51">
+<p>Profiler</p>
+</td>
+<td align="left" headers="r13c1-t51 r1c2-t51">
+<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-t51 r1c3-t51">
+<p>NoProfiler</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<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>
+<p>This page is not available for projects using the <span class="bold">Generic</span> platform.</p>
+</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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference048.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference048.htm
new file mode 100644
index 0000000000..3d87cbe561
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference048.htm
@@ -0,0 +1,166 @@
+<!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>Caching</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Caching" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIABEDCH" name="CIABEDCH"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
+<h1><a id="sthref450" name="sthref450"></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="inftblhruleinformal">
+<table class="HRuleInformal" summary="This table lists the properties of the Caching page of the persistence.xml Editor." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" 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-t53">Property</th>
+<th align="left" valign="bottom" id="r1c2-t53">Description</th>
+<th align="left" valign="bottom" id="r1c3-t53">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t53" headers="r1c1-t53">
+<p>Shared cache mode</p>
+</td>
+<td align="left" headers="r2c1-t53 r1c2-t53">
+<p>Select one of the following as the shared cache mode:</p>
+<ul>
+<li>
+<p><span class="bold">All</span> &ndash; .</p>
+</li>
+<li>
+<p><span class="bold">None</span> &ndash;</p>
+</li>
+<li>
+<p><span class="bold">Enable Selective</span> &ndash;</p>
+</li>
+<li>
+<p><span class="bold">Disable Selective</span> &ndash;</p>
+</li>
+<li>
+<p><span class="bold">Unspecified</span> &ndash;</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r2c1-t53 r1c3-t53">
+<p>Disable selective</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t53" headers="r1c1-t53">
+<p>Default Cache Type</p>
+</td>
+<td align="left" headers="r3c1-t53 r1c2-t53">
+<p>Select one of the following as the Default Cache Type:</p>
+<ul>
+<li>
+<p><span class="bold">Weak with Soft Subcache</span>&ndash;This option is similar to <span class="bold">Weak with Hard Subcache</span> except that it maintains a most frequently used subcache that uses soft references. The size of the subcache is proportional to the size of the identity map. The subcache uses soft references to ensure that these objects are garbage-collected only if the system is low on memory.</p>
+<p>Use this identity map in most circumstances as a means to control memory used by the cache.</p>
+</li>
+<li>
+<p><span class="bold">Weak with Hard Subcache</span>&ndash;This option is similar to <span class="bold">Soft with Weak</span> subcache except that it maintains a most frequently used subcache that uses hard references. Use this identity map if soft references are not suitable for your platform.</p>
+</li>
+<li>
+<p><span class="bold">Weak</span>&ndash;This option is similar to <span class="bold">Full</span>, except that objects are referenced using weak references. This option uses less memory than <span class="bold">Full</span>, allows complete garbage collection and provides full caching and guaranteed identity.</p>
+<p>Use this identity map for transactions that, once started, stay on the server side.</p>
+</li>
+<li>
+<p><span class="bold">Soft</span>&ndash;This option is similar to <span class="bold">Weak</span> except that the map holds the objects using soft references. This identity map enables full garbage collection when memory is low. It provides full caching and guaranteed identity.</p>
+</li>
+<li>
+<p><span class="bold">Full</span>&ndash;This option provides full caching and guaranteed identity: all objects are cached and not removed.</p>
+<p>Note: This process may be memory-intensive when many objects are read.</p>
+</li>
+<li>
+<p><span class="bold">None</span>&ndash;This option does not preserve object identity and does not cache objects.This option is not recommended.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r3c1-t53 r1c3-t53">
+<p>Weak with soft subcache</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t53" headers="r1c1-t53">
+<p>Default Cache Size</p>
+</td>
+<td align="left" headers="r4c1-t53 r1c2-t53">
+<p>Set the size (maximum number of objects) of the cache.</p>
+</td>
+<td align="left" headers="r4c1-t53 r1c3-t53">
+<p>100</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t53" headers="r1c1-t53">
+<p>Flush clear cache</p>
+</td>
+<td align="left" headers="r5c1-t53 r1c2-t53">
+<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="r5c1-t53 r1c3-t53">
+<p>Drop Invalidate</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<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>
+<p>This page is not available for projects using the <span class="bold">Generic</span> platform.</p>
+</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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference049.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference049.htm
new file mode 100644
index 0000000000..83f39012bd
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference049.htm
@@ -0,0 +1,293 @@
+<!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>Logging</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Logging" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIABGHHI" name="CIABGHHI"></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="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>
+<p>This page is not available for projects using the <span class="bold">Generic</span> platform.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblnote" --></div>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="This table lists the properties of the Logging page of the persistence.xml Editor." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" 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-t56">Property</th>
+<th align="left" valign="bottom" id="r1c2-t56">Description</th>
+<th align="left" valign="bottom" id="r1c3-t56">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t56" headers="r1c1-t56">
+<p>Logging Level</p>
+</td>
+<td align="left" headers="r2c1-t56 r1c2-t56">
+<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">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">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>
+</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-t56 r1c3-t56">
+<p>Info</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t56" headers="r1c1-t56">
+<p>Timestamp</p>
+</td>
+<td align="left" headers="r3c1-t56 r1c2-t56">
+<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-t56 r1c3-t56">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t56" headers="r1c1-t56">
+<p>Thread</p>
+</td>
+<td align="left" headers="r4c1-t56 r1c2-t56">
+<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>
+</li>
+</ul>
+</td>
+<td align="left" headers="r4c1-t56 r1c3-t56">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t56" headers="r1c1-t56">
+<p>Session</p>
+</td>
+<td align="left" headers="r5c1-t56 r1c2-t56">
+<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-t56 r1c3-t56">
+<p>true</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t56" headers="r1c1-t56">
+<p>Exceptions</p>
+</td>
+<td align="left" headers="r6c1-t56 r1c2-t56">
+<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-t56 r1c3-t56">
+<p>false</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t56" headers="r1c1-t56">
+<p>Log file</p>
+</td>
+<td align="left" headers="r7c1-t56 r1c2-t56">
+<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-t56 r1c3-t56">
+<p>stdout</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t56" headers="r1c1-t56">
+<p>Logger</p>
+</td>
+<td align="left" headers="r8c1-t56 r1c2-t56">
+<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-t56 r1c3-t56">
+<p>DefaultLogger</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t56" headers="r1c1-t56">
+<p>Logging Categories</p>
+</td>
+<td align="left" headers="r9c1-t56 r1c2-t56">
+<p>You can also specify the logging level for the following specific categories:</p>
+<ul>
+<li>
+<p>SQL</p>
+</li>
+<li>
+<p>Connection</p>
+</li>
+<li>
+<p>Event</p>
+</li>
+<li>
+<p>Query</p>
+</li>
+<li>
+<p>Cache</p>
+</li>
+<li>
+<p>Propagation</p>
+</li>
+<li>
+<p>EJB</p>
+</li>
+<li>
+<p>DMS</p>
+</li>
+<li>
+<p>EJB or metatdata</p>
+</li>
+<li>
+<p>JPA metadata</p>
+</li>
+<li>
+<p>Weaving</p>
+</li>
+<li>
+<p>Properties</p>
+</li>
+<li>
+<p>Server</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r9c1-t56 r1c3-t56"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" --></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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference050.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference050.htm
new file mode 100644
index 0000000000..706ae085c2
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference050.htm
@@ -0,0 +1,220 @@
+<!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>Options</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Options" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIAFJCHE" name="CIAFJCHE"></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="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>
+<p>This page is not available for projects using the <span class="bold">Generic</span> platform.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblnote" --></div>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="This table lists the properties of the Options page of the persistence.xml Editor." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" 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-t58">Property</th>
+<th align="left" valign="bottom" id="r1c2-t58">Description</th>
+<th align="left" valign="bottom" id="r1c3-t58">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t58" headers="r1c1-t58">
+<p>Session Name</p>
+</td>
+<td align="left" headers="r2c1-t58 r1c2-t58">
+<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-t58 r1c3-t58"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t58" headers="r1c1-t58">
+<p>Sessions XML</p>
+</td>
+<td align="left" headers="r3c1-t58 r1c2-t58">
+<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-t58 r1c3-t58"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t58" headers="r1c1-t58">
+<p>Target Database</p>
+</td>
+<td align="left" headers="r4c1-t58 r1c2-t58">
+<p>Select the target database. You can also set the value to the fully qualified class name 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-t58 r1c3-t58">
+<p>Auto</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t58" headers="r1c1-t58">
+<p>Target Server</p>
+</td>
+<td align="left" headers="r5c1-t58 r1c2-t58">
+<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-t58 r1c3-t58">
+<p>None</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t58" headers="r1c1-t58">
+<p>Event Listener</p>
+</td>
+<td align="left" headers="r6c1-t58 r1c2-t58">
+<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-t58 r1c3-t58"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t58" headers="r1c1-t58">
+<p>Include Descriptor Queries</p>
+</td>
+<td align="left" headers="r7c1-t58 r1c2-t58">
+<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-t58 r1c3-t58">
+<p>True</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t58" headers="r1c1-t58">
+<p>Miscellaneous Options</p>
+</td>
+<td align="left" headers="r8c1-t58 r1c2-t58"><br /></td>
+<td align="left" headers="r8c1-t58 r1c3-t58"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t58" headers="r1c1-t58">
+<p>Temporal mutable</p>
+</td>
+<td align="left" headers="r9c1-t58 r1c2-t58">
+<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-t58 r1c3-t58">
+<p>False</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t58" headers="r1c1-t58">
+<p>Lock timeout</p>
+</td>
+<td align="left" headers="r10c1-t58 r1c2-t58"><br /></td>
+<td align="left" headers="r10c1-t58 r1c3-t58">
+<p>5</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t58" headers="r1c1-t58">
+<p>Query timeout</p>
+</td>
+<td align="left" headers="r11c1-t58 r1c2-t58"><br /></td>
+<td align="left" headers="r11c1-t58 r1c3-t58">
+<p>5</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t58" headers="r1c1-t58">
+<p>Validation mode</p>
+</td>
+<td align="left" headers="r12c1-t58 r1c2-t58"><br /></td>
+<td align="left" headers="r12c1-t58 r1c3-t58">
+<p>Auto</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r13c1-t58" headers="r1c1-t58">
+<p>Validate pre-persist group</p>
+</td>
+<td align="left" headers="r13c1-t58 r1c2-t58"><br /></td>
+<td align="left" headers="r13c1-t58 r1c3-t58"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r14c1-t58" headers="r1c1-t58">
+<p>Validate pre-update group</p>
+</td>
+<td align="left" headers="r14c1-t58 r1c2-t58"><br /></td>
+<td align="left" headers="r14c1-t58 r1c3-t58"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r15c1-t58" headers="r1c1-t58">
+<p>Validate pre-remove group</p>
+</td>
+<td align="left" headers="r15c1-t58 r1c2-t58"><br /></td>
+<td align="left" headers="r15c1-t58 r1c3-t58"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" --></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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference051.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference051.htm
new file mode 100644
index 0000000000..5ec6bf20ed
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference051.htm
@@ -0,0 +1,143 @@
+<!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>Schema Generation</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Schema Generation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIACCFCB" name="CIACCFCB"></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="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>
+<p>This page is not available for projects using the <span class="bold">Generic</span> platform.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblnote" --></div>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="This table lists the properties of the Schema Generation page of the persistence.xml Editor." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" 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-t60">Property</th>
+<th align="left" valign="bottom" id="r1c2-t60">Description</th>
+<th align="left" valign="bottom" id="r1c3-t60">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t60" headers="r1c1-t60">
+<p>DDL Generation Type</p>
+</td>
+<td align="left" headers="r2c1-t60 r1c2-t60">
+<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-t60 r1c3-t60">
+<p>None</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t60" headers="r1c1-t60">
+<p>Output Mode</p>
+</td>
+<td align="left" headers="r3c1-t60 r1c2-t60">
+<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-t60 r1c3-t60"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t60" headers="r1c1-t60">
+<p>DDL Generation Location</p>
+</td>
+<td align="left" headers="r4c1-t60 r1c2-t60">
+<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-t60 r1c3-t60"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t60" headers="r1c1-t60">
+<p>Create DDL File Name</p>
+</td>
+<td align="left" headers="r5c1-t60 r1c2-t60">
+<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-t60 r1c3-t60">
+<p><code>createDDL.jdbc</code></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t60" headers="r1c1-t60">
+<p>Drop DDL File Name</p>
+</td>
+<td align="left" headers="r6c1-t60 r1c2-t60">
+<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-t60 r1c3-t60">
+<p><code>dropDDL.jdbc</code></p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" --></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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference052.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference052.htm
new file mode 100644
index 0000000000..6f9ca8febd
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference052.htm
@@ -0,0 +1,41 @@
+<!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>Properties</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Properties" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<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 <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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference053.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference053.htm
new file mode 100644
index 0000000000..fa9fa36536
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference053.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>Source</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Source" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<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 <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>
+<a id="sthref451" name="sthref451"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a></p>
+</li>
+</ul>
+</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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference054.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference054.htm
new file mode 100644
index 0000000000..78af94aef9
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference054.htm
@@ -0,0 +1,61 @@
+<!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>Preferences</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Preferences" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<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="reference055.htm#CACBFACC">Java Persistence Preferences page &ndash; JPA</a></p>
+</li>
+<li>
+<p><a href="reference056.htm#CACFGIDG">Java Persistence Preferences page &ndash; Errors/Warnings</a></p>
+</li>
+</ul>
+<p>This section also includes information on the following project property pages:</p>
+<ul>
+<li>
+<p><a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; JPA Options</a></p>
+</li>
+<li>
+<p><a href="reference057.htm#CACFJJGG">Project Properties page &ndash; EclipseLink</a></p>
+</li>
+<li>
+<p><a href="reference058.htm#CACDCIGD">Project Properties Page &ndash; Entity Generation</a></p>
+</li>
+<li>
+<p><a href="reference059.htm#CACEEJJB">Project Properties page &ndash; Errors/Warnings</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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference055.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference055.htm
new file mode 100644
index 0000000000..7d1f81817f
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference055.htm
@@ -0,0 +1,103 @@
+<!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 Persistence Preferences page &ndash; JPA</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Java Persistence Preferences page &ndash; JPA" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACBFACC" name="CACBFACC"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Java Persistence Preferences page &ndash; JPA</h1>
+<div class="inftblinformal">
+<table class="Informal" title="Options on the Java Persistence Preferences page &gt; JPA" summary="Options on the Java Persistence Preferences page &gt; JPA" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t61">Property</th>
+<th align="left" valign="bottom" id="r1c2-t61">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t61" headers="r1c1-t61">
+<p><span class="bold">Entity generation from tables</span></p>
+</td>
+<td align="left" headers="r2c1-t61 r1c2-t61"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t61" headers="r1c1-t61">
+<p>Default package</p>
+</td>
+<td align="left" headers="r3c1-t61 r1c2-t61"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t61" headers="r1c1-t61">
+<p><span class="bold">JPQL Editing</span></p>
+</td>
+<td align="left" headers="r4c1-t61 r1c2-t61"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t61" headers="r1c1-t61">
+<p>Specify the case ...</p>
+</td>
+<td align="left" headers="r5c1-t61 r1c2-t61">
+<ul>
+<li>
+<p>Lowercase</p>
+</li>
+<li>
+<p>Uppercase</p>
+</li>
+</ul>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t61" headers="r1c1-t61">
+<p>Match case of first character</p>
+</td>
+<td align="left" headers="r6c1-t61 r1c2-t61"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblinformal" -->
+<a id="sthref452" name="sthref452"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+</li>
+<li>
+<p><a href="tasks023.htm#CIHHFGIG">Generating dynamic entities from tables</a></p>
+</li>
+</ul>
+</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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference056.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference056.htm
new file mode 100644
index 0000000000..10e76996dc
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference056.htm
@@ -0,0 +1,109 @@
+<!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 Persistence Preferences page &ndash; Errors/Warnings</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Java Persistence Preferences page &ndash; Errors/Warnings" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACFGIDG" name="CACFGIDG"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Java Persistence Preferences page &ndash; Errors/Warnings</h1>
+<div class="inftblinformal">
+<table class="Informal" title="Options on the Java Persistence Preferences page &gt; Errors/Warnings" summary="Options on the Java Persistence Preferences page &gt; Errors/Warnings" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t62">Property</th>
+<th align="left" valign="bottom" id="r1c2-t62">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t62" headers="r1c1-t62">
+<p><span class="bold">Enable project specific settings</span></p>
+</td>
+<td align="left" headers="r2c1-t62 r1c2-t62"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t62" headers="r1c1-t62">
+<p>Project</p>
+</td>
+<td align="left" headers="r3c1-t62 r1c2-t62"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t62" headers="r1c1-t62">
+<p>Persistence unit</p>
+</td>
+<td align="left" headers="r4c1-t62 r1c2-t62"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t62" headers="r1c1-t62">
+<p>Type</p>
+</td>
+<td align="left" headers="r5c1-t62 r1c2-t62"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t62" headers="r1c1-t62">
+<p>Attribute</p>
+</td>
+<td align="left" headers="r6c1-t62 r1c2-t62"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t62" headers="r1c1-t62">
+<p>DAtabase</p>
+</td>
+<td align="left" headers="r7c1-t62 r1c2-t62"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t62" headers="r1c1-t62">
+<p>Inheritance</p>
+</td>
+<td align="left" headers="r8c1-t62 r1c2-t62"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t62" headers="r1c1-t62">
+<p>Queries and generators</p>
+</td>
+<td align="left" headers="r9c1-t62 r1c2-t62"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblinformal" -->
+<a id="sthref453" name="sthref453"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="tasks024.htm#BABFAIBA">Validating mappings and reporting problems</a></p>
+</li>
+</ul>
+</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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference057.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference057.htm
new file mode 100644
index 0000000000..184a6bb69b
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference057.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>Project Properties page &ndash; EclipseLink</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Project Properties page &ndash; EclipseLink" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACFJJGG" name="CACFJJGG"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Project Properties page &ndash; EclipseLink</h1>
+<div class="inftblinformal">
+<table class="Informal" title="Options on the Project Properties page &gt; EclipseLink" summary="Options on the Project Properties page &gt; EclipseLink" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t64">Property</th>
+<th align="left" valign="bottom" id="r1c2-t64">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t64" headers="r1c1-t64">
+<p><span class="bold">Static weaving</span></p>
+</td>
+<td align="left" headers="r2c1-t64 r1c2-t64"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t64" headers="r1c1-t64">
+<p>Weave classes on build</p>
+</td>
+<td align="left" headers="r3c1-t64 r1c2-t64"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t64" headers="r1c1-t64">
+<p>Source classes</p>
+</td>
+<td align="left" headers="r4c1-t64 r1c2-t64"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t64" headers="r1c1-t64">
+<p>Target classes</p>
+</td>
+<td align="left" headers="r5c1-t64 r1c2-t64"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t64" headers="r1c1-t64">
+<p>Log level</p>
+</td>
+<td align="left" headers="r6c1-t64 r1c2-t64"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t64" headers="r1c1-t64">
+<p>Persistence XML root</p>
+</td>
+<td align="left" headers="r7c1-t64 r1c2-t64"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblinformal" --></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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference058.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference058.htm
new file mode 100644
index 0000000000..e2dd31df07
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference058.htm
@@ -0,0 +1,76 @@
+<!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>Project Properties Page &ndash; Entity Generation</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Project Properties Page &ndash; Entity Generation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACDCIGD" name="CACDCIGD"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Project Properties Page &ndash; Entity Generation</h1>
+<div class="inftblinformal">
+<table class="Informal" title="Options on the Project Properties page &gt; Entity Generation" summary="Options on the Project Properties page &gt; Entity Generation" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t65">Property</th>
+<th align="left" valign="bottom" id="r1c2-t65">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t65" headers="r1c1-t65">
+<p><span class="bold">Entity generation from tables</span></p>
+</td>
+<td align="left" headers="r2c1-t65 r1c2-t65"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t65" headers="r1c1-t65">
+<p>Default package</p>
+</td>
+<td align="left" headers="r3c1-t65 r1c2-t65"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblinformal" -->
+<a id="sthref466" name="sthref466"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
+</li>
+<li>
+<p><a href="tasks023.htm#CIHHFGIG">Generating dynamic entities from tables</a></p>
+</li>
+</ul>
+</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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference059.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference059.htm
new file mode 100644
index 0000000000..6267973b37
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference059.htm
@@ -0,0 +1,110 @@
+<!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>Project Properties page &ndash; Errors/Warnings</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Project Properties page &ndash; Errors/Warnings" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACEEJJB" name="CACEEJJB"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Project Properties page &ndash; Errors/Warnings</h1>
+<div class="inftblinformal">
+<table class="Informal" title="Options on the Project Properties page &gt; Errors/Warnings" summary="Options on the Project Properties page &gt; Errors/Warnings" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t66">Property</th>
+<th align="left" valign="bottom" id="r1c2-t66">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t66" headers="r1c1-t66">
+<p><span class="bold">Enable project specific settings</span></p>
+</td>
+<td align="left" headers="r2c1-t66 r1c2-t66"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t66" headers="r1c1-t66">
+<p>Project</p>
+</td>
+<td align="left" headers="r3c1-t66 r1c2-t66"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t66" headers="r1c1-t66">
+<p>Persistence unit</p>
+</td>
+<td align="left" headers="r4c1-t66 r1c2-t66"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t66" headers="r1c1-t66">
+<p>Type</p>
+</td>
+<td align="left" headers="r5c1-t66 r1c2-t66"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t66" headers="r1c1-t66">
+<p>Attribute</p>
+</td>
+<td align="left" headers="r6c1-t66 r1c2-t66"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t66" headers="r1c1-t66">
+<p>DAtabase</p>
+</td>
+<td align="left" headers="r7c1-t66 r1c2-t66"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t66" headers="r1c1-t66">
+<p>Inheritance</p>
+</td>
+<td align="left" headers="r8c1-t66 r1c2-t66"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t66" headers="r1c1-t66">
+<p>Queries and generators</p>
+</td>
+<td align="left" headers="r9c1-t66 r1c2-t66"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblinformal" -->
+<a id="sthref467" name="sthref467"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="tasks024.htm#BABFAIBA">Validating mappings and reporting problems</a></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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference060.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference060.htm
new file mode 100644
index 0000000000..4c6bd7b83b
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference060.htm
@@ -0,0 +1,61 @@
+<!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>Dialogs</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Dialogs" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<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 dialogs:</p>
+<ul>
+<li>
+<p><a href="reference061.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>
+<li>
+<p><a href="ref_add_converter.htm#CIAGCGIJ">Add Converter dialog</a></p>
+</li>
+<li>
+<p><a href="reference063.htm#CACFEGAG">Mapping Type Selection dialog</a></p>
+</li>
+<li>
+<p><a href="reference064.htm#CACJBCGG">JPA Metadata Conversion dialog</a></p>
+</li>
+<li>
+<p><a href="reference065.htm#CACIBDFB">Make Persistent 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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference061.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference061.htm
new file mode 100644
index 0000000000..e217e86b98
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference061.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>Edit Join Columns Dialog</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Edit Join Columns Dialog" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<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="inftblhruleinformal">
+<table class="HRuleInformal" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t67">Property</th>
+<th align="left" valign="bottom" id="r1c2-t67">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t67" headers="r1c1-t67">
+<p>Name</p>
+</td>
+<td align="left" headers="r2c1-t67 r1c2-t67">
+<p>Name of the joint table column that contains the foreign key column.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t67" headers="r1c1-t67">
+<p>Referenced Column Name</p>
+</td>
+<td align="left" headers="r3c1-t67 r1c2-t67">
+<p>Name of the database column that contains the foreign key reference for the entity relationship.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref468" name="sthref468"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="reference039.htm#CACIJEGI">Joining Strategy</a></p>
+</li>
+</ul>
+</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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference062.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference062.htm
new file mode 100644
index 0000000000..8d77bb4dd1
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference062.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>Add Join Column dialog</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Add Join Column dialog" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACJJBAD" name="CACJJBAD"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Add Join Column 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">Add Join Column</span> dialog.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" title="Fields on the Add Join Column dialog" summary="Fields on the Add Join Column dialog" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="32%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t68">Property</th>
+<th align="left" valign="bottom" id="r1c2-t68">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t68" headers="r1c1-t68">
+<p>Name</p>
+</td>
+<td align="left" headers="r2c1-t68 r1c2-t68">
+<p>Name of the joint table column that contains the foreign key column.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t68" headers="r1c1-t68">
+<p>Referenced Column Name</p>
+</td>
+<td align="left" headers="r3c1-t68 r1c2-t68">
+<p>Name of the database column that contains the foreign key reference for the entity relationship.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t68" headers="r1c1-t68">
+<p>Table</p>
+</td>
+<td align="left" headers="r4c1-t68 r1c2-t68"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t68" headers="r1c1-t68">
+<p>Column definition</p>
+</td>
+<td align="left" headers="r5c1-t68 r1c2-t68"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t68" headers="r1c1-t68">
+<p>Insertable</p>
+</td>
+<td align="left" headers="r6c1-t68 r1c2-t68"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t68" headers="r1c1-t68">
+<p>Updatable</p>
+</td>
+<td align="left" headers="r7c1-t68 r1c2-t68"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t68" headers="r1c1-t68">
+<p>Unique</p>
+</td>
+<td align="left" headers="r8c1-t68 r1c2-t68"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t68" headers="r1c1-t68">
+<p>Mutable</p>
+</td>
+<td align="left" headers="r9c1-t68 r1c2-t68"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref469" name="sthref469"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="reference026.htm#CACBCGDI">Element Collection Mapping</a></p>
+</li>
+</ul>
+</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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference063.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference063.htm
new file mode 100644
index 0000000000..96bd027fbb
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference063.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>Mapping Type Selection dialog</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Mapping Type Selection dialog" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACFEGAG" name="CACFEGAG"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Mapping Type Selection dialog</h1>
+<p>Use this dialog to select a specific mapping type for the attribute or entity.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="This table lists the options on the JPA Global Metadata Conversion 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-t71">Property</th>
+<th align="left" valign="bottom" id="r1c2-t71">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t71" headers="r1c1-t71">
+<p>Enter mapping type or pattern</p>
+</td>
+<td align="left" headers="r2c1-t71 r1c2-t71">
+<p>Enter the name (or part of a name) of a mapping type.</p>
+<p>Leave blank to show all available options.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t71" headers="r1c1-t71">
+<p>Matched items</p>
+</td>
+<td align="left" headers="r3c1-t71 r1c2-t71">
+<p>Dali displays the mapping types that match your search pattern.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref472" name="sthref472"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+</ul>
+</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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference064.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference064.htm
new file mode 100644
index 0000000000..ecf649100b
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference064.htm
@@ -0,0 +1,85 @@
+<!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>JPA Metadata Conversion dialog</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="JPA Metadata Conversion dialog" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACJBCGG" name="CACJBCGG"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>JPA Metadata Conversion dialog</h1>
+<p>Use this dialog to export your JPA metadata (converters, queries, and generators) to an XML mapping file.</p>
+<p>Duplicated or overridden annotations <span class="italic">will not</span> be included in the generated mapping file.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="This table lists the options on the JPA Global Metadata Conversion 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-t72">Property</th>
+<th align="left" valign="bottom" id="r1c2-t72">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t72" headers="r1c1-t72">
+<p>Mapping file</p>
+</td>
+<td align="left" headers="r2c1-t72 r1c2-t72">
+<p>Name and location of the XML file in which to save the JPA metadata</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<div align="center">
+<div class="inftblnotewarn"><br />
+<table class="NoteWarn oac_no_warn" summary="" cellpadding="3" cellspacing="0">
+<tbody>
+<tr>
+<td align="left">
+<p class="notep1">WARNING:</p>
+<p class="warnsp">Malformed metadata will result in a non-functional mapping file</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblnotewarn" --></div>
+<a id="sthref473" name="sthref473"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="tasks028.htm#CIHEHCHB">Converting JPA metadata to XML</a></p>
+</li>
+</ul>
+</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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference065.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference065.htm
new file mode 100644
index 0000000000..f950658dfd
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference065.htm
@@ -0,0 +1,108 @@
+<!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>Make Persistent dialog</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Make Persistent dialog" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACIBDFB" name="CACIBDFB"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Make Persistent dialog</h1>
+<p>Use this dialog to add persistence to a Java class.</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="This table lists the options on the Make Persistent 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-t74">Property</th>
+<th align="left" valign="bottom" id="r1c2-t74">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t74" headers="r1c1-t74">
+<p>Annotate in Java</p>
+</td>
+<td align="left" headers="r2c1-t74 r1c2-t74">
+<p>Specify if Dali should use annotations. If disabled, Dali will add persistence information in the XML mapping file.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t74" headers="r1c1-t74">
+<p>Add to XML mapping file</p>
+</td>
+<td align="left" headers="r3c1-t74 r1c2-t74">
+<p>Specify if Dali should add persistence information in the XML mapping file. If disabled, Dali will use annotations.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t74" headers="r1c1-t74">
+<p>Java classes</p>
+</td>
+<td align="left" headers="r4c1-t74 r1c2-t74">
+<p>For each Java class, select the Mapping type:</p>
+<ul>
+<li>
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+</li>
+<li>
+<p><a href="tasks003.htm#BABFEICE">Embeddable</a></p>
+</li>
+<li>
+<p><a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</li>
+</ul>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t74" headers="r1c1-t74">
+<p>List in persistence.xml</p>
+</td>
+<td align="left" headers="r5c1-t74 r1c2-t74">
+<p>Specify if Dali should add persistence properties to the persistence.xml file.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref474" name="sthref474"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+<li>
+<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
+</li>
+</ul>
+</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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference066.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference066.htm
new file mode 100644
index 0000000000..a0a0290edc
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference066.htm
@@ -0,0 +1,86 @@
+<!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 Query dialog</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Add Query dialog" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACJIFEG" name="CACJIFEG"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Add Query dialog</h1>
+<p>Use this dialog to add a new named query or native named query .</p>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="This table lists the options on the Add Query 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-t75">Property</th>
+<th align="left" valign="bottom" id="r1c2-t75">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t75" headers="r1c1-t75">
+<p>Name</p>
+</td>
+<td align="left" headers="r2c1-t75 r1c2-t75">
+<p>Name of the query</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t75" headers="r1c1-t75">
+<p>Type</p>
+</td>
+<td align="left" headers="r3c1-t75 r1c2-t75">
+<p>Select the type of query to create:</p>
+<ul>
+<li>
+<p>Named query</p>
+</li>
+<li>
+<p>Native named query</p>
+</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref475" name="sthref475"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="tasks009.htm#BABIGBGG">Creating queries</a></p>
+</li>
+</ul>
+</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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference067.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference067.htm
new file mode 100644
index 0000000000..12edf11e0d
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference067.htm
@@ -0,0 +1,93 @@
+<!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 Primary Key Join Column dialog</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Add Primary Key Join Column dialog" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACDGGDB" name="CACDGGDB"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Add Primary Key Join Column dialog</h1>
+<div class="inftblhruleinformal">
+<table class="HRuleInformal" summary="Add Primary Key Join Column dialog" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="27%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t76">Property</th>
+<th align="left" valign="bottom" id="r1c2-t76">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t76" headers="r1c1-t76">
+<p>Name</p>
+</td>
+<td align="left" headers="r2c1-t76 r1c2-t76"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t76" headers="r1c1-t76">
+<p>Referenced column name</p>
+</td>
+<td align="left" headers="r3c1-t76 r1c2-t76"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t76" headers="r1c1-t76">
+<p>Table</p>
+</td>
+<td align="left" headers="r4c1-t76 r1c2-t76"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t76" headers="r1c1-t76">
+<p>Column definitions</p>
+</td>
+<td align="left" headers="r5c1-t76 r1c2-t76"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref476" name="sthref476"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="reference018.htm#CACFHGHE">Inheritance</a></p>
+</li>
+</ul>
+<a id="sthref477" name="sthref477"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference068.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference068.htm
new file mode 100644
index 0000000000..16fba01b44
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference068.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>Icons and buttons</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Icons and buttons" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<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="reference069.htm#CACGEACG">Icons</a></p>
+</li>
+<li>
+<p><a href="reference070.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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference069.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference069.htm
new file mode 100644
index 0000000000..d4c39c843b
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference069.htm
@@ -0,0 +1,192 @@
+<!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>Icons</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:7Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Icons" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<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="inftblhruleinformal">
+<table class="HRuleInformal" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="23%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t77">Icon</th>
+<th align="left" valign="bottom" id="r1c2-t77">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t77" headers="r1c1-t77">
+<p><span class="bold">Entity icons</span></p>
+</td>
+<td align="left" headers="r2c1-t77 r1c2-t77"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t77" headers="r1c1-t77">
+<p><img src="img/new_icon_mappedentity.png" alt="" title="" /></p>
+<br /></td>
+<td align="left" headers="r3c1-t77 r1c2-t77">
+<p><a href="tasks002.htm#BABGBIEE">Entity</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t77" headers="r1c1-t77"><img src="img/new_icon_embeddableentitymapping.png" alt="Embeddable entity icon" title="Embeddable entity icon" /><br /></td>
+<td align="left" headers="r4c1-t77 r1c2-t77">
+<p><a href="tasks003.htm#BABFEICE">Embeddable</a> entity</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t77" headers="r1c1-t77"><img src="img/new_icon_mappedsuperclass.png" alt="Mapped superclass icon" title="Mapped superclass icon" /><br /></td>
+<td align="left" headers="r5c1-t77 r1c2-t77">
+<p><a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t77" headers="r1c1-t77">
+<p><span class="bold">Mapping icons</span></p>
+</td>
+<td align="left" headers="r6c1-t77 r1c2-t77"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r7c1-t77" headers="r1c1-t77"><img src="img/icon_arraymapping.png" alt="Array mapping icon" title="Array mapping icon" /><br /></td>
+<td align="left" headers="r7c1-t77 r1c2-t77">
+<p>Array mapping</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r8c1-t77" headers="r1c1-t77"><img src="img/new_icon_basicmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
+<td align="left" headers="r8c1-t77 r1c2-t77">
+<p><a href="tasks010.htm#BABBABCE">Basic mapping</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r9c1-t77" headers="r1c1-t77"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
+<td align="left" headers="r9c1-t77 r1c2-t77">
+<p>Basic collection mapping</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r10c1-t77" headers="r1c1-t77"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
+<td align="left" headers="r10c1-t77 r1c2-t77">
+<p>Basic map mapping</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r11c1-t77" headers="r1c1-t77"><img src="img/icon_elementcollection.png" alt="Element collection mapping icon" title="Element collection mapping icon" /><br /></td>
+<td align="left" headers="r11c1-t77 r1c2-t77">
+<p><a href="tasks011.htm#CIHHJEBJ">Element collection mapping</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r12c1-t77" headers="r1c1-t77"><img src="img/new_icon_embeddedidmapping.png" alt="Embedded mapping icon" title="Embedded mapping icon" /><br /></td>
+<td align="left" headers="r12c1-t77 r1c2-t77">
+<p><a href="tasks012.htm#BABCBHDF">Embedded mapping</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r13c1-t77" headers="r1c1-t77"><img src="img/new_icon_embeddedmapping.png" alt="Embedded ID mapping icon" title="Embedded ID mapping icon" /><br /></td>
+<td align="left" headers="r13c1-t77 r1c2-t77">
+<p><a href="tasks013.htm#CIHDIAEE">Embedded ID mapping</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r14c1-t77" headers="r1c1-t77"><img src="img/new_icon_idmapping.png" alt="ID mapping icon" title="ID mapping icon" /><br /></td>
+<td align="left" headers="r14c1-t77 r1c2-t77">
+<p><a href="tasks014.htm#BABGCBHG">ID mapping</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r15c1-t77" headers="r1c1-t77"><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="r15c1-t77 r1c2-t77">
+<p><a href="tasks015.htm#BABEIEGD">Many-to-many mapping</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r16c1-t77" headers="r1c1-t77"><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="r16c1-t77 r1c2-t77">
+<p><a href="tasks016.htm#BABHFAFJ">Many-to-one mapping</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r17c1-t77" headers="r1c1-t77"><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="r17c1-t77 r1c2-t77">
+<p><a href="tasks017.htm#BABHGEBD">One-to-many mapping</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r18c1-t77" headers="r1c1-t77"><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="r18c1-t77 r1c2-t77">
+<p><a href="tasks018.htm#BABFHBCJ">One-to-one mapping</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r19c1-t77" headers="r1c1-t77"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
+<td align="left" headers="r19c1-t77 r1c2-t77">
+<p>Transformation mappings</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r20c1-t77" headers="r1c1-t77"><img src="img/new_icon_transientmapping.png" alt="Transient mapping icon." title="Transient mapping icon." /><br /></td>
+<td align="left" headers="r20c1-t77 r1c2-t77">
+<p><a href="tasks019.htm#BABHFHEI">Transient mapping</a></p>
+<br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r21c1-t77" headers="r1c1-t77"><img src="img/icon_basicmapmappings.png" alt="Basic mapping icon" title="Basic mapping icon" /><br /></td>
+<td align="left" headers="r21c1-t77 r1c2-t77">
+<p>Variable one-to-one mappings</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r22c1-t77" headers="r1c1-t77">
+<p><img src="img/new_icon_versionmapping.png" alt="Version mapping icon." title="Version mapping icon." /></p>
+<br /></td>
+<td align="left" headers="r22c1-t77 r1c2-t77">
+<p><a href="tasks020.htm#BABHIBII">Version mapping</a></p>
+<br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref482" name="sthref482"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="reference068.htm#CACDHCIA">Icons and buttons</a></p>
+</li>
+</ul>
+</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;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference070.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference070.htm
new file mode 100644
index 0000000000..c703c02345
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference070.htm
@@ -0,0 +1,69 @@
+<!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>Buttons</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:9Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Buttons" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<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="inftblhruleinformal">
+<table class="HRuleInformal" 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="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="27%" />
+<col width="*" />
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t78">Icon</th>
+<th align="left" valign="bottom" id="r1c2-t78">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t78" headers="r1c1-t78"><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-t78 r1c2-t78">
+<p>JPA Development perspective</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblhruleinformal" -->
+<a id="sthref483" name="sthref483"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="reference068.htm#CACDHCIA">Icons and buttons</a></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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference071.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference071.htm
new file mode 100644
index 0000000000..be8cf85451
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference071.htm
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Dali Developer Documentation</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:9Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Dali Developer Documentation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CACBBDIB" name="CACBBDIB"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>Dali Developer Documentation</h1>
+<p><a id="sthref484" name="sthref484"></a><a id="sthref485" name="sthref485"></a><a id="sthref486" name="sthref486"></a>Additional Dali documentation is available online at:</p>
+<p><code><a href="http://wiki.eclipse.org/index.php/Dali_Developer_Documentation">http://wiki.eclipse.org/index.php/Dali_Developer_Documentation</a></code></p>
+<p>This developer documentation includes information about:</p>
+<ul>
+<li>
+<p>Dali architecture</p>
+</li>
+<li>
+<p>Plugins that comprise the Dali JPA Eclipse feature</p>
+</li>
+<li>
+<p>Extension points</p>
+</li>
+</ul>
+</div>
+<!-- class="sect1" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<col width="86%" />
+<col width="*" />
+<tr>
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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> \ No newline at end of file
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 4c9842ee03..e7681a4d87 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
@@ -3,58 +3,86 @@
<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>Adding persistence to a class</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:43Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:4Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Adding persistence to a class" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BABHICAI" name="BABHICAI"></a></p>
<div class="sect1">
<h1>Adding persistence to a class</h1>
-<p><a id="sthref67" name="sthref67"></a><a id="sthref68" name="sthref68"></a><a id="sthref69" name="sthref69"></a>You can make a Java class into one of the following persistent types:</p>
+<p><a id="sthref62" name="sthref62"></a><a id="sthref63" name="sthref63"></a><a id="sthref64" name="sthref64"></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="tasks002.htm#BABGBIEE">Entity</a></p>
</li>
<li>
-<p><a href="tasks007.htm#BABFEICE">Embeddable</a></p>
+<p><a href="tasks003.htm#BABFEICE">Embeddable</a></p>
</li>
<li>
-<p><a href="tasks008.htm#BABDAGCI">Mapped superclass</a></p>
+<p><a href="tasks004.htm#BABDAGCI">Mapped superclass</a></p>
</li>
</ul>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
-<br />
-<a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a><br />
-<a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a><br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</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="concepts003.htm#CHDBIJAC">The orm.xml file</a><br />
-<a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a> <!-- Start Footer -->
+<p>To add persistence to an existing Java class:</p>
+<ol>
+<li>
+<p>Right-click the class in the <span class="gui-object-title">Project Explorer</span> and select <span class="gui-object-action">JPA Tools &gt; Make Persistent</span>. The <a href="reference065.htm#CACIBDFB">Make Persistent dialog</a> appears.</p>
+<div class="figure"><a id="sthref65" name="sthref65"></a>
+<p class="titleinfigure">Make Persistence Dialog</p>
+<img src="img/make_persistence_dialog.png" alt="" title="" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Complete the fields on the <a href="reference065.htm#CACIBDFB">Make Persistent dialog</a>, specify the persistence mapping for each class, and click <span class="bold">Finish</span>.</p>
+</li>
+</ol>
+<p>Dali adds the necessary annotation or entry in the XML mapping file for the class.</p>
+<a id="sthref66" name="sthref66"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a></p>
+</li>
+<li>
+<p><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></p>
+</li>
+<li>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
+</li>
+</ul>
+<a id="sthref67" name="sthref67"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a></p>
+</li>
+<li>
+<p><a href="concepts003.htm#CHDBIJAC">The orm.xml file</a></p>
+</li>
+<li>
+<p><a href="concepts002.htm#CHDHAGIH">The persistence.xml file</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, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 77d584cd6b..ab3e5deff3 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
@@ -3,21 +3,21 @@
<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>Specifying additional tables</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:43Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:4Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Specifying additional tables" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CIHGBIEI" name="CIHGBIEI"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>Specifying additional tables</h1>
@@ -29,7 +29,7 @@
</li>
<li>
<p>In the <span class="gui-object-title">JPA Details</span> view, select the <span class="gui-object-action">Secondary Tables</span> information.</p>
-<div class="figure"><a id="sthref92" name="sthref92"></a>
+<div class="figure"><a id="sthref129" name="sthref129"></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>
@@ -55,18 +55,23 @@
<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 />
-<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 /></div>
+<a id="sthref130" name="sthref130"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+</ul>
+<a id="sthref131" name="sthref131"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
@@ -74,11 +79,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_create_jpa_entity.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_create_jpa_entity.htm
index a83f787ffc..2bc2ebc2b6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_create_jpa_entity.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_create_jpa_entity.htm
@@ -3,39 +3,54 @@
<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" />
-<meta name="date" content="2010-05-19T8:12:42Z" />
+<title>Creating a JPA entity</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:3Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Creating a JPA Entity" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Creating a JPA entity" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<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>
+<h1><a id="sthref52" name="sthref52"></a>Creating a JPA entity</h1>
+<p>Use this procedure to create a JPA entity with the <a href="ref_create_jpa_entity_wizard.htm#CIAGGGDF">Create JPA Entity wizard</a>:</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>
+<div class="figure"><a id="sthref53" name="sthref53"></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>
+<!-- class="figure" -->
+<div align="center">
+<div class="inftblnotealso"><br />
+<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0">
+<tbody>
+<tr>
+<td align="left">
+<p class="notep1">Tip:</p>
+<p>You can also select the JPA perspective and then select <span class="bold">File &gt; New &gt; JPA Entity</span>.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblnotealso" --></div>
+</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>
+<p>Select <span class="bold">JPA &gt; JPA 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="sthref54" name="sthref54"></a>
+<p class="titleinfigure"><a id="sthref55" name="sthref55"></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>
+<p>Complete the fields on the <a href="ref_EntityClassPage.htm#CIAFEIGF">Entity Class page</a> as follows:</p>
<ul>
<li>
<p>Select the JPA project in the <span class="bold">Project</span> field.</p>
@@ -59,7 +74,7 @@
<p>Accept the <span class="bold">Entity</span> option (the default) to create a Java class with the <code>@Entity</code> option.</p>
</li>
<li>
-<p>Alternatively, select <a href="tasks008.htm#BABDAGCI">Mapped superclass</a> (if you defined a super class).</p>
+<p>Alternatively, select <a href="tasks004.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>
@@ -73,8 +88,8 @@
</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>
+<div class="figure"><a id="sthref56" name="sthref56"></a>
+<p class="titleinfigure"><a id="sthref57" name="sthref57"></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>
@@ -94,7 +109,8 @@
<tr>
<td align="left">
<p class="notep1">Note:</p>
-The Entity Name-related options are not available if you selected <a href="tasks008.htm#BABDAGCI">Mapped superclass</a> on the <a href="ref_EntityClassPage.htm#CIAFEIGF">Entity Class page</a></td>
+<p>The Entity Name-related options are not available if you selected <a href="tasks004.htm#BABDAGCI">Mapped superclass</a> on the <a href="ref_EntityClassPage.htm#CIAFEIGF">Entity Class page</a></p>
+</td>
</tr>
</tbody>
</table>
@@ -103,7 +119,7 @@ The Entity Name-related options are not available if you selected <a href="tasks
</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>
+<div class="figure"><a id="sthref58" name="sthref58"></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>
@@ -125,23 +141,36 @@ The Entity Name-related options are not available if you selected <a href="tasks
<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>
+<a id="sthref59" name="sthref59"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></p>
+</li>
+<li>
+<p><a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a></p>
+</li>
+<li>
+<p><a href="ref_create_jpa_entity_wizard.htm#CIAGGGDF">Create JPA Entity wizard</a></p>
+</li>
+</ul>
+<a id="sthref60" name="sthref60"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+</ul>
+<a id="sthref61" name="sthref61"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a></p>
+</li>
+<li>
+<p><a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a></p>
+</li>
+</ul>
</div>
<!-- class="sect1" -->
<!-- Start Footer -->
@@ -150,11 +179,11 @@ The Entity Name-related options are not available if you selected <a href="tasks
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 ee7e1ede8e..96670e4d20 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
@@ -3,25 +3,25 @@
<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 new JPA project</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:41Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:3Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Creating a new JPA project" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<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="sthref26" name="sthref26"></a><a id="sthref27" name="sthref27"></a>Use this procedure to create a new JPA project.</p>
+<p><a id="sthref33" name="sthref33"></a><a id="sthref34" name="sthref34"></a>Use this procedure to create a new JPA project.</p>
<ol>
<li>
<p>From the Navigator or Project Explorer, select <span class="bold">File &gt; New &gt; Project</span>. The Select a wizard dialog appears.</p>
@@ -32,20 +32,21 @@
<tr>
<td align="left">
<p class="notep1">Tip:</p>
-You can also select the JPA perspective and then select <span class="bold">File &gt; New &gt; JPA Project</span>.</td>
+<p>You can also select the JPA perspective and then select <span class="bold">File &gt; New &gt; JPA Project</span>.</p>
+</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblnotealso" --></div>
-<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>
+<div class="figure"><a id="sthref35" name="sthref35"></a>
+<p class="titleinfigure"><a id="sthref36" name="sthref36"></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="sthref30" name="sthref30"></a>
-<p class="titleinfigure"><a id="sthref31" name="sthref31"></a>The JPA Project Page</p>
+<div class="figure"><a id="sthref37" name="sthref37"></a>
+<p class="titleinfigure"><a id="sthref38" name="sthref38"></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>
@@ -57,7 +58,8 @@ You can also select the JPA perspective and then select <span class="bold">File
<tr>
<td align="left">
<p class="notep1">Note:</p>
-The Target Runtime is not required for Java SE development.</td>
+<p>The Target Runtime is not required for Java SE development.</p>
+</td>
</tr>
</tbody>
</table>
@@ -66,24 +68,24 @@ The Target Runtime is not required for Java SE development.</td>
</li>
<li>
<p>Click <span class="bold">Next</span>. The Java source page appears.</p>
-<div class="figure"><a id="sthref32" name="sthref32"></a>
+<div class="figure"><a id="CIHIFEGJ" name="CIHIFEGJ"></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>
+<img src="img/new_jpa_project_source.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="sthref33" name="sthref33"></a>
-<p class="titleinfigure"><a id="sthref34" name="sthref34"></a>The JPA Facet Page</p>
+<div class="figure"><a id="sthref39" name="sthref39"></a>
+<p class="titleinfigure"><a id="sthref40" name="sthref40"></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, 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="reference002.htm#CIAIJCCE">Mapping File Wizard</a>.</p>
+<p>If you clear the <span class="bold">Create mapping file (orm.xml)</span> option (which is selected by default), you can later add a mapping file to the project using the <a href="reference007.htm#CIAIJCCE">Create ORM Mapping File wizard</a>.</p>
<div align="center">
<div class="inftblnote"><br />
<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
@@ -91,7 +93,7 @@ The Target Runtime is not required for Java SE development.</td>
<tr>
<td align="left">
<p class="notep1">Note:</p>
-If the server runtime does not provide a JPA implementation, you must explicitly select a JPA implementation library.
+<p>If the server runtime does not provide a JPA implementation, you must explicitly select a JPA implementation library.</p>
<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>
@@ -102,27 +104,46 @@ If the server runtime does not provide a JPA implementation, you must explicitly
<!-- class="inftblnote" --></div>
</li>
<li>
-<p>Click <span class="bold">Finish</span>. You should now open the <a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a>.</p>
+<p>Click <span class="bold">Finish</span>. Dali creates the new JPA project.</p>
+<p>You should now open the <a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a>.</p>
</li>
</ol>
-<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><br />
-<a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a><br />
-<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><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 />
-<a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a><br />
-<a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a>
-<p>&nbsp;</p>
+<a id="sthref41" name="sthref41"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></p>
+</li>
+<li>
+<p><a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a></p>
+</li>
+<li>
+<p><a href="reference007.htm#CIAIJCCE">Create ORM Mapping File wizard</a></p>
+</li>
+</ul>
+<a id="sthref42" name="sthref42"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a></p>
+</li>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+<li>
+<p><a href="tasks001.htm#BEIBADHH">Converting a Java project to a JPA project</a></p>
+</li>
+</ul>
+<a id="sthref43" name="sthref43"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a></p>
+</li>
+<li>
+<p><a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a></p>
+</li>
+</ul>
</div>
<!-- class="sect1" -->
<!-- Start Footer -->
@@ -131,11 +152,11 @@ If the server runtime does not provide a JPA implementation, you must explicitly
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 15a4d073d7..32e22f2f7f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm
@@ -3,33 +3,33 @@
<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>Specifying entity inheritance</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:43Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:4Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Specifying entity inheritance" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CIHCCCJD" name="CIHCCCJD"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>Specifying entity inheritance</h1>
-<p><a id="sthref93" name="sthref93"></a><a id="sthref94" name="sthref94"></a>An entity may inherit properties from other entities. You can specify a specific strategy to use for inheritance.</p>
+<p><a id="sthref132" name="sthref132"></a><a id="sthref133" name="sthref133"></a>An entity may inherit properties from other entities. You can specify a specific strategy to use for inheritance.</p>
<p>Use this procedure to specify inheritance (<code>@Inheritance)</code> for an existing entity (<code>@Entity</code>):</p>
<ol>
<li>
<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="sthref95" name="sthref95"></a>
+<p>In the <span class="gui-object-title">JPA Details</span> view, select the <a href="reference018.htm#CACFHGHE">Inheritance</a> information.</p>
+<div class="figure"><a id="sthref134" name="sthref134"></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>
@@ -48,50 +48,9 @@
</ul>
</li>
<li>
-<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-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-t13" headers="r1c1-t13"><a id="sthref96" name="sthref96"></a><a id="sthref97" name="sthref97"></a>Discriminator Column</td>
-<td align="left" headers="r2c1-t13 r1c2-t13">Name of the discriminator column when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.
-<p>This field corresponds to the <code>@DiscriminatorColumn</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t13 r1c3-t13"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<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-t13" headers="r1c1-t13"><a id="sthref98" name="sthref98"></a><a id="sthref99" name="sthref99"></a>Discriminator Value</td>
-<td align="left" headers="r4c1-t13 r1c2-t13">Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified <span class="bold">Discriminator Type</span>.
-<p>This field corresponds to the <code>@DiscriminatorValue</code> annotation.</p>
-</td>
-<td align="left" headers="r4c1-t13 r1c3-t13"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<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-t13 r1c3-t13"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
+<p>Complete the fields in the <a href="reference018.htm#CACFHGHE">Inheritance</a> area.</p>
+<p>Use the following table to complete the remaining fields on the tab. See <a href="reference018.htm#CACFHGHE">"Inheritance"</a> for additional details.</p>
+</li>
</ol>
<p>Eclipse adds the following annotations the entity field:</p>
<pre xml:space="preserve" class="oac_no_warn">
@@ -103,24 +62,30 @@
referencedColumnName = "<span class="italic">&lt;REFERENCED_COLUMN_NAME&gt;</span>")
</pre>
-<p><a id="sthref100" name="sthref100"></a><a id="sthref101" name="sthref101"></a><a id="sthref102" name="sthref102"></a>The following figures illustrates the different inheritance strategies.</p>
-<div class="figure"><a id="sthref103" name="sthref103"></a>
+<p><a id="sthref135" name="sthref135"></a><a id="sthref136" name="sthref136"></a><a id="sthref137" name="sthref137"></a>The following figures illustrates the different inheritance strategies.</p>
+<div class="figure"><a id="sthref138" name="sthref138"></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="sthref104" name="sthref104"></a>
-<p class="titleinfigure"><a id="sthref105" name="sthref105"></a><a id="sthref106" name="sthref106"></a>Joined Table Inheritance</p>
+<div class="figure"><a id="sthref139" name="sthref139"></a>
+<p class="titleinfigure"><a id="sthref140" name="sthref140"></a><a id="sthref141" name="sthref141"></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 />
-<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/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a><br /></div>
+<a id="sthref142" name="sthref142"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+</ul>
+<a id="sthref143" name="sthref143"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
@@ -128,11 +93,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 8968739b98..179024b395 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
@@ -3,26 +3,28 @@
<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>Managing the orm.xml file</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:42Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:4Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Managing the orm.xml file" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CIHDGDCD" name="CIHDGDCD"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1><a id="sthref58" name="sthref58"></a>Managing the orm.xml file</h1>
+<h1><a id="sthref110" name="sthref110"></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="sthref59" name="sthref59"></a>Eclipse creates the <code>META-INF\orm.xml</code> file in your project's directory:</p>
+<p><a id="sthref111" name="sthref111"></a>Eclipse creates the <code>META-INF\orm.xml</code> file in your project's directory:</p>
+<div class="example"><a id="sthref112" name="sthref112"></a>
+<p class="titleinexample">Sample orm.xml File</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>"
@@ -34,31 +36,46 @@
&lt;provider="<span class="italic">&lt;PERSISTENCE_PROVIDER&gt;</span>" /&gt;
&lt;/persistence-unit&gt;
&lt;/persistence&gt;
-</pre>
-<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><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 />
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concepts003.htm#CHDBIJAC">The orm.xml file</a><br />
+</pre></div>
+<!-- class="example" -->
+<a id="sthref113" name="sthref113"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></p>
+</li>
+<li>
+<p><a href="ref_eclipselink_mapping_file.htm#CIAEDEJF">New EclipseLink Mapping File dialog</a></p>
+</li>
+</ul>
+<a id="sthref114" name="sthref114"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></p>
+</li>
+<li>
+<p><a href="tasks008.htm#CIHBCDCE">Working with orm.xml file</a></p>
+</li>
+</ul>
+<a id="sthref115" name="sthref115"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concepts003.htm#CHDBIJAC">The orm.xml file</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, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
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 92f618b401..47e2327202 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
@@ -3,26 +3,42 @@
<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>Managing the persistence.xml file</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:42Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:4Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Managing the persistence.xml file" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CIHDAJID" name="CIHDAJID"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<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>
+<h1><a id="sthref93" name="sthref93"></a>Managing the persistence.xml file</h1>
+<p><a id="sthref94" name="sthref94"></a>When you create a project, Eclipse creates the <code>META-INF\persistence.xml</code> file in the project's directory.</p>
+<div class="example"><a id="sthref95" name="sthref95"></a>
+<p class="titleinexample">Sample persistence.xml File</p>
+<pre xml:space="preserve" class="oac_no_warn">
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"&gt;
+ &lt;persistence-unit name="QuickStart"&gt;
+ &lt;class&gt;quickstart.demo.model.Address&lt;/class&gt;
+ &lt;class&gt;quickstart.demo.model.Item&lt;/class&gt;
+ &lt;/persistence-unit&gt;
+&lt;/persistence&gt;
+</pre></div>
+<!-- class="example" -->
+<p>You can manage this file either through the XML editor or through the <a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>.</p>
+<div class="figure"><a id="sthref96" name="sthref96"></a>
+<p class="titleinfigure">The persistence.xml Editor</p>
+<img src="img/persistence_editor_general.png" alt="General tab of persistence.xml editor" title="General tab of persistence.xml editor" /><br /></div>
+<!-- class="figure" -->
<div align="center">
<div class="inftblnote"><br />
<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
@@ -30,38 +46,45 @@
<tr>
<td align="left">
<p class="notep1">Note:</p>
-Depending on your JPA implementation (for example, EclipseLink), the following additional pages may be available in the persistence.xml Editor:
+<p>Depending on your JPA implementation (for example, EclipseLink), the following pages may be available in the persistence.xml Editor:</p>
<ul>
<li>
-<p><a href="reference019.htm#CIAJAFEG">Customization</a></p>
-<p>Use this page to define change-tracking and session customizer-related properties.</p>
+<p><a href="ref_persistence_general.htm#CIACIFGJ">General</a> &ndash;</p>
</li>
<li>
-<p><a href="reference020.htm#CIABEDCH">Caching</a></p>
-<p>Use this page to define caching properties.</p>
+<p><a href="reference046.htm#CIAFFJIE">Connection</a> &ndash;</p>
</li>
<li>
-<p><a href="reference021.htm#CIABGHHI">Logging</a></p>
-<p>Use this page to define logging properties.</p>
+<p><a href="reference047.htm#CIAJAFEG">Customization</a> &ndash; Use this page to define change-tracking and session customizer-related properties.</p>
</li>
<li>
-<p><a href="reference022.htm#CIAFJCHE">Options</a></p>
-<p>Use this page to define session and target database properties.</p>
+<p><a href="reference048.htm#CIABEDCH">Caching</a> &ndash; Use this page to define caching properties.</p>
</li>
<li>
-<p><a href="reference023.htm#CIACCFCB">Schema Generation</a></p>
-<p>Use this page to define DDL-related properties.</p>
+<p><a href="reference049.htm#CIABGHHI">Logging</a> &ndash; Use this page to define logging properties.</p>
+</li>
+<li>
+<p><a href="reference050.htm#CIAFJCHE">Options</a> &ndash; Use this page to define session and target database properties.</p>
+</li>
+<li>
+<p><a href="reference051.htm#CIACCFCB">Schema Generation</a> &ndash; Use this page to define DDL-related properties.</p>
+</li>
+<li>
+<p><a href="reference052.htm#CIAHJDFF">Properties</a> &ndash;</p>
+</li>
+<li>
+<p><a href="reference053.htm#CIAHCJAH">Source</a> &ndash;</p>
</li>
</ul>
<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>
+<p>If the project uses the Generic platform, then only the <a href="ref_persistence_general.htm#CIACIFGJ">General</a>, <a href="reference046.htm#CIAFFJIE">Connection</a>, <a href="reference052.htm#CIAHJDFF">Properties</a> and <a href="reference053.htm#CIAHCJAH">Source</a> pages are available.</p>
</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblnote" --></div>
-<p>To use the <code>persistence.xml</code> Editor:</p>
+<p>To use the persistence.xml Editor:</p>
<ol>
<li>
<p>Open the <code>peristence.xml</code> file. The <a href="ref_persistence_general.htm#CIACIFGJ">General</a> page of the editor appears.</p>
@@ -75,66 +98,22 @@ Depending on your JPA implementation (for example, EclipseLink), the following a
<tr>
<td align="left">
<p class="notep1">Tip:</p>
-The persistence.xml Editor's Source page enables you to view and edit the raw XML file.</td>
+<p>The persistence.xml Editor's Source page enables you to view and edit the raw XML file.</p>
+</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblnotealso" --></div>
-<div class="inftblinformal">
-<table class="Informal" summary="This table lists the properties of the persistence.xml editor." dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
-<col width="29%" />
-<col width="29%" />
-<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>
-<th align="left" valign="bottom" id="r1c3-t8">Element Defined</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t8" headers="r1c1-t8">Name</td>
-<td align="left" headers="r2c1-t8 r1c2-t8">Enter the name of the persistence unit.</td>
-<td align="left" headers="r2c1-t8 r1c3-t8"><code>&lt;persistence-unit name = "&lt;Name&gt;"&gt;</code></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t8" headers="r1c1-t8"><a id="sthref49" name="sthref49"></a>Persistence Provider</td>
-<td align="left" headers="r3c1-t8 r1c2-t8">Enter the name of the persistence provider.</td>
-<td align="left" headers="r3c1-t8 r1c3-t8"><code>&lt;provider&gt;</code></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t8" headers="r1c1-t8">Description</td>
-<td align="left" headers="r4c1-t8 r1c2-t8">Enter a description for this persistence unit. This is an optional property.</td>
-<td align="left" headers="r4c1-t8 r1c3-t8"><code>&lt;description&gt;</code></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t8" headers="r1c1-t8"><a id="sthref50" name="sthref50"></a>Managed Classes</td>
-<td align="left" headers="r5c1-t8 r1c2-t8">Add or remove the classes managed through the persistence unit.</td>
-<td align="left" headers="r5c1-t8 r1c3-t8"><code>&lt;class&gt;</code></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t8" headers="r1c1-t8">&nbsp;&nbsp;Exclude&nbsp;Unlisted&nbsp;Classes</td>
-<td align="left" headers="r6c1-t8 r1c2-t8">Select to include all annotated entity classes in the root of the persistence unit.</td>
-<td align="left" headers="r6c1-t8 r1c3-t8"><code>&lt;exclude-unlisted-classes&gt;</code></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t8" headers="r1c1-t8">XML&nbsp;Mapping&nbsp;Files</td>
-<td align="left" headers="r7c1-t8 r1c2-t8">Add or remove the object/relational mapping XML files define the classes managed through the persistence unit.</td>
-<td align="left" headers="r7c1-t8 r1c3-t8"><code>&lt;mapping-file&gt;</code></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r8c1-t8" headers="r1c1-t8">JAR&nbsp;Files</td>
-<td align="left" headers="r8c1-t8 r1c2-t8">Add or remove additional JAR files and libraries</td>
-<td align="left" headers="r8c1-t8 r1c3-t8"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblinformal" --></li>
+<div class="figure"><a id="sthref97" name="sthref97"></a>
+<p class="titleinfigure">General tab of persistence.xml Editor</p>
+<img src="img/persistence_editor_general.png" alt="General tab of persistence.xml editor" title="General tab of persistence.xml editor" /><br /></div>
+<!-- class="figure" --></li>
<li>
-<p>Use the <a href="reference018.htm#CIAFFJIE">Connection</a> page to define the <code>&lt;jta-data-source&gt;</code> and <code>&lt;non-jta-data-source&gt;</code> elements as follows:</p>
+<p>Complete each field on the <a href="ref_persistence_general.htm#CIACIFGJ">General</a> page.</p>
+</li>
+<li>
+<p>Use the <a href="reference046.htm#CIAFFJIE">Connection</a> page to define the <code>&lt;jta-data-source&gt;</code> and <code>&lt;non-jta-data-source&gt;</code> elements as follows:</p>
<p>To configure the JTA (Java Transaction API) source used by the persistence provider:</p>
<ol>
<li>
@@ -158,7 +137,8 @@ The persistence.xml Editor's Source page enables you to view and edit the raw XM
<tr>
<td align="left">
<p class="notep1">Note:</p>
-Select <span class="bold">Default()</span> to use the data source provided by the container.</td>
+<p>Select <span class="bold">Default()</span> to use the data source provided by the container.</p>
+</td>
</tr>
</tbody>
</table>
@@ -166,7 +146,13 @@ Select <span class="bold">Default()</span> to use the data source provided by th
<!-- class="inftblnote" --></div>
</li>
</ol>
-<p><a id="sthref51" name="sthref51"></a>For projects using the Generic platform, you can also define the EclipseLink connection pool driver, connection pool driver, URL, user name and password.</p>
+<p><a id="sthref98" name="sthref98"></a>For projects using the Generic platform, you can also define the EclipseLink connection pool driver, connection pool driver, URL, user name and password.</p>
+<div class="figure"><a id="sthref99" name="sthref99"></a>
+<p class="titleinfigure">Connection tab of persistence.xml Editor</p>
+<img src="img/persistence_editor_connection.png" alt="Connection tab of persistence.xml Editor" title="Connection tab of persistence.xml Editor" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Complete each field on the <a href="reference046.htm#CIAFFJIE">Connection</a> page.</p>
</li>
<li>
<p>Use the table in the Properties page to set the vendor-specific <code>&lt;properties&gt;</code> element.</p>
@@ -187,36 +173,54 @@ Select <span class="bold">Default()</span> to use the data source provided by th
<tr>
<td align="left">
<p class="notep1">Note:</p>
-If the project uses the EclipseLink platform, the connection page also includes parameters for JDBC connection pooling.</td>
+<p>If the project uses the EclipseLink platform, the connection page also includes parameters for JDBC connection pooling.</p>
+</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblnote" --></div>
+<div class="figure"><a id="sthref100" name="sthref100"></a>
+<p class="titleinfigure">Customization tab of persistence.xml Editor</p>
+<img src="img/persistence_editor_customization.png" alt="Customization tab of persistence.xml Editor" title="Customization tab of persistence.xml Editor" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Complete each field on the <a href="reference047.htm#CIAJAFEG">Customization</a> page.</p>
</li>
</ol>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="tasks002.htm#CIHFEBAI">Synchronizing classes</a><br />
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a><br />
+<p>Additional pages may be available for the persistence.xml editor, depending on your JPA provider. See <a href="ref_persistence_xmll_editor.htm#CIACCHID">"persistence.xml Editor"</a> for more information.</p>
+<a id="sthref101" name="sthref101"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a></p>
+</li>
+</ul>
+<a id="sthref102" name="sthref102"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="tasks006.htm#CIHFEBAI">Synchronizing classes</a></p>
+</li>
+</ul>
+<a id="sthref103" name="sthref103"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concepts002.htm#CHDHAGIH">The persistence.xml file</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, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm
index be8d8f1f48..76ed232d03 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm
@@ -3,21 +3,21 @@
<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>Mapping an entity</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:43Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:5Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Mapping an entity" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BABDGBIJ" name="BABDGBIJ"></a></p>
<div class="sect1">
<h1>Mapping an entity</h1>
@@ -27,51 +27,68 @@
<p><a href="tasks010.htm#BABBABCE">Basic mapping</a></p>
</li>
<li>
-<p><a href="tasks011.htm#BABCBHDF">Embedded mapping</a></p>
+<p><a href="tasks011.htm#CIHHJEBJ">Element collection mapping</a></p>
</li>
<li>
-<p><a href="tasks012.htm#CIHDIAEE">Embedded ID mapping</a></p>
+<p><a href="tasks012.htm#BABCBHDF">Embedded mapping</a></p>
</li>
<li>
-<p><a href="tasks013.htm#BABGCBHG">ID mapping</a></p>
+<p><a href="tasks013.htm#CIHDIAEE">Embedded ID mapping</a></p>
</li>
<li>
-<p><a href="tasks014.htm#BABEIEGD">Many-to-many mapping</a></p>
+<p><a href="tasks014.htm#BABGCBHG">ID mapping</a></p>
</li>
<li>
-<p><a href="tasks015.htm#BABHFAFJ">Many-to-one mapping</a></p>
+<p><a href="tasks015.htm#BABEIEGD">Many-to-many mapping</a></p>
</li>
<li>
-<p><a href="tasks016.htm#BABHGEBD">One-to-many mapping</a></p>
+<p><a href="tasks016.htm#BABHFAFJ">Many-to-one mapping</a></p>
</li>
<li>
-<p><a href="tasks017.htm#BABFHBCJ">One-to-one mapping</a></p>
+<p><a href="tasks017.htm#BABHGEBD">One-to-many mapping</a></p>
</li>
<li>
-<p><a href="tasks018.htm#BABHFHEI">Transient mapping</a></p>
+<p><a href="tasks018.htm#BABFHBCJ">One-to-one mapping</a></p>
</li>
<li>
-<p><a href="tasks019.htm#BABHIBII">Version mapping</a></p>
+<p><a href="tasks019.htm#BABHFHEI">Transient mapping</a></p>
</li>
<li>
-<p><a href="tasks020.htm#CIHBDEAJ">Element Collection mapping</a></p>
+<p><a href="tasks020.htm#BABHIBII">Version mapping</a></p>
</li>
</ul>
+<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>
<p>Additional mapping types (such as Basic Collection mappings) may be available when using Dali with EclipseLink.</p>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a> <!-- Start Footer -->
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblnote" --></div>
+<a id="sthref153" name="sthref153"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</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, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm
index 00e2189526..46e7132bde 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm
@@ -3,22 +3,22 @@
<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>Tasks</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-06-04T19:32:58Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:3Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content=" Tasks" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Tasks" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="sthref25" name="sthref25"></a></p>
+<p><a id="sthref32" name="sthref32"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<h1>Tasks</h1>
<p>This section includes detailed step-by-step procedures for accessing the Dali OR mapping tool functionality.</p>
<ul>
@@ -26,19 +26,22 @@
<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
</li>
<li>
-<p><a href="tasks001.htm#BEIBADHH">Converting a Java Project to a JPA Project</a></p>
+<p><a href="tasks001.htm#BEIBADHH">Converting a Java project to a JPA project</a></p>
</li>
<li>
-<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a></p>
+<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
</li>
<li>
-<p><a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a></p>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
</li>
<li>
-<p><a href="task_manage_orm.htm#CIHDGDCD">Managing the orm.xml file</a></p>
+<p><a href="tasks005.htm#CIHIAJHC">Adding virtual attributes</a></p>
</li>
<li>
-<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+<p><a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a></p>
+</li>
+<li>
+<p><a href="task_manage_orm.htm#CIHDGDCD">Managing the orm.xml file</a></p>
</li>
<li>
<p><a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a></p>
@@ -47,22 +50,28 @@
<p><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></p>
</li>
<li>
+<p><a href="tasks009.htm#BABIGBGG">Creating queries</a></p>
+</li>
+<li>
<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
</li>
<li>
<p><a href="tasks021.htm#BABBAGFI">Generating entities from tables</a></p>
</li>
<li>
-<p><a href="tasks023.htm#BABFAIBA">Validating mappings and reporting problems</a></p>
+<p><a href="tasks022.htm#CIHJIGBE">Generating tables from entities</a></p>
+</li>
+<li>
+<p><a href="tasks023.htm#CIHHFGIG">Generating dynamic entities from tables</a></p>
</li>
<li>
-<p><a href="tasks026.htm#BABDBCBI">Modifying persistent project properties</a></p>
+<p><a href="tasks024.htm#BABFAIBA">Validating mappings and reporting problems</a></p>
</li>
<li>
-<p><a href="task_generating_schema_from_classes.htm#CIHHBJCJ">Generating Schema from Classes</a></p>
+<p><a href="tasks027.htm#BABDBCBI">Modifying persistent project properties</a></p>
</li>
<li>
-<p><a href="task_generate_classes_from_schema.htm#CIHCBHJD">Generating JAXB Classes from a Schema</a></p>
+<p><a href="tasks028.htm#CIHEHCHB">Converting JPA metadata to XML</a></p>
</li>
</ul>
<!-- Start Footer -->
@@ -71,11 +80,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm
index 0960434330..ad991ca1c6 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm
@@ -3,29 +3,29 @@
<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>Converting a Java Project to a JPA Project</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:41Z" />
+<title>Converting a Java project to a JPA project</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:3Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Converting a Java Project to a JPA Project" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Converting a Java project to a JPA project" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BEIBADHH" name="BEIBADHH"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Converting a Java Project to a JPA Project</h1>
-<p><a id="sthref35" name="sthref35"></a><a id="sthref36" name="sthref36"></a><a id="sthref37" name="sthref37"></a>Use this procedure to convert an existing Java project to a JPA project.</p>
+<h1>Converting a Java project to a JPA project</h1>
+<p><a id="sthref44" name="sthref44"></a><a id="sthref45" name="sthref45"></a><a id="sthref46" name="sthref46"></a>Use this procedure to convert an existing Java project to a JPA project.</p>
<ol>
<li>
<p>From the Navigator or Project explorer, right-click the Java project and then select <span class="bold">Configure &gt; Convert to JPA Project.</span> The Project Facets page of the Modify Faceted Project wizard appears.</p>
-<div class="figure"><a id="sthref38" name="sthref38"></a>
+<div class="figure"><a id="sthref47" name="sthref47"></a>
<p class="titleinfigure">Modify Faceted Project Page</p>
<img src="img/modify_faceted_project.png" alt="" title="" /><br /></div>
<!-- class="figure" --></li>
@@ -33,8 +33,11 @@
<p>Change the <span class="bold">Configuration</span> to <span class="bold">Default JPA Configuration</span>.</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="sthref39" name="sthref39"></a>
+<p>Click <span class="bold">Next</span>. The Java source page appears (see <a href="task_create_new_project.htm#CIHIFEGJ">Figure: The Java Source Page</a>).</p>
+</li>
+<li>
+<p>Click <span class="bold">Add Folder</span> to add existing Java source files to the project and click <span class="bold">Next</span>. The <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a> appears.</p>
+<div class="figure"><a id="sthref48" name="sthref48"></a>
<p class="titleinfigure">JPA Facet Page</p>
<img src="img/new_jpa_facet_task.png" alt="" title="" /><br /></div>
<!-- class="figure" --></li>
@@ -42,31 +45,49 @@
<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="reference002.htm#CIAIJCCE">Mapping File Wizard</a>.</p>
+<p>If you clear the <span class="bold">Create mapping file (orm.xml)</span> option (which is selected by default), you can later add a mapping file to the project using the <a href="reference007.htm#CIAIJCCE">Create ORM Mapping File wizard</a>.</p>
</li>
<li>
<p>Click <span class="bold">Finish</span>.</p>
</li>
</ol>
<p>The Dali OR Mapping Tool adds the JPA implementation libraries to your project and creates the necessary <code>orm.xml</code> and <code>perisistence.xml</code> files.</p>
-<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><br />
-<a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a><br />
-<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><br />
-<a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</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>
-<p>&nbsp;</p>
+<a id="sthref49" name="sthref49"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></p>
+</li>
+<li>
+<p><a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a></p>
+</li>
+<li>
+<p><a href="reference007.htm#CIAIJCCE">Create ORM Mapping File wizard</a></p>
+</li>
+</ul>
+<a id="sthref50" name="sthref50"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a></p>
+</li>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+<li>
+<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
+</li>
+</ul>
+<a id="sthref51" name="sthref51"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a></p>
+</li>
+<li>
+<p><a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a></p>
+</li>
+</ul>
</div>
<!-- class="sect1" -->
<!-- Start Footer -->
@@ -75,11 +96,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm
index 96f9bb0090..3ae6ef9778 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm
@@ -3,60 +3,91 @@
<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>Synchronizing classes</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:42Z" />
+<title>Entity</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:4Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Synchronizing classes" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Entity" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIHFEBAI" name="CIHFEBAI"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="BABGBIEE" name="BABGBIEE"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Synchronizing classes</h1>
-<p>As you work with the classes in your Java project, you will need to update the <code>persistence.xml</code> file to reflect the changes. <a id="sthref52" name="sthref52"></a><a id="sthref53" name="sthref53"></a><a id="sthref54" name="sthref54"></a></p>
-<p>Use this procedure to synchronize the <code>persistence.xml</code> file:</p>
+<h1>Entity</h1>
+<p><a id="sthref68" name="sthref68"></a><a id="sthref69" name="sthref69"></a><a id="sthref70" name="sthref70"></a><a id="sthref71" name="sthref71"></a>An <span class="bold">Entity</span> is a persistent domain object.</p>
+<p>An entity <span class="italic">can be</span>:</p>
+<ul>
+<li>
+<p>Abstract or concrete classes. Entities may also extend non-entity classes as well as entity classes, and non-entity classes may extend entity classes.</p>
+</li>
+</ul>
+<p>An entity <span class="italic">must have</span>:</p>
+<ul>
+<li>
+<p>A no-arg constructor (public or protected); the entity class may have other constructors as well.</p>
+</li>
+</ul>
+<p><a id="sthref72" name="sthref72"></a><a id="sthref73" name="sthref73"></a><a id="sthref74" name="sthref74"></a>Each persistent entity must be mapped to a database table and contain a primary key. Persistent entities are identified by the <code>@Entity</code> annotation.</p>
+<p>Use this procedure to add persistence to an existing entity:</p>
<ol>
<li>
-<p>Right-click the <code>persistence.xml</code> file in the <span class="gui-object-title">Project Explorer</span> and select <span class="gui-object-action">JPA Tools &gt; Synchronize Class List</span>.</p>
+<p>Open the Java class in the <span class="gui-object-title">Project Explorer.</span></p>
+</li>
+<li>
+<p>Select the class in the JPA Structure view.</p>
+</li>
+<li>
+<p>In the JPA Details view, click the mapping type hyperlink to access the <a href="reference063.htm#CACFEGAG">Mapping Type Selection dialog</a>. In the following figure, clicking <span class="italic">entity</span> invokes the dialog from the JPA Details View.</p>
+<div class="figure"><a id="sthref75" name="sthref75"></a>
+<p class="titleinfigure">The Mapping Type Hyperlink</p>
+<img src="img/mapped_entity_type_link.png" alt="The JPA Details view for an entity showing the mapping type hyperlink." title="The JPA Details view for an entity showing the mapping type hyperlink." /><br /></div>
+<!-- class="figure" -->
<div align="center">
-<div class="inftblnote"><br />
-<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
+<div class="inftblnotealso"><br />
+<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0">
<tbody>
<tr>
<td align="left">
-<p class="notep1">Note:</p>
-Use this function if you selected <span class="bold">Annotated classes must be listed in the persistence.xml option</span> in the <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a>. In general, you do not have to use this function within the container.</td>
+<p class="notep1">Tip:</p>
+<p>You can also change (or add) persistence for an entity by right-clicking the class in the JPA Structure View and then clicking <span class="bold">Map As &gt; Entity</span>.</p>
+</td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblnote" --></div>
-<div class="figure"><a id="sthref55" name="sthref55"></a>
-<p class="titleinfigure">Synchronizing the persistence.xml File</p>
-<img src="img/synchornize_classes.png" alt="This figure shows the JPA Tools &gt; Synchronize Classes option." title="This figure shows the JPA Tools &gt; Synchronize Classes option." /><br /></div>
-<!-- class="figure" -->
-<p>Dali adds the necessary <code>&lt;class&gt;</code> elements to the <code>persistence.xml</code> file.</p>
+<!-- class="inftblnotealso" --></div>
</li>
<li>
-<p>Use the <span class="gui-object-title">Persistence XML Editor</span> to continue editing the <code>persistence.xml</code> file.</p>
+<p>Select <span class="bold">Entity</span> from the <a href="reference063.htm#CACFEGAG">Mapping Type Selection dialog</a> and then click <span class="bold">OK</span>.</p>
+<div class="figure"><a id="sthref76" name="sthref76"></a>
+<p class="titleinfigure">The Mapping Type Selection Dialog</p>
+<img src="img/mapping_type_selection_entity.png" alt="The Mapping Type selection dialog with Enity selected." title="The Mapping Type selection dialog with Enity selected." /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Complete the remaining <a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>.</p>
</li>
</ol>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a><br />
-<br /></div>
+<a id="sthref77" name="sthref77"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+<li>
+<p><a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a></p>
+</li>
+<li>
+<p><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
@@ -64,11 +95,11 @@ Use this function if you selected <span class="bold">Annotated classes must be l
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm
index 818f14603c..bee9045b31 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm
@@ -3,41 +3,74 @@
<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>Upgrading document version</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:42Z" />
+<title>Embeddable</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:4Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Upgrading document version" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Embeddable" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<div class="sect2"><!-- infolevel="all" infotype="General" --><a id="sthref56" name="sthref56"></a>
-<h1>Upgrading document version</h1>
-<p>Use this procedure to migrate your project from JPA 1.0 to JPA 2.0. You must complete this upgrade to use the current JPA 2.0 features in Dali.</p>
-<div class="figure"><a id="sthref57" name="sthref57"></a>
-<p class="titleinfigure">Upgrading the persistence.xml File</p>
-<img src="img/upgrade_persistence_jpa_version.png" alt="This figure shows the JPA Tools &gt; Synchronize Classes option." title="This figure shows the JPA Tools &gt; Synchronize Classes option." /><br /></div>
-<!-- class="figure" --></div>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="BABFEICE" name="BABFEICE"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Embeddable</h1>
+<p><a id="sthref78" name="sthref78"></a><a id="sthref79" name="sthref79"></a>An <span class="bold">Embedded</span> class is a class whose instances are stored as part of an owning entity; it shares the identity of the owning entity. Each field of the embedded class is mapped to the database table associated with the owning entity.</p>
+<p>To override the mapping information for a specific subclass, use the <code>@AttributeOverride</code> annotation for that specific class.</p>
+<p><a id="sthref80" name="sthref80"></a><a id="sthref81" name="sthref81"></a><a id="sthref82" name="sthref82"></a>An embeddable entity is identified by the <code>@Embeddable</code> annotation.</p>
+<p>Use this procedure to add embeddable persistence to an existing entity:</p>
+<ol>
+<li>
+<p>Open the Java class in the <span class="gui-object-title">Project Explorer</span>.</p>
+</li>
+<li>
+<p>Select the class in the JPA Structure view.</p>
+</li>
+<li>
+<p>Click the mapping type hyperlink to open the <a href="reference063.htm#CACFEGAG">Mapping Type Selection dialog</a>.</p>
+</li>
+<li>
+<p>Select <span class="bold">Embeddable</span> and then click <span class="bold">OK</span>.</p>
+<div class="figure"><a id="sthref83" name="sthref83"></a>
+<p class="titleinfigure">Mapping Type Selection Dialog (Embeddable)</p>
+<img src="img/mapping_type_selection_embed.png" alt="The Mapping Type Selection dialog with Embeddable selected." title="The Mapping Type Selection dialog with Embeddable selected." /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Complete the remaining <a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>.</p>
+</li>
+</ol>
+<a id="sthref84" name="sthref84"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+<li>
+<p><a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a></p>
+</li>
+<li>
+<p><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm
index 90441ad325..ebf5d2e676 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm
@@ -3,56 +3,90 @@
<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 an orm.xml file</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:42Z" />
+<title>Mapped superclass</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:4Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Creating an orm.xml file" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Mapped superclass" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<div class="sect2"><!-- infolevel="all" infotype="General" --><a id="sthref60" name="sthref60"></a>
-<h1>Creating an orm.xml file</h1>
-<p><a id="sthref61" name="sthref61"></a>If you opt not to create an <code>orm.xml</code> file when you create a JPA project, you can create one using the <a href="reference002.htm#CIAIJCCE">Mapping File Wizard</a>.</p>
-<p>Use this procedure to create an <code>orm.xml</code> file:</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="BABDAGCI" name="BABDAGCI"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Mapped superclass</h1>
+<p><a id="sthref85" name="sthref85"></a><a id="sthref86" name="sthref86"></a>An entity that extends a <span class="bold">Mapped Superclass</span> class inherits the persistent state and mapping information from a superclass. You should use a mapped superclass to define mapping information that is common to multiple entity classes.</p>
+<p>A mapped superclass <span class="italic">can be</span>:</p>
+<ul>
+<li>
+<p>Abstract or concrete classes</p>
+</li>
+</ul>
+<p>A mapped superclass <span class="italic">cannot be</span>:</p>
+<ul>
+<li>
+<p>Be queried or passed as an argument to Entity-Manager or Query operations</p>
+</li>
+<li>
+<p>Be the target of a persistent relationship</p>
+</li>
+</ul>
+<p>A mapped superclass does not have a defined database table. Instead, its mapping information is derived from its superclass. To override the mapping information for a specific subclass, use the <code>@AttributeOverride</code> annotation for that specific class.</p>
+<p><a id="sthref87" name="sthref87"></a><a id="sthref88" name="sthref88"></a><a id="sthref89" name="sthref89"></a><a id="sthref90" name="sthref90"></a>A mapped superclass is identified by the <code>@MappedSuperclass</code> annotation.</p>
+<p>Use this procedure to add Mapped Superclass persistence to an existing entity:</p>
<ol>
<li>
-<p>From the Navigator or Project Explorer, select <span class="bold">File &gt; New &gt; Other</span>. The Select a Wizard dialog appears.</p>
-<div class="figure"><a id="sthref62" name="sthref62"></a>
-<p class="titleinfigure">The Select a Wizard Dialog</p>
-<img src="img/select_a_wizard_mapping.png" alt="The Select a Wizard dialog with Mapping file selected." title="The Select a Wizard dialog with Mapping file selected." /><br /></div>
-<!-- class="figure" --></li>
+<p>Open the Java class in the <span class="gui-object-title">Project Explorer</span>.</p>
+</li>
+<li>
+<p>Select the class in the JPA Structure view.</p>
+</li>
+<li>
+<p>In the JPA Details view, click the mapping type hyperlink to open the <a href="reference063.htm#CACFEGAG">Mapping Type Selection dialog</a>.</p>
+</li>
<li>
-<p>Select <span class="bold">Mapping File</span> and then click <span class="bold">Next</span>. The Mapping File page appears.</p>
-<p>If you are using EclipseLink, you can select <span class="bold">EclipseLink &gt; EclipseLink Mapping File</span>.</p>
-<div class="figure"><a id="sthref63" name="sthref63"></a>
-<p class="titleinfigure">The Mapping File Page</p>
-<img src="img/mapping_file_new.png" alt="The Mapping File page." title="The Mapping File page." /><br /></div>
+<p>Select <span class="bold">Mapped Superclass</span> and then <span class="bold">OK</span>.</p>
+<div class="figure"><a id="sthref91" name="sthref91"></a>
+<p class="titleinfigure">Mapping Type Selection Dialog (Mapped Superclass)</p>
+<img src="img/mapping_type_selection_superclass.png" alt="The Mapping Type Selection dialog with Mapped Superclass selected." title="The Mapping Type Selection dialog with Mapped Superclass selected." /><br /></div>
<!-- class="figure" --></li>
<li>
-<p>Define the properties in the page and click <span class="bold">Finish</span>. The <code>orm.xml</code> file appears in the src directory of the selected JPA project. You can manage the orm.xml file using the JPA Details view or through the XML Editor. See also <a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a>.</p>
+<p>Complete the remaining <a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>.</p>
</li>
</ol>
+<a id="sthref92" name="sthref92"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
+</li>
+<li>
+<p><a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a></p>
+</li>
+<li>
+<p><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm
index 1f960838f9..67ad9d222b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm
@@ -3,52 +3,25 @@
<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>Working with orm.xml file</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:42Z" />
+<title>Adding virtual attributes</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:4Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Working with orm.xml file" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Adding virtual attributes" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIHBCDCE" name="CIHBCDCE"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Working with orm.xml file</h1>
-<p><a id="sthref64" name="sthref64"></a><a id="sthref65" name="sthref65"></a>You can work with the <code>orm.xml</code> by using the JPA Details view.</p>
-<p>Use this procedure to work with the <code>orm.xml</code> file:</p>
-<ol>
-<li>
-<p>Right-click the <code>orm.xml</code> file in the <span class="gui-object-title">Project Explorer</span> and select <span class="gui-object-action">Open</span>.</p>
-</li>
-<li>
-<p>In the JPA Structure view, select <span class="bold">EntityMappings</span>.</p>
-</li>
-<li>
-<p>Use the JPA Details view to configure the entity mapping and persistence unit defaults.</p>
-<div class="figure"><a id="sthref66" name="sthref66"></a>
-<p class="titleinfigure">JPA Details view for EntityMappings (orm.xml)</p>
-<img src="img/details_entitymappings.png" alt="JPA Details view for orm.xml file." title="JPA Details view for orm.xml file." /><br /></div>
-<!-- class="figure" --></li>
-</ol>
-<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a><br />
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="#CIHBCDCE">Working with orm.xml file</a><br />
-<a href="../org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html">Working with XML Files</a><br />
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concepts003.htm#CHDBIJAC">The orm.xml file</a><br /></div>
-<!-- class="sect2" -->
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIHIAJHC" name="CIHIAJHC"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>Adding virtual attributes</h1>
+</div>
<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
@@ -56,11 +29,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm
index eca0d7006b..19ebcf5006 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm
@@ -3,94 +3,81 @@
<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</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:43Z" />
+<title>Synchronizing classes</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:4Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Entity" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Synchronizing classes" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="BABGBIEE" name="BABGBIEE"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIHFEBAI" name="CIHFEBAI"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Entity</h1>
-<p><a id="sthref70" name="sthref70"></a><a id="sthref71" name="sthref71"></a><a id="sthref72" name="sthref72"></a><a id="sthref73" name="sthref73"></a>An <span class="bold">Entity</span> is a persistent domain object.</p>
-<p>An entity <span class="italic">can be</span>:</p>
-<ul>
-<li>
-<p>Abstract or concrete classes. Entities may also extend non-entity classes as well as entity classes, and non-entity classes may extend entity classes.</p>
-</li>
-</ul>
-<p>An entity <span class="italic">must have</span>:</p>
-<ul>
-<li>
-<p>A no-arg constructor (public or protected); the entity class may have other constructors as well.</p>
-</li>
-</ul>
-<p><a id="sthref74" name="sthref74"></a><a id="sthref75" name="sthref75"></a><a id="sthref76" name="sthref76"></a>Each persistent entity must be mapped to a database table and contain a primary key. Persistent entities are identified by the <code>@Entity</code> annotation.</p>
-<p>Use this procedure to add persistence to an existing entity:</p>
+<h1>Synchronizing classes</h1>
+<p>As you work with the classes in your Java project, you will need to update the <code>persistence.xml</code> file to reflect the changes. <a id="sthref104" name="sthref104"></a><a id="sthref105" name="sthref105"></a><a id="sthref106" name="sthref106"></a></p>
+<p>Use this procedure to synchronize the <code>persistence.xml</code> file:</p>
<ol>
<li>
-<p>Open the Java class in the <span class="gui-object-title">Project Explorer.</span></p>
-</li>
-<li>
-<p>Select the class in the JPA Structure view.</p>
-</li>
-<li>
-<p>In the JPA Details view, click the mapping type hyperlink to access the Mapping Type Selection dialog. In the following figure, clicking <span class="italic">entity</span> invokes the dialog from the JPA Details View.</p>
-<div class="figure"><a id="sthref77" name="sthref77"></a>
-<p class="titleinfigure">The Mapping Type Hyperlink</p>
-<img src="img/mapped_entity_type_link.png" alt="The JPA Details view for an entity showing the mapping type hyperlink." title="The JPA Details view for an entity showing the mapping type hyperlink." /><br /></div>
-<!-- class="figure" -->
+<p>Right-click the <code>persistence.xml</code> file in the <span class="gui-object-title">Project Explorer</span> and select <span class="gui-object-action">JPA Tools &gt; Synchronize Class List</span>.</p>
<div align="center">
-<div class="inftblnotealso"><br />
-<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0">
+<div class="inftblnote"><br />
+<table class="Note oac_no_warn" summary="" cellpadding="3" cellspacing="0">
<tbody>
<tr>
<td align="left">
-<p class="notep1">Tip:</p>
-You can also change (or add) persistence for an entity by right-clicking the class in the JPA Structure View and then clicking <span class="bold">Map As &gt; Entity</span>.</td>
+<p class="notep1">Note:</p>
+<p>Use this function if you selected <span class="bold">Annotated classes must be listed in the persistence.xml option</span> in the <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a>. In general, you do not have to use this function within the container.</p>
+</td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblnotealso" --></div>
+<!-- class="inftblnote" --></div>
+<div class="figure"><a id="sthref107" name="sthref107"></a>
+<p class="titleinfigure">Synchronizing the persistence.xml File</p>
+<img src="img/synchornize_classes.png" alt="This figure shows the JPA Tools &gt; Synchronize Classes option." title="This figure shows the JPA Tools &gt; Synchronize Classes option." /><br /></div>
+<!-- class="figure" -->
+<p>Dali adds the necessary <code>&lt;class&gt;</code> elements to the <code>persistence.xml</code> file.</p>
</li>
<li>
-<p>Select <span class="bold">Entity</span> from the Mapping Type Selection dialog and then click <span class="bold">OK</span>.</p>
-<div class="figure"><a id="sthref78" name="sthref78"></a>
-<p class="titleinfigure">The Mapping Type Selection Dialog</p>
-<img src="img/mapping_type_selection_entity.png" alt="The Mapping Type selection dialog with Enity selected." title="The Mapping Type selection dialog with Enity selected." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Complete the remaining <a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>.</p>
+<p>Use the <a href="ref_persistence_xmll_editor.htm#CIACCHID">persistence.xml Editor</a> to continue editing the <code>persistence.xml</code> file.</p>
</li>
</ol>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
-<br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a><br />
-<a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a><br />
-<a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a><br /></div>
+<a id="sthref108" name="sthref108"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a></p>
+</li>
+</ul>
+<a id="sthref109" name="sthref109"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concepts002.htm#CHDHAGIH">The persistence.xml file</a></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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm
index 004a1691dd..4e4cb5b0b1 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm
@@ -3,55 +3,77 @@
<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>Embeddable</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:43Z" />
+<title>Creating an orm.xml file</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:4Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Embeddable" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Creating an orm.xml file" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="BABFEICE" name="BABFEICE"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIHDEFCA" name="CIHDEFCA"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Embeddable</h1>
-<p><a id="sthref79" name="sthref79"></a><a id="sthref80" name="sthref80"></a>An <span class="bold">Embedded</span> class is a class whose instances are stored as part of an owning entity; it shares the identity of the owning entity. Each field of the embedded class is mapped to the database table associated with the owning entity.</p>
-<p>To override the mapping information for a specific subclass, use the <code>@AttributeOverride</code> annotation for that specific class.</p>
-<p><a id="sthref81" name="sthref81"></a><a id="sthref82" name="sthref82"></a><a id="sthref83" name="sthref83"></a>An embeddable entity is identified by the <code>@Embeddable</code> annotation.</p>
-<p>Use this procedure to add embeddable persistence to an existing entity:</p>
+<h1>Creating an orm.xml file</h1>
+<p><a id="sthref116" name="sthref116"></a>If you opt not to create an <code>orm.xml</code> file when you create a JPA project, you can create one using the <a href="reference007.htm#CIAIJCCE">Create ORM Mapping File wizard</a>.</p>
+<p>Use this procedure to create an <code>orm.xml</code> file:</p>
<ol>
<li>
-<p>Open the Java class in the <span class="gui-object-title">Project Explorer</span>.</p>
+<p>From the Navigator or Project Explorer, select <span class="bold">File &gt; New &gt; Other</span>. The Select a Wizard dialog appears.</p>
+<div class="figure"><a id="sthref117" name="sthref117"></a>
+<p class="titleinfigure">The Select a Wizard Dialog</p>
+<img src="img/select_a_wizard_mapping.png" alt="The Select a Wizard dialog with Mapping file selected." title="The Select a Wizard dialog with Mapping file selected." /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Select <span class="bold">JPA ORM Mapping File</span> and then click <span class="bold">Next</span>. The Mapping File page of the <a href="reference007.htm#CIAIJCCE">Create ORM Mapping File wizard</a> appears.</p>
+<p>If you are using EclipseLink, you can select <span class="bold">EclipseLink &gt; EclipseLink ORM Mapping File</span>.</p>
+<div class="figure"><a id="sthref118" name="sthref118"></a>
+<p class="titleinfigure">New Mapping File Location Page</p>
+<img src="img/mapping_file_new.png" alt="The Mapping File page." title="The Mapping File page." /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Select the name and location of your mapping file and click <span class="bold">Next</span>. The <a href="reference009.htm#CACDFCDB">Mapping File Options</a> page appears.</p>
+<div class="figure"><a id="sthref119" name="sthref119"></a>
+<p class="titleinfigure">New Mapping File Options Page</p>
+<img src="img/new_mapping_file_options.png" alt="New Mapping File Options Page" title="New Mapping File Options Page" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Define the properties in the <a href="reference009.htm#CACDFCDB">Mapping File Options</a> page and click <span class="bold">Finish</span>. The <code>orm.xml</code> file appears in the <code>src</code> directory of the selected JPA project. You can manage the <code>orm.xml</code> file using the JPA Details view or through the XML Editor. See also <a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a>.</p>
</li>
+</ol>
+<a id="sthref120" name="sthref120"></a>
+<p class="subhead2">Related reference</p>
+<ul>
<li>
-<p>Select the class in the JPA Structure view.</p>
+<p><a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></p>
</li>
<li>
-<p>Click the mapping type hyperlink to open the Mapping Type Selection dialog.</p>
+<p><a href="ref_eclipselink_mapping_file.htm#CIAEDEJF">New EclipseLink Mapping File dialog</a></p>
</li>
+</ul>
+<a id="sthref121" name="sthref121"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
<li>
-<p>Select <span class="bold">Embeddable</span> and then click <span class="bold">OK</span>.</p>
-<div class="figure"><a id="sthref84" name="sthref84"></a>
-<p class="titleinfigure">Mapping Type Selection Dialog (Embeddable)</p>
-<img src="img/mapping_type_selection_embed.png" alt="The Mapping Type Selection dialog with Embeddable selected." title="The Mapping Type Selection dialog with Embeddable selected." /><br /></div>
-<!-- class="figure" --></li>
+<p><a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a></p>
+</li>
<li>
-<p>Complete the remaining <a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>.</p>
+<p><a href="tasks008.htm#CIHBCDCE">Working with orm.xml file</a></p>
</li>
-</ol>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
-<dl>
-<dd><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></dd>
-<dd><a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a></dd>
-<dd><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></dd>
-</dl>
+</ul>
+<a id="sthref122" name="sthref122"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concepts003.htm#CHDBIJAC">The orm.xml file</a></p>
+</li>
+</ul>
</div>
<!-- class="sect2" -->
<!-- Start Footer -->
@@ -60,11 +82,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm
index 1b5054e055..720a4202af 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm
@@ -3,69 +3,68 @@
<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>Mapped superclass</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:43Z" />
+<title>Working with orm.xml file</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:4Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Mapped superclass" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Working with orm.xml file" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="BABDAGCI" name="BABDAGCI"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIHBCDCE" name="CIHBCDCE"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Mapped superclass</h1>
-<p><a id="sthref85" name="sthref85"></a><a id="sthref86" name="sthref86"></a>An entity that extends a <span class="bold">Mapped Superclass</span> class inherits the persistent state and mapping information from a superclass. You should use a mapped superclass to define mapping information that is common to multiple entity classes.</p>
-<p>A mapped superclass <span class="italic">can be</span>:</p>
-<ul>
+<h1>Working with orm.xml file</h1>
+<p><a id="sthref123" name="sthref123"></a><a id="sthref124" name="sthref124"></a>You can work with the <code>orm.xml</code> by using the JPA Details view.</p>
+<p>Use this procedure to work with the <code>orm.xml</code> file:</p>
+<ol>
<li>
-<p>Abstract or concrete classes</p>
+<p>Right-click the <code>orm.xml</code> file in the <span class="gui-object-title">Project Explorer</span> and select <span class="gui-object-action">Open</span>.</p>
</li>
-</ul>
-<p>A mapped superclass <span class="italic">cannot be</span>:</p>
-<ul>
<li>
-<p>Be queried or passed as an argument to Entity-Manager or Query operations</p>
+<p>In the JPA Structure view, select <span class="bold">EntityMappings</span>.</p>
</li>
<li>
-<p>Be the target of a persistent relationship</p>
-</li>
-</ul>
-<p>A mapped superclass does not have a defined database table. Instead, its mapping information is derived from its superclass. To override the mapping information for a specific subclass, use the <code>@AttributeOverride</code> annotation for that specific class.</p>
-<p><a id="sthref87" name="sthref87"></a><a id="sthref88" name="sthref88"></a><a id="sthref89" name="sthref89"></a><a id="sthref90" name="sthref90"></a>A mapped superclass is identified by the <code>@MappedSuperclass</code> annotation.</p>
-<p>Use this procedure to add Mapped Superclass persistence to an existing entity:</p>
-<ol>
+<p>Use the JPA Details view to configure the entity mapping and persistence unit defaults.</p>
+<div class="figure"><a id="sthref125" name="sthref125"></a>
+<p class="titleinfigure">JPA Details view for EntityMappings (orm.xml)</p>
+<img src="img/details_entitymappings.png" alt="JPA Details view for orm.xml file." title="JPA Details view for orm.xml file." /><br /></div>
+<!-- class="figure" --></li>
<li>
-<p>Open the Java class in the <span class="gui-object-title">Project Explorer</span>.</p>
+<p>Complete the fields on the JPA Details view.</p>
</li>
+</ol>
+<a id="sthref126" name="sthref126"></a>
+<p class="subhead2">Related reference</p>
+<ul>
<li>
-<p>Select the class in the JPA Structure view.</p>
+<p><a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
</li>
+</ul>
+<a id="sthref127" name="sthref127"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
<li>
-<p>In the JPA Details view, click the mapping type hyperlink to open the Mapping Type Selection dialog.</p>
+<p><a href="#CIHBCDCE">Working with orm.xml file</a></p>
</li>
<li>
-<p>Select <span class="bold">Mapped Superclass</span> and then <span class="bold">OK</span>.</p>
-<div class="figure"><a id="sthref91" name="sthref91"></a>
-<p class="titleinfigure">Mapping Type Selection Dialog (Mapped Superclass)</p>
-<img src="img/mapping_type_selection_superclass.png" alt="The Mapping Type Selection dialog with Mapped Superclass selected." title="The Mapping Type Selection dialog with Mapped Superclass selected." /><br /></div>
-<!-- class="figure" --></li>
+<p><a href="../org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html">Working with XML Files</a></p>
+</li>
+</ul>
+<a id="sthref128" name="sthref128"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
<li>
-<p>Complete the remaining <a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>.</p>
+<p><a href="concepts003.htm#CHDBIJAC">The orm.xml file</a></p>
</li>
-</ol>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
-<br />
-<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a><br />
-<a href="task_additonal_tables.htm#CIHGBIEI">Specifying additional tables</a><br />
-<a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a><br /></div>
+</ul>
+</div>
<!-- class="sect2" -->
<!-- class="sect1" -->
<!-- Start Footer -->
@@ -74,11 +73,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm
index 82e8697c54..cd3f6d92ef 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm
@@ -3,25 +3,25 @@
<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 Named Queries</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:43Z" />
+<title>Creating queries</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:5Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Creating Named Queries" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Creating queries" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BABIGBGG" name="BABIGBGG"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Creating Named Queries</h1>
-<p><a id="sthref107" name="sthref107"></a><a id="sthref108" name="sthref108"></a>Named queries improve application performance because they are prepared once and they (and all of their associated supporting objects) can be efficiently reused thereafter, making them well suited for complex and frequently executed operations. Named queries use the JPA query language for portable execution on any underlying database; named native queries use the SQL language native to the underlying database.</p>
+<h1>Creating queries</h1>
+<p><a id="sthref144" name="sthref144"></a><a id="sthref145" name="sthref145"></a>Named queries improve application performance because they are prepared once and they (and all of their associated supporting objects) can be efficiently reused thereafter, making them well suited for complex and frequently executed operations. Named queries use the JPA query language for portable execution on any underlying database; named native queries use the SQL language native to the underlying database.</p>
<p>Use this procedure to add <code>@NamedQuery</code> and <code>@NamedNativeQuery</code> annotations to the entity.</p>
<p>To create a named query:</p>
<ol>
@@ -29,23 +29,29 @@
<p>Select the entity in the Project Explorer.</p>
</li>
<li>
-<p>In the JPA Details view, expand Queries.</p>
-</li>
+<p>In the JPA Details view, expand the <a href="reference017.htm#CACBICGJ">Queries</a> area.</p>
+<div class="figure"><a id="sthref146" name="sthref146"></a>
+<p class="titleinfigure">JPA Details, Queries Tab</p>
+<img src="img/jpa_details_query_1.png" alt="" title="" /><br /></div>
+<!-- class="figure" --></li>
<li>
-<p>Click <span class="bold">Add</span> for a named query, or <span class="bold">Add Native</span> for a native query.</p>
-</li>
+<p>Click <span class="bold">Add</span> to add a new query. The <a href="reference066.htm#CACJIFEG">Add Query dialog</a> appears</p>
+<div class="figure"><a id="sthref147" name="sthref147"></a>
+<p class="titleinfigure">Add Query Dialog</p>
+<img src="img/add_query.png" alt="Add Query dialog" title="Add Query dialog" /><br /></div>
+<!-- class="figure" --></li>
<li>
-<p>In the dialog that appears, enter the name of the query in the Name field and then click OK.</p>
-</li>
+<p>Enter the name of the query, select the query type (<span class="bold">Named Query</span> or <span class="bold">Named Native Query</span>), and click <span class="bold">OK</span>. The <a href="reference017.htm#CACBICGJ">Queries</a> area expands to show additional fields.</p>
+<div class="figure"><a id="sthref148" name="sthref148"></a>
+<p class="titleinfigure">JPA Details, Queries Tab</p>
+<img src="img/jpa_details_query_2.png" alt="" title="" /><br /></div>
+<!-- class="figure" --></li>
<li>
<p>Enter the query in the Query field.</p>
</li>
<li>
-<p><a id="sthref109" name="sthref109"></a><a id="sthref110" name="sthref110"></a><a id="sthref111" name="sthref111"></a><a id="sthref112" name="sthref112"></a>To add a Query hint, click <span class="bold">Add</span>.</p>
-<div class="figure"><a id="sthref113" name="sthref113"></a>
-<p class="titleinfigure">Entering a Named Query</p>
-<img src="img/task_entering_query.png" alt="The Queries section of the JPA Details view." title="The Queries section of the JPA Details view." /><br /></div>
-<!-- class="figure" --></li>
+<p><a id="sthref149" name="sthref149"></a><a id="sthref150" name="sthref150"></a><a id="sthref151" name="sthref151"></a><a id="sthref152" name="sthref152"></a>To add a Query hint, click <span class="bold">Add</span>.</p>
+</li>
</ol>
</div>
<!-- class="sect1" -->
@@ -55,11 +61,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm
index f4022d9d10..13e2e15e19 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm
@@ -3,25 +3,25 @@
<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>Basic mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:43Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:5Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Basic mapping" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BABBABCE" name="BABBABCE"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
<h1>Basic mapping</h1>
-<p><a id="sthref114" name="sthref114"></a><a id="sthref115" name="sthref115"></a><a id="sthref116" name="sthref116"></a><a id="sthref117" name="sthref117"></a>Use a <span class="bold">Basic Mapping</span> to map an attribute directly to a database column. Basic mappings may be used only with the following attribute types:</p>
+<p><a id="sthref154" name="sthref154"></a><a id="sthref155" name="sthref155"></a><a id="sthref156" name="sthref156"></a><a id="sthref157" name="sthref157"></a>Use a <span class="bold">Basic Mapping</span> to map an attribute directly to a database column. Basic mappings may be used only with the following attribute types:</p>
<ul>
<li>
<p>Java primitive types and wrappers of the primitive types</p>
@@ -67,105 +67,52 @@
<ol>
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, right-click the field to map. Select <span class="bold">Map As &gt; Basic</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
-</li>
+<div class="figure"><a id="sthref158" name="sthref158"></a>
+<p class="titleinfigure">JPA Details, Basic mapping</p>
+<img src="img/jpa_details_basic.png" alt="PA Details, Basic mapping" title="PA Details, Basic mapping" /><br /></div>
+<!-- class="figure" --></li>
<li>
-<p>Use this table to complete the remaining fields on the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="19%" />
-<col width="*" />
-<col width="41%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t14">Property</th>
-<th align="left" valign="bottom" id="r1c2-t14">Description</th>
-<th align="left" valign="bottom" id="r1c3-t14">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t14" headers="r1c1-t14">Entity Map Hyperlink</td>
-<td align="left" headers="r2c1-t14 r1c2-t14">Defines this mapping as a <span class="bold">Basic Mapping</span>.
-<p>This corresponds to the <code>@Basic</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t14 r1c3-t14">Basic</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t14" headers="r1c1-t14">Column</td>
-<td align="left" headers="r3c1-t14 r1c2-t14">The database column mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.</td>
-<td align="left" headers="r3c1-t14 r1c3-t14">By default, the Column is assumed to be named identically to the attribute and always included in the <code>INSERT</code> and <code>UPDATE</code> statements.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t14" headers="r1c1-t14">Table</td>
-<td align="left" headers="r4c1-t14 r1c2-t14">Name of the database table.</td>
-<td align="left" headers="r4c1-t14 r1c3-t14"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t14" headers="r1c1-t14">Fetch</td>
-<td align="left" headers="r5c1-t14 r1c2-t14">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
-<ul>
+<p>Complete each field in the <a href="reference025.htm#CACCGGCG">Basic Mapping</a> area.</p>
+</li>
<li>
-<p>Eager</p>
+<p>Complete the remaining areas in the <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>.</p>
</li>
+</ol>
+<p>Eclipse adds the following annotations to the field:</p>
+<pre xml:space="preserve" class="oac_no_warn">
+@Column(name="<span class="italic">&lt;COLUMN_NAME&gt;</span>", table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>",
+ insertable=<span class="italic">&lt;INSERTABLE&gt;</span>, updatable=<span class="italic">&lt;UPDATABLE&gt;</span>)
+@Basic(fetch=FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>, optional = <span class="italic">&lt;OPTIONAL&gt;</span>)
+@Temporal(TemporalType.<span class="italic">&lt;TEMPORAL&gt;</span>)
+</pre>
+<a id="sthref159" name="sthref159"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
<li>
-<p>Lazy</p>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
</li>
</ul>
-</td>
-<td align="left" headers="r5c1-t14 r1c3-t14">Eager</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t14" headers="r1c1-t14">Optional</td>
-<td align="left" headers="r6c1-t14 r1c2-t14">Specifies if this field is can be null.</td>
-<td align="left" headers="r6c1-t14 r1c3-t14">Yes</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t14" headers="r1c1-t14">Type</td>
-<td align="left" headers="r7c1-t14 r1c2-t14">Specifies the type of data:
+<a id="sthref160" name="sthref160"></a>
+<p class="subhead2">Related references</p>
<ul>
<li>
-<p>Default</p>
+<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
</li>
<li>
-<p>LOB &ndash; Specifies if this is a large objects (BLOB or CLOB). See <a href="ref_mapping_general.htm#CACBBIBI">"Lob"</a> for details.</p>
+<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
</li>
+</ul>
+<a id="sthref161" name="sthref161"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
<li>
-<p>Temporal &ndash; Specify if this is a Date, Time, or Timestamp object. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.</p>
+<p><a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a></p>
</li>
<li>
-<p>Enumerated &ndash; Specify how to persist enumerated constraints as ordinal or string, in order to match an existing database schema.</p>
+<p><a href="concepts001.htm#BABBGFJG">Understanding Java Persistence API</a></p>
</li>
</ul>
-</td>
-<td align="left" headers="r7c1-t14 r1c3-t14"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-</ol>
-<p>Eclipse adds the following annotations to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@Column(name="<span class="italic">&lt;COLUMN_NAME&gt;</span>", table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>",
- insertable=<span class="italic">&lt;INSERTABLE&gt;</span>, updatable=<span class="italic">&lt;UPDATABLE&gt;</span>)
-@Basic(fetch=FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>, optional = <span class="italic">&lt;OPTIONAL&gt;</span>)
-@Temporal(TemporalType.<span class="italic">&lt;TEMPORAL&gt;</span>)
-
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
+</div>
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
@@ -173,11 +120,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm
index 5634d786c3..e0b5455090 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm
@@ -3,83 +3,73 @@
<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>Embedded mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:44Z" />
+<title>Element collection mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:5Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Embedded mapping" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Element collection mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="BABCBHDF" name="BABCBHDF"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIHHJEBJ" name="CIHHJEBJ"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Embedded mapping</h1>
-<p><a id="sthref118" name="sthref118"></a><a id="sthref119" name="sthref119"></a><a id="sthref120" name="sthref120"></a><a id="sthref121" name="sthref121"></a>Use an <span class="bold">Embedded Mapping</span> to specify a persistent field or property of an entity whose value is an instance of an embeddable class.</p>
+<h1>Element collection mapping</h1>
+<p>To create an element collection mapping:</p>
<ol>
<li>
-<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, right-click the field to map.</p>
-</li>
+<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, right-click the field to map. Select <span class="bold">Map As &gt; Element Collection</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
+<div class="figure"><a id="sthref162" name="sthref162"></a>
+<p class="titleinfigure">JPA Details, Element collection mapping</p>
+<img src="img/jpa_details_elementcollection.png" alt="PA Details, Element collection mapping" title="PA Details, Element collection mapping" /><br /></div>
+<!-- class="figure" --></li>
<li>
-<p>Select <span class="bold">Map as &gt; Embedded</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
+<p>Complete each field in the <a href="reference026.htm#CACBCGDI">Element Collection Mapping</a> area.</p>
</li>
<li>
-<p>Use this table to complete the remaining fields on the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="19%" />
-<col width="*" />
-<col width="38%" />
-<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">Entity Mapping Hyperlink</td>
-<td align="left" headers="r2c1-t15 r1c2-t15">Defines this mapping as a <span class="bold">Embedded</span>.
-<p>This corresponds to the <code>@Embedded</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t15 r1c3-t15">Embedded</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t15" headers="r1c1-t15">Attribute Overrides</td>
-<td align="left" headers="r3c1-t15 r1c2-t15">Specify to override the default mapping of an entity's attribute. Select <span class="bold">Override Default</span>.</td>
-<td align="left" headers="r3c1-t15 r1c3-t15"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
+<p>Complete the remaining areas in the <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>.</p>
+</li>
</ol>
<p>Eclipse adds the following annotations to the field:</p>
<pre xml:space="preserve" class="oac_no_warn">
-@Embedded
-@AttributeOverride(column=@Column(table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>", name = "<span class="italic">&lt;COLUMN_NAME&gt;</span>"))
+
+
+
</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
+<a id="sthref163" name="sthref163"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
+</li>
+</ul>
+<a id="sthref164" name="sthref164"></a>
+<p class="subhead2">Related references</p>
+<ul>
+<li>
+<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
+</li>
+<li>
+<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
+</li>
+</ul>
+<a id="sthref165" name="sthref165"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a></p>
+</li>
+<li>
+<p><a href="concepts001.htm#BABBGFJG">Understanding Java Persistence API</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
@@ -87,11 +77,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm
index 425fb6498c..6b1507c41e 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm
@@ -3,77 +3,73 @@
<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>Embedded ID mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:44Z" />
+<title>Embedded mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:5Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Embedded ID mapping" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Embedded mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIHDIAEE" name="CIHDIAEE"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="BABCBHDF" name="BABCBHDF"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Embedded ID mapping</h1>
-<p><a id="sthref122" name="sthref122"></a><a id="sthref123" name="sthref123"></a><a id="sthref124" name="sthref124"></a><a id="sthref125" name="sthref125"></a>Use an <span class="bold">Embedded ID Mapping</span> to specify the primary key of an embedded ID. These mappings may be used with a <a href="tasks007.htm#BABFEICE">Embeddable</a> entities.</p>
+<h1>Embedded mapping</h1>
+<p><a id="sthref166" name="sthref166"></a><a id="sthref167" name="sthref167"></a><a id="sthref168" name="sthref168"></a><a id="sthref169" name="sthref169"></a>Use an <span class="bold">Embedded Mapping</span> to specify a persistent field or property of an entity whose value is an instance of an embeddable class.</p>
<ol>
<li>
-<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
+<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, right-click the field to map.</p>
</li>
<li>
-<p>Right-click the field and then select <span class="bold">Map As &gt; Embedded Id</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
-</li>
+<p>Select <span class="bold">Map as &gt; Embedded</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
+<div class="figure"><a id="sthref170" name="sthref170"></a>
+<p class="titleinfigure">JPA Details, Embedded mapping</p>
+<img src="img/jpa_details_embedded.png" alt="PA Details, Element collection mapping" title="PA Details, Element collection mapping" /><br /></div>
+<!-- class="figure" --></li>
<li>
-<p>Use this table to complete the remaining fields on the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="19%" />
-<col width="*" />
-<col width="38%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t16">Property</th>
-<th align="left" valign="bottom" id="r1c2-t16">Description</th>
-<th align="left" valign="bottom" id="r1c3-t16">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t16" headers="r1c1-t16">Entity Mapping Hyperlink</td>
-<td align="left" headers="r2c1-t16 r1c2-t16">Defines this mapping as a <span class="bold">Embedded Id</span>.
-<p>This corresponds to the <code>@EmbeddedId</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t16 r1c3-t16">Embedded Id</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
+<p>Complete each field in the <a href="reference027.htm#CACBJBFD">Embedded Mapping</a> area.</p>
+</li>
</ol>
<p>Eclipse adds the following annotations to the field:</p>
<pre xml:space="preserve" class="oac_no_warn">
-@EmbeddedId
+@Embedded
+@AttributeOverride(column=@Column(table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>", name = "<span class="italic">&lt;COLUMN_NAME&gt;</span>"))
+
</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
+<a id="sthref171" name="sthref171"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
+</li>
+</ul>
+<a id="sthref172" name="sthref172"></a>
+<p class="subhead2">Related references</p>
+<ul>
+<li>
+<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
+</li>
+<li>
+<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
+</li>
+</ul>
+<a id="sthref173" name="sthref173"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a></p>
+</li>
+<li>
+<p><a href="concepts001.htm#BABBGFJG">Understanding Java Persistence API</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
@@ -81,11 +77,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm
index 8aadf81887..2ea0b5d2ea 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm
@@ -3,162 +3,71 @@
<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>ID mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:44Z" />
+<title>Embedded ID mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:5Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="ID mapping" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Embedded ID mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="BABGCBHG" name="BABGCBHG"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIHDIAEE" name="CIHDIAEE"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>ID mapping</h1>
-<p><a id="sthref126" name="sthref126"></a><a id="sthref127" name="sthref127"></a><a id="sthref128" name="sthref128"></a><a id="sthref129" name="sthref129"></a>Use an <span class="bold">ID Mapping</span> to specify the primary key of an entity. ID mappings may be used with a <a href="tasks006.htm#BABGBIEE">Entity</a> or <a href="tasks008.htm#BABDAGCI">Mapped superclass</a>. Each <a href="tasks006.htm#BABGBIEE">Entity</a> must have an ID mapping.</p>
+<h1>Embedded ID mapping</h1>
+<p><a id="sthref174" name="sthref174"></a><a id="sthref175" name="sthref175"></a><a id="sthref176" name="sthref176"></a><a id="sthref177" name="sthref177"></a>Use an <span class="bold">Embedded ID Mapping</span> to specify the primary key of an embedded ID. These mappings may be used with a <a href="tasks003.htm#BABFEICE">Embeddable</a> entities.</p>
<ol>
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
</li>
<li>
-<p>Right click the filed and then select <span class="bold">Map as &gt; ID</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
-</li>
-<li>
-<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields in the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="22%" />
-<col width="*" />
-<col width="35%" />
-<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">Entity Mapping Hyperlink</td>
-<td align="left" headers="r2c1-t17 r1c2-t17">Defines this mapping as an <span class="bold">ID Mapping</span>.
-<p>This field corresponds to the <code>@Id</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t17 r1c3-t17">ID</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t17" headers="r1c1-t17">Column</td>
-<td align="left" headers="r3c1-t17 r1c2-t17">The database column mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.</td>
-<td align="left" headers="r3c1-t17 r1c3-t17">By default, the Column is assumed to be named identically to the attribute.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t17" headers="r1c1-t17">Table</td>
-<td align="left" headers="r4c1-t17 r1c2-t17">The database table mapped to the entity attribute.</td>
-<td align="left" headers="r4c1-t17 r1c3-t17">By default, the Table is assumed to be identical to the table associated with the entity.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t17" headers="r1c1-t17">Temporal</td>
-<td align="left" headers="r5c1-t17 r1c2-t17">Specifies the type of data. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.
-<ul>
+<p>Right-click the field and then select <span class="bold">Map As &gt; Embedded Id</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
+<div class="figure"><a id="sthref178" name="sthref178"></a>
+<p class="titleinfigure">JPA Details, Embedded ID mapping</p>
+<img src="img/jpa_details_embedded.png" alt="PA Details, Element collection mapping" title="PA Details, Element collection mapping" /><br /></div>
+<!-- class="figure" --></li>
<li>
-<p>Date</p>
-</li>
-<li>
-<p>Time</p>
+<p>Complete each field in the <a href="reference028.htm#CACDIDIA">Embedded ID Mapping</a> area.</p>
</li>
+</ol>
+<p>Eclipse adds the following annotations to the field:</p>
+<pre xml:space="preserve" class="oac_no_warn">
+@EmbeddedId
+</pre>
+<a id="sthref179" name="sthref179"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
<li>
-<p>Timestamp</p>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
</li>
</ul>
-</td>
-<td align="left" headers="r5c1-t17 r1c3-t17"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-<li>
-<p>Use this table to complete the fields in <a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a> area in the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the PK Generation tab." summary="This table lists the fields in the PK Generation tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="22%" />
-<col width="*" />
-<col width="35%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t18">Property</th>
-<th align="left" valign="bottom" id="r1c2-t18">Description</th>
-<th align="left" valign="bottom" id="r1c3-t18">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t18" headers="r1c1-t18">Primary Key Generation</td>
-<td align="left" headers="r2c1-t18 r1c2-t18">These fields define how the primary key is generated.</td>
-<td align="left" headers="r2c1-t18 r1c3-t18"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t18" headers="r1c1-t18">&nbsp;&nbsp;Strategy</td>
-<td align="left" headers="r3c1-t18 r1c2-t18">See <a href="ref_primary_key.htm#CACBAJBC">"Primary Key Generation"</a> for details.
+<a id="sthref180" name="sthref180"></a>
+<p class="subhead2">Related references</p>
<ul>
<li>
-<p>Auto</p>
+<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
</li>
<li>
-<p>Sequence</p>
+<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
</li>
+</ul>
+<a id="sthref181" name="sthref181"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
<li>
-<p>Identity</p>
+<p><a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a></p>
</li>
<li>
-<p>Table</p>
+<p><a href="concepts001.htm#BABBGFJG">Understanding Java Persistence API</a></p>
</li>
</ul>
-</td>
-<td align="left" headers="r3c1-t18 r1c3-t18">Auto</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t18" headers="r1c1-t18">&nbsp;&nbsp;Generator&nbsp;Name</td>
-<td align="left" headers="r4c1-t18 r1c2-t18">Name of the primary key generator specified in the <span class="bold">Strategy</span></td>
-<td align="left" headers="r4c1-t18 r1c3-t18"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-</ol>
-<p>Additional fields will appear in the <a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a> area, depending on the selected Strategy. See <a href="ref_persistence_map_view.htm#BABIFBAF">"JPA Details view (for attributes)"</a> for additional information.</p>
-<p>Eclipse adds the following annotations to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@Id
-@Column(name="<span class="italic">&lt;COLUMN_NAME&gt;</span>", table="<span class="italic">&lt;TABLE_NAME&gt;</span>", insertable=<span class="italic">&lt;INSERTABLE&gt;</span>,
- updatable=<span class="italic">&lt;UPDATABLE&gt;</span>)
-@Temporal(<span class="italic">&lt;TEMPORAL&gt;</span>)
-@GeneratedValue(strategy=GeneratorType.<span class="italic">&lt;STRATEGY&gt;</span>, generator="<span class="italic">&lt;GENERATOR_NAME&gt;</span>")@TableGenerator(name="<span class="italic">&lt;TABLE_GENERATOR_NAME&gt;</span>", table = "<span class="italic">&lt;TABLE_GENERATOR_TABLE&gt;</span>",
- pkColumnName = "<span class="italic">&lt;TABLE_GENERATOR_PK&gt;</span>",
- valueColumnName = "<span class="italic">&lt;TABLE_GENERATOR_VALUE_COLUMN&gt;</span>",
- pkColumnValue = "<span class="italic">&lt;TABLE_GENERATOR_PK_COLUMN_VALUE&gt;</span>")@SequenceGenerator(name="<span class="italic">&lt;SEQUENCE_GENERATOR_NAME&gt;</span>",
- sequenceName="<span class="italic">&lt;SEQUENCE_GENERATOR_SEQUENCE&gt;</span>")
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
+</div>
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
@@ -166,11 +75,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm
index d158190edb..db47586a44 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm
@@ -3,165 +3,95 @@
<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>Many-to-many mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:44Z" />
+<title>ID mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:5Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Many-to-many mapping" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="ID mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="BABEIEGD" name="BABEIEGD"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="BABGCBHG" name="BABGCBHG"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Many-to-many mapping</h1>
-<p><a id="sthref130" name="sthref130"></a><a id="sthref131" name="sthref131"></a><a id="sthref132" name="sthref132"></a><a id="sthref133" name="sthref133"></a>Use a <span class="bold">Many-to-Many Mapping</span> to define a many-valued association with many-to-many multiplicity. A many-to-many mapping has two sides: the <span class="italic">owning side</span> and <span class="italic">non-owning side</span>. You must specify the join table on the owning side. For bidirectional mappings, either side may be the owning side.</p>
+<h1>ID mapping</h1>
+<p><a id="sthref182" name="sthref182"></a><a id="sthref183" name="sthref183"></a><a id="sthref184" name="sthref184"></a><a id="sthref185" name="sthref185"></a>Use an <span class="bold">ID Mapping</span> to specify the primary key of an entity. ID mappings may be used with a <a href="tasks002.htm#BABGBIEE">Entity</a> or <a href="tasks004.htm#BABDAGCI">Mapped superclass</a>. Each <a href="tasks002.htm#BABGBIEE">Entity</a> must have an ID mapping.</p>
<ol>
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
</li>
<li>
-<p>Right-click the field and then select <span class="bold">Map As &gt; Many-to-Many</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
+<p>Right click the filed and then select <span class="bold">Map as &gt; ID</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
+<div class="figure"><a id="sthref186" name="sthref186"></a>
+<p class="titleinfigure">JPA Details, ID mapping</p>
+<img src="img/jpa_details_idmapping.png" alt="" title="" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Complete each field in the <a href="reference029.htm#CACIAEFI">ID Mapping</a> area.</p>
</li>
<li>
-<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields of the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="19%" />
-<col width="*" />
-<col width="41%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-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-t19" headers="r1c1-t19">Mapping Entity Hyperlink</td>
-<td align="left" headers="r2c1-t19 r1c2-t19">Defines this mapping as a <span class="bold">Many to Many Mapping</span>.
-<p>This field corresponds to the <code>@ManyToMany</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t19 r1c3-t19">Many to Many</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t19" headers="r1c1-t19">Target Entity</td>
-<td align="left" headers="r3c1-t19 r1c2-t19">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r3c1-t19 r1c3-t19">null
-<p>You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t19" headers="r1c1-t19">Fetch</td>
-<td align="left" headers="r4c1-t19 r1c2-t19">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
-<ul>
+<p>Use the Primary Key Generation area to specify ...................</p>
+<div class="figure"><a id="sthref187" name="sthref187"></a>
+<p class="titleinfigure">JPA Details, Primary key generation</p>
+<img src="img/jpa_details_primarykeygeneration.png" alt="JPA Details, Primary key generation" title="JPA Details, Primary key generation" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Complete each field in the <a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a> area.</p>
+</li>
<li>
-<p>Eager</p>
+<p>Complete the remaining areas in the <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>.</p>
</li>
+</ol>
+<p>Additional fields will appear in the <a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a> area, depending on the selected Strategy. See <a href="ref_persistence_map_view.htm#BABIFBAF">"JPA Details view (for attributes)"</a> for additional information.</p>
+<p>Eclipse adds the following annotations to the field:</p>
+<pre xml:space="preserve" class="oac_no_warn">
+@Id
+@Column(name="<span class="italic">&lt;COLUMN_NAME&gt;</span>", table="<span class="italic">&lt;TABLE_NAME&gt;</span>", insertable=<span class="italic">&lt;INSERTABLE&gt;</span>,
+ updatable=<span class="italic">&lt;UPDATABLE&gt;</span>)
+@Temporal(<span class="italic">&lt;TEMPORAL&gt;</span>)
+@GeneratedValue(strategy=GeneratorType.<span class="italic">&lt;STRATEGY&gt;</span>, generator="<span class="italic">&lt;GENERATOR_NAME&gt;</span>")@TableGenerator(name="<span class="italic">&lt;TABLE_GENERATOR_NAME&gt;</span>", table = "<span class="italic">&lt;TABLE_GENERATOR_TABLE&gt;</span>",
+ pkColumnName = "<span class="italic">&lt;TABLE_GENERATOR_PK&gt;</span>",
+ valueColumnName = "<span class="italic">&lt;TABLE_GENERATOR_VALUE_COLUMN&gt;</span>",
+ pkColumnValue = "<span class="italic">&lt;TABLE_GENERATOR_PK_COLUMN_VALUE&gt;</span>")@SequenceGenerator(name="<span class="italic">&lt;SEQUENCE_GENERATOR_NAME&gt;</span>",
+ sequenceName="<span class="italic">&lt;SEQUENCE_GENERATOR_SEQUENCE&gt;</span>")
+</pre>
+<a id="sthref188" name="sthref188"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
<li>
-<p>Lazy</p>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
</li>
</ul>
-</td>
-<td align="left" headers="r4c1-t19 r1c3-t19">Lazy</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t19" headers="r1c1-t19">Mapped By</td>
-<td align="left" headers="r5c1-t19 r1c2-t19">The database field that owns the relationship.</td>
-<td align="left" headers="r5c1-t19 r1c3-t19"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t19" headers="r1c1-t19">Order By</td>
-<td align="left" headers="r6c1-t19 r1c2-t19">Specify the default order for objects returned from a query. See <a href="ref_mapping_general.htm#CACDADIH">"Order By"</a> for details.
+<a id="sthref189" name="sthref189"></a>
+<p class="subhead2">Related references</p>
<ul>
<li>
-<p>No ordering</p>
+<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
</li>
<li>
-<p>Primary key</p>
+<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
</li>
<li>
-<p>Custom</p>
+<p><a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a></p>
</li>
</ul>
-</td>
-<td align="left" headers="r6c1-t19 r1c3-t19">No ordering</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
+<a id="sthref190" name="sthref190"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
<li>
-<p>Use this table to complete the fields in the <a href="reference011.htm#CACBAEBC">Join Table Information</a> area in the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." summary="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="19%" />
-<col width="*" />
-<col width="38%" />
-<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">Name</td>
-<td align="left" headers="r2c1-t20 r1c2-t20">Name of the join table that contains the foreign key column.</td>
-<td align="left" headers="r2c1-t20 r1c3-t20">You must specify the join table on the owning side.
-<p>By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t20" headers="r1c1-t20">Join Columns</td>
-<td align="left" headers="r3c1-t20 r1c2-t20">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
-<td align="left" headers="r3c1-t20 r1c3-t20">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t20" headers="r1c1-t20">Inverse Join Columns</td>
-<td align="left" headers="r4c1-t20 r1c2-t20">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
-<td align="left" headers="r4c1-t20 r1c3-t20">By default, the mapping is assumed to have a single join.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
+<p><a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a></p>
+</li>
<li>
-<p>To add a new Join or Inverse Join Column, click <span class="gui-object-action">Add</span>.</p>
-<p>To edit an existing Join or Inverse Join Column, select the field to and click <span class="gui-object-action">Edit</span>.</p>
+<p><a href="concepts001.htm#BABBGFJG">Understanding Java Persistence API</a></p>
</li>
-</ol>
-<p>Eclipse adds the following annotations to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@JoinTable(joinColumns=@JoinColumn(name="<span class="italic">&lt;JOIN_COLUMN&gt;</span>"),
- name = "<span class="italic">&lt;JOIN_TABLE_NAME&gt;</span>")
-@ManyToMany(cascade=CascadeType.<span class="italic">&lt;CASCADE_TYPE&gt;</span>, fetch=FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>,
- targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>, mappedBy = "<span class="italic">&lt;MAPPED_BY&gt;</span>")
-@OrderBy("<span class="italic">&lt;ORDER_BY&gt;</span>")
-
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
+</ul>
+</div>
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
@@ -169,11 +99,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm
index 05eba6a8dd..1eb0dbb5d4 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm
@@ -3,153 +3,91 @@
<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>Many-to-one mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:44Z" />
+<title>Many-to-many mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:5Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Many-to-one mapping" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Many-to-many mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="BABHFAFJ" name="BABHFAFJ"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="BABEIEGD" name="BABEIEGD"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Many-to-one mapping</h1>
-<p><a id="sthref134" name="sthref134"></a><a id="sthref135" name="sthref135"></a><a id="sthref136" name="sthref136"></a><a id="sthref137" name="sthref137"></a>Use a <span class="bold">Many-to-One</span> mapping to defines a single-valued association to another entity class that has many-to-one multiplicity.</p>
+<h1>Many-to-many mapping</h1>
+<p><a id="sthref191" name="sthref191"></a><a id="sthref192" name="sthref192"></a><a id="sthref193" name="sthref193"></a><a id="sthref194" name="sthref194"></a>Use a <span class="bold">Many-to-Many Mapping</span> to define a many-valued association with many-to-many multiplicity. A many-to-many mapping has two sides: the <span class="italic">owning side</span> and <span class="italic">non-owning side</span>. You must specify the join table on the owning side. For bidirectional mappings, either side may be the owning side.</p>
<ol>
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
</li>
<li>
-<p>Right click the field and then select <span class="bold">Map As &gt; Many-to-One</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
+<p>Right-click the field and then select <span class="bold">Map As &gt; Many-to-Many</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
+<div class="figure"><a id="sthref195" name="sthref195"></a>
+<p class="titleinfigure">JPA Details, Many to many mapping</p>
+<img src="img/jpa_details.manytomany.png" alt="JPA Details, Primary key generation" title="JPA Details, Primary key generation" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Complete each field in the <a href="reference030.htm#CACIHGCE">Many-to-Many Mapping</a> area.</p>
</li>
<li>
-<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields JPA Details view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields ion the General tab for this mapping." summary="This table lists the fields ion the General tab for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="19%" />
-<col width="*" />
-<col width="41%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t21">Property</th>
-<th align="left" valign="bottom" id="r1c2-t21">Description</th>
-<th align="left" valign="bottom" id="r1c3-t21">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t21" headers="r1c1-t21">Mapping Entity Hyperlink</td>
-<td align="left" headers="r2c1-t21 r1c2-t21">Defines mapping as <span class="bold">Many-to-One</span>. This corresponds to the <code>@ManyToOne</code> annotation.</td>
-<td align="left" headers="r2c1-t21 r1c3-t21">Many-to-One</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t21" headers="r1c1-t21">Target Entity</td>
-<td align="left" headers="r3c1-t21 r1c2-t21">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r3c1-t21 r1c3-t21">null
-<p>You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t21" headers="r1c1-t21">Fetch</td>
-<td align="left" headers="r4c1-t21 r1c2-t21">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
-<ul>
+<p>Use the Joining Strategy area to specify ...................</p>
+<div class="figure"><a id="sthref196" name="sthref196"></a>
+<p class="titleinfigure">JPA Details, Joining Strategy</p>
+<img src="img/jpa_details_joiningstrategy.png" alt="JPA Details, Joining Strategy" title="JPA Details, Joining Strategy" /><br /></div>
+<!-- class="figure" --></li>
<li>
-<p>Eager</p>
+<p>Complete each field in the <a href="reference039.htm#CACIJEGI">Joining Strategy</a> area.</p>
</li>
<li>
-<p>Lazy</p>
+<p>Complete the remaining areas in the <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>.</p>
+</li>
+</ol>
+<p>Eclipse adds the following annotations to the field:</p>
+<pre xml:space="preserve" class="oac_no_warn">
+@JoinTable(joinColumns=@JoinColumn(name="<span class="italic">&lt;JOIN_COLUMN&gt;</span>"),
+ name = "<span class="italic">&lt;JOIN_TABLE_NAME&gt;</span>")
+@ManyToMany(=Type.<span class="italic">&lt;_TYPE&gt;</span>, fetch=FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>,
+ targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>, mappedBy = "<span class="italic">&lt;MAPPED_BY&gt;</span>")
+@OrderBy("<span class="italic">&lt;ORDER_BY&gt;</span>")
+
+</pre>
+<a id="sthref197" name="sthref197"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
</li>
</ul>
-</td>
-<td align="left" headers="r4c1-t21 r1c3-t21">Eager</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t21" headers="r1c1-t21">Cascade</td>
-<td align="left" headers="r5c1-t21 r1c2-t21">See <a href="ref_mapping_general.htm#CACJAIHB">"Cascade Type"</a> for details.
+<a id="sthref198" name="sthref198"></a>
+<p class="subhead2">Related references</p>
<ul>
<li>
-<p>Default</p>
+<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
</li>
<li>
-<p>All</p>
+<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
</li>
<li>
-<p>Persist</p>
+<p><a href="reference039.htm#CACIJEGI">Joining Strategy</a></p>
</li>
+</ul>
+<a id="sthref199" name="sthref199"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
<li>
-<p>Merge</p>
+<p><a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a></p>
</li>
<li>
-<p>Remove</p>
+<p><a href="concepts001.htm#BABBGFJG">Understanding Java Persistence API</a></p>
</li>
</ul>
-</td>
-<td align="left" headers="r5c1-t21 r1c3-t21">Default</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t21" headers="r1c1-t21">Optional</td>
-<td align="left" headers="r6c1-t21 r1c2-t21">Specifies if this field is can be null.</td>
-<td align="left" headers="r6c1-t21 r1c3-t21">Yes</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-<li>
-<p>Use this table to complete the fields on the <a href="reference012.htm#CACFCEJC">Join Columns Information</a> tab in the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="19%" />
-<col width="*" />
-<col width="41%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t22">Property</th>
-<th align="left" valign="bottom" id="r1c2-t22">Description</th>
-<th align="left" valign="bottom" id="r1c3-t22">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t22" headers="r1c1-t22">Join Column</td>
-<td align="left" headers="r2c1-t22 r1c2-t22"><a id="sthref138" name="sthref138"></a><a id="sthref139" name="sthref139"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
-<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
-</td>
-<td align="left" headers="r2c1-t22 r1c3-t22">By default, the mapping is assumed to have a single join.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-</ol>
-<p>Eclipse adds the following annotations to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@JoinTable(joinColumns=@JoinColumn(name="<span class="italic">&lt;JOIN_COLUMN&gt;</span>"),
- name = "<span class="italic">&lt;JOIN_TABLE_NAME&gt;</span>")
-@ManyToOne(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>, fetch=<span class="italic">&lt;FETCH_TYPE&gt;</span>,
- cascade=<span class="italic">&lt;CASCADE_TYPE&gt;</span>)
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
+</div>
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
@@ -157,11 +95,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm
index 417c743805..974b498b62 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm
@@ -3,183 +3,77 @@
<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>One-to-many mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:44Z" />
+<title>Many-to-one mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:5Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="One-to-many mapping" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Many-to-one mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="BABHGEBD" name="BABHGEBD"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="BABHFAFJ" name="BABHFAFJ"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>One-to-many mapping</h1>
-<p><a id="sthref140" name="sthref140"></a><a id="sthref141" name="sthref141"></a><a id="sthref142" name="sthref142"></a><a id="sthref143" name="sthref143"></a>Use a <span class="bold">One-to-Many Mapping</span> to define a relationship with one-to-many multiplicity.</p>
+<h1>Many-to-one mapping</h1>
+<p><a id="sthref200" name="sthref200"></a><a id="sthref201" name="sthref201"></a><a id="sthref202" name="sthref202"></a><a id="sthref203" name="sthref203"></a>Use a <span class="bold">Many-to-One</span> mapping to defines a single-valued association to another entity class that has many-to-one multiplicity.</p>
<ol>
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
</li>
<li>
-<p>Right-click the field and then select <span class="bold">Map As &gt; One-to-many</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
-</li>
-<li>
-<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields JPA Details view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the General tab of the Persistence Properties view for this mapping." summary="This table lists the fields in the General tab of the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="19%" />
-<col width="*" />
-<col width="38%" />
-<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>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t23" headers="r1c1-t23">Mapping Entity Type Hyperlink</td>
-<td align="left" headers="r2c1-t23 r1c2-t23">Defines mapping as <span class="bold">One-to-Many</span>. This corresponds to the <code>@OneToMany</code> annotation.</td>
-<td align="left" headers="r2c1-t23 r1c3-t23">One-to-Many</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t23" headers="r1c1-t23">Target Entity</td>
-<td align="left" headers="r3c1-t23 r1c2-t23">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r3c1-t23 r1c3-t23"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t23" headers="r1c1-t23">Cascade</td>
-<td align="left" headers="r4c1-t23 r1c2-t23">See <a href="ref_mapping_general.htm#CACJAIHB">"Cascade Type"</a> for details.
-<ul>
-<li>
-<p>Default</p>
-</li>
+<p>Right click the field and then select <span class="bold">Map As &gt; Many-to-One</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
+<div class="figure"><a id="sthref204" name="sthref204"></a>
+<p class="titleinfigure">JPA Details, Many-to-one mapping</p>
+<img src="img/jpa_details_manytoone.png" alt="JPA Details, Many-to-one mapping" title="JPA Details, Many-to-one mapping" /><br /></div>
+<!-- class="figure" --></li>
<li>
-<p>All</p>
+<p>Complete each field in the <a href="reference030.htm#CACIHGCE">Many-to-Many Mapping</a> area.</p>
</li>
<li>
-<p>Persist</p>
-</li>
-<li>
-<p>Merge</p>
+<p>Complete the remaining areas in the <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>.</p>
</li>
+</ol>
+<p>Eclipse adds the following annotations to the field:</p>
+<pre xml:space="preserve" class="oac_no_warn">
+@JoinTable(joinColumns=@JoinColumn(name="<span class="italic">&lt;JOIN_COLUMN&gt;</span>"),
+ name = "<span class="italic">&lt;JOIN_TABLE_NAME&gt;</span>")
+@ManyToOne(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>, fetch=<span class="italic">&lt;FETCH_TYPE&gt;</span>,
+ =<span class="italic">&lt;_TYPE&gt;</span>)
+</pre>
+<a id="sthref205" name="sthref205"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
<li>
-<p>Remove</p>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
</li>
</ul>
-</td>
-<td align="left" headers="r4c1-t23 r1c3-t23"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t23" headers="r1c1-t23">Fetch</td>
-<td align="left" headers="r5c1-t23 r1c2-t23">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
+<a id="sthref206" name="sthref206"></a>
+<p class="subhead2">Related references</p>
<ul>
<li>
-<p>Eager</p>
+<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
</li>
<li>
-<p>Lazy</p>
+<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
</li>
</ul>
-</td>
-<td align="left" headers="r5c1-t23 r1c3-t23">Eager</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t23" headers="r1c1-t23">Mapped By</td>
-<td align="left" headers="r6c1-t23 r1c2-t23">The database field that owns the relationship.</td>
-<td align="left" headers="r6c1-t23 r1c3-t23"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r7c1-t23" headers="r1c1-t23">Order By</td>
-<td align="left" headers="r7c1-t23 r1c2-t23">Specify the default order for objects returned from a query. See <a href="ref_mapping_general.htm#CACDADIH">"Order By"</a> for details.
+<a id="sthref207" name="sthref207"></a>
+<p class="subhead2">Related concepts</p>
<ul>
<li>
-<p>No ordering</p>
-</li>
-<li>
-<p>Primary key</p>
+<p><a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a></p>
</li>
<li>
-<p>Custom</p>
+<p><a href="concepts001.htm#BABBGFJG">Understanding Java Persistence API</a></p>
</li>
</ul>
-</td>
-<td align="left" headers="r7c1-t23 r1c3-t23">No ordering</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-<li>
-<p>Use this table to complete the <a href="reference011.htm#CACBAEBC">Join Table Information</a> fields in the JPA Details view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." summary="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="19%" />
-<col width="*" />
-<col width="38%" />
-<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">Name</td>
-<td align="left" headers="r2c1-t24 r1c2-t24">Name of the join table</td>
-<td align="left" headers="r2c1-t24 r1c3-t24">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t24" headers="r1c1-t24">Join Columns</td>
-<td align="left" headers="r3c1-t24 r1c2-t24">Specify two or more join columns (that is, a primary key).</td>
-<td align="left" headers="r3c1-t24 r1c3-t24"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t24" headers="r1c1-t24">Inverse Join Columns</td>
-<td align="left" headers="r4c1-t24 r1c2-t24">The join column on the owned (or inverse) side of the association: the owned entity's primary key column.</td>
-<td align="left" headers="r4c1-t24 r1c3-t24"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-</ol>
-<p>Eclipse adds the following annotations to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@OneToMany(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>)
-@Column(name="<span class="italic">&lt;COLUMN&gt;</span>")
-
-
-@OneToMany(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>.class, cascade=CascadeType.<span class="italic">&lt;CASCADE_TYPE&gt;</span>,
- fetch = FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>, mappedBy = "<span class="italic">&lt;MAPPED_BY&gt;</span>")@OrderBy("<span class="italic">&lt;ORDER_BY&gt;</span>")
-@JoinTable(name="<span class="italic">&lt;JOIN_TABLE_NAME&gt;</span>", joinColumns=@JoinColumn(name=
- "<span class="italic">&lt;JOIN_COLUMN_NAME&gt;</span>", referencedColumnName="<span class="italic">&lt;JOIN_COLUMN_REFERENCED_COLUMN&gt;</span>"),
- inverseJoinColumns=@JoinColumn(name="<span class="italic">&lt;INVERSE_JOIN_COLUMN_NAME&gt;</span>",
- referencedColumnName="<span class="italic">&lt;INVERSE_JOIN_COLUMN_REFERENCED_COLUMN&gt;</span>"))
-
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
+</div>
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
@@ -187,11 +81,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm
index 9c58f8a42b..f6e7a3d34a 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm
@@ -3,132 +3,95 @@
<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>One-to-one mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:44Z" />
+<title>One-to-many mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:5Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="One-to-one mapping" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="One-to-many mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="BABFHBCJ" name="BABFHBCJ"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="BABHGEBD" name="BABHGEBD"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>One-to-one mapping</h1>
-<p><a id="sthref144" name="sthref144"></a><a id="sthref145" name="sthref145"></a><a id="sthref146" name="sthref146"></a><a id="sthref147" name="sthref147"></a>Use a <span class="bold">One-to-One Mapping</span> to define a relationship with one-to-many multiplicity.</p>
+<h1>One-to-many mapping</h1>
+<p><a id="sthref208" name="sthref208"></a><a id="sthref209" name="sthref209"></a><a id="sthref210" name="sthref210"></a><a id="sthref211" name="sthref211"></a>Use a <span class="bold">One-to-Many Mapping</span> to define a relationship with one-to-many multiplicity.</p>
<ol>
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
</li>
<li>
-<p>Right-click the field and then select <span class="bold">Map As &gt; One-to-One</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
+<p>Right-click the field and then select <span class="bold">Map As &gt; One-to-many</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
+<div class="figure"><a id="sthref212" name="sthref212"></a>
+<p class="titleinfigure">JPA Details, One-to-many Mapping</p>
+<img src="img/jpa_details_onetomany.png" alt="JPA Details, One-to-many Mapping" title="JPA Details, One-to-many Mapping" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Complete each field in the <a href="reference032.htm#CACHGGHH">One-to-Many Mapping</a> area.</p>
</li>
<li>
-<p>Use this table to complete the <a href="ref_mapping_general.htm#CACBHFIJ">General information</a> fields in the JPA Details view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="19%" />
-<col width="*" />
-<col width="41%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t25">Property</th>
-<th align="left" valign="bottom" id="r1c2-t25">Description</th>
-<th align="left" valign="bottom" id="r1c3-t25">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t25" headers="r1c1-t25">Mapped Entity Hyperlink</td>
-<td align="left" headers="r2c1-t25 r1c2-t25">Defines mapping as <span class="bold">One-to-One</span>. This corresponds to the <code>@OneToOne</code> annotation.</td>
-<td align="left" headers="r2c1-t25 r1c3-t25">One-to-One</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t25" headers="r1c1-t25">Target Entity</td>
-<td align="left" headers="r3c1-t25 r1c2-t25">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r3c1-t25 r1c3-t25">null
-<p>You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t25" headers="r1c1-t25">Fetch Type</td>
-<td align="left" headers="r4c1-t25 r1c2-t25">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
+<p>Complete the remaining areas in the <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>:</p>
<ul>
<li>
-<p>Eager</p>
+<p><a href="reference039.htm#CACIJEGI">Joining Strategy</a></p>
</li>
<li>
-<p>Lazy</p>
+<p><a href="reference037.htm#CACJCHJB">Converters</a></p>
</li>
-</ul>
-</td>
-<td align="left" headers="r4c1-t25 r1c3-t25">Eager</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t25" headers="r1c1-t25">Mapped By</td>
-<td align="left" headers="r5c1-t25 r1c2-t25">The database field that owns the relationship.</td>
-<td align="left" headers="r5c1-t25 r1c3-t25"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
<li>
-<p>Use this table to complete the <a href="reference012.htm#CACFCEJC">Join Columns Information</a> fields in the <span class="gui-object-title">JPA Details</span> view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="19%" />
-<col width="*" />
-<col width="41%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t26">Property</th>
-<th align="left" valign="bottom" id="r1c2-t26">Description</th>
-<th align="left" valign="bottom" id="r1c3-t26">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t26" headers="r1c1-t26">Join Column</td>
-<td align="left" headers="r2c1-t26 r1c2-t26"><a id="sthref148" name="sthref148"></a><a id="sthref149" name="sthref149"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
-<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
-</td>
-<td align="left" headers="r2c1-t26 r1c3-t26">By default, the mapping is assumed to have a single join.</td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
+<p><a href="reference038.htm#CACBIJFD">Ordering</a></p>
+</li>
+</ul>
+</li>
</ol>
<p>Eclipse adds the following annotations to the field:</p>
<pre xml:space="preserve" class="oac_no_warn">
-@OneToOne(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>, cascade=CascadeType.<span class="italic">&lt;CASCADE_TYPE&gt;</span>,
- fetch = FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>, mappedBy = "<span class="italic">&lt;MAPPED_BY&gt;</span>")
-@JoinColumn(name="<span class="italic">&lt;JOIN_COLUMN_NAME&gt;</span>", referencedColumnName=
- "<span class="italic">&lt;JOIN_COLUMN_REFERENCED_COLUMN&gt;</span>", insertable = <span class="italic">&lt;INSERTABLE&gt;</span>,
- updatable = <span class="italic">&lt;UPDATABLE&gt;</span>)
+@OneToMany(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>)
+@Column(name="<span class="italic">&lt;COLUMN&gt;</span>")
+
+
+@OneToMany(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>.class, =Type.<span class="italic">&lt;_TYPE&gt;</span>,
+ fetch = FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>, mappedBy = "<span class="italic">&lt;MAPPED_BY&gt;</span>")@OrderBy("<span class="italic">&lt;ORDER_BY&gt;</span>")
+@JoinTable(name="<span class="italic">&lt;JOIN_TABLE_NAME&gt;</span>", joinColumns=@JoinColumn(name=
+ "<span class="italic">&lt;JOIN_COLUMN_NAME&gt;</span>", referencedColumnName="<span class="italic">&lt;JOIN_COLUMN_REFERENCED_COLUMN&gt;</span>"),
+ inverseJoinColumns=@JoinColumn(name="<span class="italic">&lt;INVERSE_JOIN_COLUMN_NAME&gt;</span>",
+ referencedColumnName="<span class="italic">&lt;INVERSE_JOIN_COLUMN_REFERENCED_COLUMN&gt;</span>"))
</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
+<a id="sthref213" name="sthref213"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
+</li>
+</ul>
+<a id="sthref214" name="sthref214"></a>
+<p class="subhead2">Related references</p>
+<ul>
+<li>
+<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
+</li>
+<li>
+<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
+</li>
+</ul>
+<a id="sthref215" name="sthref215"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a></p>
+</li>
+<li>
+<p><a href="concepts001.htm#BABBGFJG">Understanding Java Persistence API</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
@@ -136,11 +99,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm
index b04bdb3c0a..41aa328302 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm
@@ -3,52 +3,86 @@
<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>Transient mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:45Z" />
+<title>One-to-one mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:5Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Transient mapping" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="One-to-one mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="BABHFHEI" name="BABHFHEI"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="BABFHBCJ" name="BABFHBCJ"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Transient mapping</h1>
-<p><a id="sthref150" name="sthref150"></a><a id="sthref151" name="sthref151"></a><a id="sthref152" name="sthref152"></a><a id="sthref153" name="sthref153"></a>Use the Transient Mapping to specify a field of the entity class that <span class="italic">is not</span> persistent.</p>
-<p>To create a transient mapping:</p>
+<h1>One-to-one mapping</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 a <span class="bold">One-to-One Mapping</span> to define a relationship with one-to-many multiplicity.</p>
<ol>
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
</li>
<li>
-<p>Right-click the field and then select <span class="bold">Map As Transient</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
+<p>Right-click the field and then select <span class="bold">Map As &gt; One-to-One</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
+<div class="figure"><a id="sthref220" name="sthref220"></a>
+<p class="titleinfigure">JPA Details, One-to-one Mapping</p>
+<img src="img/jpa_details_onetoone.png" alt="JPA Details, One-to-one Mapping" title="JPA Details, One-to-one Mapping" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Complete each field in the <a href="reference033.htm#CACGGHDD">One-to-One Mapping</a> area.</p>
+</li>
+<li>
+<p>Complete the remaining areas in the <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>:</p>
+<ul>
+<li>
+<p><a href="reference039.htm#CACIJEGI">Joining Strategy</a></p>
+</li>
+<li>
+<p><a href="reference040.htm#CACGHHGB">Derived Identity</a></p>
+</li>
+</ul>
</li>
</ol>
-<p>Eclipse adds the following annotation to the field:</p>
+<p>Eclipse adds the following annotations to the field:</p>
<pre xml:space="preserve" class="oac_no_warn">
-@Transient
+@OneToOne(targetEntity=<span class="italic">&lt;TARGET_ENTITY&gt;</span>, =Type.<span class="italic">&lt;_TYPE&gt;</span>,
+ fetch = FetchType.<span class="italic">&lt;FETCH_TYPE&gt;</span>, mappedBy = "<span class="italic">&lt;MAPPED_BY&gt;</span>")
+@JoinColumn(name="<span class="italic">&lt;JOIN_COLUMN_NAME&gt;</span>", referencedColumnName=
+ "<span class="italic">&lt;JOIN_COLUMN_REFERENCED_COLUMN&gt;</span>", insertable = <span class="italic">&lt;INSERTABLE&gt;</span>,
+ updatable = <span class="italic">&lt;UPDATABLE&gt;</span>)
</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
+<a id="sthref221" name="sthref221"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
+</li>
+</ul>
+<a id="sthref222" name="sthref222"></a>
+<p class="subhead2">Related references</p>
+<ul>
+<li>
+<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
+</li>
+<li>
+<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
+</li>
+</ul>
+<a id="sthref223" name="sthref223"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a></p>
+</li>
+<li>
+<p><a href="concepts001.htm#BABBGFJG">Understanding Java Persistence API</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
@@ -56,11 +90,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm
index f9f3209292..5379b3df7f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm
@@ -3,122 +3,66 @@
<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>Version mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:45Z" />
+<title>Transient mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Version mapping" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Transient mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="BABHIBII" name="BABHIBII"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="BABHFHEI" name="BABHFHEI"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Version mapping</h1>
-<p><a id="sthref154" name="sthref154"></a><a id="sthref155" name="sthref155"></a><a id="sthref156" name="sthref156"></a><a id="sthref157" name="sthref157"></a>Use a <span class="bold">Version Mapping</span> to specify the field used for optimistic locking. If the entity is associated with multiple tables, you should use a version mapping only with the primary table. You should have only a single version mapping per persistent entity. Version mappings may be used only with the following attribute types:</p>
-<ul>
-<li>
-<p><code>int</code></p>
-</li>
-<li>
-<p><code>Integer</code></p>
-</li>
+<h1>Transient mapping</h1>
+<p><a id="sthref224" name="sthref224"></a><a id="sthref225" name="sthref225"></a><a id="sthref226" name="sthref226"></a><a id="sthref227" name="sthref227"></a>Use the Transient Mapping to specify a field of the entity class that <span class="italic">is not</span> persistent.</p>
+<p>To create a transient mapping:</p>
+<ol>
<li>
-<p><code>short, Short</code></p>
+<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
</li>
<li>
-<p><code>long, Long</code></p>
+<p>Right-click the field and then select <span class="bold">Map As Transient</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
</li>
+</ol>
+<p>Eclipse adds the following annotation to the field:</p>
+<pre xml:space="preserve" class="oac_no_warn">
+@Transient
+</pre>
+<a id="sthref228" name="sthref228"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
<li>
-<p><code>Timestamp</code></p>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
</li>
</ul>
-<p>To create a version mapping:</p>
-<ol>
+<a id="sthref229" name="sthref229"></a>
+<p class="subhead2">Related references</p>
+<ul>
<li>
-<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
+<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
</li>
<li>
-<p>Right-click the field and then select <span class="bold">Map As &gt; Version</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
+<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
</li>
-<li>
-<p>Use this table to complete the remaining fields in the JPA Details view.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="19%" />
-<col width="*" />
-<col width="38%" />
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t27">Property</th>
-<th align="left" valign="bottom" id="r1c2-t27">Description</th>
-<th align="left" valign="bottom" id="r1c3-t27">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t27" headers="r1c1-t27">Mapped Entity Hyperlink</td>
-<td align="left" headers="r2c1-t27 r1c2-t27">Defines the mapping as Version. This corresponds to the <code>@Version</code> annotation.</td>
-<td align="left" headers="r2c1-t27 r1c3-t27">Version</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t27" headers="r1c1-t27">Column</td>
-<td align="left" headers="r3c1-t27 r1c2-t27">The database column mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.</td>
-<td align="left" headers="r3c1-t27 r1c3-t27">By default, the Column is assumed to be named identically to the attribute and always included in the <code>INSERT</code> and <code>UPDATE</code> statements.</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t27" headers="r1c1-t27">Table</td>
-<td align="left" headers="r4c1-t27 r1c2-t27">Name of the database table. This must be the primary table associated with the attribute's entity.</td>
-<td align="left" headers="r4c1-t27 r1c3-t27"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t27" headers="r1c1-t27">Temporal</td>
-<td align="left" headers="r5c1-t27 r1c2-t27">Specifies the type of data. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.
+</ul>
+<a id="sthref230" name="sthref230"></a>
+<p class="subhead2">Related concepts</p>
<ul>
<li>
-<p>Date</p>
-</li>
-<li>
-<p>Time</p>
+<p><a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a></p>
</li>
<li>
-<p>Timestamp</p>
+<p><a href="concepts001.htm#BABBGFJG">Understanding Java Persistence API</a></p>
</li>
</ul>
-</td>
-<td align="left" headers="r5c1-t27 r1c3-t27"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
-</ol>
-<p>Eclipse adds the following annotations to the field:</p>
-<pre xml:space="preserve" class="oac_no_warn">
-@Version
-@Column(table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>", name="&lt;<span class="italic">COLUMN_NAME</span>&gt;")
-
-</pre>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a><br />
-<a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a><br />
-<a href="concepts001.htm#BABBGFJG">Understanding EJB 3.0 Java Persistence API</a></div>
+</div>
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
@@ -126,11 +70,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm
index c785cd4dc0..0f79806550 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm
@@ -3,24 +3,101 @@
<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>Element Collection mapping</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:45Z" />
+<title>Version mapping</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Element Collection mapping" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Version mapping" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIHBDEAJ" name="CIHBDEAJ"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="BABHIBII" name="BABHIBII"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Element Collection mapping</h1>
+<h1>Version mapping</h1>
+<p><a id="sthref231" name="sthref231"></a><a id="sthref232" name="sthref232"></a><a id="sthref233" name="sthref233"></a><a id="sthref234" name="sthref234"></a>Use a <span class="bold">Version Mapping</span> to specify the field used for optimistic locking. If the entity is associated with multiple tables, you should use a version mapping only with the primary table. You should have only a single version mapping per persistent entity. Version mappings may be used only with the following attribute types:</p>
+<ul>
+<li>
+<p><code>int</code></p>
+</li>
+<li>
+<p><code>Integer</code></p>
+</li>
+<li>
+<p><code>short, Short</code></p>
+</li>
+<li>
+<p><code>long, Long</code></p>
+</li>
+<li>
+<p><code>Timestamp</code></p>
+</li>
+</ul>
+<p>To create a version mapping:</p>
+<ol>
+<li>
+<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map.</p>
+</li>
+<li>
+<p>Right-click the field and then select <span class="bold">Map As &gt; Version</span>. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
+<div class="figure"><a id="sthref235" name="sthref235"></a>
+<p class="titleinfigure">JPA Details, Version Mapping</p>
+<img src="img/jpa_details_version.png" alt="JPA Details, Version Mapping" title="JPA Details, Version Mapping" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Complete each field in the <a href="reference034.htm#CACHAEBB">Version Mapping</a> area.</p>
+</li>
+<li>
+<p>Complete the remaining areas in the <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a>:</p>
+<ul>
+<li>
+<p><a href="reference035.htm#CACIHAAF">Type information</a></p>
+</li>
+<li>
+<p><a href="reference037.htm#CACJCHJB">Converters</a></p>
+</li>
+</ul>
+</li>
+</ol>
+<p>Eclipse adds the following annotations to the field:</p>
+<pre xml:space="preserve" class="oac_no_warn">
+@Version
+@Column(table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>", name="&lt;<span class="italic">COLUMN_NAME</span>&gt;")
+
+</pre>
+<a id="sthref236" name="sthref236"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
+</li>
+</ul>
+<a id="sthref237" name="sthref237"></a>
+<p class="subhead2">Related references</p>
+<ul>
+<li>
+<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
+</li>
+<li>
+<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
+</li>
+</ul>
+<a id="sthref238" name="sthref238"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concept_mapping.htm#BABBDJFI">Understanding OR mappings</a></p>
+</li>
+<li>
+<p><a href="concepts001.htm#BABBGFJG">Understanding Java Persistence API</a></p>
+</li>
+</ul>
</div>
<!-- class="sect2" -->
<!-- class="sect1" -->
@@ -30,11 +107,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm
index 358ebb8f33..53a13cb469 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm
@@ -3,37 +3,38 @@
<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>Generating entities from tables</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:45Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Generating entities from tables" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="BABBAGFI" name="BABBAGFI"></a></p>
<div class="sect1">
<h1>Generating entities from tables</h1>
-<p><a id="sthref158" name="sthref158"></a><a id="sthref159" name="sthref159"></a>Use this procedure to generate Java persistent entities from database tables. You must create a JPA project and establish a database connection <span class="italic">before</span> generating persistent entities. See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> for more information.<a id="sthref160" name="sthref160"></a><a id="sthref161" name="sthref161"></a></p>
+<p><a id="sthref239" name="sthref239"></a><a id="sthref240" name="sthref240"></a>Use this procedure to generate Java persistent entities from database tables. You must create a JPA project and establish a database connection <span class="italic">before</span> generating persistent entities. See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> for more information.<a id="sthref241" name="sthref241"></a><a id="sthref242" name="sthref242"></a></p>
+<p>To use the <a href="reference010.htm#CIAGHCGA">Generate Tables from Entities wizard</a>:</p>
<ol>
<li>
<p>Right-click the JPA project in the <span class="gui-object-title">Project Explorer</span> and select <span class="gui-object-action">JPA Tools &gt; Generate Entities from Tables</span>.</p>
-<div class="figure"><a id="sthref162" name="sthref162"></a>
-<p class="titleinfigure">Generating Entities</p>
+<div class="figure"><a id="sthref243" name="sthref243"></a>
+<p class="titleinfigure">Generating Entities from Tables</p>
<img src="img/generate_entities.png" alt="Using the JPA Tools &gt; Generate Entities menu option." title="Using the JPA Tools &gt; Generate Entities menu option." /><br /></div>
<!-- class="figure" --></li>
<li>
-<p>On the <a href="ref_selectTables.htm#CIAHCGEE">Select Tables</a> page, select your database connection and schema.</p>
+<p>On the <a href="ref_selectTables.htm#CIAHCGEE">Select Tables</a> page of the <a href="ref_create_custom_entities_wizard.htm#CIAGBFJE">Generate Entities from Tables wizard</a>, select your database connection and schema.</p>
<p>To create a new database connection, click <span class="bold">Add connection</span>.</p>
<p>If you are not currently connected to the database, the Database Connection page appears. Select your database connection and schema, and click <span class="bold">Reconnect</span>.</p>
-<div class="figure"><a id="sthref163" name="sthref163"></a>
+<div class="figure"><a id="sthref244" name="sthref244"></a>
<p class="titleinfigure">Select Tables</p>
<img src="img/select_tables.png" alt="" title="" /><br /></div>
<!-- class="figure" --></li>
@@ -42,8 +43,8 @@
</li>
<li>
<p>On the <a href="ref_tableAssociations.htm#CIACDICB">Table Associations</a> page, select the associations to generate. You can specify to generate specific references for each association.</p>
-<p>To create a new association, click <span class="bold">Add Association</span>. Use the <a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association</a> wizard to define the association.</p>
-<div class="figure"><a id="sthref164" name="sthref164"></a>
+<p>To create a new association, click <span class="bold">Add Association</span>. Use the <a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association wizard</a> wizard to define the association.</p>
+<div class="figure"><a id="sthref245" name="sthref245"></a>
<p class="titleinfigure">Table Associations</p>
<img src="img/table_associations.png" alt="" title="" /><br /></div>
<!-- class="figure" --></li>
@@ -52,7 +53,7 @@
</li>
<li>
<p>On the <a href="ref_customizeDefaultEntityGeneration.htm#CIAEJDBE">Customize Default Entity Generation</a> page, customize the mapping and class information for each generated entity.</p>
-<div class="figure"><a id="sthref165" name="sthref165"></a>
+<div class="figure"><a id="sthref246" name="sthref246"></a>
<p class="titleinfigure">Customize Default Entity Generation</p>
<img src="img/customize_default_entity_generation.png" alt="" title="" /><br /></div>
<!-- class="figure" --></li>
@@ -61,7 +62,7 @@
</li>
<li>
<p>On the <a href="ref_customizIndividualEntities.htm#CIACIGEE">Customize Individual Entities</a> page, review the mapping and class information for each entity that will be generated, then click <span class="bold">Finish</span>.</p>
-<div class="figure"><a id="sthref166" name="sthref166"></a>
+<div class="figure"><a id="sthref247" name="sthref247"></a>
<p class="titleinfigure">Customize Individual Entities</p>
<img src="img/customize_individual_entities.png" alt="" title="" /><br /></div>
<!-- class="figure" --></li>
@@ -71,13 +72,21 @@
<p class="titleinfigure">Generating Entities from Tables</p>
<img src="img/table_entity.png" alt="This figure shows the EMPLOYEE and ADDRESS entities generated from database tables." title="This figure shows the EMPLOYEE and ADDRESS entities generated from database tables." /><br /></div>
<!-- class="figure" -->
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<a id="sthref248" name="sthref248"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; Java Persistence Options</a></div>
+</li>
+</ul>
+<a id="sthref249" name="sthref249"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="reference058.htm#CACDCIGD">Project Properties Page &ndash; Entity Generation</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
@@ -85,11 +94,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks022.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks022.htm
index 6341e8970b..6544681db1 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks022.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks022.htm
@@ -3,21 +3,21 @@
<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>Generating tables from entities</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:45Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
<meta name="doctitle" content="Generating tables from entities" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<p><a id="CIHJIGBE" name="CIHJIGBE"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<h1>Generating tables from entities</h1>
@@ -29,21 +29,43 @@
<tr>
<td align="left">
<p class="notep1">Note:</p>
-The DDL script with DROP existing tables on the database and CREATE new tables, based on the entities in your project.</td>
+<p>The DDL script with <code>DROP</code> existing tables on the database and <code>CREATE</code> new tables, based on the entities in your project.</p>
+</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblnote" --></div>
<p>To generate a DDL script:</p>
+<ol>
+<li>
<p>Right-click the JPA project in the <span class="gui-object-title">Project Explorer</span> and select <span class="gui-object-action">JPA Tools &gt; Generate Tables from Entities</span>.</p>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA Entity</a></p>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; Java Persistence Options</a></div>
+<img src="img/generate_tables_from_entities.png" alt="JPA Tools &gt; Generate Tables from Entities" title="JPA Tools &gt; Generate Tables from Entities" /><br /></li>
+<li>
+<p>On the Schema Generation page, select the generation output mode.</p>
+<div class="figure"><a id="sthref250" name="sthref250"></a>
+<p class="titleinfigure">Schema Generation</p>
+<img src="img/generate_tables.png" alt="" title="" /><br /></div>
+<!-- class="figure" --></li>
+</ol>
+<p>On the <a href="ref_selectTables.htm#CIAHCGEE">Select Tables</a> page, select your database connection and schema.</p>
+<p>To create a new database connection, click <span class="bold">Add connection</span>.</p>
+<p>If you are not currently connected to the database, the Database Connection page appears. Select your database connection and schema, and click <span class="bold">Reconnect</span>.</p>
+<a id="sthref251" name="sthref251"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_create_jpa_entity.htm#BABFBJBG">Creating a JPA entity</a></p>
+</li>
+</ul>
+<a id="sthref252" name="sthref252"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; JPA Options</a></p>
+</li>
+</ul>
+</div>
<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
@@ -51,11 +73,11 @@ The DDL script with DROP existing tables on the database and CREATE new tables,
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm
index a1870e4d58..cdf3c85df7 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm
@@ -3,52 +3,94 @@
<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>Validating mappings and reporting problems</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:45Z" />
+<title>Generating dynamic entities from tables</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Validating mappings and reporting problems" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Generating dynamic entities from tables" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="BABFAIBA" name="BABFAIBA"></a></p>
-<div class="sect1">
-<h1>Validating mappings and reporting problems</h1>
-<p><a id="sthref167" name="sthref167"></a><a id="sthref168" name="sthref168"></a><a id="sthref169" name="sthref169"></a><a id="sthref170" name="sthref170"></a>Errors and warnings on persistent entities and mappings are indicated with a red error or yellow warning next to the resource with the error, as well as the parent containers up to the project.</p>
-<div class="figure"><a id="sthref171" name="sthref171"></a>
-<p class="titleinfigure">Sample Errors and Warnings</p>
-<img src="img/error_sample.png" alt="This figure shows sample error and warning icons in the Explorer view." title="This figure shows sample error and warning icons in the Explorer view." /><br /></div>
-<!-- class="figure" -->
-<p>This section contains information on the following:</p>
-<ul>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIHHFGIG" name="CIHHFGIG"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>Generating dynamic entities from tables</h1>
+<p>When using EclipseLink JPA, you can create dynamic entities from your database tables. This dynamic persistence provides access to a relational database with all the benefits of JPA <span class="italic">without coding</span> or maintaining Java classes.</p>
+<p>Dali dynamically creates the classes at runtime, as needed.</p>
+<p>To generate dynamic entities:</p>
+<ol>
<li>
-<p><a href="tasks024.htm#CIHFEDEI">Error messages</a></p>
+<p>Right-click the JPA project in the <span class="gui-object-title">Project Explorer</span> and select <span class="gui-object-action">JPA Tools &gt; Generate Dynamic Entities from Tables</span>.</p>
+<img src="img/generate_dynamic_entities.png" alt="JPA Tools &gt; Generate Dynamic Entities from Tables" title="JPA Tools &gt; Generate Dynamic Entities from Tables" /><br />
+<p>The Select Tables page of the <a href="reference002.htm#CACGDFDJ">Generate Dynamic Entities from Tables wizard</a> appears.</p>
+<div class="figure"><a id="sthref253" name="sthref253"></a>
+<p class="titleinfigure">Select Tables</p>
+<img src="img/select_tables_dynamic.png" alt="" title="" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>On the <a href="reference003.htm#CACFGHJF">Select Tables</a> page, select the tables from which to generate the entities and click <span class="bold">Next</span>.</p>
+<p>The <a href="reference004.htm#CACBDJAC">Table Associations</a> page appears.</p>
+<div class="figure"><a id="sthref254" name="sthref254"></a>
+<p class="titleinfigure">Table Associations</p>
+<img src="img/table_associations_dynamic.png" alt="" title="" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>On the <a href="reference004.htm#CACBDJAC">Table Associations</a> page, specify which table associations should be generated. Use the <a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association wizard</a> to create additional relationships.</p>
+<p>Click <span class="bold">Next</span>. The <a href="reference005.htm#CACHHEEH">Customize Default Entity Generation</a> page appears.</p>
+<div class="figure"><a id="sthref255" name="sthref255"></a>
+<p class="titleinfigure">Customize Defaults</p>
+<img src="img/customize_default_entity_generation_dynamic.png" alt="" title="" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>On the <a href="reference005.htm#CACHHEEH">Customize Default Entity Generation</a> page, specify the default information to use when generating the entities, and click <span class="bold">Next</span>.</p>
+<p>The <a href="reference006.htm#CACDGDIC">Customize Individual Entities</a> page appears.</p>
+<div class="figure"><a id="sthref256" name="sthref256"></a>
+<p class="titleinfigure">Customize Individual Entities</p>
+<img src="img/customize_individual_entities_dynamic.png" alt="" title="" /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Use the <a href="reference006.htm#CACDGDIC">Customize Individual Entities</a> page to customize specific generated entities.</p>
</li>
<li>
-<p><a href="tasks025.htm#CIHGEAIJ">Warning messages</a></p>
+<p>Click <span class="bold">Finish</span> to complete the wizard and generate the entities.</p>
</li>
-</ul>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<p><a href="../org.eclipse.platform.doc.user/concepts/cprbview.htm">Problems view</a></p>
+</ol>
+<p>Dali generates the dynamic entities, using the <code>VIRTUAL</code> access type, as shown in <a href="#CIHIDHAB">Example: Sample eclipselink-orm.xml File with Dynamic Entities</a>.</p>
+<div class="example"><a id="CIHIDHAB" name="CIHIDHAB"></a>
+<p class="titleinexample">Sample eclipselink-orm.xml File with Dynamic Entities</p>
+<pre xml:space="preserve" class="oac_no_warn">
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;entity-mappings version="2.4" xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eclipse.org/eclipselink/xsds/persistence/orm http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_2_4.xsd"&gt;
+ &lt;entity class="quickstart.demo.model.Inventory" <span class="bold">access="VIRTUAL"</span>&gt;
+ &lt;attributes&gt;
+ &lt;id name="itemSku" attribute-type="long"&gt;
+
+ &lt;/id&gt;
+ &lt;/attributes&gt;
+ &lt;/entity&gt;
+ &lt;entity ..."&gt;
+ &lt;/entity&gt;
+&lt;/entity-mappings&gt;
+</pre></div>
+<!-- class="example" --></div>
+<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm
index b3fee1f68d..e47eb0f5d9 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm
@@ -3,90 +3,80 @@
<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>Error messages</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:45Z" />
+<title>Validating mappings and reporting problems</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Error messages" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Validating mappings and reporting problems" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIHFEDEI" name="CIHFEDEI"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Error messages<a id="sthref172" name="sthref172"></a></h1>
-<p>This section contains information on error messages (including how to resolve the issue) you may encounter while working with Dali.</p>
-<a id="sthref173" name="sthref173"></a>
-<p class="subhead2">Attribute "<span class="italic">&lt;ATTRIBUTE__NAME&gt;</span>" has invalid mapping type in this context</p>
-<p>The mapped attribute is invalid. Either change the mapping type or change the entity type.</p>
-<p>See <a href="task_mapping.htm#BABDGBIJ">"Mapping an entity"</a> for more information.</p>
-<a id="sthref174" name="sthref174"></a>
-<p class="subhead2">Attribute "<span class="italic">&lt;ATTRIBUTE_NAME&gt;</span>" cannot be resolved.</p>
-<p>Dali cannot map the attribute to a database table and column. Verify that you database connection information is correct.</p>
-<p>See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> for more information.</p>
-<a id="sthref175" name="sthref175"></a>
-<p class="subhead2">Class "<span class="italic">&lt;CLASS_NAME&gt;</span>" is not annotated as a persistent class.</p>
-<p>The class has not been identified as a persistent class. Configure the class as an Entity, Mapped Superclass, or Embeddable persistent entity.</p>
-<p>See <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a>.</p>
-<a id="sthref176" name="sthref176"></a>
-<p class="subhead2">Column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" cannot be resolved.</p>
-<p>You mapped an entity's field to an incorrect or invalid column in the database table. By default, Dali will attempt to map each field in the entity with an identically named row in the database table. If the field's name differs from the row's name, you must explicitly create the mapping.</p>
-<p>Map the field to a valid row in the database table as shown in <a href="task_mapping.htm#BABDGBIJ">"Mapping an entity"</a>.</p>
-<a id="sthref177" name="sthref177"></a>
-<p class="subhead2">Duplicate class "<span class="italic">&lt;CLASS_NAME&gt;</span>".</p>
-<p>You created to persistence classes with the same name. Each Java class must have a unique name. See <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a> for more information.</p>
-<a id="sthref178" name="sthref178"></a>
-<p class="subhead2">Entity does not have an Id or Embedded Id.</p>
-<p>You created a persistent entity without identifying its primary key. A persistent entity must have a primary key field designated with an <code>@Id</code> or <code>@EmbeddedId</code> annotation.</p>
-<p>Add an ID mapping to the entity as shown in <a href="tasks013.htm#BABGCBHG">"ID mapping"</a> or <a href="tasks012.htm#CIHDIAEE">"Embedded ID mapping"</a>.</p>
-<a id="sthref179" name="sthref179"></a>
-<p class="subhead2">Multiple persistence.xml files in project.</p>
-<p>You created a JPA project with more than one <code>persistence.xml</code> file. Each JPA project must contain a <span class="italic">single</span> <code>persistence.xml</code> file.</p>
-<p>See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for more information.</p>
-<a id="sthref180" name="sthref180"></a>
-<p class="subhead2">No persistence unit defined.</p>
-<p>There is no persistence unit defined in the <code>persistence.xml</code> file. Use the &lt;persistence-unit name="<span class="italic">&lt;PERSISTENCE_UNIT_NAME&gt;</span>" tag to define the persistent unit.</p>
-<p>See <a href="task_manage_orm.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
-<a id="sthref181" name="sthref181"></a>
-<p class="subhead2">No persistence.xml file in project.</p>
-<p>You created a JPA project without a <code>persistence.xml</code> file. Each JPA project must contain a <span class="italic">single</span> <code>persistence.xml</code> file.</p>
-<p>See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for more information.</p>
-<a id="sthref182" name="sthref182"></a>
-<p class="subhead2">Referenced column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" in join column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" cannot be resolved.</p>
-<p>The column that you selected to join a relationship mapping does not exist on the database table. Either select a different column on the <a href="reference011.htm#CACBAEBC">Join Table Information</a> or create the necessary column on the database table.</p>
-<p>See <a href="ref_persistence_map_view.htm#BABIFBAF">"JPA Details view (for attributes)"</a> for more information.</p>
-<a id="sthref183" name="sthref183"></a>
-<p class="subhead2">Schema "&lt;<span class="italic">SCHEMA_NAME</span>&gt;" cannot be resolved for table/join table "&lt;<span class="italic">TABLE_NAME</span>&gt;".</p>
-<p>Define the default database schema information in the persistence unit.</p>
-<p>See <a href="task_manage_orm.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
-<a id="sthref184" name="sthref184"></a>
-<p class="subhead2">Table "<span class="italic">&lt;TABLE_NAME&gt;</span>" cannot be resolved.</p>
-<p>You associated a persistent entity to an incorrect or invalid database table. By default, Dali will attempt to associate each persistent entity with an identically named database table. If the entity's name differs from the table's name, you must explicitly create the association.</p>
-<p>Associate the entity with a valid database table as shown in <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a>.</p>
-<a id="sthref185" name="sthref185"></a>
-<p class="subhead2">Unresolved generator "<span class="italic">&lt;GENERATOR_NAME&gt;</span>" is defined in persistence unit.</p>
-<p>You created a persistence entity that uses sequencing or a table generator, but did not define the generator in the persistence unit. Either define the generator by using an annotation or including it in the XML mapping file.</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="BABFAIBA" name="BABFAIBA"></a></p>
+<div class="sect1">
+<h1>Validating mappings and reporting problems</h1>
+<p><a id="sthref257" name="sthref257"></a><a id="sthref258" name="sthref258"></a><a id="sthref259" name="sthref259"></a><a id="sthref260" name="sthref260"></a>Errors and warnings on persistent entities and mappings are indicated with a red error or yellow warning next to the resource with the error, as well as the parent containers up to the project.</p>
+<div align="center">
+<div class="inftblnotealso"><br />
+<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0">
+<tbody>
+<tr>
+<td align="left">
+<p class="notep1">Tip:</p>
+<p>Use the <a href="reference059.htm#CACEEJJB">Project Properties page &ndash; Errors/Warnings</a> and <a href="reference056.htm#CACFGIDG">Java Persistence Preferences page &ndash; Errors/Warnings</a> to specify which problems Dali will report.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblnotealso" --></div>
+<div class="figure"><a id="sthref261" name="sthref261"></a>
+<p class="titleinfigure">Sample Errors and Warnings</p>
+<img src="img/error_sample.png" alt="This figure shows sample error and warning icons in the Explorer view." title="This figure shows sample error and warning icons in the Explorer view." /><br /></div>
+<!-- class="figure" -->
+<p>This section contains information on the following:</p>
+<ul>
+<li>
+<p><a href="tasks025.htm#CIHFEDEI">Error messages</a></p>
+</li>
+<li>
+<p><a href="tasks026.htm#CIHGEAIJ">Warning messages</a></p>
+</li>
+</ul>
+<a id="sthref262" name="sthref262"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="reference059.htm#CACEEJJB">Project Properties page &ndash; Errors/Warnings</a></p>
+</li>
+<li>
+<p><a href="reference056.htm#CACFGIDG">Java Persistence Preferences page &ndash; Errors/Warnings</a></p>
+</li>
+</ul>
+<a id="sthref263" name="sthref263"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
<p><a href="../org.eclipse.platform.doc.user/concepts/cprbview.htm">Problems view</a></p>
-</div>
-<!-- class="sect2" -->
+</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, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm
index f6bbacb426..809a92670c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm
@@ -3,48 +3,98 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Warning messages</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:45Z" />
+<title>Error messages</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Warning messages" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Error messages" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="CIHGEAIJ" name="CIHGEAIJ"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIHFEDEI" name="CIHFEDEI"></a></p>
<div class="sect2"><!-- infolevel="all" infotype="General" -->
-<h1>Warning messages</h1>
-<p>This section contains information on warning messages (including how to resolve the issue) you may encounter while working with Dali.</p>
-<a id="sthref186" name="sthref186"></a>
-<p class="subhead2">Connection "<span class="italic">&lt;CONNECTION_NAME&gt;</span>" is not active. No validation will be done against the data source.</p>
-<p>The database connection you specified to use with the JPA project is not active. The JPA project requires an active connection.</p>
-<a id="sthref187" name="sthref187"></a>
-<p class="subhead2">No connection specified for the project. No data-specific validation will be performed.</p>
-<p>You created a JPA project without specifying a database connection. The JPA project requires an active connection.</p>
-<p>See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> or <a href="tasks026.htm#BABDBCBI">"Modifying persistent project properties"</a> for information on specifying a database connection.</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
+<h1>Error messages<a id="sthref264" name="sthref264"></a></h1>
+<p>This section contains information on error messages (including how to resolve the issue) you may encounter while working with Dali.</p>
+<a id="sthref265" name="sthref265"></a>
+<p class="subhead2">Attribute "<span class="italic">&lt;ATTRIBUTE__NAME&gt;</span>" has invalid mapping type in this context</p>
+<p>The mapped attribute is invalid. Either change the mapping type or change the entity type.</p>
+<p>See <a href="task_mapping.htm#BABDGBIJ">"Mapping an entity"</a> for more information.</p>
+<a id="sthref266" name="sthref266"></a>
+<p class="subhead2">Attribute "<span class="italic">&lt;ATTRIBUTE_NAME&gt;</span>" cannot be resolved.</p>
+<p>Dali cannot map the attribute to a database table and column. Verify that you database connection information is correct.</p>
+<p>See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> for more information.</p>
+<a id="sthref267" name="sthref267"></a>
+<p class="subhead2">Class "<span class="italic">&lt;CLASS_NAME&gt;</span>" is not annotated as a persistent class.</p>
+<p>The class has not been identified as a persistent class. Configure the class as an Entity, Mapped Superclass, or Embeddable persistent entity.</p>
+<p>See <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a>.</p>
+<a id="sthref268" name="sthref268"></a>
+<p class="subhead2">Column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" cannot be resolved.</p>
+<p>You mapped an entity's field to an incorrect or invalid column in the database table. By default, Dali will attempt to map each field in the entity with an identically named row in the database table. If the field's name differs from the row's name, you must explicitly create the mapping.</p>
+<p>Map the field to a valid row in the database table as shown in <a href="task_mapping.htm#BABDGBIJ">"Mapping an entity"</a>.</p>
+<a id="sthref269" name="sthref269"></a>
+<p class="subhead2">Duplicate class "<span class="italic">&lt;CLASS_NAME&gt;</span>".</p>
+<p>You created to persistence classes with the same name. Each Java class must have a unique name. See <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a> for more information.</p>
+<a id="sthref270" name="sthref270"></a>
+<p class="subhead2">Embeddable attribute "<span class="italic">&lt;ATTRIBUTE_NAME&gt;</span>" mapped to unresolved column.</p>
+<p><span class="italic">Complete information will be available in a future build.</span></p>
+<a id="sthref271" name="sthref271"></a>
+<p class="subhead2">Entity does not have an Id or Embedded Id.</p>
+<p>You created a persistent entity without identifying its primary key. A persistent entity must have a primary key field designated with an <code>@Id</code> or <code>@EmbeddedId</code> annotation.</p>
+<p>Add an ID mapping to the entity as shown in <a href="tasks014.htm#BABGCBHG">"ID mapping"</a> or <a href="tasks013.htm#CIHDIAEE">"Embedded ID mapping"</a>.</p>
+<a id="sthref272" name="sthref272"></a>
+<p class="subhead2">Multiple persistence.xml files in project.</p>
+<p>You created a JPA project with more than one <code>persistence.xml</code> file. Each JPA project must contain a <span class="italic">single</span> <code>persistence.xml</code> file.</p>
+<p>See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for more information.</p>
+<a id="sthref273" name="sthref273"></a>
+<p class="subhead2">No persistence unit defined.</p>
+<p>There is no persistence unit defined in the <code>persistence.xml</code> file. Use the &lt;persistence-unit name="<span class="italic">&lt;PERSISTENCE_UNIT_NAME&gt;</span>" tag to define the persistent unit.</p>
+<p>See <a href="task_manage_orm.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
+<a id="sthref274" name="sthref274"></a>
+<p class="subhead2">No persistence.xml file in project.</p>
+<p>You created a JPA project without a <code>persistence.xml</code> file. Each JPA project must contain a <span class="italic">single</span> <code>persistence.xml</code> file.</p>
+<p>See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for more information.</p>
+<a id="sthref275" name="sthref275"></a>
+<p class="subhead2">Referenced column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" in join column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" cannot be resolved.</p>
+<p>The column that you selected to join a relationship mapping does not exist on the database table. Either select a different column on the <a href="reference039.htm#CACIJEGI">Joining Strategy</a> or create the necessary column on the database table.</p>
+<p>See <a href="ref_persistence_map_view.htm#BABIFBAF">"JPA Details view (for attributes)"</a> for more information.</p>
+<a id="sthref276" name="sthref276"></a>
+<p class="subhead2">Schema "&lt;<span class="italic">SCHEMA_NAME</span>&gt;" cannot be resolved for table/join table "&lt;<span class="italic">TABLE_NAME</span>&gt;".</p>
+<p>Define the default database schema information in the persistence unit.</p>
+<p>See <a href="task_manage_orm.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
+<a id="sthref277" name="sthref277"></a>
+<p class="subhead2">Table "<span class="italic">&lt;TABLE_NAME&gt;</span>" cannot be resolved.</p>
+<p>You associated a persistent entity to an incorrect or invalid database table. By default, Dali will attempt to associate each persistent entity with an identically named database table. If the entity's name differs from the table's name, you must explicitly create the association.</p>
+<p>Associate the entity with a valid database table as shown in <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a>.</p>
+<a id="sthref278" name="sthref278"></a>
+<p class="subhead2">Unresolved generator "<span class="italic">&lt;GENERATOR_NAME&gt;</span>" is defined in persistence unit.</p>
+<p>You created a persistence entity that uses sequencing or a table generator, but did not define the generator in the persistence unit. Either define the generator by using an annotation or including it in the XML mapping file.</p>
+<a id="sthref279" name="sthref279"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
<p><a href="../org.eclipse.platform.doc.user/concepts/cprbview.htm">Problems view</a></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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks026.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks026.htm
index 295a03a8bb..655bffd63b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks026.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks026.htm
@@ -3,49 +3,41 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Modifying persistent project properties</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:45Z" />
+<title>Warning messages</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Modifying persistent project properties" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Warning messages" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
-<p><a id="BABDBCBI" name="BABDBCBI"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Modifying persistent project properties</h1>
-<p>Each persistent project must be associated with a database connection. To create a new database connection, click <span class="gui-object-action">Database Connection</span> use the New Connection wizard.</p>
-<p>Use this procedure to modify the vender-specific platform and database connection associated with your JPA project.</p>
-<ol>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIHGEAIJ" name="CIHGEAIJ"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<h1>Warning messages</h1>
+<p>This section contains information on warning messages (including how to resolve the issue) you may encounter while working with Dali.</p>
+<a id="sthref280" name="sthref280"></a>
+<p class="subhead2">Connection "<span class="italic">&lt;CONNECTION_NAME&gt;</span>" is not active. No validation will be done against the data source.</p>
+<p>The database connection you specified to use with the JPA project is not active. The JPA project requires an active connection.</p>
+<a id="sthref281" name="sthref281"></a>
+<p class="subhead2">No connection specified for the project. No data-specific validation will be performed.</p>
+<p>You created a JPA project without specifying a database connection. The JPA project requires an active connection.</p>
+<p>See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> or <a href="tasks027.htm#BABDBCBI">"Modifying persistent project properties"</a> for information on specifying a database connection.</p>
+<a id="sthref282" name="sthref282"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
<li>
-<p>Right-click the project in the <span class="gui-object-title">Explorer</span> view and select <span class="gui-object-action">Properties</span>. The Properties page appears.</p>
-<div class="figure"><a id="sthref188" name="sthref188"></a>
-<p class="titleinfigure">The Properties Page</p>
-<img src="img/project_properties_tasks.png" alt="The Persistence page." title="The Persistence page." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Complete each field on the <a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; Java Persistence Options</a> click <span class="bold">OK</span>.</p>
+<p><a href="../org.eclipse.platform.doc.user/concepts/cprbview.htm">Problems view</a></p>
</li>
-</ol>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br />
-<a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; Java Persistence Options</a>
-<p>&nbsp;</p>
-<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
-<br />
-<a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a></div>
+</ul>
+</div>
+<!-- class="sect2" -->
<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
@@ -53,11 +45,11 @@
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks027.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks027.htm
new file mode 100644
index 0000000000..da786e4c55
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks027.htm
@@ -0,0 +1,76 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<title>Modifying persistent project properties</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Modifying persistent project properties" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="BABDBCBI" name="BABDBCBI"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>Modifying persistent project properties</h1>
+<p>Each persistent project must be associated with a database connection. To create a new database connection, click <span class="gui-object-action">Database Connection</span> use the New Connection wizard.</p>
+<p>Use this procedure to modify the vender-specific platform and database connection associated with your JPA project.</p>
+<ol>
+<li>
+<p>Right-click the project in the <span class="gui-object-title">Explorer</span> view and select <span class="gui-object-action">Properties</span>. The Properties page appears.</p>
+</li>
+<li>
+<p>Select <span class="bold">JPA</span>.</p>
+<div class="figure"><a id="sthref283" name="sthref283"></a>
+<p class="titleinfigure">The Properties Page</p>
+<img src="img/project_properties_tasks.png" alt="The Persistence page." title="The Persistence page." /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>Complete each field on the <a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; JPA Options</a> click <span class="bold">OK</span>.</p>
+</li>
+</ol>
+<a id="sthref284" name="sthref284"></a>
+<p class="subhead2">Related tasks</p>
+<ul>
+<li>
+<p><a href="task_create_new_project.htm#CIHHEJCJ">Creating a new JPA project</a></p>
+</li>
+</ul>
+<a id="sthref285" name="sthref285"></a>
+<p class="subhead2">Related reference</p>
+<ul>
+<li>
+<p><a href="ref_project_properties.htm#BABJHBCI">Project Properties page &ndash; JPA Options</a></p>
+</li>
+</ul>
+<a id="sthref286" name="sthref286"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks028.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks028.htm
new file mode 100644
index 0000000000..5315550132
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks028.htm
@@ -0,0 +1,61 @@
+<!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>Converting JPA metadata to XML</title>
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:6Z" />
+<meta name="robots" content="noarchive" />
+<meta name="doctitle" content="Converting JPA metadata to XML" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+</head>
+<body>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CIHEHCHB" name="CIHEHCHB"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>Converting JPA metadata to XML</h1>
+<p>Starting in Release 3.2, Dali can convert all of the annotated JPA metadata into an XML mapping file. This allows you to maintain the global metadata for a persistence unit (such as queries and generators) in an XML mapping file.</p>
+<ol>
+<li>
+<p>Right-click the project in the <span class="gui-object-title">Explorer</span> view and select <span class="gui-object-action">JPA Tools &gt; Move to XML</span> &gt; specific metadata (such as <span class="bold">Java Converters</span>, <span class="bold">Java Queries</span>, or <span class="bold">Java Generators</span>).</p>
+<div class="figure"><a id="sthref287" name="sthref287"></a>
+<p class="titleinfigure">Moving Metadata to XML</p>
+<img src="img/move_to_xml.png" alt="Moving Metadata to XML" title="Moving Metadata to XML" /><br /></div>
+<!-- class="figure" -->
+<p>The <a href="reference064.htm#CACJBCGG">JPA Metadata Conversion dialog</a> page appears.</p>
+</li>
+<li>
+<p>Enter the filename and location of the XML mapping file, and click <span class="bold">Finish</span>.</p>
+</li>
+</ol>
+<p>Dali generates the XML file.</p>
+<a id="sthref288" name="sthref288"></a>
+<p class="subhead2">Related concepts</p>
+<ul>
+<li>
+<p><a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</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"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tips_and_tricks.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tips_and_tricks.htm
index a47917f7e1..e2d24c2bd0 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tips_and_tricks.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tips_and_tricks.htm
@@ -3,66 +3,76 @@
<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>Tips and tricks</title>
-<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" />
-<meta name="date" content="2010-05-19T8:12:49Z" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
+<meta name="date" content="2012-09-11T7:44:9Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content=" Tips and tricks" />
-<meta name="relnum" content="Release 2.3" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
+<meta name="doctitle" content="Tips and tricks" />
+<meta name="relnum" content="Release 3.2" />
+<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<!-- contents -->
</head>
<body>
<p><a id="CHDHGHBF" name="CHDHGHBF"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
<h1>Tips and tricks</h1>
<p>The following tips and tricks give some helpful ideas for increasing your productivity.</p>
-<ul>
-<li>
-<p><a href="#BABFIIHA"><span class="bold">Database Connections</span></a></p>
-</li>
-<li>
-<p><a href="#BABCHAHF"><span class="bold">Schema-based persistence.xml</span></a></p>
-</li>
-</ul>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table lists the tips and tricks in this category." summary="This table lists the tips and tricks in this category." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<col width="27%" />
+<div class="inftblhruleinformalwide">
+<table class="HRuleInformalWide" summary="Tips and Tricks" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
+<col width="24%" />
<col width="*" />
-<thead>
+<tbody>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t2">Tip</th>
-<th align="left" valign="bottom" id="r1c2-t2">Description</th>
+<td align="left" id="r1c1-t2">
+<p><span class="bold">Database connections</span></p>
+</td>
+<td align="left">
+<p>When starting a new workbench session, be sure to <a href="../org.eclipse.datatools.connectivity.doc.user/doc/html/asc1229700343352.html">reconnect to your database</a> (if you are working online). This allows Dali to provide database-related mapping assistance and validation.</p>
+</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t2">
+<p><span class="bold">Schema-based persistence.xml file</span></p>
+</td>
+<td align="left" headers="r2c1-t2">
+<p>If you are behind a firewall, you may need to configure your Eclipse workspace proxy in the <a href="../org.eclipse.platform.doc.user/reference/ref-72.htm">Preferences dialog</a> (<span class="gui-object-action">Preferences &gt; Internet &gt; Proxy Settings</span>) to properly validate a schema-based <code>persistence.xml</code> file.</p>
+</td>
</tr>
-</thead>
-<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t2" headers="r1c1-t2"><a id="BABFIIHA" name="BABFIIHA"></a><span class="bold">Database Connections</span></td>
-<td align="left" headers="r2c1-t2 r1c2-t2">When starting a new workbench session, be sure to <a href="../org.eclipse.datatools.connectivity.doc.user/doc/html/asc1229700343352.html">reconnect to your database</a> (if you are working online). This allows Dali to provide database-related mapping assistance and validation.</td>
+<td align="left" id="r3c1-t2">
+<p><span class="bold">@XmlPath content assist and validation</span></p>
+</td>
+<td align="left" headers="r3c1-t2">
+<p>Dali supports <code>@XmlPath</code> content assist and validation. You can now easily traverse deeply nested XML structures specifying <code>XmlPath</code> values.</p>
+<img src="img/xmlpath_validation.png" alt="" title="" /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t2" headers="r1c1-t2"><a id="BABCHAHF" name="BABCHAHF"></a><span class="bold">Schema-based persistence.xml</span></td>
-<td align="left" headers="r3c1-t2 r1c2-t2">If you are behind a firewall, you may need to configure your Eclipse workspace proxy in the <a href="../org.eclipse.platform.doc.user/reference/ref-72.htm">Preferences dialog</a> (<span class="gui-object-action">Preferences &gt; Internet &gt; Proxy Settings</span>) to properly validate a schema-based <code>persistence.xml</code> file.</td>
+<td align="left" id="r4c1-t2">
+<p><span class="bold">Making persistent entities</span></p>
+</td>
+<td align="left" headers="r4c1-t2">
+<p>With the <a href="reference065.htm#CACIBDFB">Make Persistent dialog</a>, you can easily transform Java classes into persistent entities via Java annotation or entry in an XML mapping file. With multi-select, you can quickly create many entities at once.</p>
+<img src="img/MakePersistentMenu.png" alt="" title="" /></td>
</tr>
</tbody>
</table>
<br /></div>
-<!-- class="inftblruleinformal" -->
+<!-- class="inftblhruleinformalwide" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<col width="86%" />
<col width="*" />
<tr>
-<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2010,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span><br />
+<td align="left"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2011, 2012,&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>
+</html> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/title.htm b/jpa/plugins/org.eclipse.jpt.doc.user/title.htm
index c6bac63f14..d2185ff5db 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/title.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/title.htm
@@ -5,25 +5,33 @@
<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>Legal</title>
+<title>Dali Java Persistence Tools User Guide</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-08-31T7:10:28Z" />
+<meta name="date" content="2012-09-11T7:44:3Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content=" Legal" />
+<meta name="doctitle" content="Dali Java Persistence Tools User Guide" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p><a id="sthref486" name="sthref486"></a></p>
-<p class="betadraftsubtitle">Beta Draft: 2012-08-31</p>
-<h1>Legal</h1>
-<p>Copyright &copy; 2011, 2012, Oracle. All rights reserved.</p>
-<p>This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at:</p>
-<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>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<h1>Dali Java Persistence Tools</h1>
+<p class="booktitle">User Guide</p>
+<p></p>
+<p class="invpartnumber">Release 3.2</p>
+<p class="date">August 2012</p>
+<p class="legalnotice">Beta Draft</p>
+<p><a id="sthref1" name="sthref1"></a></p>
+<hr />
+<p>Dali Java Persistence Tools User Guide</p>
+<p>Release 3.2</p>
+<p>Copyright &copy; 2011, 2012,&nbsp;Oracle and/or its affiliates. All rights reserved.</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.</p>
+<p class="alphabetanotice">This documentation is in pre-production status and is intended for demonstration and preliminary use only. It may not be specific to the hardware on which you are using the software. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to this documentation and will not be responsible for any loss, costs, or damages incurred due to the use of this documentation.</p>
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml b/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml
index 976debe599..4cb3779ada 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml
@@ -1,155 +1,188 @@
-<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- User Guide -->
- <toc label="Dali Java Persistence Tools User Guide">
+<?xml version='1.0' encoding='UTF-8'?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+<toc label="Dali Java Persistence Tools User Guide">
<topic href="getting_started.htm" label="Getting started">
- <topic href="getting_started001.htm#BABEFHCD" label="Requirements and installation" />
- <topic href="getting_started002.htm#BABIGCJA" label="Dali quick start">
- <topic href="getting_started003.htm#BABDFHDA" label="Creating a new JPA project" />
- <topic href="getting_started004.htm#BABFGDDG" label="Creating a Java persistent entity with persistent fields" />
+ <topic href="getting_started001.htm" label="Requirements and installation" />
+ <topic href="getting_started002.htm" label="Dali quick start">
+ <topic href="getting_started003.htm" label="Creating a new JPA project" />
+ <topic href="getting_started004.htm" label="Creating a Java persistent entity with persistent fields" />
</topic>
</topic>
- <topic href="concepts.htm" label=" Concepts">
- <topic href="concept_persistence.htm#BABCAHIC" label="Understanding Java persistence" />
- <topic href="concept_mapping.htm#BABBDJFI" label="Understanding OR mappings" />
- <topic href="concepts001.htm#BABBGFJG" label="Understanding EJB 3.0 Java Persistence API">
- <topic href="concepts002.htm#CHDHAGIH" label="The persistence.xml file" />
- <topic href="concepts003.htm#CHDBIJAC" label="The orm.xml file" />
+ <topic href="concepts.htm" label="Concepts">
+ <topic href="concept_persistence.htm" label="Understanding Java persistence" />
+ <topic href="concept_mapping.htm" label="Understanding OR mappings" />
+ <topic href="concepts001.htm" label="Understanding Java Persistence API">
+ <topic href="concepts002.htm" label="The persistence.xml file" />
+ <topic href="concepts003.htm" label="The orm.xml file" />
</topic>
</topic>
- <topic href="tasks.htm" label=" Tasks">
- <topic href="task_create_new_project.htm#CIHHEJCJ" label="Creating a new JPA project" />
- <topic href="tasks001.htm#BEIBADHH" label="Converting a Java Project to a JPA Project" />
- <topic href="task_create_jpa_entity.htm#BABFBJBG" label="Creating a JPA Entity" />
- <topic href="task_manage_persistence.htm#CIHDAJID" label="Managing the persistence.xml file">
- <topic href="tasks002.htm#CIHFEBAI" label="Synchronizing classes" />
- <topic href="tasks003.htm#sthref56" label="Upgrading document version" />
+ <topic href="tasks.htm" label="Tasks">
+ <topic href="task_create_new_project.htm" label="Creating a new JPA project" />
+ <topic href="tasks001.htm" label="Converting a Java project to a JPA project" />
+ <topic href="task_create_jpa_entity.htm" label="Creating a JPA entity" />
+ <topic href="task_add_persistence.htm" label="Adding persistence to a class">
+ <topic href="tasks002.htm" label="Entity" />
+ <topic href="tasks003.htm" label="Embeddable" />
+ <topic href="tasks004.htm" label="Mapped superclass" />
</topic>
- <topic href="task_manage_orm.htm#CIHDGDCD" label="Managing the orm.xml file">
- <topic href="tasks004.htm#sthref60" label="Creating an orm.xml file" />
- <topic href="tasks005.htm#CIHBCDCE" label="Working with orm.xml file" />
+ <topic href="tasks005.htm" label="Adding virtual attributes" />
+ <topic href="task_manage_persistence.htm" label="Managing the persistence.xml file">
+ <topic href="tasks006.htm" label="Synchronizing classes" />
</topic>
- <topic href="task_add_persistence.htm#BABHICAI" label="Adding persistence to a class">
- <topic href="tasks006.htm#BABGBIEE" label="Entity" />
- <topic href="tasks007.htm#BABFEICE" label="Embeddable" />
- <topic href="tasks008.htm#BABDAGCI" label="Mapped superclass" />
+ <topic href="task_manage_orm.htm" label="Managing the orm.xml file">
+ <topic href="tasks007.htm" label="Creating an orm.xml file" />
+ <topic href="tasks008.htm" label="Working with orm.xml file" />
</topic>
- <topic href="task_additonal_tables.htm#CIHGBIEI" label="Specifying additional tables" />
- <topic href="task_inheritance.htm#CIHCCCJD" label="Specifying entity inheritance" />
- <topic href="tasks009.htm#BABIGBGG" label="Creating Named Queries" />
- <topic href="task_mapping.htm#BABDGBIJ" label="Mapping an entity">
- <topic href="tasks010.htm#BABBABCE" label="Basic mapping" />
- <topic href="tasks011.htm#BABCBHDF" label="Embedded mapping" />
- <topic href="tasks012.htm#CIHDIAEE" label="Embedded ID mapping" />
- <topic href="tasks013.htm#BABGCBHG" label="ID mapping" />
- <topic href="tasks014.htm#BABEIEGD" label="Many-to-many mapping" />
- <topic href="tasks015.htm#BABHFAFJ" label="Many-to-one mapping" />
- <topic href="tasks016.htm#BABHGEBD" label="One-to-many mapping" />
- <topic href="tasks017.htm#BABFHBCJ" label="One-to-one mapping" />
- <topic href="tasks018.htm#BABHFHEI" label="Transient mapping" />
- <topic href="tasks019.htm#BABHIBII" label="Version mapping" />
- <topic href="tasks020.htm#CIHBDEAJ" label="Element Collection mapping" />
+ <topic href="task_additonal_tables.htm" label="Specifying additional tables" />
+ <topic href="task_inheritance.htm" label="Specifying entity inheritance" />
+ <topic href="tasks009.htm" label="Creating queries" />
+ <topic href="task_mapping.htm" label="Mapping an entity">
+ <topic href="tasks010.htm" label="Basic mapping" />
+ <topic href="tasks011.htm" label="Element collection mapping" />
+ <topic href="tasks012.htm" label="Embedded mapping" />
+ <topic href="tasks013.htm" label="Embedded ID mapping" />
+ <topic href="tasks014.htm" label="ID mapping" />
+ <topic href="tasks015.htm" label="Many-to-many mapping" />
+ <topic href="tasks016.htm" label="Many-to-one mapping" />
+ <topic href="tasks017.htm" label="One-to-many mapping" />
+ <topic href="tasks018.htm" label="One-to-one mapping" />
+ <topic href="tasks019.htm" label="Transient mapping" />
+ <topic href="tasks020.htm" label="Version mapping" />
</topic>
- <topic href="tasks021.htm#BABBAGFI" label="Generating entities from tables" />
- <topic href="tasks022.htm#CIHJIGBE" label="Generating tables from entities" />
- <topic href="tasks023.htm#BABFAIBA" label="Validating mappings and reporting problems">
- <topic href="tasks024.htm#CIHFEDEI" label="Error messages" />
- <topic href="tasks025.htm#CIHGEAIJ" label="Warning messages" />
+ <topic href="tasks021.htm" label="Generating entities from tables" />
+ <topic href="tasks022.htm" label="Generating tables from entities" />
+ <topic href="tasks023.htm" label="Generating dynamic entities from tables" />
+ <topic href="tasks024.htm" label="Validating mappings and reporting problems">
+ <topic href="tasks025.htm" label="Error messages" />
+ <topic href="tasks026.htm" label="Warning messages" />
</topic>
- <topic href="tasks026.htm#BABDBCBI" label="Modifying persistent project properties" />
- <topic href="task_generating_schema_from_classes.htm#CIHHBJCJ" label="Generating Schema from Classes" />
- <topic href="task_generate_classes_from_schema.htm#CIHCBHJD" label="Generating JAXB Classes from a Schema" />
+ <topic href="tasks027.htm" label="Modifying persistent project properties" />
+ <topic href="tasks028.htm" label="Converting JPA metadata to XML" />
</topic>
- <topic label=" Reference">
+ <topic label="Reference">
<topic label="Wizards">
- <topic href="ref_new_jpa_project_wizard.htm#CACBJGBG" label="Create New JPA Project wizard">
- <topic href="ref_new_jpa_project.htm#CACBJAGC" label="New JPA Project page" />
- <topic href="ref_java_page.htm#CIAGEBAA" label="Java Page" />
- <topic href="ref_jpa_facet.htm#CACIFDIF" label="JPA Facet page" />
+ <topic href="ref_create_custom_entities_wizard.htm" label="Generate Entities from Tables wizard">
+ <topic href="ref_selectTables.htm" label="Select Tables" />
+ <topic href="ref_tableAssociations.htm" label="Table Associations" />
+ <topic href="ref_customizeDefaultEntityGeneration.htm" label="Customize Default Entity Generation" />
+ <topic href="ref_customizIndividualEntities.htm" label="Customize Individual Entities" />
</topic>
- <topic href="ref_create_jpa_entity_wizard.htm#CIAGGGDF" label="Create JPA Entity wizard">
- <topic href="ref_EntityClassPage.htm#CIAFEIGF" label="Entity Class page" />
- <topic href="ref_EntityPropertiesPage.htm#CIADECIA" label="Entity Properties page" />
+ <topic href="reference002.htm" label="Generate Dynamic Entities from Tables wizard">
+ <topic href="reference003.htm" label="Select Tables" />
+ <topic href="reference004.htm" label="Table Associations" />
+ <topic href="reference005.htm" label="Customize Default Entity Generation" />
+ <topic href="reference006.htm" label="Customize Individual Entities" />
</topic>
- <topic href="reference002.htm#CIAIJCCE" label="Mapping File Wizard">
- <topic href="reference003.htm#CIAJEIDJ" label="Mapping File" />
+ <topic href="ref_create_jpa_entity_wizard.htm" label="Create JPA Entity wizard">
+ <topic href="ref_EntityClassPage.htm" label="Entity Class page" />
+ <topic href="ref_EntityPropertiesPage.htm" label="Entity Properties page" />
</topic>
- <topic href="reference004.htm#CIAGHCGA" label="Generate Tables from Entities Wizard" />
- <topic href="ref_create_custom_entities_wizard.htm#CIAGBFJE" label="Generate Entities from Tables Wizard">
- <topic href="ref_selectTables.htm#CIAHCGEE" label="Select Tables" />
- <topic href="ref_tableAssociations.htm#CIACDICB" label="Table Associations" />
- <topic href="ref_customizeDefaultEntityGeneration.htm#CIAEJDBE" label="Customize Default Entity Generation" />
- <topic href="ref_customizIndividualEntities.htm#CIACIGEE" label="Customize Individual Entities" />
+ <topic href="reference007.htm" label="Create ORM Mapping File wizard">
+ <topic href="reference008.htm" label="Mapping File Location" />
+ <topic href="reference009.htm" label="Mapping File Options" />
</topic>
- <topic href="ref_create_new_association_wizard.htm#CIAFGHIF" label="Create New Association">
- <topic href="ref_association_table.htm#CIAGJHDC" label="Association Tables" />
- <topic href="ref_join_columns.htm#CIAEGEEG" label="Join Columns" />
- <topic href="ref_association_cardinality.htm#CIAFIIFH" label="Association Cardinality" />
+ <topic href="ref_new_jpa_project_wizard.htm" label="Create New JPA Project wizard">
+ <topic href="ref_new_jpa_project.htm" label="New JPA Project page" />
+ <topic href="ref_java_page.htm" label="Java Page" />
+ <topic href="ref_jpa_facet.htm" label="JPA Facet page" />
</topic>
- <topic href="ref_jaxb_schema_wizard.htm#CACGADFH" label="Generate Schema from JAXB Classes Wizard">
- <topic href="ref_schema_from_classes_page.htm#CACHBEGJ" label="Generate Schema from Classes" />
+ <topic href="reference010.htm" label="Generate Tables from Entities wizard">
+ <topic href="reference011.htm" label="Schema Generation" />
+ </topic>
+ <topic href="ref_create_new_association_wizard.htm" label="Create New Association wizard">
+ <topic href="ref_association_table.htm" label="Association Tables" />
+ <topic href="ref_join_columns.htm" label="Join Columns" />
+ <topic href="ref_association_cardinality.htm" label="Association Cardinality" />
</topic>
</topic>
<topic label="Property pages">
- <topic href="ref_persistence_prop_view.htm#BABFAEBB" label="JPA Details view (for entities)">
- <topic href="reference006.htm#CACCAGGC" label="General information" />
- <topic href="reference007.htm#CACIJBGH" label="Attribute overrides" />
- <topic href="reference008.htm#CACBHIDA" label="Secondary table information" />
- <topic href="reference009.htm#CACFHGHE" label="Inheritance information" />
- <topic href="reference010.htm#sthref241" label="Queries" />
+ <topic href="ref_persistence_prop_view.htm" label="JPA Details view (for entities)">
+ <topic href="reference013.htm" label="Entity" />
+ <topic href="reference014.htm" label="Embeddable" />
+ <topic href="reference015.htm" label="Mapped Superclass" />
+ <topic href="reference016.htm" label="Caching" />
+ <topic href="reference017.htm" label="Queries" />
+ <topic href="reference018.htm" label="Inheritance" />
+ <topic href="reference019.htm" label="Attribute Overrides" />
+ <topic href="reference020.htm" label="Multitenancy" />
+ <topic href="reference021.htm" label="Primary Key Generation" />
+ <topic href="reference022.htm" label="Secondary tables" />
+ <topic href="reference023.htm" label="Converters" />
+ <topic href="reference024.htm" label="Advanced" />
</topic>
- <topic href="ref_persistence_map_view.htm#BABIFBAF" label="JPA Details view (for attributes)">
- <topic href="ref_mapping_general.htm#CACBHFIJ" label="General information" />
- <topic href="reference011.htm#CACBAEBC" label="Join Table Information" />
- <topic href="reference012.htm#CACFCEJC" label="Join Columns Information" />
- <topic href="ref_primary_key.htm#CACFCCAB" label="Primary Key Generation information" />
+ <topic href="ref_persistence_map_view.htm" label="JPA Details view (for attributes)">
+ <topic href="reference025.htm" label="Basic Mapping" />
+ <topic href="reference026.htm" label="Element Collection Mapping" />
+ <topic href="reference027.htm" label="Embedded Mapping" />
+ <topic href="reference028.htm" label="Embedded ID Mapping" />
+ <topic href="reference029.htm" label="ID Mapping" />
+ <topic href="reference030.htm" label="Many-to-Many Mapping" />
+ <topic href="reference031.htm" label="Many-to-One Mapping" />
+ <topic href="reference032.htm" label="One-to-Many Mapping" />
+ <topic href="reference033.htm" label="One-to-One Mapping" />
+ <topic href="reference034.htm" label="Version Mapping" />
+ <topic href="reference035.htm" label="Type information" />
+ <topic href="reference036.htm" label="Value" />
+ <topic href="reference037.htm" label="Converters" />
+ <topic href="reference038.htm" label="Ordering" />
+ <topic href="reference039.htm" label="Joining Strategy" />
+ <topic href="reference040.htm" label="Derived Identity" />
+ <topic href="ref_primary_key.htm" label="Primary Key Generation information" />
</topic>
- <topic href="ref_details_orm.htm#CACGDGHC" label="JPA Details view (for orm.xml)">
- <topic href="reference013.htm#CACCACGH" label="General information" />
- <topic href="reference014.htm#CACEAGBG" label="Persistence Unit information" />
- <topic href="reference015.htm#CIAFGAIJ" label="Generators" />
- <topic href="reference016.htm#CIAIBAAJ" label="Queries" />
- <topic href="reference017.htm#CIADGCID" label="Converters" />
+ <topic href="ref_details_orm.htm" label="JPA Details view (for orm.xml)">
+ <topic href="reference041.htm" label="Entity Mappings" />
+ <topic href="reference042.htm" label="Persistence Unit" />
+ <topic href="reference043.htm" label="Generators" />
+ <topic href="reference044.htm" label="Queries" />
+ <topic href="reference045.htm" label="Converters" />
</topic>
- <topic href="ref_persistence_outline.htm#BABEGGFE" label="JPA Structure view" />
- <topic href="ref_persistence_xmll_editor.htm#CIACCHID" label="persistence.xml Editor">
- <topic href="ref_persistence_general.htm#CIACIFGJ" label="General" />
- <topic href="reference018.htm#CIAFFJIE" label="Connection" />
- <topic href="reference019.htm#CIAJAFEG" label="Customization" />
- <topic href="reference020.htm#CIABEDCH" label="Caching" />
- <topic href="reference021.htm#CIABGHHI" label="Logging" />
- <topic href="reference022.htm#CIAFJCHE" label="Options" />
- <topic href="reference023.htm#CIACCFCB" label="Schema Generation" />
- <topic href="reference024.htm#CIAHJDFF" label="Properties" />
- <topic href="reference025.htm#CIAHCJAH" label="Source" />
+ <topic href="ref_persistence_outline.htm" label="JPA Structure view" />
+ <topic href="ref_persistence_xmll_editor.htm" label="persistence.xml Editor">
+ <topic href="ref_persistence_general.htm" label="General" />
+ <topic href="reference046.htm" label="Connection" />
+ <topic href="reference047.htm" label="Customization" />
+ <topic href="reference048.htm" label="Caching" />
+ <topic href="reference049.htm" label="Logging" />
+ <topic href="reference050.htm" label="Options" />
+ <topic href="reference051.htm" label="Schema Generation" />
+ <topic href="reference052.htm" label="Properties" />
+ <topic href="reference053.htm" label="Source" />
</topic>
</topic>
<topic label="Preferences">
- <topic href="ref_project_properties.htm#BABJHBCI" label="Project Properties page - Java Persistence Options" />
- <topic href="reference027.htm#CACFBAEH" label="Project Properties page - Validation Preferences" />
+ <topic href="reference055.htm" label="Java Persistence Preferences page - JPA" />
+ <topic href="reference056.htm" label="Java Persistence Preferences page - Errors/Warnings" />
+ <topic href="ref_project_properties.htm" label="Project Properties page - JPA Options" />
+ <topic href="reference057.htm" label="Project Properties page - EclipseLink" />
+ <topic href="reference058.htm" label="Project Properties Page - Entity Generation" />
+ <topic href="reference059.htm" label="Project Properties page - Errors/Warnings" />
</topic>
<topic label="Dialogs">
- <topic href="reference029.htm#CACCGEHC" label="Edit Join Columns Dialog" />
- <topic href="ref_select_cascade_dialog.htm#CIAFDGIJ" label="Select Cascade dialog" />
- <topic href="ref_eclipselink_mapping_file.htm#CIAEDEJF" label="New EclipseLink Mapping File dialog" />
- <topic href="ref_add_converter.htm#CIAGCGIJ" label="Add Converter dialog" />
- <topic href="ref_configure_jaxb_class_generation_dialog.htm#CACHHHJA" label="Configure JAXB Class Generation dialog" />
+ <topic href="reference061.htm" label="Edit Join Columns Dialog" />
+ <topic href="reference062.htm" label="Add Join Column dialog" />
+ <topic href="ref_select_cascade_dialog.htm" label="Select Cascade dialog" />
+ <topic href="ref_eclipselink_mapping_file.htm" label="New EclipseLink Mapping File dialog" />
+ <topic href="ref_add_converter.htm" label="Add Converter dialog" />
+ <topic href="reference063.htm" label="Mapping Type Selection dialog" />
+ <topic href="reference064.htm" label="JPA Metadata Conversion dialog" />
+ <topic href="reference065.htm" label="Make Persistent dialog" />
+ <topic href="reference066.htm" label="Add Query dialog" />
+ <topic href="reference067.htm" label="Add Primary Key Join Column dialog" />
</topic>
- <topic href="ref_persistence_perspective.htm#BABIFBDB" label="JPA Development perspective" />
+ <topic href="ref_persistence_perspective.htm" label="JPA Development perspective" />
<topic label="Icons and buttons">
- <topic href="reference031.htm#CACGEACG" label="Icons" />
- <topic href="reference032.htm#CACDJCEI" label="Buttons" />
+ <topic href="reference069.htm" label="Icons" />
+ <topic href="reference070.htm" label="Buttons" />
</topic>
- <topic href="reference033.htm#CACBBDIB" label="Dali Developer Documentation" />
- </topic>
- <topic href="tips_and_tricks.htm" label="Tips and tricks">
- <topic href="whats_new001.htm#sthref306" label="Improved Internationalization and Localization" />
- <topic href="whats_new002.htm#CJACEDDE" label="Multiple Improvements to the Dali Perspective" />
- <topic href="whats_new003.htm#CJADIFHJ" label="Support for JPA 2.0 and EclipseLink" />
- <topic href="whats_new004.htm#CJABIJEC" label="Conversion of Java Projects to JPA Projects" />
- <topic href="whats_new005.htm#CJACJBDA" label="EclipseLink 2.x Support" />
- <topic href="whats_new006.htm#sthref307" label="Table-per-Concrete-Class Inheritance" />
+ <topic href="reference071.htm" label="Dali Developer Documentation" />
</topic>
- <topic href="legal.htm" label=" Legal">
- <topic href="about.htm#sthref309" label="About this content" />
+ <topic href="tips_and_tricks.htm" label="Tips and tricks" />
+ <topic href="whats_new.htm" label="What's new">
+ <topic href="whats_new001.htm" label="EclipseLink multitenancy support" />
+ <topic href="whats_new002.htm" label="EclipseLink static weaving support" />
+ <topic href="whats_new003.htm" label="Generating EclipseLink dynamic entities from tables" />
+ <topic href="whats_new004.htm" label="Converting JPA metadata to XML" />
+ <topic href="whats_new005.htm" label="EclipseLink 2.4 support" />
</topic>
-</toc>
+ <topic href="legal.htm" label=" Legal" />
+</toc> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm
index 1e0148f333..9c53b9aefb 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm
@@ -5,38 +5,39 @@
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Dali Developer Documentation</title>
+<title>What's new</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-08-31T7:10:28Z" />
+<meta name="date" content="2012-09-11T7:44:9Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Dali Developer Documentation" />
+<meta name="doctitle" content="What's new" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-08-31</p>
-<p><a id="CACBBDIB" name="CACBBDIB"></a></p>
-<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Dali Developer Documentation</h1>
-<p><a id="sthref483" name="sthref483"></a><a id="sthref484" name="sthref484"></a><a id="sthref485" name="sthref485"></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="CEGIAIGD" name="CEGIAIGD"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<h1>What's new</h1>
+<p>This section contains descriptions of the following new features and significant changes made to the Dali OR Mapping Tool for Release 3.2 (Web Tools Platform 3.4):</p>
<ul>
<li>
-<p>Dali architecture</p>
+<p><a href="whats_new001.htm#CEGCBCGH">EclipseLink multitenancy support</a></p>
</li>
<li>
-<p>Plugins that comprise the Dali JPA Eclipse feature</p>
+<p><a href="whats_new002.htm#CEGJBECH">EclipseLink static weaving support</a></p>
</li>
<li>
-<p>Extension points</p>
+<p><a href="whats_new003.htm#CEGBGIJH">Generating EclipseLink dynamic entities from tables</a></p>
+</li>
+<li>
+<p><a href="whats_new004.htm#CEGIJHCJ">Converting JPA metadata to XML</a></p>
+</li>
+<li>
+<p><a href="whats_new005.htm#CEGIJCIF">EclipseLink 2.4 support</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%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm
index 47733c40e8..d7e41c7777 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm
@@ -5,63 +5,47 @@
<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>Tips and tricks</title>
+<title>EclipseLink multitenancy support</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-08-31T7:10:28Z" />
+<meta name="date" content="2012-09-11T7:44:9Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Tips and tricks" />
+<meta name="doctitle" content="EclipseLink multitenancy support" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p><a id="CHDHGHBF" name="CHDHGHBF"></a></p>
-<p class="betadraftsubtitle">Beta Draft: 2012-08-31</p>
-<h1>Tips and tricks</h1>
-<p>The following tips and tricks give some helpful ideas for increasing your productivity.</p>
-<div class="inftblhruleinformalwide">
-<table class="HRuleInformalWide" summary="Tips and Tricks" dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0">
-<col width="24%" />
-<col width="*" />
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r1c1-t2">
-<p><span class="bold">Database connections</span></p>
-</td>
-<td align="left">
-<p>When starting a new workbench session, be sure to <a href="../org.eclipse.datatools.connectivity.doc.user/doc/html/asc1229700343352.html">reconnect to your database</a> (if you are working online). This allows Dali to provide database-related mapping assistance and validation.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t2">
-<p><span class="bold">Schema-based persistence.xml file</span></p>
-</td>
-<td align="left" headers="r2c1-t2">
-<p>If you are behind a firewall, you may need to configure your Eclipse workspace proxy in the <a href="../org.eclipse.platform.doc.user/reference/ref-72.htm">Preferences dialog</a> (<span class="gui-object-action">Preferences &gt; Internet &gt; Proxy Settings</span>) to properly validate a schema-based <code>persistence.xml</code> file.</p>
-</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t2">
-<p><span class="bold">@XmlPath content assist and validation</span></p>
-</td>
-<td align="left" headers="r3c1-t2">
-<p>Dali supports <code>@XmlPath</code> content assist and validation. You can now easily traverse deeply nested XML structures specifying <code>XmlPath</code> values.</p>
-<img src="img/xmlpath_validation.png" alt="" title="" /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t2">
-<p><span class="bold">Making persistent entities</span></p>
-</td>
-<td align="left" headers="r4c1-t2">
-<p>With the <a href="reference065.htm#CACIBDFB">Make Persistent dialog</a>, you can easily transform Java classes into persistent entities via Java annotation or entry in an XML mapping file. With multi-select, you can quickly create many entities at once.</p>
-<img src="img/MakePersistentMenu.png" alt="" title="" /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblhruleinformalwide" -->
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CEGCBCGH" name="CEGCBCGH"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>EclipseLink multitenancy support</h1>
+<p>Dali Release 3.2 supports configuration of EclipseLink's multitenancy feature. Multitenancy allows multiple application tenants to share the same schema using tenant descriptor columns. Dali supports the following multitenant strategies:</p>
+<ul>
+<li>
+<p>Single table</p>
+</li>
+<li>
+<p>Table per tenant</p>
+</li>
+<li>
+<p>VPD</p>
+</li>
+</ul>
+<img src="img/jpa_details_multitenancy.png" alt="" title="" /><br />
+<p>For more information, see:</p>
+<ul>
+<li>
+<p><a href="reference020.htm#CACDIJEE">"Multitenancy"</a></p>
+</li>
+<li>
+<p>"Multitenant" in the <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span><br />
+<code><a href="http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_multitenant.htm">http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_multitenant.htm</a></code></p>
+</li>
+</ul>
+</div>
+<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm
index c13085fe0d..b26c805b33 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm
@@ -5,39 +5,36 @@
<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>What's new</title>
+<title>EclipseLink static weaving support</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-08-31T7:10:28Z" />
+<meta name="date" content="2012-09-11T7:44:9Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="What's new" />
+<meta name="doctitle" content="EclipseLink static weaving support" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p><a id="CEGIAIGD" name="CEGIAIGD"></a></p>
-<p class="betadraftsubtitle">Beta Draft: 2012-08-31</p>
-<h1>What's new</h1>
-<p>This section contains descriptions of the following new features and significant changes made to the Dali OR Mapping Tool for Release 3.2 (Web Tools Platform 3.4):</p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CEGJBECH" name="CEGJBECH"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<h1>EclipseLink static weaving support</h1>
+<p>Dali Release 3.2 allows the configuration of EclipseLink's weaving support at the project properties level. Static weaving allows you to use EclipseLink's weaving support in cases where dynamic weaving is not available or is not an option. Dali configures and executes the byte code weaving of compiled Java classes</p>
+<img src="img/properties_jpa_eclipselink.png" alt="persistence.xml Editor, Weaving options" title="persistence.xml Editor, Weaving options" /><br />
+<p>For more information, see:</p>
<ul>
<li>
-<p><a href="whats_new001.htm#CEGCBCGH">EclipseLink multitenancy support</a></p>
+<p><a href="reference057.htm#CACFJJGG">"Project Properties page &ndash; EclipseLink"</a></p>
</li>
<li>
-<p><a href="#CEGJBECH">EclipseLink static weaving support</a></p>
-</li>
-<li>
-<p><a href="whats_new003.htm#CEGBGIJH">Generating EclipseLink dynamic entities from tables</a></p>
-</li>
-<li>
-<p><a href="whats_new004.htm#CEGIJHCJ">Converting JPA metadata to XML</a></p>
-</li>
-<li>
-<p><a href="whats_new005.htm#CEGIJCIF">EclipseLink 2.4 support</a></p>
+<p>"Static Weaving" in the EclipseLink documentation<br />
+<code><a href="http://wiki.eclipse.org/EclipseLink/UserGuide/JPA/Advanced_JPA_Development/Performance/Weaving/Static_Weaving">http://wiki.eclipse.org/EclipseLink/UserGuide/JPA/Advanced_JPA_Development/Performance/Weaving/Static_Weaving</a></code></p>
</li>
</ul>
+</div>
+<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm
index 0559ac42db..ccc2c65c54 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm
@@ -5,43 +5,28 @@
<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>EclipseLink multitenancy support</title>
+<title>Generating EclipseLink dynamic entities from tables</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-08-31T7:10:28Z" />
+<meta name="date" content="2012-09-11T7:44:9Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="EclipseLink multitenancy support" />
+<meta name="doctitle" content="Generating EclipseLink dynamic entities from tables" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-08-31</p>
-<p><a id="CEGCBCGH" name="CEGCBCGH"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CEGBGIJH" name="CEGBGIJH"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>EclipseLink multitenancy support</h1>
-<p>Dali Release 3.2 supports configuration of EclipseLink's multitenancy feature. Multitenancy allows multiple application tenants to share the same schema using tenant descriptor columns. Dali supports the following multitenant strategies:</p>
-<ul>
-<li>
-<p>Single table</p>
-</li>
-<li>
-<p>Table per tenant</p>
-</li>
-<li>
-<p>VPD</p>
-</li>
-</ul>
-<img src="img/GraphicFile872.cgm" alt="" title="" />
+<h1>Generating EclipseLink dynamic entities from tables</h1>
+<p>When using EclipseLink JPA, you can create dynamic entities from your database tables. This dynamic persistence provides access to a relational database with all the benefits of JPA <span class="italic">without coding</span> or maintaining Java classes.</p>
+<img src="img/generate_dynamic_entities.png" alt="JPA Tools &gt; Generate Dynamic Entities from Tables" title="JPA Tools &gt; Generate Dynamic Entities from Tables" /><br />
<p>For more information, see:</p>
<ul>
<li>
-<p><a href="reference020.htm#CACDIJEE">"Multitenancy"</a></p>
-</li>
-<li>
-<p>"Multitenant" in the <span class="italic">Java Persistence API (JPA) Extensions Reference for EclipseLink</span><br />
-<code><a href="http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_multitenant.htm">http://www.eclipse.org/eclipselink/documentation/2.4/jpa/extensions/a_multitenant.htm</a></code></p>
+<p><a href="tasks023.htm#CIHHFGIG">"Generating dynamic entities from tables"</a></p>
</li>
</ul>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm
index d64bd71b3a..ff31065253 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm
@@ -5,32 +5,28 @@
<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>EclipseLink static weaving support</title>
+<title>Converting JPA metadata to XML</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-08-31T7:10:28Z" />
+<meta name="date" content="2012-09-11T7:44:9Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="EclipseLink static weaving support" />
+<meta name="doctitle" content="Converting JPA metadata to XML" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-08-31</p>
-<p><a id="CEGJBECH" name="CEGJBECH"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CEGIJHCJ" name="CEGIJHCJ"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>EclipseLink static weaving support</h1>
-<p>Dali Release 3.2 allows the configuration of EclipseLink's weaving support at the workspace or project properties level. Static weaving allows you to use EclipseLink's weaving support in cases where dynamic weaving is not available or is not an option</p>
-<img src="img/persistence_editor_customization.png" alt="persistence.xml Editor, Weaving options" title="persistence.xml Editor, Weaving options" />
+<h1>Converting JPA metadata to XML</h1>
+<p>Dali can convert JPA metadata (such as converters, queries, and generators) into an XML mapping file. This allows you to maintain the global metadata for a persistence unit (such as queries and generators) in an XML mapping file.</p>
+<img src="img/move_to_xml.png" alt="JPA Tools &gt; Generate Dynamic Entities from Tables" title="JPA Tools &gt; Generate Dynamic Entities from Tables" /><br />
<p>For more information, see:</p>
<ul>
<li>
-<p><a href="reference047.htm#CIAJAFEG">"Customization"</a></p>
-</li>
-<li>
-<p>"Static Weaving" in the EclipseLink documentation<br />
-<code><a href="http://wiki.eclipse.org/EclipseLink/UserGuide/JPA/Advanced_JPA_Development/Performance/Weaving/Static_Weaving">http://wiki.eclipse.org/EclipseLink/UserGuide/JPA/Advanced_JPA_Development/Performance/Weaving/Static_Weaving</a></code></p>
+<p><a href="tasks028.htm#CIHEHCHB">"Converting JPA metadata to XML"</a></p>
</li>
</ul>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm
index d1b30542bf..fd4866b5da 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm
@@ -5,30 +5,25 @@
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<title>Generating EclipseLink dynamic entities from tables</title>
+<title>EclipseLink 2.4 support</title>
<meta name="copyright" content="Copyright (c) 2000, 2009 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" />
<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 1.0.11" />
-<meta name="date" content="2012-08-31T7:10:28Z" />
+<meta name="date" content="2012-09-11T7:44:9Z" />
<meta name="robots" content="noarchive" />
-<meta name="doctitle" content="Generating EclipseLink dynamic entities from tables" />
+<meta name="doctitle" content="EclipseLink 2.4 support" />
<meta name="relnum" content="Release 3.2" />
<meta name="partnum" content="Release 3.2" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
</head>
<body>
-<p class="betadraftsubtitle">Beta Draft: 2012-08-31</p>
-<p><a id="CEGBGIJH" name="CEGBGIJH"></a></p>
+<p class="betadraftsubtitle">Beta Draft: 2012-09-11</p>
+<p><a id="CEGIJCIF" name="CEGIJCIF"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
-<h1>Generating EclipseLink dynamic entities from tables</h1>
-<p>When using EclipseLink JPA, you can create dynamic entities from your database tables. This dynamic persistence provides access to a relational database with all the benefits of JPA <span class="italic">without coding</span> or maintaining Java classes.</p>
-<img src="img/generate_dynamic_entities.png" alt="JPA Tools &gt; Generate Dynamic Entities from Tables" title="JPA Tools &gt; Generate Dynamic Entities from Tables" />
-<p>For more information, see:</p>
-<ul>
-<li>
-<p><a href="tasks023.htm#CIHHFGIG">"Generating dynamic entities from tables"</a></p>
-</li>
-</ul>
+<h1>EclipseLink 2.4 support</h1>
+<p>Release 3.2 provides support for EclipseLink 2.4.x.</p>
+<img src="img/new_jpa_facet_task.png" alt="EclipseLink 2.4 support" title="EclipseLink 2.4 support" /><br />
+<p>EclipseLink (the Eclipse Persistence Services Project) is a complete persistence frame work. Refer to <code><a href="http://www.eclipse.org/eclipselink/">http://www.eclipse.org/eclipselink/</a></code> for more information.</p>
</div>
<!-- class="sect1" -->
<!-- Start Footer -->

Back to the top