From f8afeae1e7e8d0c3f63887e84a366b91e5e674ae Mon Sep 17 00:00:00 2001 From: nhauge Date: Thu, 22 May 2008 15:43:42 +0000 Subject: 232870 - Documentation updates for 2.0. --- jpa/plugins/org.eclipse.jpt.doc.user/about.htm | 42 +++ jpa/plugins/org.eclipse.jpt.doc.user/about.html | 12 +- .../org.eclipse.jpt.doc.user/build.properties | 42 ++- .../org.eclipse.jpt.doc.user/concept_mapping.htm | 10 +- .../concept_persistence.htm | 12 +- jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm | 10 +- .../org.eclipse.jpt.doc.user/concepts001.htm | 8 +- .../org.eclipse.jpt.doc.user/concepts002.htm | 25 +- .../org.eclipse.jpt.doc.user/concepts003.htm | 41 ++- .../dcommon/css/blafdoc.css | 4 +- .../org.eclipse.jpt.doc.user/dcommon/html/cpyr.htm | 1 - .../org.eclipse.jpt.doc.user/getting_started.htm | 11 +- .../getting_started001.htm | 14 +- .../getting_started002.htm | 19 +- .../getting_started003.htm | 67 ++-- .../getting_started004.htm | 172 +++++++--- .../getting_started005.htm | 132 -------- .../getting_started006.htm | 42 --- .../getting_started007.htm | 209 ------------ .../getting_started008.htm | 46 --- .../getting_started009.htm | 62 ---- .../getting_started010.htm | 57 ---- .../getting_started011.htm | 76 ----- .../getting_started012.htm | 54 ---- .../getting_started013.htm | 58 ---- .../getting_started014.htm | 126 -------- .../getting_started015.htm | 127 -------- .../getting_started016.htm | 83 ----- .../getting_started017.htm | 65 ---- .../getting_started018.htm | 83 ----- .../getting_started019.htm | 61 ---- .../img/address.java_jpa_details.png | Bin 0 -> 11748 bytes .../img/address_id_details_quickstart.png | Bin 0 -> 11473 bytes .../img/address_java_JPA_structure_quickstart.png | Bin 0 -> 4148 bytes .../img/address_java_open.png | Bin 5702 -> 0 bytes .../img/address_jpa_details.png | Bin 8558 -> 0 bytes .../img/address_jpa_structure.png | Bin 4099 -> 0 bytes .../img/button_jpa_perspective.png | Bin 318 -> 0 bytes .../img/change_connection_profile.png | Bin 0 -> 27031 bytes .../img/column_support_new.png | Bin 0 -> 12713 bytes .../img/convert_java_project_new.png | Bin 0 -> 16438 bytes .../img/create_jpa_entity_new.png | Bin 0 -> 23710 bytes .../img/create_jpa_entity_wizard.png | Bin 0 -> 23711 bytes .../img/create_jpa_fields.png | Bin 0 -> 21704 bytes .../img/database_explorer.png | Bin 4645 -> 0 bytes .../img/edit_join_column_dialog.png | Bin 10049 -> 0 bytes .../img/entering_query_new.png | Bin 0 -> 6361 bytes .../img/icon_11mapping.png | Bin 244 -> 0 bytes .../img/icon_1mmapping.png | Bin 303 -> 0 bytes .../img/icon_basicmapping.png | Bin 476 -> 0 bytes .../img/icon_embeddable.png | Bin 354 -> 0 bytes .../img/icon_embeddedidmapping.png | Bin 213 -> 0 bytes .../img/icon_embeddedmapping.png | Bin 400 -> 0 bytes .../img/icon_idmapping.png | Bin 521 -> 0 bytes .../img/icon_m1mapping.png | Bin 301 -> 0 bytes .../img/icon_mmmapping.png | Bin 255 -> 0 bytes .../img/icon_nonpersistent.png | Bin 210 -> 0 bytes .../img/icon_persistent.png | Bin 649 -> 0 bytes .../img/icon_superclass.png | Bin 632 -> 0 bytes .../img/icon_transientmapping.png | Bin 224 -> 0 bytes .../img/icon_versionmapping.png | Bin 443 -> 0 bytes .../img/jpa_details_employee.png | Bin 8587 -> 0 bytes .../img/jpa_facet_dialog.png | Bin 25146 -> 0 bytes .../img/jpa_wizard_create_fields.png | Bin 0 -> 7864 bytes .../img/mapped_entity_type_link.png | Bin 0 -> 11725 bytes .../img/mapping_file_new.png | Bin 0 -> 19392 bytes .../img/mapping_type_selection_embed.png | Bin 0 -> 15081 bytes .../img/mapping_type_selection_entity.png | Bin 0 -> 14963 bytes .../img/mapping_type_selection_superclass.png | Bin 0 -> 15145 bytes .../img/new_icon_basicmappings.png | Bin 0 -> 332 bytes .../img/new_icon_embeddableentitymapping.png | Bin 0 -> 700 bytes .../img/new_icon_embeddedidmapping.png | Bin 0 -> 477 bytes .../img/new_icon_embeddedmapping.png | Bin 0 -> 321 bytes .../img/new_icon_idmapping.png | Bin 0 -> 461 bytes .../img/new_icon_manytomanymapping.png | Bin 0 -> 311 bytes .../img/new_icon_manytoonemapping.png | Bin 0 -> 316 bytes .../img/new_icon_mappedentity.png | Bin 0 -> 682 bytes .../img/new_icon_mappedsuperclass.png | Bin 0 -> 681 bytes .../img/new_icon_onetomanymapping.png | Bin 0 -> 325 bytes .../img/new_icon_onetoonemapping.png | Bin 0 -> 270 bytes .../img/new_icon_transientmapping.png | Bin 0 -> 303 bytes .../img/new_icon_versionmapping.png | Bin 0 -> 373 bytes .../img/new_jpa_facet_task.png | Bin 0 -> 26085 bytes .../img/new_jpa_perspective_button.png | Bin 0 -> 387 bytes .../img/new_jpa_project_dialog.png | Bin 23157 -> 0 bytes .../img/new_jpa_project_task.png | Bin 0 -> 25449 bytes .../org.eclipse.jpt.doc.user/img/new_project_2.png | Bin 7208 -> 0 bytes .../img/open_persistence_editor.png | Bin 12962 -> 12520 bytes .../img/persistence_editor_new.png | Bin 0 -> 14334 bytes .../img/persistence_outline_address.png | Bin 7215 -> 0 bytes .../img/persistence_outline_empid.png | Bin 6734 -> 0 bytes .../img/persistence_outline_entity.png | Bin 2090 -> 0 bytes .../img/persistence_outline_fields.png | Bin 4307 -> 0 bytes .../img/persistence_outline_fname.png | Bin 6658 -> 0 bytes .../img/persistence_outline_owner.png | Bin 6409 -> 0 bytes .../img/persistence_outline_phone.png | Bin 7292 -> 0 bytes .../img/persistence_outline_version.png | Bin 6923 -> 0 bytes .../img/persistence_perspective.png | Bin 43141 -> 0 bytes .../img/persistence_view_address.png | Bin 8600 -> 0 bytes .../img/persistence_view_addressid.png | Bin 9705 -> 0 bytes .../img/persistence_view_embedded.png | Bin 8080 -> 0 bytes .../img/persistence_view_empid.png | Bin 6545 -> 0 bytes .../img/persistence_view_empid_pk.png | Bin 12188 -> 0 bytes .../img/persistence_view_employee.png | Bin 8850 -> 0 bytes .../img/persistence_view_entity.png | Bin 8013 -> 0 bytes .../img/persistence_view_firstname.png | Bin 8892 -> 0 bytes .../img/persistence_view_manytoone.png | Bin 11009 -> 0 bytes .../img/persistence_view_mappedsprc.png | Bin 8293 -> 0 bytes .../img/persistence_view_onetomany.png | Bin 17395 -> 0 bytes .../img/persistence_view_onetoone.png | Bin 9280 -> 0 bytes .../img/persistence_view_version.png | Bin 7852 -> 0 bytes .../img/project_properties_tasks.png | Bin 0 -> 22916 bytes .../img/properties_persistence.png | Bin 19758 -> 0 bytes .../img/select_a_wizard_entity.png | Bin 0 -> 20222 bytes .../img/select_a_wizard_jpa_project.png | Bin 0 -> 20446 bytes .../img/select_a_wizard_mapping.png | Bin 0 -> 20509 bytes .../img/task_entering_query.png | Bin 0 -> 6361 bytes .../img/tutorial_object_model.png | Bin 7632 -> 0 bytes jpa/plugins/org.eclipse.jpt.doc.user/index.xml | 360 ++++++++++----------- jpa/plugins/org.eclipse.jpt.doc.user/legal.htm | 18 +- .../org.eclipse.jpt.doc.user/ref_details_orm.htm | 12 +- .../org.eclipse.jpt.doc.user/ref_jpa_facet.htm | 34 +- .../ref_mapping_general.htm | 182 ++++++----- .../ref_new_jpa_project.htm | 8 +- .../ref_new_jpa_project_wizard.htm | 11 +- .../ref_persistence_map_view.htm | 14 +- .../ref_persistence_outline.htm | 13 +- .../ref_persistence_perspective.htm | 14 +- .../ref_persistence_prop_view.htm | 18 +- .../org.eclipse.jpt.doc.user/ref_primary_key.htm | 90 +++--- .../ref_project_properties.htm | 32 +- jpa/plugins/org.eclipse.jpt.doc.user/reference.htm | 20 +- .../org.eclipse.jpt.doc.user/reference001.htm | 11 +- .../org.eclipse.jpt.doc.user/reference002.htm | 30 +- .../org.eclipse.jpt.doc.user/reference003.htm | 118 ++++--- .../org.eclipse.jpt.doc.user/reference004.htm | 84 +++-- .../org.eclipse.jpt.doc.user/reference005.htm | 33 +- .../org.eclipse.jpt.doc.user/reference006.htm | 112 ++++--- .../org.eclipse.jpt.doc.user/reference007.htm | 63 +--- .../org.eclipse.jpt.doc.user/reference008.htm | 66 ++-- .../org.eclipse.jpt.doc.user/reference009.htm | 77 ++--- .../org.eclipse.jpt.doc.user/reference010.htm | 80 ++--- .../org.eclipse.jpt.doc.user/reference011.htm | 37 ++- .../org.eclipse.jpt.doc.user/reference012.htm | 81 ++++- .../org.eclipse.jpt.doc.user/reference013.htm | 51 +-- .../org.eclipse.jpt.doc.user/reference014.htm | 71 ++-- .../org.eclipse.jpt.doc.user/reference015.htm | 99 ++---- .../org.eclipse.jpt.doc.user/reference016.htm | 75 +++-- .../org.eclipse.jpt.doc.user/reference017.htm | 87 ++++- .../org.eclipse.jpt.doc.user/reference018.htm | 65 ++-- .../org.eclipse.jpt.doc.user/reference019.htm | 115 +++++++ .../org.eclipse.jpt.doc.user/reference020.htm | 163 ++++++++++ .../org.eclipse.jpt.doc.user/reference021.htm | 153 +++++++++ .../org.eclipse.jpt.doc.user/reference022.htm | 157 +++++++++ .../org.eclipse.jpt.doc.user/reference023.htm | 217 +++++++++++++ .../org.eclipse.jpt.doc.user/reference024.htm | 124 +++++++ .../org.eclipse.jpt.doc.user/reference025.htm | 139 ++++++++ .../org.eclipse.jpt.doc.user/reference026.htm | 39 +++ .../org.eclipse.jpt.doc.user/reference027.htm | 45 +++ .../org.eclipse.jpt.doc.user/reference028.htm | 42 +++ .../org.eclipse.jpt.doc.user/reference029.htm | 45 +++ .../org.eclipse.jpt.doc.user/reference030.htm | 65 ++++ .../org.eclipse.jpt.doc.user/reference031.htm | 45 +++ .../org.eclipse.jpt.doc.user/reference032.htm | 106 ++++++ .../org.eclipse.jpt.doc.user/reference033.htm | 59 ++++ .../org.eclipse.jpt.doc.user/reference034.htm | 52 +++ .../task_add_persistence.htm | 16 +- .../task_additonal_tables.htm | 14 +- .../task_create_new_project.htm | 80 +++-- .../task_generate_entities.htm | 32 +- .../org.eclipse.jpt.doc.user/task_inheritance.htm | 52 +-- .../org.eclipse.jpt.doc.user/task_manage_orm.htm | 14 +- .../task_manage_persistence.htm | 194 +++++++++-- .../org.eclipse.jpt.doc.user/task_mapping.htm | 28 +- jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm | 19 +- jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm | 143 ++++++-- jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm | 46 +-- jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm | 54 ++-- jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm | 74 ++--- jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm | 52 ++- jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm | 65 ++-- jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm | 171 ++-------- jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm | 108 +++---- jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm | 80 ++--- jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm | 162 +++++----- jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm | 123 ++----- jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm | 80 ++--- jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm | 137 ++++---- jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm | 114 ++++--- jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm | 123 ++++++- jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm | 154 ++++++--- jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm | 127 ++++++-- jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm | 51 ++- jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm | 118 +++++-- jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm | 103 +++--- jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm | 40 ++- jpa/plugins/org.eclipse.jpt.doc.user/tasks022.htm | 76 ++--- jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm | 91 ++++++ jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm | 49 +++ jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm | 87 +++++ .../org.eclipse.jpt.doc.user/tips_and_tricks.htm | 8 +- jpa/plugins/org.eclipse.jpt.doc.user/toc.xml | 129 ++++---- jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm | 33 +- .../org.eclipse.jpt.doc.user/whats_new001.htm | 40 ++- .../org.eclipse.jpt.doc.user/whats_new002.htm | 54 ++-- .../org.eclipse.jpt.doc.user/whats_new003.htm | 51 ++- .../org.eclipse.jpt.doc.user/whats_new004.htm | 47 +++ .../org.eclipse.jpt.doc.user/whats_new005.htm | 53 +++ .../org.eclipse.jpt.doc.user/whats_new006.htm | 41 +++ .../org.eclipse.jpt.doc.user/whats_new007.htm | 48 +++ .../org.eclipse.jpt.doc.user/whats_new008.htm | 43 +++ 211 files changed, 5184 insertions(+), 3643 deletions(-) create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/about.htm delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/getting_started005.htm delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/getting_started006.htm delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/getting_started007.htm delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/getting_started008.htm delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/getting_started009.htm delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/getting_started010.htm delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/getting_started011.htm delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/getting_started012.htm delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/getting_started013.htm delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/getting_started014.htm delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/getting_started015.htm delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/getting_started016.htm delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/getting_started017.htm delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/getting_started018.htm delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/getting_started019.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/address.java_jpa_details.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/address_id_details_quickstart.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/address_java_JPA_structure_quickstart.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/address_java_open.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/address_jpa_details.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/address_jpa_structure.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/button_jpa_perspective.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/change_connection_profile.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/column_support_new.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/convert_java_project_new.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_new.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_wizard.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_fields.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/database_explorer.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/edit_join_column_dialog.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/entering_query_new.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/icon_11mapping.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/icon_1mmapping.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/icon_basicmapping.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/icon_embeddable.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/icon_embeddedidmapping.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/icon_embeddedmapping.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/icon_idmapping.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/icon_m1mapping.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/icon_mmmapping.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/icon_nonpersistent.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/icon_persistent.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/icon_superclass.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/icon_transientmapping.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/icon_versionmapping.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_employee.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_facet_dialog.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_wizard_create_fields.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/mapped_entity_type_link.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_file_new.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_embed.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_entity.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_superclass.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_basicmappings.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddableentitymapping.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddedidmapping.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddedmapping.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_idmapping.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_manytomanymapping.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_manytoonemapping.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_mappedentity.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_mappedsuperclass.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_onetomanymapping.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_onetoonemapping.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_transientmapping.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_versionmapping.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_facet_task.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_perspective_button.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_dialog.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_task.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/new_project_2.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_new.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_address.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_empid.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_entity.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_fields.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_fname.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_owner.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_phone.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_version.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_perspective.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_address.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_addressid.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_embedded.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_empid.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_empid_pk.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_employee.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_entity.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_firstname.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_manytoone.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_mappedsprc.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_onetomany.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_onetoone.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_version.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/project_properties_tasks.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/properties_persistence.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_entity.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_jpa_project.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_mapping.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/task_entering_query.png delete mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/img/tutorial_object_model.png create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/whats_new006.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/whats_new007.htm create mode 100644 jpa/plugins/org.eclipse.jpt.doc.user/whats_new008.htm (limited to 'jpa/plugins') diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/about.htm b/jpa/plugins/org.eclipse.jpt.doc.user/about.htm new file mode 100644 index 0000000000..42981259b3 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/about.htm @@ -0,0 +1,42 @@ + + + + + +About this content + + + + + + + + + + + + + + + +
+

About this content

+

January, 2008

+ +

License

+

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 http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.

+

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 http://www.eclipse.org.

+
+ + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/about.html b/jpa/plugins/org.eclipse.jpt.doc.user/about.html index 851ab7ce54..42981259b3 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/about.html +++ b/jpa/plugins/org.eclipse.jpt.doc.user/about.html @@ -2,28 +2,28 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + About this content + - - + + -
+

About this content

January, 2008

- +

License

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 http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.

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 http://www.eclipse.org.

diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/build.properties b/jpa/plugins/org.eclipse.jpt.doc.user/build.properties index d21a6965d8..102a0cfb7d 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/build.properties +++ b/jpa/plugins/org.eclipse.jpt.doc.user/build.properties @@ -16,21 +16,6 @@ bin.includes = cheatsheets/,\ getting_started002.htm,\ getting_started003.htm,\ getting_started004.htm,\ - getting_started005.htm,\ - getting_started006.htm,\ - getting_started007.htm,\ - getting_started008.htm,\ - getting_started009.htm,\ - getting_started010.htm,\ - getting_started011.htm,\ - getting_started012.htm,\ - getting_started013.htm,\ - getting_started014.htm,\ - getting_started015.htm,\ - getting_started016.htm,\ - getting_started017.htm,\ - getting_started018.htm,\ - getting_started019.htm,\ index.xml,\ legal.htm,\ plugin.properties,\ @@ -101,4 +86,29 @@ bin.includes = cheatsheets/,\ whats_new.htm,\ whats_new001.htm,\ whats_new002.htm,\ - whats_new003.htm + whats_new003.htm,\ + about.htm,\ + reference019.htm,\ + reference020.htm,\ + reference021.htm,\ + reference022.htm,\ + reference023.htm,\ + reference024.htm,\ + reference025.htm,\ + reference026.htm,\ + reference027.htm,\ + reference028.htm,\ + reference030.htm,\ + reference029.htm,\ + reference031.htm,\ + reference032.htm,\ + reference033.htm,\ + reference034.htm,\ + tasks023.htm,\ + tasks024.htm,\ + tasks025.htm,\ + whats_new004.htm,\ + whats_new005.htm,\ + whats_new006.htm,\ + whats_new007.htm,\ + whats_new008.htm 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 593f1bdb15..afceadbea0 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Understanding OR mappings + - - + + @@ -23,7 +23,7 @@

Understanding OR mappings

-

The Dali OR (object-relational) Mapping Tool allows you to describe how your entity objects map to the data source (or other objects). This approach isolates persistence information from the object model–developers are free to design their ideal object model, and DBAs are free to design their ideal schema.

+

The Dali OR (object-relational) Mapping Tool allows you to describe how your entity objects map to the data source (or other objects). This approach isolates persistence information from the object model–developers are free to design their ideal object model, and DBAs are free to design their ideal schema.

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.

You can use these mappings to map simple data types including primitives (such as int), JDK classes (such as String), 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.

Related task
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 65e30ba97f..4f166231f1 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Understanding Java persistence + - - + + @@ -23,8 +23,8 @@

Understanding Java persistence

-

Persistence 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.

-

Entity beans 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 application-managed persistence or container-managed persistence.

+

Persistence 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.

+

Entity beans 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 application-managed persistence or container-managed persistence.

diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm index 4251d3763d..098e54bf5d 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm @@ -2,25 +2,25 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Concepts + - - + + -

+

Concepts

This section contains an overview of concepts you should be familiar with when using Dali to create mappings for Java persistent entities.

    diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm index 86b3b7ffa2..6eacd90f58 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Understanding EJB 3.0 Java Persistence API + - - + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm index cde700e769..689d988ebc 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + The persistence.xml file + - - + + @@ -22,8 +22,21 @@

    -

    The persistence.xml file

    -

    The JPA specification requires the use of a persistence.xml file for deployment. This file defines the database and entity manager options, and may contain more than one persistence unit. Dali can use the Eclipse XML Editor to create and maintain this information. See "Managing the persistence.xml file" for more information.

    +

    The persistence.xml file

    +

    The JPA specification requires the use of a persistence.xml 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 persistence.xml Editor. Alternatively, you can use the Eclipse XML Editor to create and maintain this information. See "Managing the persistence.xml file" for more information.

    +
    +

    + + + + + + +
    +

    Tip:

    +To work with multiple persistence units, comment out all but one persistence unit in persistence.xml.
    +
    +
    Related task

    Managing the persistence.xml file
    diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm index 8e67467c8d..88beca6e7f 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + The orm.xml file + - - + + @@ -22,12 +22,39 @@

    -

    The orm.xml file

    -

    Although the JPA specification emphasizes the use of annotations to specify persistence, you can also the orm.xml file to store this metadata. Dali can use the Eclipse XML Editor to create and maintain this information. The metadata must match the XSD specification of your selected JPA implementation. See "Managing the orm.xml file" for more information.

    +

    The orm.xml file

    +

    Although the JPA specification emphasizes the use of annotations to specify persistence, you can also use the orm.xml file to store this metadata. Dali enables you to create a stub orm.xml file for a JPA project using the Mapping File Wizard. See "Managing the orm.xml file" for more information.

    +
    +

    + + + + + + +
    +

    Note:

    +The metadata must match the XSD specification of your selected JPA implementation.
    +
    +
    +

    Dali provides comprehensive support for configuring XML mapping files through the JPA Details view (for orm.xml) 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 orm.xml.

    +
    +

    + + + + + + +
    +

    Note:

    +Dali works exclusively with XML mapping files named orm.xml.
    +
    +
    Related task

    Managing the orm.xml file
    -Creating a new JPA project +Creating a new JPA project

     

    diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/css/blafdoc.css b/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/css/blafdoc.css index 4fa017b8b0..baf6127928 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/css/blafdoc.css +++ b/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/css/blafdoc.css @@ -16,6 +16,6 @@ span.code { font-family: monospace; } -span.copyrightlogo {font-size: 75%} +span.copyrightlogo {font-size: 0.8em} -.footer {padding-top: 2em;} \ No newline at end of file +.footer {margin-top: 2em;border-top:1px solid #cccccc;padding-top:1em;} \ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/html/cpyr.htm b/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/html/cpyr.htm index fe52e9587f..382ec67619 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/html/cpyr.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/dcommon/html/cpyr.htm @@ -3,7 +3,6 @@ - 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 ad83e5975c..9ae5581fac 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Getting started + - - + + @@ -30,9 +30,6 @@
  • Dali quick start

  • -
  • -

    Dali basic tutorial

    -

For additional information, please visit the Dali home page at:

http://www.eclipse.org/webtools/dali/main.php.

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 32cca6f06a..0e61f17bc1 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Requirements and installation + - - + + @@ -26,13 +26,13 @@

Before installing Dali, ensure that your environment meets the following minimum requirements:

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 81303aebd5..2c5e806500 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Dali quick start + - - + + @@ -26,19 +26,16 @@

This section includes information to help you quickly start using Dali to create relational mappings between Java persistent entities and database tables.

-

The Dali basic tutorial contains detailed procedures for building you first Dali project.

+

The contains detailed procedures for building you first Dali project.

Related reference

-Dali basic tutorial
+
Tips and tricks
- - - - - - - diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started006.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started006.htm deleted file mode 100644 index d3fefcfa8a..0000000000 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started006.htm +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - -Dali basic tutorial - - - - - - - - - - - - - - -

-
-

Dali basic tutorial

-

In this tutorial, you will use Dali to map the object model of a company's HR application to track its employees. Figure: Tutorial Object Model illustrates the object model for the tutorial.

-
-

Tutorial Object Model

-This figure shows the object model for the tutorial.
- -

Next, you will Generate the tutorial database schema.

- - -
- - diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started007.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started007.htm deleted file mode 100644 index cd6a14382f..0000000000 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started007.htm +++ /dev/null @@ -1,209 +0,0 @@ - - - - - - -Generate the tutorial database schema - - - - - - - - - - - - - - -

-
-

Generate the tutorial database schema

-

The tutorial application uses three database tables to store each employee's information: EMPLOYEE, ADDRESS and PHONE. Table: Tutorial Database Schema describes the columns for each table.

-

You can download SQL scripts to build and populate the database tables with sample data from http://www.eclipse.org/webtools/dali/docs/dbscripts.zip.

-
-

Tutorial Database Schema

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TableColumnTypeDetails
-

EMPLOYEE

-
-

EMP_ID

-
-

NUMBER(15)

-
-

Primary Key

-
-

F_NAME

-
-

VARCHAR(40)

-

-

L_NAME

-
-

VARCHAR(40)

-

-

ADDR_ID

-
-

NUMBER(15)

-
-

Foreign Key, references ADDRESS.ADDRES_ID

-
-

VERSION

-
-

NUMBER(15)

-

-

ADDRESS

-
-

ADDRESS_ID

-
-

NUMBER(15)

-
-

Primary Key

-
-

PROVINCE

-
-

VARCHAR(80)

-

-

COUNTRY

-
-

VARCHAR(80)

-

-

STREET

-
-

VARCHAR(80)

-

-

P_CODE

-
-

VARCHAR(20)

-

-

CITY

-
-

VARCHAR(80)

-

-

PHONE

-
-

EMP_ID

-
-

NUMBER(15)

-
-

Foreign Key, reference to EMPLOYEE.EMP_ID

-
-

AREA_CODE

-
-

VARCHAR(3)

-

-

P_NUMBER

-
-

VARCHAR(7)

-
-

Primary key

-
-

TYPE

-
-

VARCHAR(15)

-

-
- -

Next, you will Create a database connection.

- - -
- - diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started008.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started008.htm deleted file mode 100644 index 111d7ad3c1..0000000000 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started008.htm +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - -Create a database connection - - - - - - - - - - - - - - -

-
-

Create a database connection

-

After creating the database you will need to create a database connection to use with the tutorial application. An active database connection is required to complete tutorial application.

-

Use the New Connection wizard to create a database connection.

-
-

Database Explorer

-This figure shows the Database Explorer.
- -

Now you're ready to Create a JPA project.

-
- - - - - - - diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started009.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started009.htm deleted file mode 100644 index 8ee078a1b1..0000000000 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started009.htm +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - -Create a JPA project - - - - - - - - - - - - - - -

-
-

Create a JPA project

-

In order to begin, you must create a new Java project.

-
    -
  1. -

    Select File > New > Project. The New Project dialog appears.

    -
  2. -
  3. -

    On the New Project dialog, select JPA > JPA Project and click OK. The New JPA Project dialog appears.

    -
  4. -
  5. -

    On the New JPA Project dialog, enter Employee as the Project name and click Next. The Project Facets page appears.

    -
  6. -
  7. -

    Verify that you have selected a Java 5.0 (or higher) and JPA 1.0 facet, and click Next. The JPA Facet page appears.

    -
  8. -
  9. -

    Select your vender-specific platform, database connection, and JPA implementation library, and click Finish.

    -
  10. -
-

Eclipse adds the project to the workbench and opens the Java perspective.

-
-

Persistence Perspective

-This figure shows the main parts of the JPA Development Perspective: The JPA Structure and JPA Details views.
- -

The next step is to Create persistent Java entities.

-
- - - - - - diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started010.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started010.htm deleted file mode 100644 index 647ff4362a..0000000000 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started010.htm +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - -Create persistent Java entities - - - - - - - - - - - - - - -

-
-

Create persistent Java entities

-

The Tutorial Object Model contains three entities: Employee, Address, and PhoneNumber. Use this procedure to add the entities to the project.

-
    -
  1. -

    Right-click the Employee project in the Package Explorer and select New > Class. The New Java Class dialog appears.

    -
  2. -
  3. -

    On the Java Class dialog, enter a package name (such as dali.tutorial.model), class name (such as Employee), and click Finish. Eclipse adds the Employee entity to the Package Explorer.

    -
  4. -
  5. -

    Select the Employee entity in the JPA Structure view.

    -
  6. -
  7. -

    In the JPA Details view, in the Map As field, select Entity. In the Table field, select the EMPLOYEE database table.

    -
    -

    Employee Entity in JPA Details View

    -Employee entity in JPA Details view.
    -
  8. -
-

Eclipse adds the @Entity annotation to the class. Repeat this procedure to add the PhoneNumber and Address entities.

-

Notice that the Problems view reports several errors for each entity. We'll address these shortly.

-

Next, you will Add fields to the entities.

- - -
- - diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started011.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started011.htm deleted file mode 100644 index 24dea89a30..0000000000 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started011.htm +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - -Add fields to the entities - - - - - - - - - - - - - - -

-
-

Add fields to the entities

-

Before mapping the entities to the database, you must add the necessary fields to each entity.

-
    -
  1. -

    Add the following fields to the Employee entity:

    -
    -private Long id;
    -private String firstNname;
    -private String lastName;
    -private String address;
    -private List<PhoneNumber> phoneNumbers;
    -private Long version;
    -
  2. -
  3. -

    Import java.util.List.

    -
  4. -
  5. -

    Generate Getters and Setters for each field.

    -
  6. -
  7. -

    Add the following fields to the Address entity:

    -
    -private Long id;
    -private String street;
    -private String city;
    -private String stateOrProvince;
    -private String country;
    -private String postalCode;
    -
  8. -
  9. -

    Add the following fields to the PhoneNumber entity:

    -
    -private String type;
    -private String areaCode;
    -private String number;
    -private Employee owner;
    -
  10. -
-

Next, you will Associate the entity with a database table.

-
- - - - - - diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started012.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started012.htm deleted file mode 100644 index 28be4336ad..0000000000 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started012.htm +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - -Associate the entity with a database table - - - - - - - - - - - - - - -

-
-

Associate the entity with a database table

-

Now you must associate each entity with its primary database table.

-
    -
  1. -

    Select the Employee class in the Explorer view.

    -
  2. -
  3. -

    In the JPA Details view, notice that Dali has automatically selected the EMPLOYEE table as the table name.

    -
    -

    JPA Details View for the Employee Entity

    -JPA Details view for the Employee entity.
    -
  4. -
-

By default, Dali attempts to associate each entity with a similarly named database table. Notice that although you have not explicitly associated the Address entity yet, there is no error in the Problems view because the entity name, Address, is identical to the table name (ADDRESS).

-

For the PhoneNumber entity, however, there is an error. This is because the entity name (PhoneNumber) is different than the database table (PHONE). You must explicitly associate the entity with the PHONE table. Dali adds the @Table(name="PHONE") annotation to the entity.

-

Now you are ready to Create OR mappings.

-
- - - - - - - diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started013.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started013.htm deleted file mode 100644 index ded417ade2..0000000000 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started013.htm +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - -Create OR mappings - - - - - - - - - - - - - - -

-
-

Create OR mappings

-

Now you're ready to map the attributes of each persistent entity to columns in the appropriate database table. For the tutorial application, you will use the following mapping types:

-
    -
  • -

    ID mappings

    -
  • -
  • -

    Basic mappings

    -
  • -
  • -

    One-to-one mappings

    -
  • -
  • -

    Many-to-one mappings

    -
  • -
  • -

    One-to-many mappings

    -
  • -
  • -

    Version mappings

    -
  • -
-

Next, you will Create ID mappings.

- - -
- - diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started014.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started014.htm deleted file mode 100644 index f1833c7663..0000000000 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started014.htm +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - -Create ID mappings - - - - - - - - - - - - - - -

-
-

Create ID mappings

-

Use an ID Mapping to specify the primary key of an entity. Each persistent entity must have an ID. Notice that the Problems view reports that each entity is missing an ID.

-
    -
  1. -

    Select the Employee entity in the Package Explorer view.

    -
  2. -
  3. -

    Expand the Employee entity in the JPA Structure view and select the id field. The JPA Details view (for attributes) displays the properties for the field.

    -
  4. -
  5. -

    In the Map As field, select ID.

    -
    -

    ID Mapping for emp_id Field

    -JPA Details view for the emp_id field.
    -
  6. -
  7. -

    Use this table to complete the remaining fields in the JPA Details view.

    -
    - - - - - - - - - - - - - - - - - -
    PropertyDescription
    Map AsDefines this mapping as an ID Mapping. Dali adds the @Id annotation to the entity.
    ColumnThe database column for the primary key of the table associated with the entity. Select EMP_ID. -

    Because the database column (EMP_ID) is named differently than the entity field (id), Dali adds the @Column(name="EMP_ID") annotation.

    -
    -
    -
  8. -
  9. -

    Leave all other fields on the tab as their defaults. Expand the Primary Key Generation area.

    -
    -

    Primary Key Generation for emp_id Field

    -JPA Details view (with Primary Key options) for the emp_id field.
    -
  10. -
  11. -

    Use this table to complete the Primary Key Generation fields in the JPA Details view.

    -
    - - - - - - - - - - - - - - - - - - - - - -
    PropertyDescription
    Generated ValueThese fields define how the primary key is generated.
      StrategyFor the tutorial project, use the Auto option.
      Generator NameLeave this field blank.
    -
    -
  12. -
-

In the JPA Structure view, the id field is identified as the primary key by the following icon:

-
-

JPA Structure for Employee Entity

-emp_id attribute of the Employee entity in the JPA Structure view.
- -

Repeat this procedure to map the following primary keys (as shown in Table: Tutorial Database Schema):

-
    -
  • -

    The id field of the Address entity to the ADDRESS_ID column of the ADDRESS table.

    -
  • -
  • -

    The number field of the PhoneNumber entity to the P_NUMBER column of the PHONE table.

    -
  • -
-

Next, you will Create basic mappings.

-
- - - - - - diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started015.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started015.htm deleted file mode 100644 index f84eb027cd..0000000000 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started015.htm +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - -Create basic mappings - - - - - - - - - - - - - - -

-
-

Create basic mappings

-

Use a Basic Mapping to map an attribute directly to a database column. In the Tutorial Object Model, the firstName field of the Employee class maps directly to the F_NAME column of the EMPLOYEE database table.

-
    -
  1. -

    Select the Employee entity in the Package Explorer view.

    -
  2. -
  3. -

    In the JPA Structure view, select the firstName field of the Employee entity. The JPA Details view (for attributes) displays the properties for the field.

    -
  4. -
  5. -

    In the Map As field, select Basic. In the Column field, select F_NAME.

    -
    -

    Basic Mapping for firstName

    -JPA Details view for the firstName field.
    -
  6. -
-

Dali adds the @Column(name="F_NAME") annotation to the entity. In the JPA Structure, the firstName field is identified as a basic mapping as shown in the following figure:

-
-

JPA Structure for Employee Entity

-The firstName attribute of the Employee entity in the JPA Structure view.
- -

Repeat this procedure to map each of the following fields as Basic mappings:

-
    -
  • -

    Employee entity

    -
      -
    • -

      lastName field to L_NAME column

      -
    • -
    -
  • -
  • -

    Address Entity

    -
      -
    • -

      city field to CITY column

      -
    • -
    • -

      country field to COUNTRY column

      -
    • -
    • -

      postalCode field to P_CODE column

      -
    • -
    • -

      stateOrProvice field to PROVINCE column

      -
    • -
    • -

      street field to STREET column

      -
    • -
    -
    -

    - - - - - - -
    -

    Note:

    -Because the city, country, and street fields are named identically to their database columns, Dali automatically maps the fields; no annotations are required.
    -
    -
    -
  • -
  • -

    Phone Entity

    -
      -
    • -

      areaCode field to AREA_CODE column

      -
    • -
    • -

      type field to TYPE column

      -
    • -
    -
    -

    - - - - - - -
    -

    Note:

    -Because the type field is named identically to its database column, Dali automatically maps the field. No annotation is required.
    -
    -
    -
  • -
-

Next, you will Create one-to-one mappings.

-
- - - - - - diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started016.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started016.htm deleted file mode 100644 index 0f604093dd..0000000000 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started016.htm +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - -Create one-to-one mappings - - - - - - - - - - - - - - -

-
-

Create one-to-one mappings

-

Use a One-to-One Mapping to define a relationship from an attribute to another class, with one-to-one multiplicity to a database column. In the Tutorial Object Model, the address field of the Employee class has a one-to-one relationship to the Address class; each employee may have a single address.

-
    -
  1. -

    Select the Employee entity in the Package Explorer view.

    -
  2. -
  3. -

    In the JPA Structure view, select the address field of the Employee entity. The JPA Details view (for attributes) displays the properties for the field.

    -
  4. -
  5. -

    In the Map As field, select One-to-One.

    -
    -

    One-to-one Mapping for address

    -JPA Details view for the address field.
    -
  6. -
  7. -

    For the Target Entity, click Browse and select the Address persistent entity. Dali adds the @OneToOne(targetEntity=dali.tutorial.model.Address.class) entity to the class.

    -

    Leave the other fields with their default values.

    -
  8. -
  9. -

    Select the Override Default option to specify the relationship between the Employee and Address entities. Because you had to explicitly define the ID field for the Address entity in its ID mapping, you will need to edit the default join relationship.

    -
  10. -
  11. -

    Select the address_ADDRESS_ID -> ADDRESS_ID relationship in the Join Columns area and click Edit.

    -
  12. -
  13. -

    In the Edit Join Column dialog, select the following options and click OK.

    -
      -
    • -

      Name: ADDR_ID (from the EMPLOYEE table)

      -
    • -
    • -

      Referenced Column Name: ADDRESS_ID (from the ADDRESS table)

      -
    • -
    -
    -

    Editing Join Column for Address Mapping

    -Edit Join Column dialog for the address 1:1 mapping.
    -
  14. -
-

In the JPA Structure, the address field is identified as a one-to-one mapping, as shown in the following figure:

-
-

JPA Structure for Employee Entity

-The address attribute of the Employee entity in the JPA Structure view.
- -

Next, you will Create one-to-many mappings.

-
- - - - - - diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started017.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started017.htm deleted file mode 100644 index f0f394ba4b..0000000000 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started017.htm +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - -Create one-to-many mappings - - - - - - - - - - - - - - -

-
-

Create one-to-many mappings

-

Use a One-to-Many Mapping to define a relationship from an attribute to another class, with one-to-many multiplicity to a database column. In the Tutorial Object Model, the phoneNumbers field of the Employee class has a one-to-many relationship to the Phone class; each employee may have many phone numbers.

-
    -
  1. -

    Select the Employee entity in the Package Explorer view.

    -
  2. -
  3. -

    In the JPA Structure view, select the phoneNumber field of the Employee entity. The JPA Details view (for attributes) displays the properties for the field.

    -
  4. -
  5. -

    In the Map As field, select One-to-Many.

    -
    -

    One-to-many Mapping for phoneNumbers

    -JPA Details view for the phoneNumbers field.
    -
  6. -
  7. -

    Select PhoneNumber as the Target Entity. Leave the other fields with their default values.

    -
  8. -
  9. -

    In the Join Table area, notice that Dali has selected the correct joins, based on the foreign key associations in the database tables.

    -
  10. -
-

In the JPA Structure, the phoneNumbers field is identified as a one-to-many mapping as shown in the following figure:

-
-

JPA Structure for Employee Entity

-The phoneNumbers attribute of the Employee entity in the JPA Structure view.
- -

Next, you will Create many-to-one mappings.

-
- - - - - - diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started018.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started018.htm deleted file mode 100644 index 819702c138..0000000000 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started018.htm +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - -Create many-to-one mappings - - - - - - - - - - - - - - -

-
-

Create many-to-one mappings

-

Use a May-to-One Mapping to define a relationship from an attribute to another class, with many-to-one multiplicity to a database column. In the Tutorial Object Model, the owner field of the PhoneNumber class has a one-to-many relationship to the Employee class; there are many phone numbers that each employee may have.

-

This is the "back mapping" of the one-to-many mapping you previously defined.

-
    -
  1. -

    Select the PhoneNumber entity in the Package Explorer view.

    -
  2. -
  3. -

    In the JPA Structure view, select the owner field of the PhoneNumber entity. The JPA Details view (for attributes) displays the properties for the field.

    -
  4. -
  5. -

    In the Map As field, select Many to One.

    -
    -

    Many to One Mapping for owner

    -The JPA Details view for the owner field.
    -
  6. -
  7. -

    Leave the other fields with their default values. Dali correctly completes the information based on the database structure and previously defined mappings.

    -
  8. -
  9. -

    Use the Join Columns area to specify the relationship between the PhoneNumber and Employee entities. Because you had to explicitly define the ID field for the Employee entity in its ID mapping, you will need to edit the default join relationship.

    -
  10. -
  11. -

    Select the Override Default option.

    -
  12. -
  13. -

    Select the owner_EMP_ID -> EMP_ID relationship in the Join Columns area and click Edit.

    -
  14. -
  15. -

    In the Edit Join Column dialog, select the following options and click OK.

    -
      -
    • -

      Name: EMP_ID (from the PHONE table)

      -
    • -
    • -

      Referenced Column Name: EMP_ID (from the EMPLOYEE table)

      -
    • -
    -
  16. -
-

In the JPA Structure, the owner field is identified as a many-to-one mapping as shown in the following figure:

-
-

JPA Structure for PhoneNumber Entity

-The owner attribute of the PhoneNumber entity in the JPA Structure view.
- -

Next, you will Create version mappings

-
- - - - - - diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started019.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started019.htm deleted file mode 100644 index 634a50bc23..0000000000 --- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started019.htm +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - -Create version mappings - - - - - - - - - - - - - - -

-
-

Create version mappings

-

Use a Version Mapping to specify the database field used by a persistent entity for optimistic locking.

-
    -
  1. -

    Select the Employee entity in the Package Explorer view.

    -
  2. -
  3. -

    In the JPA Structure view, select the version field of the Employee entity. The JPA Details view (for attributes) displays the properties for the field.

    -
  4. -
  5. -

    In the Map As field, select Version.

    -
    -

    Version Mapping for version

    -JPA Details view for the version field.
    -
  6. -
-

Dali automatically selects the Version column in the EMPLOYEE database table. In the JPA Structure, the Version field is identified as a version mapping, as shown in the following figure:

-
-

JPA Structure for Employee Entity

-The version attribute of the Employee entity in the JPA Structure view.
- -

Congratulations! All of the entities have been successfully mapped.

-
- - - - - - - - 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 new file mode 100644 index 0000000000..ed27a5ce29 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/address.java_jpa_details.png 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 new file mode 100644 index 0000000000..7ef40cf6c6 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/address_id_details_quickstart.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/address_java_JPA_structure_quickstart.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/address_java_JPA_structure_quickstart.png new file mode 100644 index 0000000000..1af51a9f9b Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/address_java_JPA_structure_quickstart.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/address_java_open.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/address_java_open.png deleted file mode 100644 index 7da0417133..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/address_java_open.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/address_jpa_details.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/address_jpa_details.png deleted file mode 100644 index f96cc3f8b8..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/address_jpa_details.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/address_jpa_structure.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/address_jpa_structure.png deleted file mode 100644 index a18a65652c..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/address_jpa_structure.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/button_jpa_perspective.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/button_jpa_perspective.png deleted file mode 100644 index e0a957185e..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/button_jpa_perspective.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/change_connection_profile.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/change_connection_profile.png new file mode 100644 index 0000000000..46ab05e0aa Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/change_connection_profile.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/column_support_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/column_support_new.png new file mode 100644 index 0000000000..8716e8b33c Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/column_support_new.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/convert_java_project_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/convert_java_project_new.png new file mode 100644 index 0000000000..91cda6e6a4 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/convert_java_project_new.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_new.png new file mode 100644 index 0000000000..69c78a5ffb Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_new.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_wizard.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_wizard.png new file mode 100644 index 0000000000..f2c0a6c6ea Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_entity_wizard.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_fields.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_fields.png new file mode 100644 index 0000000000..52a7fab8db Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/create_jpa_fields.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/database_explorer.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/database_explorer.png deleted file mode 100644 index 435be3dcc1..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/database_explorer.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/edit_join_column_dialog.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/edit_join_column_dialog.png deleted file mode 100644 index 9cc32cf47c..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/edit_join_column_dialog.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/entering_query_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/entering_query_new.png new file mode 100644 index 0000000000..98ec0ac5b0 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/entering_query_new.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_11mapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_11mapping.png deleted file mode 100644 index 6944826370..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_11mapping.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_1mmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_1mmapping.png deleted file mode 100644 index 69d3193a5e..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_1mmapping.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_basicmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_basicmapping.png deleted file mode 100644 index b193753e98..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_basicmapping.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_embeddable.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_embeddable.png deleted file mode 100644 index 645922c306..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_embeddable.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_embeddedidmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_embeddedidmapping.png deleted file mode 100644 index 0587544e2d..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_embeddedidmapping.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_embeddedmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_embeddedmapping.png deleted file mode 100644 index 4bef3567ed..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_embeddedmapping.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_idmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_idmapping.png deleted file mode 100644 index 2b2a94becd..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_idmapping.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_m1mapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_m1mapping.png deleted file mode 100644 index a77a01ba6d..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_m1mapping.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_mmmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_mmmapping.png deleted file mode 100644 index 5d5fd1c145..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_mmmapping.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_nonpersistent.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_nonpersistent.png deleted file mode 100644 index 001ef86ee2..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_nonpersistent.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_persistent.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_persistent.png deleted file mode 100644 index 7ea0b1d53e..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_persistent.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_superclass.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_superclass.png deleted file mode 100644 index 952f11d131..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_superclass.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_transientmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_transientmapping.png deleted file mode 100644 index 1a70dd9e68..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_transientmapping.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_versionmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_versionmapping.png deleted file mode 100644 index aa7e0a6f15..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/icon_versionmapping.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_employee.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_employee.png deleted file mode 100644 index d2c21ce726..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_details_employee.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_facet_dialog.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_facet_dialog.png deleted file mode 100644 index 81bcf317e0..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_facet_dialog.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_wizard_create_fields.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_wizard_create_fields.png new file mode 100644 index 0000000000..30550ea033 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/jpa_wizard_create_fields.png 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 new file mode 100644 index 0000000000..d264d09639 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapped_entity_type_link.png 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 new file mode 100644 index 0000000000..3355741af7 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_file_new.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_embed.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_embed.png new file mode 100644 index 0000000000..fb3d1b263f Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_embed.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_entity.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_entity.png new file mode 100644 index 0000000000..7a653db355 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_entity.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_superclass.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_superclass.png new file mode 100644 index 0000000000..6ef54378f0 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/mapping_type_selection_superclass.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_basicmappings.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_basicmappings.png new file mode 100644 index 0000000000..1b0b7ff4bd Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_basicmappings.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddableentitymapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddableentitymapping.png new file mode 100644 index 0000000000..48294edaf6 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddableentitymapping.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddedidmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddedidmapping.png new file mode 100644 index 0000000000..abe9dc8d20 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddedidmapping.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddedmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddedmapping.png new file mode 100644 index 0000000000..44d52b8bc4 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_embeddedmapping.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_idmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_idmapping.png new file mode 100644 index 0000000000..fdefb5d781 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_idmapping.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_manytomanymapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_manytomanymapping.png new file mode 100644 index 0000000000..eb8022e16c Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_manytomanymapping.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_manytoonemapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_manytoonemapping.png new file mode 100644 index 0000000000..ccacc19f1e Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_manytoonemapping.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_mappedentity.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_mappedentity.png new file mode 100644 index 0000000000..398ea2c11f Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_mappedentity.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_mappedsuperclass.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_mappedsuperclass.png new file mode 100644 index 0000000000..fc97ceb1fb Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_mappedsuperclass.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_onetomanymapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_onetomanymapping.png new file mode 100644 index 0000000000..5ddc989dfd Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_onetomanymapping.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_onetoonemapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_onetoonemapping.png new file mode 100644 index 0000000000..74d9bbd66c Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_onetoonemapping.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_transientmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_transientmapping.png new file mode 100644 index 0000000000..750488f49d Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_transientmapping.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_versionmapping.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_versionmapping.png new file mode 100644 index 0000000000..a87371215b Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_icon_versionmapping.png 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 new file mode 100644 index 0000000000..d7ffcdcad9 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_facet_task.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_perspective_button.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_perspective_button.png new file mode 100644 index 0000000000..07425ad08a Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_perspective_button.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_dialog.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_dialog.png deleted file mode 100644 index 0fb14b17e1..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_dialog.png and /dev/null 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 new file mode 100644 index 0000000000..61e71bdac8 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_jpa_project_task.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_project_2.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_project_2.png deleted file mode 100644 index ad3ab04aa9..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/new_project_2.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/open_persistence_editor.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/open_persistence_editor.png index b37937c5b4..56911fe5a5 100644 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/open_persistence_editor.png and b/jpa/plugins/org.eclipse.jpt.doc.user/img/open_persistence_editor.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_new.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_new.png new file mode 100644 index 0000000000..6aefae4bab Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_editor_new.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_address.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_address.png deleted file mode 100644 index bd9351ce90..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_address.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_empid.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_empid.png deleted file mode 100644 index 90d889fb4f..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_empid.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_entity.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_entity.png deleted file mode 100644 index bbcbb52d28..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_entity.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_fields.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_fields.png deleted file mode 100644 index 5a41682f77..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_fields.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_fname.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_fname.png deleted file mode 100644 index 3b8b032dc2..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_fname.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_owner.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_owner.png deleted file mode 100644 index f24fe486b9..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_owner.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_phone.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_phone.png deleted file mode 100644 index 25aca17350..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_phone.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_version.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_version.png deleted file mode 100644 index 4ba483ed2a..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_outline_version.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_perspective.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_perspective.png deleted file mode 100644 index f92ea6422b..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_perspective.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_address.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_address.png deleted file mode 100644 index c186d3fef6..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_address.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_addressid.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_addressid.png deleted file mode 100644 index a7e71ad7ca..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_addressid.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_embedded.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_embedded.png deleted file mode 100644 index 91affa5e47..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_embedded.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_empid.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_empid.png deleted file mode 100644 index 9c2811abd5..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_empid.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_empid_pk.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_empid_pk.png deleted file mode 100644 index 46fcc69d4f..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_empid_pk.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_employee.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_employee.png deleted file mode 100644 index 01337ffab0..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_employee.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_entity.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_entity.png deleted file mode 100644 index 0a7685ae3f..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_entity.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_firstname.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_firstname.png deleted file mode 100644 index 67670ff6f0..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_firstname.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_manytoone.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_manytoone.png deleted file mode 100644 index c9f02200b9..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_manytoone.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_mappedsprc.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_mappedsprc.png deleted file mode 100644 index ceb79d9623..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_mappedsprc.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_onetomany.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_onetomany.png deleted file mode 100644 index 148c735293..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_onetomany.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_onetoone.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_onetoone.png deleted file mode 100644 index 3e2b739dcd..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_onetoone.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_version.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_version.png deleted file mode 100644 index fea937d9b6..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/persistence_view_version.png and /dev/null 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 new file mode 100644 index 0000000000..8f6310c59f Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/project_properties_tasks.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/properties_persistence.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/properties_persistence.png deleted file mode 100644 index fcc9886484..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/properties_persistence.png and /dev/null 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 new file mode 100644 index 0000000000..2cebe90add Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_entity.png 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 new file mode 100644 index 0000000000..182350246d Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_jpa_project.png 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 new file mode 100644 index 0000000000..8862770ac0 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/select_a_wizard_mapping.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/task_entering_query.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/task_entering_query.png new file mode 100644 index 0000000000..98ec0ac5b0 Binary files /dev/null and b/jpa/plugins/org.eclipse.jpt.doc.user/img/task_entering_query.png differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/tutorial_object_model.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/tutorial_object_model.png deleted file mode 100644 index eb25d7d6fb..0000000000 Binary files a/jpa/plugins/org.eclipse.jpt.doc.user/img/tutorial_object_model.png and /dev/null differ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/index.xml b/jpa/plugins/org.eclipse.jpt.doc.user/index.xml index 53f4f73873..96cf22cc0b 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/index.xml +++ b/jpa/plugins/org.eclipse.jpt.doc.user/index.xml @@ -1,473 +1,473 @@ - + - + - + - + - + - + - + - + - + - + - + - - + - - - - + + + + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - - + + - + - + - + - + - - + + - + - - + + - - + + - + - + - - + + - + - + - + - + - - - + + - + - + - + - + - + - + - - - - + - + - + - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - - + + - + @@ -478,78 +478,70 @@ - + - + - + - + - + - + - - + + - + - + - - + + - + - + - - - - + - + - - + + - + - - - - - - + - - + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm b/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm index 3ec245a416..fe4ce88c74 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm @@ -2,30 +2,30 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Legal + - - + + -

+

Legal

-

-

Notices

-

The material in this guide is copyright © 2006, 2008 by Oracle.

-

Terms and conditions regarding the use of this guide.

+

Copyright © 2006, 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

+

Terms and conditions regarding the use of this guide.

- diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm index d75c4d72ad..29bf7c18c8 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm @@ -2,30 +2,30 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + -Inheritance information +Mapping File Wizard + - - - + + + -

-
-

Inheritance information

-

This table lists the fields available on the Inheritance area in the Java Details view for each entity type.

-
- +
+

Mapping File

+

This table lists the properties of the Mapping File Wizard.

+
+

Mapping File Wizard Properties

+
@@ -35,57 +35,75 @@ - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + - - + + -
Property
StrategySpecify the strategy to use when mapping a class or class hierarchy: + +

Project

+
+

The name of the JPA project.

+
+

Selected.

+
+

Source folder

+
+

The location of the project's src folder. If needed, click Browse to point the wizard to the src file's location.

+
+

Selected.

+
+

File Path

+
+

The location for the new orm.xml file.

+
+

Selected.

+
+

Default Access

+
+

Select whether the access to the entity is field-based or property-based, as defined in JPA specification.

  • -

    Single table – All classes in the hierarchy are mapped to a single table.

    +

    None – No access type specified.

  • -

    Joined – The root of the hierarchy is mapped to a single table; each child maps to its own table.

    +

    Property-based – Persistent state accessed through the property accessor methods. The property accessor methods must be public or private.

  • -

    Table per class – Each class is mapped to a separate table.

    +

    Field-based – Instance variables are accessed directly. All non-transient instance variables are persistent.

Single table
Discriminator ColumnUse to specify the name of the discriminator column when using a Single or Joined inheritance strategy.
Discriminator TypeSet this field to set the discriminator type to Char or Integer (instead of its default: String). The Discriminator Value must conform to this type.String
Discriminator ValueSpecify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified Discriminator Type.
+

None

+
Primary Key Join ColumnsUse to override the default primary key join columns. Select Override Default, then click Add to select new Join Column. -

This field corresponds with @PrimaryKeyJoinColumn annotation.

+
+

Add to persistence unit

+
+

Designates the persistence unit for this object map file.

+
+

Selected.



- -

 

-Related task
-
-Specifying entity inheritance
-Adding persistence to a class -

 

-Related reference
-
-JPA Details view (for entities)
+
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm index 5c3844baee..372d36b924 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm @@ -2,69 +2,30 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + -Join Table Information +Mapping File Wizard Properties + - - - + + + -

-
-

Join Table Information

-

Use area to specify a mapped column for joining an entity association. By default, the mapping is assumed to have a single join.

-

This table lists the fields available on the Join Table area in the JPA Details view for One-to-many mapping and Many-to-many mapping mapping types.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
PropertyDescriptionDefault
NameName of the join table that contains the foreign key column.By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.
Join ColumnsSpecify a mapped column for joining an entity association. This field corresponds to the @JoinColum attribute. -

Select Override Default, then Add, Edit, or Remove the join columns.

-
By default, the mapping is assumed to have a single join.
Inverse Join ColumnsSelect Override Default, then Add, Edit, or Remove the join columns.
-
- -

 

-Related task
-
-Mapping an entity -

 

-Related task
-
-Edit Join Columns Dialog
- +
+

Generate DDL from Entities Wizard

+

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.

+
+ + - -

 

-Related task
-
-Mapping an entity -

 

-Related task
-
-Edit Join Columns Dialog
- +

+
+

Property pages

+

This section includes information on the following:

+ - +
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm index 15924fcd39..2216c0bebf 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm @@ -2,76 +2,79 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + General information + - - + + -

+

General information

This table lists the General information fields available in the JPA Details view for each entity type.

-
- +
+
- - - + + + + - - - + + + + - - - + + + + - - - + + + + - - - + + + + + + + + + + + + + + + +
PropertyDescriptionDefaultPropertyDescriptionDefaultAvailable for Entity Type
PackageThe Java package that contains the persistent entities. Click Browse and select the package
Mapping Type HyperlinkClicking 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.EntityEntity, Embeddable, and Mapped superclass
SchemaThe database schema that contains the Table. -

This field corresponds to the <schema> element in the orm.xml file.

-

NameThe name of this entity. By default, the class name is used as the entity name.
Entity
CatalogThe database catalog that contains the Table. -

This field corresponds to the <catalog> element in the orm.xml file.

-

TableThe default database table information for this entity. These fields can be overridden by the information in the Attribute overrides area.
Entity
AccessSpecify the default access method for the variables in the project: -
    -
  • -

    Property

    -
  • -
  • -

    Field

    -
  • -
-

This field corresponds to the <access> element in the orm.xml file.

-

  NameThe name of the primary database table associated with the entity.
Entity
  CatalogThe database catalog that contains the Table.As defined in orm.xml.Entity
  SchemaThe database schema that contains the Table.As defined in orm.xml.Entity

- +

 

Related task

diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm index b7412b2c7f..7c51be887c 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm @@ -2,94 +2,66 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + -Persistence Unit information +Attribute overrides + - - - + + + -

+

-

Persistence Unit information

-

This table lists the Persistence Unit information fields available in the JPA Details view for each entity type. These fields are contained in the <persistence-unit-metadata> element in the orm.xml file.

-
- +

Attribute overrides

+

Use the Attribute Overrides area in the JPA Details view to override the default settings specified in the General information area of an attribute. Attribute overrides generally override/configure attribtues that are inherited or embedded.

+

This table lists the Attribute override fields available in the JPA Details view for each entity type.

+
+
- - - + + + + - - - + + + + - - - - - - - - - - - - - - - - - - + + + +
PropertyDescriptionDefaultPropertyDescriptionDefaultAvailable for Entity Type
XML Mapping Data CompleteSpecifies that the Java classes in this persistence unit are fully specified by their metadata. Any annotations will be ignored. -

This field corresponds to the <xml-mapping-metadata-complete> element in the orm.xml file.

-

Attribute OverridesSpecify a property or field to be overridden (from the default mappings). Select Override Default.
Entity
SchemaThe database schema that contains the Table. -

This field corresponds to the <schema> element in the orm.xml file.

-

CatalogThe database catalog that contains the Table. -

This field corresponds to the <catalog> element in the orm.xml file.

-

Access TypeSpecify how the entity its access instance variables. -
    -
  • -

    Property – Persistent state accessed through the property accessor methods. The property accessor methods must be public or private.

    -
  • -
  • -

    Field – Instance variables are accessed directly. All non-transient instance variables are persistent.

    -
  • -
-
Property
Cascade PersistAdds cascade-persist to the set of cascade options in entity relationships of the persistence unit. -

This field corresponds to the <cascade-persist> element in the orm.xml file.

-

Join Columns

Entity

- +

 

Related task

+General information
Adding persistence to a class

 

Related reference

JPA Details view (for entities)
- -
+ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm index 7f13b162d4..c0d2f2e8f9 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm @@ -2,36 +2,91 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + -Dialogs +Inheritance information + - - - + + + -

-
-

Dialogs

-

This section includes information on the following preference pages:

+

+
+

Inheritance information

+

This table lists the fields available on the Inheritance area in the JPA Details view for each entity type.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyDescriptionDefault
StrategySpecify the strategy to use when mapping a class or class hierarchy:
  • -

    Generate Entities from Tables dialog

    +

    Single table – All classes in the hierarchy are mapped to a single table.

    +
  • +
  • +

    Joined – The root of the hierarchy is mapped to a single table; each child maps to its own table.

  • -

    Edit Join Columns Dialog

    +

    Table per class – Each class is mapped to a separate table.

+
Single table
Discriminator ColumnUse to specify the name of the discriminator column when using a Single or Joined inheritance strategy.
Discriminator TypeSet this field to set the discriminator type to Char or Integer (instead of its default: String). The Discriminator Value must conform to this type.String
Discriminator ValueSpecify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified Discriminator Type.
Primary Key Join ColumnsUse to override the default primary key join columns. Select Override Default, then click Add to select new Join Column. +

This field corresponds with @PrimaryKeyJoinColumn annotation.

+

+
+ +

 

+Related task
+
+Specifying entity inheritance
+Adding persistence to a class +

 

+Related reference
+
+JPA Details view (for entities)
+ -
+ diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm index 74a81b6a05..b051676e97 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm @@ -2,56 +2,37 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + -Edit Join Columns Dialog +Inheritance information + - - - + + + -

-
-

Edit Join Columns Dialog

-

Use the Join Columns dialog to create or modify the join tables and columns in relationship mappings.

-

This table lists the properties available in the Join Columns dialog.

-
- - - - - - - - - - - - - - - - - -
PropertyDescription
NameName of the joint table column that contains the foreign key column.
Referenced Column NameName of the database column that contains the foreign key reference for the entity relationship.
-
- +
+

Queries

+

Use the queries area of the JPA Details view to create named queries and named native queries. Refer to "Creating Named Queries" for additional information.

+

 

+Related task
+
+Creating Named Queries +

 

Related reference

-Join Table Information
-Join Columns Information
+JPA Details view (for entities)
+ - + +

 

+Related task
+
+Mapping an entity +

 

+Related task
+
+Edit Join Columns Dialog + - + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm index 0216d82d18..5d0b6c7895 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm @@ -2,101 +2,58 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + -Icons +Join Columns Information + - - - + + + -

-
-

Icons

-

The following icons are used throughout the Dali OR Mapping Tool.

+

+
+

Join Columns Information

+

This table lists the fields available in the Join Table area in JPA Details view for Many-to-one mapping and One-to-one mapping mapping types.

- +
- - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
IconDescriptionPropertyDescriptionDefault
Nonpersistent class icon
Nonpersistent class
Persistent entity icon
Entity
Embeddable entity icon
Embeddable entity
Mapped superclass icon
Mapped superclass
Basic mapping icon
Basic mapping
Embedded mapping icon
Embedded mapping
Embedded ID mapping icon
Embedded ID mapping
ID mapping icon
ID mapping
Many-to-many mapping icon
Many-to-many mapping
Many-to-one mapping icon
Many-to-one mapping
One-to-many mapping icon
One-to-many mapping
One-to-one mapping icon
One-to-one mapping
Transient mapping icon
Transient mapping
Version mapping icon
Version mapping
Join ColumnSpecify a mapped column for joining an entity association. This field corresponds to the @JoinColum attribute. +

Select Override Default, then Add, Edit, or Remove the join columns.

+
By default, the mapping is assumed to have a single join.

-Related concept
-

Icons and buttons

-
- +

 

+Related task
+
+Mapping an entity +

 

+Related task
+
+Edit Join Columns Dialog
+ -Related concept
-

Icons and buttons

- - - +

 

+Related task
+
+Adding persistence to a class +

 

+Related reference
+
+JPA Details view (for entities) + + +

 

+Related task
+
+Adding persistence to a class +

 

+Related reference
+
+JPA Details view (for entities) + + - + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm new file mode 100644 index 0000000000..1800b3f03d --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference019.htm @@ -0,0 +1,115 @@ + + + + + +General + + + + + + + + + + + + + + + +

+
+

General

+

The following table lists properties available in the General page of the persistence.xml Editor.

+
+

Properties of the General Page

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyDescriptionDefault
+

Name

+
+

Enter the name of the persistence unit.

+
+

The project name.

+
+

Persistence Provider

+
+

Enter the name of the persistence provider.

+
+

Determined by the server.

+
+

Description

+
+

Enter a description for this persistence unit. This is an optional property.

+

+

Managed Classes

+
+

Add or remove the classes managed through the persistence unit.

+

+

  Exclude Unlisted Classes

+
+

Select to include all annotated entity classes in the root of the persistence unit.

+
+

False

+
+

XML Mapping Files

+
+

Add or remove the object/relational mapping XML files define the classes managed through the persistence unit.

+
+

Meta-INF\orm.xml

+
+
+
+ + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm new file mode 100644 index 0000000000..2aeca38b22 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference020.htm @@ -0,0 +1,163 @@ + + + + + +Connection + + + + + + + + + + + + + + + +

+
+

Connection

+

The following table lists the properties available in the Connection page of the persistence.xml Editor.

+
+

Properties of the Connection Page

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyDescriptionDefault
+

Transaction Type

+
+

Specify if the connection for this persistence unit uses one of the following transaction types:

+
    +
  • +

    Default -- Select to use the container used by the container.

    +
  • +
  • +

    JTA (Java Transaction API) -- Transactions of the Java EE server.

    +
  • +
  • +

    Resource Local -- Native actions of a JDBC driver that are referenced by a persistence unit.

    +
  • +
+

+

Batch Writing

+
+

Specify the use of batch writing to optimize transactions with multiple write operations.

+

Set the value of this property into the session at deployment time.

+

Note: This property applies when used both in a Java SE and Java EE environment.

+

The following are the valid values for oracle.toplink.config.BatchWriting:

+
    +
  • +

    JDBC–Use JDBC batch writing.

    +
  • +
  • +

    Buffered–Do not use either JDBC batch writing nor native platform batch writing.

    +
  • +
  • +

    OracleJDBC–Use both JDBC batch writing and Oracle native platform batch writing.

    +
  • +
  • +

    None–Do not use batch writing (turn it off).

    +
  • +
+
+

None

+
+

JTA Data Source Name

+
+

If you selected JTA as the transaction type, then enter the name of the default JTA data source for the persistence unit.

+

+

Non-JTA Data Source Name

+
+

If you selected Resource Local as the transaction type, then enter the name of the non-JTA data source.

+

This property is not available for projects using the Generic platform.

+

+

  Bind Parameters

+
+

Control whether or not the query uses parameter binding.

+

Note: This property applies when used in a Java SE environment.

+

This property is not available for projects using the Generic platform.

+

+

EclipseLink Connection Pool

+
+

Define the connection pool driver, URL, user name and password.

+

These properties are note available for projects using the Generic platform.

+

+

  Read Connection

+
+

The maximum and minimum number of connections allowed in the JDBC read connection pool.

+

Note: Thesse property apply when used in a Java SE environment.

+

These properties are not available for projects using the Generic platform

+

+

  Write Connection

+
+

The maximum and minimum number of connections allowed in the JDBC read connection pool.

+

Note: Thesse property apply when used in a Java SE environment.

+

These properties are not available for projects using the Generic platform

+

+
+
+ + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm new file mode 100644 index 0000000000..236e9d5c8b --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference021.htm @@ -0,0 +1,153 @@ + + + + + +Customization + + + + + + + + + + + + + + + +

+
+

Customization

+

The following table lists the properties available in the Customization page of the persistence.xml Editor.

+
+

Properties of the Customization Page

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyDescriptionDefault
+

Weaving

+
+

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:

+
    +
  • +

    No Weaving

    +
  • +
  • +

    Weave Dynamically

    +
  • +
  • +

    Weave Statically -- 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 -javaagent:eclipselink.jar on the JVM command line. This assumes that classes have already been statically woven. Run the static weaver on the classes before deploying them.

    +
  • +
+
+

Weave Dynamically

+
+

  Weaving Lazy

+
+

Select this optoin to enable lazy weaving.

+

+

  Weaving Fetch Groups

+
+

Select this option to enable fetch groups through weaving. Set this option to false if:

+
    +
  • +

    There is no weaving.

    +
  • +
  • +

    Classes should not be changed during weaving (for example, when debugging).

    +
  • +
+

Set this property to false for platforms where it is not supported.

+

+

  Weaving Change Tracking

+
+

Select this option to use weaving to detect which fields or properties of the object change.

+

+

  Throw Exceptions

+
+

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 persistence.xml file <mapping-file> element.

+

+

Session Customizer

+
+

Select a session customizer class: a Java class that implements the eclipselink.tools.sessionconfiguration.SessionCustomizer interface and provides a default (zero-argument) constructor. Use this class' customize method, which takes an eclipselink.sessions.Session, to programmatically access advanced EclipseLink session API.

+

+

Descriptor Customizer

+
+

Select an EclipseLink descriptor customizer class–a Java class that implements the eclipselink.tools.sessionconfiguration.DescriptorCustomizer interface and provides a default (zero-argument) constructor. Use this class's customize method, which takes an eclipselink.descriptors.ClassDescriptor, to programmatically access advanced EclipseLink descriptor and mapping API for the descriptor associated with the JPA entity named <ENTITY>.

+

+
+ +

The following table lists the properties of the persistence.xml Editor.

+
+

+ + + + + + +
+

Note:

+This page is not available for projects using the Generic platform.
+
+
+
+ + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm new file mode 100644 index 0000000000..e8b7597699 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference022.htm @@ -0,0 +1,157 @@ + + + + + +Caching + + + + + + + + + + + + + + + +

+
+

Caching

+

This table lists the properties of the Caching page of the persistence.xml Editor.

+
+

Properties of the Caching Page

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyDescriptionDefault
+

Default Cache Type

+
+

Select one of the following as the Default Cache Type:

+
    +
  • +

    Soft with Weak Subcache–This option is similar to Weak with Hard Subcache 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.

    +

    Use this identity map in most circumstances as a means to control memory used by the cache.

    +
  • +
  • +

    Week with Hard Subcache–This option is similar to Soft with Weak 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.

    +
  • +
  • +

    Weak–This option is similar to Full, except that objects are referenced using weak references. This option uses less memory than Full, allows complete garbage collection and provides full caching and guaranteed identity.

    +

    Use this identity map for transactions that, once started, stay on the server side.

    +
  • +
  • +

    Soft–This option is similar to Weak 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.

    +
  • +
  • +

    Full–This option provides full caching and guaranteed identity: all objects are cached and not removed.

    +

    Note: This process may be memory-intensive when many objects are read.

    +
  • +
  • +

    None–This option does not preserve object identity and does not cache objects.This option is not recommended.

    +
  • +
+
+

Weak with hard subcache

+
+

Default Cache Size

+
+

Set the size of the cache.

+
+

1000

+
+

Default Shared Cache

+
+

Specfies if cached instances should be in the shared cache or in a client isolated cache.

+

+

Entity Caching

+
+

Specify the entity.

+

+

  Cache Type

+
+

Select a cache type. See Default Cache

+

+

  Cache Size

+
+

Set the size of the cache.

+

+

  Shared Cache

+
+

See Default Shared Cache.

+

+
+ +
+

+ + + + + + +
+

Note:

+This page is not available for projects using the Generic platform.
+
+
+
+ + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm new file mode 100644 index 0000000000..d977ea45cb --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference023.htm @@ -0,0 +1,217 @@ + + + + + +Logging + + + + + + + + + + + + + + + +

+
+

Logging

+

This table lists the properties of the Logging page of the persistence.xml Editor.

+
+

+ + + + + + +
+

Note:

+This page is not available for projects using the Generic platform.
+
+
+
+

Properties of the Logging Page

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyDescriptionDefault
+

Logging Level

+
+

Specifies the amount and detail of log output by selecting the log level (in ascending order of information):

+

The following are the valid values for the java.util.logging.Level:

+
    +
  • +

    OFF–disables logging

    +
  • +
  • +

    SEVERE–logs exceptions indicating TopLink cannot continue, as well as any exceptions generated during login. This includes a stack trace.

    +
  • +
  • +

    WARNING–logs exceptions that do not force TopLink to stop, including all exceptions not logged with severe level. This does not include a stack trace.

    +
  • +
  • +

    INFO–logs the login/logout per sever session, including the user name. After acquiring the session, detailed information is logged.

    +
  • +
  • +

    CONFIG–logs only login, JDBC connection, and database information.

    +
  • +
  • +

    FINE–logs SQL.

    +
  • +
  • +

    FINER–similar to warning. Includes stack trace.

    +
  • +
  • +

    FINEST–includes additional low level information.

    +
  • +
+

Example: persistence.xml file

+
+<property name="eclipselink.logging.level" value="INFO"/>
+
+

Info

+
+

  TimeStamp

+
+

Control whether the timestamp is logged in each log entry.

+

The following are the valid values:

+
    +
  • +

    true–log a timestamp.

    +
  • +
  • +

    false–do not log a timestamp.

    +
  • +
+

Example: persistence.xml file

+
+<property name="eclipselink.logging.timestamp" value="false"/>
+

+

  Thread

+
+

Control whether a thread identifier is logged in each log entry.

+

The following are the valid values:

+
    +
  • +

    true–log a thread identifier.

    +
  • +
  • +

    false–do not log a thread identifier.

    +
  • +
+

+

  Session

+
+

Control whether an EclipseLink session identifier is logged in each log entry.

+

The following are the valid values:

+
    +
  • +

    true–log a EclipseLink session identifier.

    +
  • +
  • +

    false–do not log a EclipseLink session identifier.

    +
  • +
+

Example: persistence.xml file

+
+<property name="eclipselink.logging.session" value="false"/>
+

+

  Exceptions

+
+

Control whether the exceptions thrown from within the TopLink code are logged prior to returning the exception to the calling application. Ensures that all exceptions are logged and not masked by the application code.

+

The following are the valid values:

+
    +
  • +

    true–log all exceptions.

    +
  • +
  • +

    false–do not log exceptions.

    +
  • +
+

Example: persistence.xml file

+
+<property name="eclipselink.logging.exceptions" value="true"/>
+

+

Logger

+
+

Select the type of logger to use:

+

The following are the valid values:

+
    +
  • +

    DefaultLogger–the EclipseLink native logger eclipselink.logging.DefaultSessionLog.

    +
  • +
  • +

    JavaLogger–the java.util.logging logger eclipselink.logging.JavaLog.

    +
  • +
  • +

    ServerLogger–the java.util.logging logger eclipselink.platform.server.ServerLog. Integrates with the application server's logging as define in the eclipselink.platform.server.ServerPlatform.

    +
  • +
  • +

    Fully qualified class name of a custom logger. The custom logger must implement the eclipselink.logging.SessionLog interface.

    +
  • +
+

Example: persistence.xml file

+
+<property name="eclipselink.logging.logger" value="acme.loggers.MyCustomLogger" />
+
+

DefaultLogger

+
+
+
+ + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm new file mode 100644 index 0000000000..cc2a5fa9d0 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference024.htm @@ -0,0 +1,124 @@ + + + + + +Options + + + + + + + + + + + + + + + +

+
+

Options

+

This table lists the properties of the Options page of the persistence.xml Editor.

+
+

+ + + + + + +
+

Note:

+This page is not available for projects using the Generic platform.
+
+
+
+

Properties of the Options Page

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyDescriptionDefault
+

Session Name

+
+

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 sessions.xml file

+

Valid values: a valid EclipseLink session name that is unique in a server deployment.

+

Example: persistence.xml file

+
+<property name="eclipselink.session-name" value="MySession"/>
+

+

Sessions XML

+
+

Specify persistence information loaded from the EclipseLink session configuration file (sessions.xml).

+

You can use this option as an alternative to annotations and deployment XML. If you specify this property, TopLink will override all class annotation and the object relational mapping from the persistence.xml, as well as ORM.xml and other mapping files, if present. .

+

Indicate the session by setting the eclipselink.session-name property.

+

Note: If you do not specify the value for this property, sessions.xml file will not be used.

+

Valid values: the resource name of the sessions XML file.

+

Example: persistence.xml file

+
+<property name="toplink.session-xml" value="mysession.xml"/>
+

+

Target Database

+


+

Event Listener

+
+

Specify a descriptor event listener to be added during bootstrapping.

+

Valid values: qualified class name for a class that implements the eclipselink.sessions.SessionEventListener interface.

+

Example: persistence.xml file

+
+<property name="eclipselink.session-event-listener" value="mypackage.MyClass.class"/>
+

+

Include Descriptor Queries

+
+

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.

+

+
+
+ + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm new file mode 100644 index 0000000000..22dc348ddc --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference025.htm @@ -0,0 +1,139 @@ + + + + + +Schema Generation + + + + + + + + + + + + + + + +

+
+

Schema Generation

+

This table lists the properties of the Schema Generation page of the persistence.xml Editor.

+
+

+ + + + + + +
+

Note:

+This page is not available for projects using the Generic platform.
+
+
+
+

 

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyDescriptionDefault
+

DDL Generation Type

+
+

Select the type of DDL generation:

+
    +
  • +

    None -- Do not generate DDL; no schema is generated.

    +
  • +
  • +

    Create Tables -- Create DDL for non-existent tables; leave existing tables unchanged.

    +
  • +
  • +

    Drop and Create Tables -- Create DDL for all tables; drop all existing tables.

    +
  • +
+
+

None

+
+

Output Mode

+
+

Select the DDL generation target:

+
    +
  • +

    Both -- Generate SQL files and execute them on the database.

    +
  • +
  • +

    Database -- Execute SQL on the database only (do not generate SQL files).

    +
  • +
  • +

    SQL Script -- Generate SQL files only (do not execute them on the database).

    +
  • +
+

+

DDL Generation Location

+
+

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.

+

+

Create DDL File Name

+
+

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.

+
+

createDDL.jdbc

+
+

Drop DDL File Name

+
+

Specify the file name of the DDL file that EclipseLink generates that contains SQL statements for dropping tables for JPA entities.

+
+

dropDDL.jdbc

+
+
+
+ + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm new file mode 100644 index 0000000000..7509ac1859 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference026.htm @@ -0,0 +1,39 @@ + + + + + +Properties + + + + + + + + + + + + + + + +

+
+

Properties

+

This page enables you to add or remove the vendor-specific <properties> elements of persistence.xml.

+
+ + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm new file mode 100644 index 0000000000..f3b17ff6b1 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference027.htm @@ -0,0 +1,45 @@ + + + + + +Source + + + + + + + + + + + + + + + +

+
+

Source

+

Using this page, you can manually edit the persistence.xml file.

+

See "Managing the persistence.xml file" for additional information.

+

 

+Related task
+
+Managing the persistence.xml file
+ + + + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm new file mode 100644 index 0000000000..34ab9b36c0 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference028.htm @@ -0,0 +1,42 @@ + + + + + +Preferences + + + + + + + + + + + + + + + +

+
+

Preferences

+

This section includes information on the following preference pages:

+ + + +
+ + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm new file mode 100644 index 0000000000..c3e5318115 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference029.htm @@ -0,0 +1,45 @@ + + + + + +Dialogs + + + + + + + + + + + + + + + +

+
+

Dialogs

+

This section includes information on the following preference pages:

+ + + +
+ + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm new file mode 100644 index 0000000000..dfef031caf --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference030.htm @@ -0,0 +1,65 @@ + + + + + +Edit Join Columns Dialog + + + + + + + + + + + + + + + +

+
+

Edit Join Columns Dialog

+

Use the Join Columns dialog to create or modify the join tables and columns in relationship mappings.

+

This table lists the properties available in the Join Columns dialog.

+
+ + + + + + + + + + + + + + + + + +
PropertyDescription
NameName of the joint table column that contains the foreign key column.
Referenced Column NameName of the database column that contains the foreign key reference for the entity relationship.
+
+ +Related reference
+
+Join Table Information
+Join Columns Information
+ + + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm new file mode 100644 index 0000000000..c1d4d61954 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference031.htm @@ -0,0 +1,45 @@ + + + + + +Icons and buttons + + + + + + + + + + + + + + + +

+
+

Icons and buttons

+

This section includes information on each of the icons and buttons used in the Dali OR Mapping Tool.

+ + + +
+ + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm new file mode 100644 index 0000000000..193500af99 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference032.htm @@ -0,0 +1,106 @@ + + + + + +Icons + + + + + + + + + + + + + + + +

+
+

Icons

+

The following icons are used throughout the Dali OR Mapping Tool.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IconDescription

Entity
Embeddable entity icon
Embeddable entity
Mapped superclass icon
Mapped superclass
Basic mapping icon
Basic mapping
Embedded mapping icon
Embedded mapping
Embedded ID mapping icon
Embedded ID mapping
ID mapping icon
ID mapping
Many-to-many mapping icon
Many-to-many mapping
Many-to-one mapping icon.
Many-to-one mapping
One-to-many mapping icon
One-to-many mapping
One-to-one mapping icon.
One-to-one mapping
Transient mapping icon.
Transient mapping
Version mapping icon.
Version mapping
+
+ +Related concept
+

Icons and buttons

+
+ + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm new file mode 100644 index 0000000000..26558166a5 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference033.htm @@ -0,0 +1,59 @@ + + + + + +Buttons + + + + + + + + + + + + + + + +

+
+

Buttons

+

The following buttons are used throughout the Dali OR Mapping Tool.

+
+ + + + + + + + + + + + + +
IconDescription
The JPA Perspective icon
JPA Development perspective
+
+ +Related concept
+

Icons and buttons

+
+ + + + + + + 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..83f7012bf7 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference034.htm @@ -0,0 +1,52 @@ + + + + + +Dali Developer Documentation + + + + + + + + + + + + + + + +

+
+

Dali Developer Documentation

+

Additional Dali documentation is available online at:

+

http://wiki.eclipse.org/index.php/Dali_Developer_Documentation

+

This developer documentation includes information about:

+ +
+ + + + + + 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 9ca7488621..a9393a413a 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Adding persistence to a class + - - + + @@ -23,16 +23,16 @@

Adding persistence to a class

-

You can make a Java class into one of the following persistent types:

+

You can make a Java class into one of the following persistent types:

 

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 fffd42b208..5889d58acb 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_additonal_tables.htm @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Specifying additional tables + - - + + @@ -23,15 +23,15 @@

Specifying additional tables

-

An entity may inherit properties from other entities. You can specify a specific strategy to use for inheritance.

-

Use this procedure to specify inheritance (@Inheritance) for an existing entity (@Entity):

+

Add a secondary table annotation to an entity if its data is split across more more than one table.

+

To add a secondary table to the entity,

  1. Select the entity in the Package Explorer.

  2. In the JPA Details view, select the Secondary Tables information.

    -
    +

    Specifying Secondary Tables

    Secondary Tables area on the JPA Details view.
  3. 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 e1dab94b80..c63bba7b86 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Creating a new JPA project + - - + + @@ -23,31 +23,59 @@

    Creating a new JPA project

    -

    Use this procedure to create a new JPA project.

    +

    Use this procedure to create a new JPA project.

    1. -

      Select File > New > Other. The New Project dialog appears.

      -
    2. +

      From the Navigator or Package Explorer, select File > New > Project. The Select a wizard dialog appears.

      +
      +

      + + + + + + +
      +

      Tip:

      +You can also select the JPA perspective and then select File > New > JPA Project.
      +
      +
      +
      +

      Selecting the Create a JPA Project wizard

      +The Select a Wizard dialog with JPA project selected.
      +
    3. -

      On the New Project dialog, select JPA > JPA Project and click Next. The New JPA Project wizard appears.

      -
      -

      New JPA Project

      -The New JPA Project dialog.
      +

      Select JPA Project and then click Next. The New JPA Project page appears.

      +
      +

      The JPA Project Page

      +The JPA Project page of the Create a JPA Project wizard.
    4. Complete the fields on the New JPA Project page to specify the project name and location, target runtime, and pre-defined configuration.

      +
      +

      + + + + + + +
      +

      Note:

      +The Target Runtime is not required for Java SE development.
      +
      +
    5. -

      Click Next. The Project Facets page appears.

      -
    6. -
    7. -

      Select the project facets to use to create the project and click Next. The JPA Facet page appears.

      -
      -

      New JPA Project

      -The JPA Facet dialog
      +

      Click Next. JPA Facet page appears.

      +
      +

      The JPA Facet Page

      +The JPA Facet page of the Create a JPA Project wizard.
    8. Complete the fields on the JPA Facet page to specify your vender-specific platform, database connection, and JPA implementation library.

      +

      If Dali derives the incorrect schema, select Override the Default Schema for Connection. Using this option, you can select a development time schema for defaults and validation.

      +

      If you clear the Create orm.xml option (which is selected by default), you can later add a mapping file to the project using the Mapping File Wizard.


      @@ -72,6 +100,22 @@ If the server runtime does not provide a JPA implementation, you must explicitly Related reference

      Create New JPA Project wizard
      +JPA Development perspective
      +Mapping File Wizard +

       

      +Related tasks
      +
      +Managing the persistence.xml file
      +Adding persistence to a class +

       

      +Related concept
      +
      +Understanding Java persistence
      +The persistence.xml file +

       

      +Related reference
      +
      +
      JPA Development perspective

       

      Related tasks
      diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_entities.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_entities.htm index 2a15e376ab..7bbeee96a7 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_entities.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_entities.htm @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - +Generate Entities from Tables dialog + - - + + @@ -23,39 +23,39 @@

      Generate Entities from Tables dialog

      -

      Use the Generate Entities dialog to create Java persistent entities from your database tables and columns.

      +

      Use the Generate Entities dialog to create Java persistent entities from your database tables and columns.

      This table lists the properties available in the Generate Entities dialog.

      - - + + - - + + - - + + - - + + - - + +
      PropertyDescriptionPropertyDescription
      Source FolderEnter a project folder name in which to generate the Java persistent entities, or click Browse to select an existing folder.Source FolderEnter a project folder name in which to generate the Java persistent entities, or click Browse to select an existing folder.
      PackageEnter a package name in which to generate the Java persistent entities, or click Browse to select an existing package.PackageEnter a package name in which to generate the Java persistent entities, or click Browse to select an existing package.
      Synchronize Classes in persistence.xmlSpecify if Dali should update the persistence.xml file to include the generated classes.Synchronize Classes in persistence.xmlSpecify if Dali should update the persistence.xml file to include the generated classes.
      TablesSelect the tables from which to create Java persistent entities. The tables shown are determined by the database connection that you defined in the Project Properties page – JPA Options.TablesSelect the tables from which to create Java persistent entities. The tables shown are determined by the database connection that you defined in the Project Properties page – JPA Options.

      Related task
      -

      Generating entities from tables

      +

      Generating entities from tables

       

      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 b69c13e561..7d35747af2 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Specifying entity inheritance + - - + + @@ -23,7 +23,7 @@

      Specifying entity inheritance

      -

      An entity may inherit properties from other entities. You can specify a specific strategy to use for inheritance.

      +

      An entity may inherit properties from other entities. You can specify a specific strategy to use for inheritance.

      Use this procedure to specify inheritance (@Inheritance) for an existing entity (@Entity):

      1. @@ -31,7 +31,7 @@
      2. In the JPA Details view, select the Inheritance information.

        -
        +

        Specifying Inheritance

        Selecting the Inheritance area on the JPA Details view.
      3. @@ -50,42 +50,42 @@
      4. -

        Use the following table to complete the remaining fields on the tab. See "Inheritance information" for additional details.

        +

        Use the following table to complete the remaining fields on the tab. See "Inheritance information" for additional details.

        - - - + + + - - + - + - - - + + + - - + - + - - + - +
        PropertyDescriptionDefaultPropertyDescriptionDefault
        Discriminator ColumnName of the discriminator column when using a Single or Joined inheritance strategy. +Discriminator ColumnName of the discriminator column when using a Single or Joined inheritance strategy.

        This field corresponds to the @DiscriminatorColumn annotation.



        Discriminator TypeSet the discriminator type to Char or Integer (instead of its default: String). The Discriminator Value must conform to this type.StringDiscriminator TypeSet the discriminator type to Char or Integer (instead of its default: String). The Discriminator Value must conform to this type.String
        Discriminator ValueSpecify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified Discriminator Type. +Discriminator ValueSpecify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified Discriminator Type.

        This field corresponds to the @DiscriminatorValue annotation.



        Override DefaultUse this field to specify custom primary key join columns. +Override DefaultUse this field to specify custom primary key join columns.

        This field corresponds to the @PrimaryKeyJoinClumn annotation.



        @@ -102,13 +102,13 @@ referencedColumnName = "<REFERENCED_COLUMN_NAME>") -

        The following figures illustrates the different inheritance strategies.

        -
        +

        The following figures illustrates the different inheritance strategies.

        +

        Single Table Inheritance

        This figure illustrates entity inheritance in a single table.
        -
        -

        Joined Table Inheritance

        +
        +

        Joined Table Inheritance

        This figure illustrates a joined subclass inheritance strategy.

        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 f893e894f9..0dba21f958 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Managing the orm.xml file + - - + + @@ -22,9 +22,9 @@

        -

        Managing the orm.xml file

        +

        Managing the orm.xml file

        When creating a JPA project, (see "Creating a new JPA project") you can also create the orm.xml file that defines the mapping metadata and defaults.

        -

        Eclipse creates the META-INF\orm.xml file in your project's directory:

        +

        Eclipse creates the META-INF\orm.xml file in your project's directory:

         <?xml version="1.0" encoding="UTF-8"?>
         <persistence version="<PERSISTENCE_VERSION>"
        @@ -44,7 +44,7 @@
         

         

        Related task

        -Working with orm.xml file
        +Working with orm.xml file

         

        Related concept

        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 0a443efd03..67a45baac5 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Managing the persistence.xml file + - - + + @@ -22,29 +22,179 @@

        -

        Managing the persistence.xml file

        -

        When creating a JPA project, (see "Creating a new JPA project") you can also create the persistence.xml file.

        -

        Eclipse creates the META-INF\persistence.xml file in your project's directory:

        -
        -<?xml version="1.0" encoding="UTF-8"?>
        -<persistence version="<PERSISTENCE_VERSION>"
        -      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_1_0.xsd">
        -  <persistence-unit name="<PERSISTENCE_UNIT_NAME>">
        -    <provider="<PERSISTENCE_PROVIDER>" />
        -  </persistence-unit>
        -</persistence>
        -
        -

         

        +

        Managing the persistence.xml file

        +

        When you create a project, Eclipse creates the META-INF\persistence.xml file in the project's directory.

        +

        You can create a stub persistence.xml file in the META-INF directory when you create a JPA project (see "Creating a new JPA project"). You can manage this file either through the XML editor (see "Using the XML Editor to edit the persistence.xml file") or through the persistence.xml Editor.

        +
        +

        + + + + + + +
        +

        Note:

        +In additon to the General, Connection, Properties and Source pages, the persistence.xml Editor pages for projects that use the EclipseLink platform include the following: +
          +
        • +

          Customization

          +

          Use this page to define change-tracking and session customizer-related properties.

          +
        • +
        • +

          Caching

          +

          Use this page to define caching properties.

          +
        • +
        • +

          Logging

          +

          Use this page to define logging properties.

          +
        • +
        • +

          Options

          +

          Use this page to define session and target database properties.

          +
        • +
        • +

          Schema Generation

          +

          Use this page to define DDL-related properties.

          +
        • +
        +

        For projects using the EclipseLink platform, the Connections page also includes JDBC connection pool properties.

        +

        If the project uses the Generic platform, then only the General, Connection, Properties and Source pages are available.

        +
        +
        +
        +

        To use the persistence.xml Editor:

        +
          +
        1. +

          Open the peristence.xml file. The General page of the editor appears.

          +
        2. +
        3. +

          Use the General page to define the persistence.xml files <persistent-unit>-related attributes as well as the <provider>, and <class> elements (described in the following table).

          +
          +

          + + + + + + +
          +

          Tip:

          +The persistence.xml Editor's Source page enables you to view and edit the raw XML file.
          +
          +
          +
          + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          PropertyDescriptionElement Defined
          NameEnter the name of the persistence unit.<persistence-unit name = "<Name>">
          Persistence ProviderEnter the name of the persistence provider.<provider>
          DescriptionEnter a description for this persistence unit. This is an optional property.<description>
          Managed ClassesAdd or remove the classes managed through the persistence unit.<class>
            Exclude Unlisted ClassesSelect to include all annotated entity classes in the root of the persistence unit.<exclude-unlisted-classes>
          XML Mapping FilesAdd or remove the object/relational mapping XML files define the classes managed through the persistence unit.<mapping-file>
          +
          +
        4. +
        5. +

          Use the Connection page to define the <jta-data-source> and <non-jta-data-source> elements as follows:

          +

          To configure the JTA (Java Transaction API) source used by the persistence provider:

          +
            +
          1. +

            Select JTA from the Transaction Type list.

            +
          2. +
          3. +

            Enter the global JNDI name of the data source.

            +
          4. +
          +

          To configure a non-JTA data source:

          +
            +
          1. +

            Select Resource Local from the Transaction Type list.

            +
          2. +
          3. +

            Enter the global JNDI name of the data source.

            +
            +

            + + + + + + +
            +

            Note:

            +Select Default() to use the data source provided by the container.
            +
            +
            +
          4. +
          +
        6. +
        7. +

          Use the table in the Properties page to set the vendor-specific <properties> element.

          +

          To add <property> elements:

          +
            +
          1. +

            Click Add.

            +
          2. +
          3. +

            Enter the <name> and <value> attributes for the <property> element using the table's Name and Value fields.

            +
          4. +
          +

          To remove a <property> element, select a defined property in the table and then click Remove.

          +
          +

          + + + + + + +
          +

          Note:

          +If the project uses the EclipseLink platform, the connection page also includes parameters for JDBC connection pooling.
          +
          +
          +
        8. +
        Related reference

        -Create New JPA Project wizard +persistence.xml Editor

         

        Related task

        -Working with persistence.xml file
        +Using the XML Editor to edit the persistence.xml file

         

        Related concept

        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 cca2ca0754..b121f6b694 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Mapping an entity + - - + + @@ -26,34 +26,34 @@

        Dali supports the following mapping types for Java persistent entities:

         

        diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm index e5839b48eb..558ad4c43a 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm @@ -2,25 +2,25 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Tasks + - - + + -

        +

        Tasks

        This section includes detailed step-by-step procedures for accessing the Dali OR mapping tool functionality.

        diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm index fd32537468..113ab6b4e6 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm @@ -2,52 +2,147 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + -Working with persistence.xml file +Creating a JPA Entity + - - - + + + -

        -
        -

        Working with persistence.xml file

        -

        You can work with the persistence.xml by using the XML Editor.

        -

        Use this procedure to work with the persistence.xml file:

        +

        +
        +

        Creating a JPA Entity

        +

        Use this procedure to create a JPA entity:

        1. -

          Right-click the persistence.xml file in the Package Explorer and select Open With > XML Editor.

          -
          -

          Opening the XML Editor

          -This figure shows the Open > XML Editor option for the persistence.xml file.
          +

          From the Navigator or Package Explorer, select the JPA project and then File > New > Other. The Select a Wizard dialog appears.

          +
          +

          Selecting the Create a JPA Entity Wizard

          +The Select a Wizard dialog with Entity selected.
        2. -

          Use the XML Editor to edit the persistence.xml file.

          -
          -

          XML Editor

          -This figure shows the XML Editor.
          +

          Select Entity and then click Next. The Entity Class page appears.

          +
          +

          The Entity Class Page

          +The Entity Class page of the Create a JPA Entity wizard.
          + +

          Complete this page as follows:

          +
            +
          • +

            Select the JPA project in the Project field.

            +
          • +
          • +

            In the Source Folder field, select, or enter, the location of the JPA project's src folder.

            +
          • +
          • +

            Select, or enter, the name of the class package for this entity in the Java Package field.

            +
          • +
          • +

            Enter the name of the Java class in the Class name field.

            +
          • +
          • +

            If needed, enter, or select a superclass.

            +
          • +
          • +

            If needed, complete the Inheritance section as follows (these properties are optional):

            +
              +
            • +

              Accept the Entity option (the default) to create a Java class with the @Entity option.

              +
            • +
            • +

              Alternatively, select Mapped superclass (if you defined a super class).

              +
            • +
            • +

              Select Inheritance and then select one of the JSR 220 inheritance mapping strategies (SINGLE_TABLE, TABLE_PER_CLASS, JOINED).

              +
            • +
            • +

              Select Add to entity mappings in XML to create XML mappings in orm.xml, rather than annotations.

              +
            • +
            +
          • +
          +
        3. +
        4. +

          Click Next to proceed to the Entity Properties page where you define the persistent fields for the entity.

          +
          +

          The Entity Properties Page

          +The Entity Properties page of the Create JPA Entity wizard.
          + +

          Alternatively, click Finish to complete the entity.

          +
        5. +
        6. +

          Complete the page as follows:

          +
            +
          1. +

            If needed, enter a new name for the entity. Doing so results in adding a name attribute to the @Entity notation (@Entity(name="EntityName")).

            +
          2. +
          3. +

            Accept Use default (the default setting) to use the default value for the name of the mapped table. Entering a different name results in adding the @Table notation with its name attribute defined as the new table (@Table(name="TableName")).

            +
            +

            + + + + + + +
            +

            Note:

            +The Entity Name-related options are not available if you selected Mapped superclass on the Entity Class page
            +
            +
            +
          4. +
          5. +

            Add persistence fields to the entity by clicking Add. The Entity Fields dialog appears.

            +
            +

            The Entity Fields Dialog

            +The Entity Fields dialog.
          6. +
          7. +

            Select a persistence type from the Type list. You can retrieve additional types using the Browse function.

            +
          8. +
          9. +

            Enter the field name and then click OK. Repeat this procedure for each field.

            +
          10. +
          11. +

            If needed, select Key to designate the field as a primary key.

            +
          12. +
          13. +

            Select either the Field-based access type (the default) or Property-based access type.

            +
          14. +
          +
        -Related task
        +

         

        +Related reference

        -Working with persistence.xml file
        -Working with XML Files +Create JPA Entity wizard
        +Create New JPA Project wizard
        +JPA Development perspective +

         

        +Related tasks
        +
        +Managing the persistence.xml file
        +Adding persistence to a class

         

        Related concept

        -The persistence.xml file
        - +Understanding Java persistence
        +The persistence.xml file
        +

         

        +
        + +
        +
        +

        Synchronizing the persistence.xml File

        +This figure shows the JPA Tools > Synchronize Classes option.
        + +

        Dali adds the necessary <class> elements to the persistence.xml file.

      5. -

        In the JPA Structure view, select EntityMappings.

        +

        Use the Persistence XML Editor to continue editing the persistence.xml file.

      6. -
      7. -

        Use the JPA Details view to configure the entity mapping and persistence unit defaults.

        -
        -

        JPA Details view for EntityMappings (orm.xml)

        -JPA Details view for orm.xml file.
        -
      Related task

      -Working with orm.xml file
      -Working with XML Files
      +Using the XML Editor to edit the persistence.xml file

       

      Related concept

      -The orm.xml file
      +The persistence.xml file
      +
    diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm index c59206b0e7..6ad5de79f6 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm @@ -2,65 +2,59 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + -Entity +Managing the orm.xml file + - - - + + + -

    -
    -

    Entity

    -

    An Entity is a persistent domain object.

    -

    An entity can be:

    -
      -
    • -

      Abstract or concrete classes. Entities may also extend non-entity classes as well as entity classes, and non-entity classes may extend entity classes.

      -
    • -
    -

    An entity must have:

    -
      -
    • -

      A no-arg constructor (public or protected); the entity class may have other constructors as well.

      -
    • -
    -

    Each persistent entity must be mapped to a database table and contain a primary key. Persistent entities are identified by the @Entity annotation.

    -

    Use this procedure to add persistence to an existing entity:

    +
    +

    Creating an orm.xml file

    +

    If you opt not to create an orm.xml file when you create a JPA project, you can create one using the Mapping File Wizard.

    +

    Use this procedure to create an orm.xml file:

    1. -

      Open the Java class in the Package Explorer.

      -
    2. -
    3. -

      Select the class in the JPA Structure view.

      -
    4. +

      From the Navigator or Package Explorer, select File > New > Other. The Select a Wizard dialog appears.

      +
      +

      The Select a Wizard Dialog

      +The Select a Wizard dialog with Mapping file selected.
      +
    5. -

      In the JPA Details view, use the Map As field to select Entity.

      -
      -

      Selecting Entity Persistence

      -Selecting entity persistence on the JPA Details view.
      +

      Select Mapping File and then click Next. The Mapping File page appears.

      +
      +

      The Mapping File Page

      +The Mapping File page.
    6. -

      Complete the remaining JPA Details view (for entities).

      +

      Define the properties in the page and click Finish. The orm.xml 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 JPA Details view (for orm.xml).

      +
      +

      + + + + + + +
      +

      Note:

      +The Mapping File Wizard will not allow you to proceed if you select a JPA project that already includes an orm.xml file.
      +
      +
    -

     

    -Related tasks
    -
    -Adding persistence to a class
    -Specifying additional tables
    -Specifying entity inheritance
    +
    + +
+ +
  • +

    Select Entity from the Mapping Type Selection dialog and then click OK.

    +
    +

    The Mapping Type Selection Dialog

    +The Mapping Type selection dialog with Enity selected.
  • Complete the remaining JPA Details view (for entities).

    @@ -66,7 +82,6 @@ Specifying additional tables
    Specifying entity inheritance
  • - - -

    Eclipse adds the following annotations to the field:

    -
    -@Column(name="<COLUMN_NAME>", table="<COLUMN_TABLE>", 
    -    insertable=<INSERTABLE>, updatable=<UPDATABLE>)
    -@Basic(fetch=FetchType.<FETCH_TYPE>, optional = <OPTIONAL>)
    -@Temporal(TemporalType.<TEMPORAL>)
    -
    -
    -

     

    -Related task
    -
    -Mapping an entity

     

    -Related reference
    -
    -JPA Structure view
    -JPA Details view (for attributes) -

     

    -Related concept
    -
    -Understanding OR mappings
    -Understanding EJB 3.0 Java Persistence API +Related tasks
    +
    +
    Adding persistence to a class
    +
    Specifying additional tables
    +
    Specifying entity inheritance
    +
    + + - +

    Click Add for a named query, or Add Native for a native query.

    + +
  • +

    In the dialog that appears, enter the name of the query in the Name field and then click OK.

    +
  • +
  • +

    Enter the query in the Query field.

    +
    +

    Entering a Named Query

    +The Queries section of the JPA Details view.
    +
  • -

    Eclipse adds the following annotations to the field:

    -
    -@EmbeddedId
    -
    -

     

    -Related task
    -
    -Mapping an entity -

     

    -Related reference
    -
    -JPA Structure view
    -JPA Details view (for attributes) -

     

    -Related concept
    -
    -Understanding OR mappings
    -Understanding EJB 3.0 Java Persistence API - + + - -
  • -

    Use this table to complete the fields in Primary Key Generation information area in the JPA Details view.

    -
    - - - - - - + - - - - - + + + - - + - + - - - + + +
    PropertyDescriptionDefaultEager
    Primary Key GenerationThese fields define how the primary key is generated.
    OptionalSpecifies if this field is can be null.Yes
      StrategySee "Primary Key Generation" for details. +TemporalSpecifies the type of data. See "Temporal" for details.
    • -

      Auto

      -
    • -
    • -

      Sequence

      +

      Date

    • -

      Identity

      +

      Time

    • -

      Table

      +

      Timestamp

    Auto
      Generator NameName of the primary key generator specified in the Strategy
    LobSpecifies if this is a large objects (BLOB or CLOB). See "Lob" for details.

  • -

    Additional fields will appear in the Primary Key Generation information area, depending on the selected Strategy. See "JPA Details view (for attributes)" for additional information.

    Eclipse adds the following annotations to the field:

    -@Id
    -@Column(name="<COLUMN_NAME>", table="<TABLE_NAME>", insertable=<INSERTABLE>,
    -    updatable=<UPDATABLE>)
    -@Temporal(<TEMPORAL>)
    -@GeneratedValue(strategy=GeneratorType.<STRATEGY>, generator="<GENERATOR_NAME>")@TableGenerator(name="<TABLE_GENERATOR_NAME>", table = "<TABLE_GENERATOR_TABLE>", 
    -    pkColumnName = "<TABLE_GENERATOR_PK>", 
    -    valueColumnName = "<TABLE_GENERATOR_VALUE_COLUMN>", 
    -    pkColumnValue = "<TABLE_GENERATOR_PK_COLUMN_VALUE>")@SequenceGenerator(name="<SEQUENCE_GENERATOR_NAME>", 
    -    sequenceName="<SEQUENCE_GENERATOR_SEQUENCE>")
    +@Column(name="<COLUMN_NAME>", table="<COLUMN_TABLE>", 
    +    insertable=<INSERTABLE>, updatable=<UPDATABLE>)
    +@Basic(fetch=FetchType.<FETCH_TYPE>, optional = <OPTIONAL>)
    +@Temporal(TemporalType.<TEMPORAL>)
    +
     

     

    Related task
    diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm index 8d7932a37f..8180e69b37 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm @@ -2,147 +2,82 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + -Many-to-many mapping +Embedded mapping + - - - + + + -

    +

    -

    Many-to-many mapping

    -

    Use a Many-to-Many Mapping to define a many-valued association with many-to-many multiplicity. A many-to-many mapping has two sides: the owning side and non-owning side. You must specify the join table on the owning side. For bidirectional mappings, either side may be the owning side.

    +

    Embedded mapping

    +

    Use an Embedded Mapping to specify a persistent field or property of an entity whose value is an instance of an embeddable class.

    1. -

      In the JPA Structure view, select the field to map. The JPA Details view (for attributes) displays the properties for the selected.

      +

      In the JPA Structure view, right-click the field to map.

    2. -

      In the Map As field, select Many-to-Many.

      +

      Select Map as > Embedded. The JPA Details view (for attributes) displays the properties for the selected field.

    3. -

      Use this table to complete the General information fields of the JPA Details view.

      +

      Use this table to complete the remaining fields on the JPA Details view.

      - - - + + + - - + - + - - - + + + - - + - - - - - - - - - - - - - -
      PropertyDescriptionDefaultPropertyDescriptionDefault
      Map AsDefines this mapping as a Many to Many Mapping. -

      This field corresponds to the @ManyToMany annotation.

      +
      Entity Mapping HyperlnkDefines this mapping as a Embedded. +

      This corresponds to the @Embedded annotation.

      Many to ManyEmbedded
      Target EntityThe entity to which this attribute is mapped.null -

      You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.

      -
      Attribute OverridesSpecify to override the default mapping of an entity's attribute. Select Override Default.
      FetchDefines how data is loaded from the database. See "Fetch Type" for details. +ColumnsThe database column (and its table) mapped to the entity attribute. See "Column" for details.
      • -

        Eager

        +

        Name – Name of the database column.

      • -

        Lazy

        +

        Table – Name of the database table.

      Lazy
      Mapped ByThe database field that owns the relationship.
      Order BySpecify the default order for objects returned from a query. See "Order By" for details. -
        -
      • -

        No ordering

        -
      • -
      • -

        Primary key

        -
      • -
      • -

        Custom

        -
      • -
      -
      No ordering
      -
      -
    4. -
    5. -

      Use this table to complete the fields in the Join Table Information area in the JPA Details view.

      -
      - - - - - - - - - - - - - - - - - - - - - - - +
      PropertyDescriptionDefault
      NameName of the join table that contains the foreign key column.You must specify the join table on the owning side. -

      By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.

      -
      Join ColumnsSelect Override Default, then Add, Edit, or Remove the join columns.By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.
      Inverse Join ColumnsSelect Override Default, then Add, Edit, or Remove the join columns.By default, the mapping is assumed to have a single join.

    6. -
    7. -

      To add a new Join or Inverse Join Column, click Add.

      -

      To edit an existing Join or Inverse Join Column, select the field to and click Edit.

      -

    Eclipse adds the following annotations to the field:

    -@JoinTable(joinColumns=@JoinColumn(name="<JOIN_COLUMN>"), 
    -    name = "<JOIN_TABLE_NAME>")
    -@ManyToMany(cascade=CascadeType.<CASCADE_TYPE>, fetch=FetchType.<FETCH_TYPE>,
    -    targetEntity=<TARGET_ENTITY>, mappedBy = "<MAPPED_BY>")
    -@OrderBy("<ORDER_BY>")
    -
    +@Embedded
    +@AttributeOverride(column=@Column(table="<COLUMN_TABLE>", name = "<COLUMN_NAME>"))
     

     

    Related task
    diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm index cdc7e6ff31..d2ba756dda 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm @@ -2,90 +2,53 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + -Many-to-one mapping +Embedded ID mapping + - - - + + + -

    +

    -

    Many-to-one mapping

    -

    Use a Many-to-One mapping to defines a single-valued association to another entity class that has many-to-one multiplicity.

    +

    Embedded ID mapping

    +

    Use an Embedded ID Mapping to specify the primary key of an embedded ID. These mappings may be used with a Embeddable entities.

    1. -

      In the JPA Structure view, select the field to map. The JPA Details view (for attributes) displays the properties for the selected.

      +

      In the JPA Structure view, select the field to map.

    2. -

      In the Map As field, select Many-to-One.

      +

      Right-click the field and then select Map As > Embedded Id. The JPA Details view (for attributes) displays the properties for the selected field.

    3. -

      Use this table to complete the General information fields JPA Details view.

      -
      - - - - - - - - - - - - - - - - - - - - -
      PropertyDescriptionDefault
      Target EntityThe entity to which this attribute is mapped.null -

      You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.

      -
      Fetch TypeDefines how data is loaded from the database. See "Fetch Type" for details. -
        -
      • -

        Eager

        -
      • -
      • -

        Lazy

        -
      • -
      -
      Eager
      -
      -
    4. -
    5. -

      Use this table to complete the fields on the Join Columns Information tab in the JPA Details view.

      +

      Use this table to complete the remaining fields on the JPA Details view.

      - - - + + + - - + - +
      PropertyDescriptionDefaultPropertyDescriptionDefault
      Join ColumnSpecify a mapped column for joining an entity association. This field corresponds to the @JoinColum attribute. -

      Select Override Default, then Add, Edit, or Remove the join columns.

      +
      Entity Mapping HyperlinkDefines this mapping as a Embedded Id. +

      This corresponds to the @EmbeddedId annotation.

      By default, the mapping is assumed to have a single join.Embedded Id
      @@ -94,10 +57,7 @@

    Eclipse adds the following annotations to the field:

    -@JoinTable(joinColumns=@JoinColumn(name="<JOIN_COLUMN>"), 
    -    name = "<JOIN_TABLE_NAME>")
    -@ManyToOne(targetEntity=<TARGET_ENTITY>, fetch=<FETCH_TYPE>, 
    -    cascade=<CASCADE_TYPE>)
    +@EmbeddedId
     

     

    Related task
    diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm index 8218ffd209..7ff0a255dc 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm @@ -2,137 +2,144 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + -One-to-many mapping +ID mapping + - - - + + + -

    +

    -

    One-to-many mapping

    -

    Use a One-to-Many Mapping to define a relationship with one-to-many multiplicity.

    +

    ID mapping

    +

    Use an ID Mapping to specify the primary key of an entity. ID mappings may be used with a Entity or Mapped superclass. Each Entity must have an ID mapping.

    1. -

      In the JPA Structure view, select the field to map. The JPA Details view (for attributes) displays the properties for the selected.

      +

      In the JPA Structure view, select the field to map.

    2. -

      In the Map As field, select One-to-many.

      +

      Right click the filed and then select Map as > ID. The JPA Details view (for attributes) displays the properties for the selected.

    3. -

      Use this table to complete the General information fields JPA Details view.

      +

      Use this table to complete the General information fields in the JPA Details view.

      - +
      - - - + + + - - - + + + - - - + + + - - - + + + - - + - +
      PropertyDescriptionDefaultPropertyDescriptionDefault
      Target EntityThe entity to which this attribute is mapped.
      Entity Mapping HyperlinkDefines this mapping as an ID Mapping. +

      This field corresponds to the @Id annotation.

      +
      ID
      Fetch TypeDefines how data is loaded from the database. See "Fetch Type" for details. -
        -
      • -

        Eager

        -
      • -
      • -

        Lazy

        -
      • -
      -
      EagerColumnThe database column mapped to the entity attribute. See "Column" for details.By default, the Column is assumed to be named identically to the attribute.
      Mapped ByThe database field that owns the relationship.
      TableThe database table mapped to the entity attribute.By default, the Table is assumed to be identical to the table associated with the entity.
      Order BySpecify the default order for objects returned from a query. See "Order By" for details. +TemporalSpecifies the type of data. See "Temporal" for details.
      • -

        No ordering

        +

        Date

      • -

        Primary key

        +

        Time

      • -

        Custom

        +

        Timestamp

      No ordering

    4. -

      Use this table to complete the Join Table Information fields in the JPA Details view.

      +

      Use this table to complete the fields in Primary Key Generation information area in the JPA Details view.

      - +
      - - - + + + - - - + + + - - - + + + - - - + + +
      PropertyDescriptionDefaultPropertyDescriptionDefault
      NameName of the join tableBy default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.Primary Key GenerationThese fields define how the primary key is generated.
      Join ColumnsSpecify two or more join columns (that is, a primary key).
        StrategySee "Primary Key Generation" for details. +
        +
      • +

        Auto

        +
      • +
      • +

        Sequence

        +
      • +
      • +

        Identity

        +
      • +
      • +

        Table

        +
      • +
      +
      Auto
      Inverse Join ColumnsThe join column on the owned (or inverse) side of the association: the owned entity's primary key column.
        Generator NameName of the primary key generator specified in the Strategy

    +

    Additional fields will appear in the Primary Key Generation information area, depending on the selected Strategy. See "JPA Details view (for attributes)" for additional information.

    Eclipse adds the following annotations to the field:

    -@OneToMany(targetEntity=<TARGET_ENTITY>)
    -@Column(name="<COLUMN>")
    -
    -
    -@OneToMany(targetEntity=<TARGET_ENTITY>.class, cascade=CascadeType.<CASCADE_TYPE>, 
    -    fetch = FetchType.<FETCH_TYPE>, mappedBy = "<MAPPED_BY>")@OrderBy("<ORDER_BY>")
    -@JoinTable(name="<JOIN_TABLE_NAME>", joinColumns=@JoinColumn(name=
    -    "<JOIN_COLUMN_NAME>", referencedColumnName="<JOIN_COLUMN_REFERENCED_COLUMN>"), 
    -    inverseJoinColumns=@JoinColumn(name="<INVERSE_JOIN_COLUMN_NAME>", 
    -    referencedColumnName="<INVERSE_JOIN_COLUMN_REFERENCED_COLUMN>"))
    -
    +@Id
    +@Column(name="<COLUMN_NAME>", table="<TABLE_NAME>", insertable=<INSERTABLE>,
    +    updatable=<UPDATABLE>)
    +@Temporal(<TEMPORAL>)
    +@GeneratedValue(strategy=GeneratorType.<STRATEGY>, generator="<GENERATOR_NAME>")@TableGenerator(name="<TABLE_GENERATOR_NAME>", table = "<TABLE_GENERATOR_TABLE>", 
    +    pkColumnName = "<TABLE_GENERATOR_PK>", 
    +    valueColumnName = "<TABLE_GENERATOR_VALUE_COLUMN>", 
    +    pkColumnValue = "<TABLE_GENERATOR_PK_COLUMN_VALUE>")@SequenceGenerator(name="<SEQUENCE_GENERATOR_NAME>", 
    +    sequenceName="<SEQUENCE_GENERATOR_SEQUENCE>")
     

     

    Related task
    diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm index b23f849efa..bc315334da 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm @@ -2,57 +2,64 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + -One-to-one mapping +Many-to-many mapping + - - - + + + -

    +

    -

    One-to-one mapping

    -

    Use a One-to-One Mapping to define a relationship with one-to-many multiplicity.

    +

    Many-to-many mapping

    +

    Use a Many-to-Many Mapping to define a many-valued association with many-to-many multiplicity. A many-to-many mapping has two sides: the owning side and non-owning side. You must specify the join table on the owning side. For bidirectional mappings, either side may be the owning side.

    1. -

      In the JPA Structure view, select the field to map. The JPA Details view (for attributes) displays the properties for the selected.

      +

      In the JPA Structure view, select the field to map.

    2. -

      In the Map As field, select One-to-one.

      +

      Right-click the field and then select Map As > Many-toMany. The JPA Details view (for attributes) displays the properties for the selected field.

    3. -

      Use this table to complete the General information fields in the JPA Details view.

      +

      Use this table to complete the General information fields of the JPA Details view.

      - - - + + + - - - + + + + + + + - - + - + - - - + + + + + + + +
      PropertyDescriptionDefaultPropertyDescriptionDefault
      Target EntityThe entity to which this attribute is mapped.null +Mapping Entity HyperlinkDefines this mapping as a Many to Many Mapping. +

      This field corresponds to the @ManyToMany annotation.

      +
      Many to Many
      Target EntityThe entity to which this attribute is mapped.null

      You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.

      Fetch TypeDefines how data is loaded from the database. See "Fetch Type" for details. +FetchDefines how data is loaded from the database. See "Fetch Type" for details.
      • Eager

        @@ -62,48 +69,79 @@
      EagerLazy
      Mapped ByThe database field that owns the relationship.
      Mapped ByThe database field that owns the relationship.
      Order BySpecify the default order for objects returned from a query. See "Order By" for details. +
        +
      • +

        No ordering

        +
      • +
      • +

        Primary key

        +
      • +
      • +

        Custom

        +
      • +
      +
      No ordering

    4. -

      Use this table to complete the Join Columns Information fields in the JPA Details view.

      +

      Use this table to complete the fields in the Join Table Information area in the JPA Details view.

      - +
      - - - + + + - - + + - + + + + + + + + + +
      PropertyDescriptionDefaultPropertyDescriptionDefault
      Join ColumnSpecify a mapped column for joining an entity association. This field corresponds to the @JoinColum attribute. -

      Select Override Default, then Add, Edit, or Remove the join columns.

      +
      NameName of the join table that contains the foreign key column.You must specify the join table on the owning side. +

      By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.

      By default, the mapping is assumed to have a single join.
      Join ColumnsSelect Override Default, then Add, Edit, or Remove the join columns.By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.
      Inverse Join ColumnsSelect Override Default, then Add, Edit, or Remove the join columns.By default, the mapping is assumed to have a single join.

    5. +
    6. +

      To add a new Join or Inverse Join Column, click Add.

      +

      To edit an existing Join or Inverse Join Column, select the field to and click Edit.

      +

    Eclipse adds the following annotations to the field:

    -@OneToOne(targetEntity=<TARGET_ENTITY>, cascade=CascadeType.<CASCADE_TYPE>, 
    -    fetch = FetchType.<FETCH_TYPE>, mappedBy = "<MAPPED_BY>")
    -@JoinColumn(name="<JOIN_COLUMN_NAME>", referencedColumnName=
    -    "<JOIN_COLUMN_REFERENCED_COLUMN>", insertable = <INSERTABLE>, 
    -    updatable = <UPDATABLE>)
    +@JoinTable(joinColumns=@JoinColumn(name="<JOIN_COLUMN>"), 
    +    name = "<JOIN_TABLE_NAME>")
    +@ManyToMany(cascade=CascadeType.<CASCADE_TYPE>, fetch=FetchType.<FETCH_TYPE>,
    +    targetEntity=<TARGET_ENTITY>, mappedBy = "<MAPPED_BY>")
    +@OrderBy("<ORDER_BY>")
     
     

     

    diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm index edec5f8640..b1d59dce06 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm @@ -2,40 +2,135 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + -Transient mapping +Many-to-one mapping + - - - + + + -

    +

    -

    Transient mapping

    -

    Use the Transient Mapping to specify a field of the entity class that is not persistent.

    -

    To create a transient mapping:

    +

    Many-to-one mapping

    +

    Use a Many-to-One mapping to defines a single-valued association to another entity class that has many-to-one multiplicity.

    1. -

      In the JPA Structure view, select the field to map. The JPA Details view (for attributes) displays the properties for the selected.

      +

      In the JPA Structure view, select the field to map.

    2. -

      In the Map As field, select Transient.

      +

      Right click the field and then select Map As > Many-to-One. The JPA Details view (for attributes) displays the properties for the selected.

    3. +
    4. +

      Use this table to complete the General information fields JPA Details view.

      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      PropertyDescriptionDefault
      Mapping Entity HyperlinkDefines mapping as Many-to-One. This corresponds to the @ManyToOne annotation.Many-to-One
      Target EntityThe entity to which this attribute is mapped.null +

      You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.

      +
      FetchDefines how data is loaded from the database. See "Fetch Type" for details. +
        +
      • +

        Eager

        +
      • +
      • +

        Lazy

        +
      • +
      +
      Eager
      CascadeSee "Cascade Type" for details. +
        +
      • +

        Default

        +
      • +
      • +

        All

        +
      • +
      • +

        Persist

        +
      • +
      • +

        Merge

        +
      • +
      • +

        Remove

        +
      • +
      +
      Default
      OptionalSpecifies if this field is can be null.Yes
      +
      +
    5. +
    6. +

      Use this table to complete the fields on the Join Columns Information tab in the JPA Details view.

      +
      + + + + + + + + + + + + + + + +
      PropertyDescriptionDefault
      Join ColumnSpecify a mapped column for joining an entity association. This field corresponds to the @JoinColum attribute. +

      Select Override Default, then Add, Edit, or Remove the join columns.

      +
      By default, the mapping is assumed to have a single join.
      +
      +
    -

    Eclipse adds the following annotation to the field:

    +

    Eclipse adds the following annotations to the field:

    -@Transient
    +@JoinTable(joinColumns=@JoinColumn(name="<JOIN_COLUMN>"), 
    +    name = "<JOIN_TABLE_NAME>")
    +@ManyToOne(targetEntity=<TARGET_ENTITY>, fetch=<FETCH_TYPE>, 
    +    cascade=<CASCADE_TYPE>)
     

     

    Related task
    diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm index 453b5115cd..e7927d1f6c 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm @@ -2,91 +2,146 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + -Version mapping +One-to-many mapping + - - - + + + -

    +

    -

    Version mapping

    -

    Use a Version Mapping 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:

    -
      +

      One-to-many mapping

      +

      Use a One-to-Many Mapping to define a relationship with one-to-many multiplicity.

      +
      1. -

        int

        +

        In the JPA Structure view, select the field to map.

      2. -

        Integer

        +

        Right-click the field and then select Map As > One-to-many. The JPA Details view (for attributes) displays the properties for the selected.

      3. -

        short, Short

        -
      4. +

        Use this table to complete the General information fields JPA Details view.

        +
        + + + + + + + + + + + + + + + + + + + + + +
        PropertyDescriptionDefault
        Mapping Entity Type HyperlinkDefines mapping as One-to-Many. This corresponds to the @OneToMany annotation.One-to-Many
        Target EntityThe entity to which this attribute is mapped.
        CascadeSee "Cascade Type" for details. +
        • -

          long, Long

          +

          Default

        • -

          Timestamp

          +

          All

        • -
        -

        To create a version mapping:

        -
        1. -

          In the JPA Structure view, select the field to map. The JPA Details view (for attributes) displays the properties for the selected.

          +

          Persist

        2. -

          In the Map As field, select Version.

          +

          Merge

        3. -

          Use this table to complete the remaining fields in the JPA Details view.

          -
          - - - - - - +

          Remove

          + + + + - - - - - + + + - - - + + + - - + - + + + +
          PropertyDescriptionDefault
          ColumnThe database column mapped to the entity attribute. See "Column" for details.By default, the Column is assumed to be named identically to the attribute and always included in the INSERT and UPDATE statements.FetchDefines how data is loaded from the database. See "Fetch Type" for details. +
            +
          • +

            Eager

            +
          • +
          • +

            Lazy

            +
          • +
          +
          Eager
          TableName of the database table. This must be the primary table associated with the attribute's entity.
          Mapped ByThe database field that owns the relationship.
          TemporalSpecifies the type of data. See "Temporal" for details. +Order BySpecify the default order for objects returned from a query. See "Order By" for details.
          • -

            Date

            +

            No ordering

          • -

            Time

            +

            Primary key

          • -

            Timestamp

            +

            Custom


          No ordering
          +
          +
        4. +
        5. +

          Use this table to complete the Join Table Information fields in the JPA Details view.

          +
          + + + + + + + + + + + + + + + + + + + + + + +
          PropertyDescriptionDefault
          NameName of the join tableBy default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.
          Join ColumnsSpecify two or more join columns (that is, a primary key).
          Inverse Join ColumnsThe join column on the owned (or inverse) side of the association: the owned entity's primary key column.
          @@ -95,8 +150,16 @@

        Eclipse adds the following annotations to the field:

        -@Version
        -@Column(table="<COLUMN_TABLE>", name="<COLUMN_NAME>")
        +@OneToMany(targetEntity=<TARGET_ENTITY>)
        +@Column(name="<COLUMN>")
        +
        +
        +@OneToMany(targetEntity=<TARGET_ENTITY>.class, cascade=CascadeType.<CASCADE_TYPE>, 
        +    fetch = FetchType.<FETCH_TYPE>, mappedBy = "<MAPPED_BY>")@OrderBy("<ORDER_BY>")
        +@JoinTable(name="<JOIN_TABLE_NAME>", joinColumns=@JoinColumn(name=
        +    "<JOIN_COLUMN_NAME>", referencedColumnName="<JOIN_COLUMN_REFERENCED_COLUMN>"), 
        +    inverseJoinColumns=@JoinColumn(name="<INVERSE_JOIN_COLUMN_NAME>", 
        +    referencedColumnName="<INVERSE_JOIN_COLUMN_REFERENCED_COLUMN>"))
         
         

         

        @@ -114,7 +177,6 @@ Understanding OR mappings
        Understanding EJB 3.0 Java Persistence API - + +
      5. +

        Use this table to complete the Join Columns Information fields in the JPA Details view.

        +
        + + + + + + + + + + + + + + + +
        PropertyDescriptionDefault
        Join ColumnSpecify a mapped column for joining an entity association. This field corresponds to the @JoinColum attribute. +

        Select Override Default, then Add, Edit, or Remove the join columns.

        +
        By default, the mapping is assumed to have a single join.
        +
        +
      6. -

        Eclipse creates a Java persistent entity for each database table. Each entity contains fields based on the table's columns. Eclipse will also generate entity relationships (such as one-to-one) based on the table constraints. Figure: Generating Entities from Tables illustrates how Eclipse generates entities from tables.

        -
        -

        Generating Entities from Tables

        -This figure shows the EMPLOYEE and ADDRESS entities generated from database tables.
        - +

        Eclipse adds the following annotations to the field:

        +
        +@OneToOne(targetEntity=<TARGET_ENTITY>, cascade=CascadeType.<CASCADE_TYPE>, 
        +    fetch = FetchType.<FETCH_TYPE>, mappedBy = "<MAPPED_BY>")
        +@JoinColumn(name="<JOIN_COLUMN_NAME>", referencedColumnName=
        +    "<JOIN_COLUMN_REFERENCED_COLUMN>", insertable = <INSERTABLE>, 
        +    updatable = <UPDATABLE>)
        +
        +

         

        Related task
        -

        Creating a new JPA project

        +
        +Mapping an entity

         

        Related reference

        -Project Properties page – JPA Options - +JPA Structure view
        +JPA Details view (for attributes) +

         

        +Related concept
        +
        +Understanding OR mappings
        +Understanding EJB 3.0 Java Persistence API + + + +

        Eclipse adds the following annotations to the field:

        +
        +@Version
        +@Column(table="<COLUMN_TABLE>", name="<COLUMN_NAME>")
        +
        +
        +

         

        +Related task
        +
        +Mapping an entity +

         

        +Related reference
        +
        +JPA Structure view
        +JPA Details view (for attributes)

         

        Related concept
        -

        Problems view

        +
        +Understanding OR mappings
        +Understanding EJB 3.0 Java Persistence API + + - + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm index 264be579e5..910984a558 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm @@ -2,82 +2,57 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + -Error messages +Generating entities from tables + - - - + + + -

        -
        -

        Error messages

        -

        This section contains information on error messages (including how to resolve the issue) you may encounter while working with Dali.

        - -

        Attribute "<ATTRIBUTE__NAME>" has invalid mapping type in this context

        -

        The mapped attribute is invalid. Either change the mapping type or change the entity type.

        -

        See "Mapping an entity" for more information.

        - -

        Attribute "<ATTRIBUTE_NAME>" cannot be resolved.

        -

        Dali cannot map the attribute to a database table and column. Verify that you database connection information is correct.

        -

        See "Creating a new JPA project" for more information.

        - -

        Class "<CLASS_NAME>" is not annotated as a persistent class.

        -

        The class has not been identified as a persistent class. Configure the class as an Entity, Mapped Superclass, or Embeddable persistent entity.

        -

        See "Adding persistence to a class".

        - -

        Column "<COLUMN_NAME>" cannot be resolved.

        -

        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.

        -

        Map the field to a valid row in the database table as shown in "Mapping an entity".

        - -

        Duplicate class "<CLASS_NAME>".

        -

        You created to persistence classes with the same name. Each Java class must have a unique name. See "Adding persistence to a class" for more information.

        - -

        Entity does not have an Id or Embedded Id.

        -

        You created a persistent entity without identifying its primary key. A persistent entity must have a primary key field designated with an @Id or @EmbeddedId annotation.

        -

        Add an ID mapping to the entity as shown in "ID mapping" or "Embedded ID mapping".

        - -

        Multiple persistence.xml files in project.

        -

        You created a JPA project with more than one persistence.xml file. Each JPA project must contain a single persistence.xml file.

        -

        See "Managing the persistence.xml file" for more information.

        - -

        No generator named "<GENERATOR_NAME>" is defined in persistence unit.

        -

        You created a persistence entity that uses sequencing, but did not define a sequence generator in the persistence unit. Either define the generator by using an annotation or including it in the XML mapping file.

        - -

        No persistence unit defined.

        -

        There is no persistence unit defined in the persistence.xml file. Use the <persistence-unit name="<PERSISTENCE_UNIT_NAME>" tag to define the persistent unit.

        -

        See "Managing the orm.xml file" for more information.

        - -

        No persistence.xml file in project.

        -

        You created a JPA project without a persistence.xml file. Each JPA project must contain a single persistence.xml file.

        -

        See "Managing the persistence.xml file" for more information.

        - -

        Referenced column "<COLUMN_NAME>" in join column "<COLUMN_NAME>" cannot be resolved.

        -

        The column that you selected to join a relationship mapping does not exist on the database table. Either select a different column on the Join Table Information or create the necessary column on the database table.

        -

        See "JPA Details view (for attributes)" for more information.

        - -

        Schema "<SCHEMA_NAME>" cannot be resolved for table/join table "<TABLE_NAME>".

        -

        Define the default database schema information in the persistence unit.

        -

        See "Managing the orm.xml file" for more information.

        - -

        Table "<TABLE_NAME>" cannot be resolved.

        -

        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.

        -

        Associate the entity with a valid database table as shown in "Adding persistence to a class".

        -Related concept
        -

        Problems view

        -
        - +

        +
        +

        Generating entities from tables

        +

        Use this procedure to generate Java persistent entities from database tables. You must create a JPA project and establish a database connection before generating persistent entities. See "Creating a new JPA project" for more information.

        +
          +
        1. +

          Right-click the JPA project in the Package Explorer and select JPA Tools > Generate Entities.

          +
          +

          Generating Entities

          +Using the JPA Tools > Generate Entities menu option.
          +
        2. +
        3. +

          If you are not currently connected to the database, the Database Connection page appears. Select your database connection and schema, and click Reconnect.

          +

          To create a new database connection, click Add connection.

          +

          After connecting to the database, click Next.

          +
        4. +
        5. +

          On the Generate Entities from Tables dialog dialog, select the tables from which to generate Java persistent entities and click Finish.

          +
        6. +
        +

        Eclipse creates a Java persistent entity for each database table. Each entity contains fields based on the table's columns. Eclipse will also generate entity relationships (such as one-to-one) based on the table constraints. Figure: Generating Entities from Tables illustrates how Eclipse generates entities from tables.

        +
        +

        Generating Entities from Tables

        +This figure shows the EMPLOYEE and ADDRESS entities generated from database tables.
        + +

         

        +Related task
        +

        Creating a new JPA project

        +

         

        +Related reference
        +
        +Project Properties page – JPA Options
        + - - -

        To create a new connection, click Add connections.

        -

         

        -Related task
        -
        -Creating a new JPA project -

         

        -Related reference
        -
        -Project Properties page – JPA Options +

        Warning messages

        + +

         

        Related concept
        -
        -Understanding Java persistence - +

        Problems view

        - + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm new file mode 100644 index 0000000000..5e622f2e66 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks023.htm @@ -0,0 +1,91 @@ + + + + + +Error messages + + + + + + + + + + + + + + + +

        +
        +

        Error messages

        +

        This section contains information on error messages (including how to resolve the issue) you may encounter while working with Dali.

        + +

        Attribute "<ATTRIBUTE__NAME>" has invalid mapping type in this context

        +

        The mapped attribute is invalid. Either change the mapping type or change the entity type.

        +

        See "Mapping an entity" for more information.

        + +

        Attribute "<ATTRIBUTE_NAME>" cannot be resolved.

        +

        Dali cannot map the attribute to a database table and column. Verify that you database connection information is correct.

        +

        See "Creating a new JPA project" for more information.

        + +

        Class "<CLASS_NAME>" is not annotated as a persistent class.

        +

        The class has not been identified as a persistent class. Configure the class as an Entity, Mapped Superclass, or Embeddable persistent entity.

        +

        See "Adding persistence to a class".

        + +

        Column "<COLUMN_NAME>" cannot be resolved.

        +

        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.

        +

        Map the field to a valid row in the database table as shown in "Mapping an entity".

        + +

        Duplicate class "<CLASS_NAME>".

        +

        You created to persistence classes with the same name. Each Java class must have a unique name. See "Adding persistence to a class" for more information.

        + +

        Entity does not have an Id or Embedded Id.

        +

        You created a persistent entity without identifying its primary key. A persistent entity must have a primary key field designated with an @Id or @EmbeddedId annotation.

        +

        Add an ID mapping to the entity as shown in "ID mapping" or "Embedded ID mapping".

        + +

        Multiple persistence.xml files in project.

        +

        You created a JPA project with more than one persistence.xml file. Each JPA project must contain a single persistence.xml file.

        +

        See "Managing the persistence.xml file" for more information.

        + +

        No generator named "<GENERATOR_NAME>" is defined in persistence unit.

        +

        You created a persistence entity that uses sequencing, but did not define a sequence generator in the persistence unit. Either define the generator by using an annotation or including it in the XML mapping file.

        + +

        No persistence unit defined.

        +

        There is no persistence unit defined in the persistence.xml file. Use the <persistence-unit name="<PERSISTENCE_UNIT_NAME>" tag to define the persistent unit.

        +

        See "Managing the orm.xml file" for more information.

        + +

        No persistence.xml file in project.

        +

        You created a JPA project without a persistence.xml file. Each JPA project must contain a single persistence.xml file.

        +

        See "Managing the persistence.xml file" for more information.

        + +

        Referenced column "<COLUMN_NAME>" in join column "<COLUMN_NAME>" cannot be resolved.

        +

        The column that you selected to join a relationship mapping does not exist on the database table. Either select a different column on the Join Table Information or create the necessary column on the database table.

        +

        See "JPA Details view (for attributes)" for more information.

        + +

        Schema "<SCHEMA_NAME>" cannot be resolved for table/join table "<TABLE_NAME>".

        +

        Define the default database schema information in the persistence unit.

        +

        See "Managing the orm.xml file" for more information.

        + +

        Table "<TABLE_NAME>" cannot be resolved.

        +

        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.

        +

        Associate the entity with a valid database table as shown in "Adding persistence to a class".

        +Related concept
        +

        Problems view

        +
        + + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm new file mode 100644 index 0000000000..95937e78b0 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks024.htm @@ -0,0 +1,49 @@ + + + + + +Warning messages + + + + + + + + + + + + + + + +

        +
        +

        Warning messages

        +

        This section contains information on warning messages (including how to resolve the issue) you may encounter while working with Dali.

        + +

        Connection "<CONNECTION_NAME>" is not active. No validation will be done against the data source.

        +

        The database connection you specified to use with the JPA project is not active. The JPA project requires an active connection.

        + +

        No connection specified for the project. No data-specific validation will be performed.

        +

        You created a JPA project without specifying a database connection. The JPA project requires an active connection.

        +

        See "Creating a new JPA project" or "Modifying persistent project properties" for information on specifying a database connection.

        +Related concept
        +

        Problems view

        +
        + + + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm new file mode 100644 index 0000000000..5a9e7fff19 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks025.htm @@ -0,0 +1,87 @@ + + + + + +Modifying persistent project properties + + + + + + + + + + + + + + + +

        +
        +

        Modifying persistent project properties

        +

        Each persistent project must be associated with a database connection. To create a new database connection, click Database Connection use the New Connection wizard.

        +

        Use this procedure to modify the vender-specific platform and database connection associated with your JPA project.

        +
          +
        1. +

          Right-click the project in the Explorer view and select Properties. The Properties page appears.

          +
          +

          The Properties Page

          +The Persistence page.
          +
        2. +
        3. +

          Use this table to complete the remaining fields on the Properties – JPA page and click OK.

          +
          + + + + + + + + + + + + + + + + + + + + + +
          PropertyDescription
          PlatformSelect the vendor-specific platform for the JPA implementation.
          Database ConnectionDatabase connection to use to store the persistent entities. To create a new connection, click Add Connection.
            Override default schema from connectionSelect a schema other than the default one derived from the connection information. Use this option if the default schema cannot be used. For example, use this option in cases where the deployment login differs from the design-time login.
          +
          +
        4. +
        +

        To create a new connection, click Add connections.

        +

         

        +Related task
        +
        +Creating a new JPA project +

         

        +Related reference
        +
        +Project Properties page – JPA Options +

         

        +Related concept
        +
        +Understanding Java persistence
        + + + + + + 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 594506c794..225ccffc7a 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 @@ -2,18 +2,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + Tips and tricks + - - + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml b/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml index 8c98ac9450..98cef9b78c 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml +++ b/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml @@ -4,28 +4,8 @@ - - - - - - - - - - - - - - - - - - - - - - + + @@ -37,39 +17,42 @@ + - - + + - + + - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - + @@ -77,43 +60,71 @@ + + + + + + + + - - - - + + + + + - - + + - - + + + + + + + + + + + + + - + - - + + - - + + + + + + + + + + - - + + 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 261e7db8ed..11b67157fa 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm @@ -2,30 +2,49 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + What's new + - - + + -

        What's new

        -

        This section contains descriptions of the following new feature and significant changes made to the Dali OR Mapping Tool for M5 - Release 2.0.0:

        +

        What's new

        +

        This section contains descriptions of the following new features and significant changes made to the Dali OR Mapping Tool for Release 2.0:

        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 b75c0a95fb..5f15ef7761 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm @@ -2,52 +2,49 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - + -Create and Manage the orm.xml file +persistence.xml Editor + - + - - - - + + + + -

        +

        - - - - -
        -

        Create and Manage the orm.xml file

        -
        -

        When creating a JPA project, you can also create the orm.xml file. Select the Create orm.xml option on the JPA Facet page page of the Create New JPA Project wizard.

        -
        -

        JPA Facet Dialog

        -JPA Facet dialog.
        - -

        Use the orm.xml file to define the project and persistence unit defaults.

        -
        -

        JPA Details view for orm.xml file.

        -JPA Details view for orm.xml file.
        +

        persistence.xml Editor

        +

        Rather than edit the XML for persistence.xml, this release of Dali provides an editor that automatically populates the file's <persistence-unit> element, its transaction type attribute as well as its <provider>, <class>, data source and <properties> sub-elements. The edtior also enables you to edit the file directly.

        +
        +

        The persistence.xml Editor

        +The General page of the persistence.xml Editor.
        +Related reference
        +
        +persistence.xml Editor +

         

        +Related task
        +
        +Managing the persistence.xml file +

         

        Related concept

        -What's new
        +The persistence.xml file
        diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm new file mode 100644 index 0000000000..ac1a3da735 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new004.htm @@ -0,0 +1,47 @@ + + + + + +Override the Default Schema for Connection + + + + + + + + + + + + + + + +

        +
        +

        Override the Default Schema for Connection

        +

        In some cases, Dali cannot calculate the correct schema for a project. If such an instance arises, you can override the default schema derived from the connection information using the Override the Default Schema for Connection option in the JPA Facet page of the Create New JPA Entity wizard (illustrated in Figure: Changing the Schema for a Project) or through the properties for the JPA project (accessed by selecting the JPA project and then Properties > JPA). Use this option when the default login information cannot be used, such as when the deployment login differs from the design-time login.

        +
        +

        Changing the Schema for a Project

        +The JPA Facet page of the Create New JPA Project wizard with the Override defualt schema selected.
        + +Related reference
        +
        +Create New JPA Project wizard +

         

        +
        + + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm new file mode 100644 index 0000000000..a1388e298d --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new005.htm @@ -0,0 +1,53 @@ + + + + + +Changing the Schema for a Project + + + + + + + + + + + + + + + +
        +

        New Mapping File Wizard

        +

        The Mapping File wizard enables you to add an object map (orm.xml) to a JPA project if no object map exists at the location specified. Completing the wizard results in a stub orm.xml file.

        +
        +

        New Mapping File Wizard

        +The Mapping File page of the New Mapping File wizard.
        + +

         

        +Related reference
        +
        +Mapping File Wizard +

         

        +Related task
        +
        +Managing the orm.xml file
        +

         

        +Related concept
        +
        +The orm.xml file
        + + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new006.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new006.htm new file mode 100644 index 0000000000..c9a8b4c486 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new006.htm @@ -0,0 +1,41 @@ + + + + + +New Mapping File Wizard + + + + + + + + + + + + + + + +
        +

        Convert to Java Project

        +

        The Convert to JPA Project option (accessed by selecting a Java project and then clicking New > JPA Tools > Convert to JPA Project) enables you to convert a non-faceted Java project into a faceted Java project. Selecting this option invokes the Modify Faceted Project wizard, which prompts you to add the JPA facet.

        +
        +

        The Convert to Java Project Option

        +A Java project in the Navigator with the JPA Tools > Convert to Java option selected.
        +
        + + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new007.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new007.htm new file mode 100644 index 0000000000..8ee5170f6a --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new007.htm @@ -0,0 +1,48 @@ + + + + + +The Convert to Java Project Option + + + + + + + + + + + + + + + +
        +

        Column Definition Support

        +

        The JPA Details view for attributes enables you to modify the nullable and unique column constraints and such column properties as length, scale, and precision.

        +
        +

        Defining Columns in JPA Details View for Entity Attributes

        +The JPA Details View for an entity with its Details section expanded to show the column configuration parameters.
        + +

         

        +Related reference
        +
        +Create New JPA Project wizard
        +JPA Development perspective +

         

        +
        + + + + + + diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new008.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new008.htm new file mode 100644 index 0000000000..f34b5c9d3c --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new008.htm @@ -0,0 +1,43 @@ + + + + + +Generate DDL from Entities wizard + + + + + + + + + + + + + + + +

        +
        +

        Generate DDL from Entities wizard

        +

        Use the Generate DDL wizard to quickly create DDL scripts from your persistent entities. Dali automatically creates the necessary primary and foreign keys, based on the entity mappings.

        +Related concept
        +
        +Related task
        +
        +Generating DDL from Entities
        + + + + + + -- cgit v1.2.3