Skip to main content
summaryrefslogtreecommitdiffstats
path: root/jpa
diff options
context:
space:
mode:
authornhauge2007-05-10 01:22:37 +0000
committernhauge2007-05-10 01:22:37 +0000
commit6a5e934be68521a0d2a5b39670bc15a262d32883 (patch)
tree7bf87391bc129471bfa5ed95a5890cca9e939840 /jpa
parent74e0f27246b007af1ffec6ef6843d865684338f5 (diff)
downloadwebtools.dali-6a5e934be68521a0d2a5b39670bc15a262d32883.tar.gz
webtools.dali-6a5e934be68521a0d2a5b39670bc15a262d32883.tar.xz
webtools.dali-6a5e934be68521a0d2a5b39670bc15a262d32883.zip
178911 - New documentation updates.
Diffstat (limited to 'jpa')
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/about.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml110
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/create_entity.xml48
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml142
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml43
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm11
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm24
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started005.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started006.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started007.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started008.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started009.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started010.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started011.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started012.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started013.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started014.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started015.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started016.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started017.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started018.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/getting_started019.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/add_persistence_dialog_xml.pngbin7513 -> 0 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl.pngbin6080 -> 0 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl_objects.pngbin6430 -> 0 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl_options.pngbin6609 -> 0 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl_save.pngbin7546 -> 0 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl_summary.pngbin11426 -> 0 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/new_project_2.pngbin0 -> 7208 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/properties_persistence.pngbin18245 -> 19758 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/img/secondary_tables.pngbin0 -> 1750 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/index.xml350
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/legal.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm52
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm21
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm14
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project_wizard.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_outline.htm10
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm22
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_prop_view.htm9
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_primary_key.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/ref_project_properties.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm69
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm74
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm37
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm55
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_add_persistence.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_create_new_project.htm28
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_generate_ddl.htm82
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_generate_entities.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm90
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance001.htm143
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm (renamed from jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence001.htm)2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm9
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm52
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm29
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm16
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm75
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm77
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm64
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm89
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm70
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm4
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm38
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm10
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm68
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm18
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/tips_and_tricks.htm2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/toc.xml19
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm8
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm29
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm26
110 files changed, 1219 insertions, 1156 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/about.htm b/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
index a8f36368ae..5194b6a9fe 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/about.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:14 -->
+<!-- Run date = May 9, 2007 10:03:47 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>About this content</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -20,7 +20,7 @@
<link rel="contents" href="toc.htm" title="Contents" type="text/html" />
</head>
<body>
-<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref257" name="sthref257"></a>
+<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref256" name="sthref256"></a>
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<tr valign="bottom">
<td align="left" width="86%">
@@ -28,8 +28,8 @@
</td>
</tr>
</table>
-<p>May 2, 2006</p>
-<a id="sthref258" name="sthref258"></a>
+<p>May 5, 2007</p>
+<a id="sthref257" name="sthref257"></a>
<p class="subhead2">License</p>
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <code><a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></code>. For purposes of the EPL, "Program" will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <code><a href="http://www.eclipse.org">http://www.eclipse.org</a></code>.</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml
index 8434065a1e..6dbeedbeca 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml
@@ -1,53 +1,63 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<cheatsheet title="Create a JPA Project">
- <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
- <description>
-This cheat sheet will automatically launch wizards, perform actions, and guide you through the steps to create a JPA project.
+ <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
+ <description>
+ This cheat sheet will automatically launch wizards, perform actions, and guide you through the steps to create a JPA project.
+
To learn more about using cheat sheets, or to see a list of available cheat sheets, click Help (?).
-To start work working on this cheat sheet click the "Click to Begin" button below.
-Let's get started!
- </description>
- </intro>
- <item title="Setup the enviroment" skip="true">
- <description>Your environment must be set up before you can perform the steps in this cheat sheet.
- Create a database connection.
- informationPending
- </description>
- </item>
- <item href="/org.eclipse.jdt.doc.user/tasks/tasks-12.htm" title="Create a JPA Project" skip="true">
- <action pluginId="org.eclipse.jdt.ui" class="org.eclipse.jdt.internal.ui.wizards.OpenProjectWizardAction" />
- <description>
-First, you will need to create a JPA project.
-If you already have a JPA project in your workspace that you would like to use, you may skip this step by clicking the "Click to Skip" button. If not, select File->New->Project... and choose JPA->JPA Project in the list.
-Complete the subsequent pages as required.
-The "New JPA Project" wizard is automatically displayed when you click the "Click to Perform" button.
- </description>
- </item>
- <item href="/org.eclipse.dali.doc.user/ref_add_persistence.htm" title="Adding Persistence">
- <action pluginId="org.eclipse.dali.ui" class="org.eclipse.dali.ui.actions.AddPersistenceNatureToIJavaProjectActionDelegate" param1=" " />
- <description>
-Now you will "add persistence" to the project.
-Right-click the Java project and select Java Persistence->Add Java Persistence.
-Complete the Add Persistence dialog by specifying your database connection information. If you do not have an active database connection, click "Add Connections" to create one.
-The "Add Java Persistence" dialog is automatically displayed when you click the "Click to Perform" button.
-If you do not use the "Click to Perform" button below, click the "Click to Skip" button to advance to the next step.
- </description>
- </item>
- <item title="Adding JPA Libraries">
- <description>
-To add your JPA library JARs, click "Configure the project build path." The Java Build Path" page of the Properties dialog appears.
-Add the JAP library JARs to your project.
-After adding the necessary libraries, click the "Click to Complete" button to advance to the next step.
- </description>
- </item>
- <item title="Creating a persistence.xml File" skip="true">
- <description>
-To create a persistence.xml file for your project, select the "Create persistence.xml" option. Complete the remaining fields on the the Add Persistence dialog and click "Finish." If you do not want to create a persistence.xml file, unselect the option and click the "Click to Skip" button to advance to the next step.
- </description>
- </item>
- <item title="Finish">
- <description>
-Congratulations! You have successfully added persistence to your Java project. Complete the additional cheat sheets to add Java persistent entities and map those entities to database tables.
- </description>
- </item>
+To start work working on this cheat sheet click the &quot;Click to Begin&quot; button below.
+
+Let&apos;s get started!
+ </description>
+ </intro>
+ <item title="Setup the Environment" dialog="false" skip="true" href="/org.eclipse.datatools.doc.user/c_database_development_setup.html">
+ <description>
+ Your environment must be set up before you can perform the steps in this cheat sheet.
+
+Create a database profile and connect to the database.
+
+The Database Connection dialog automatically appears when you click the &quot;Click to Perform&quot; button.
+ </description>
+ <command serialization="org.eclipse.datatools.sqltools.sqleditor.attachProfileAction" confirm="false">
+ </command>
+ </item>
+ <item title="Create a JPA Project" dialog="false" skip="false" href="/org.eclipse.jpt.doc.user/task_create_new_project.htm">
+ <description>
+ Use the New Project Wizard to create a JPA project.
+Select <b>File-&gt;New-&gt;Project...</b> and choose <b>JPA-&gt;JPA Project</b> in the list.
+
+On the first page of the wizard, enter a project name and location, select your target runtime, and select a predefined project configuration.
+
+Click <b>Next</b> to display the next page of the wizard.
+
+The &quot;New JPA Project&quot; wizard is automatically displayed when you click the &quot;Click to Perform&quot; button.
+ </description>
+ <action class="org.eclipse.jdt.internal.ui.wizards.OpenProjectWizardAction" pluginId="org.eclipse.jdt.ui" confirm="false">
+ </action>
+ </item>
+ <item title="Select Project Facet" dialog="false" skip="false" href="/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html">
+ <description>
+ Use the Project Facet page to select a predefined project configuration or specific specific facets to include in the project.
+
+Click &quot;Next&quot; to display the next page of the wizard.
+ </description>
+ </item>
+ <item title="Specify the JPA Facet" dialog="false" skip="false" href="/org.eclipse.jdt.doc.user/ref_jpa_facet.htm">
+ <description>
+ Use the JPA Facet page to specify the the vendor-specific JPA platform, the database connection to use, and the specific JPA implementation library.
+
+You can also specify if Dali should create an orm.xml file.
+
+If you do not have an active database connection, click <b>Add Connections</b> to create one.
+
+If you do not have a defined JPA implementation library, click <b>Configure default JPA implementation library</b> or <b>Configure user libraries</b> to define one.
+
+Click <b>Finish</b> to complete the wizard and open the open the project.
+ </description>
+ </item>
+ <item title="Finish" dialog="false" skip="false">
+ <description>
+ Congratulations! You have successfully created a JPA project. Complete the additional cheat sheets to add Java persistent entities and map those entities to database tables.
+ </description>
+ </item>
</cheatsheet>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/create_entity.xml b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/create_entity.xml
index 5d275f6485..b64e8afdee 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/create_entity.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/create_entity.xml
@@ -1,48 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by FREDERICK (RICK) SAPIR (ORACLE BELMONT) -->
<cheatsheet title="Create a Persistent Entity">
<intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
<description>
This cheat sheet will automatically launch wizards, perform actions, and guide you through the steps to add a Java persistent entity to your Java project.
To learn more about using cheat sheets or to see a list of available cheat sheets, click Help (?).
-To start work working on this cheat sheet, click the "Click to Begin" button below.
+To start work working on this cheat sheet, click the <b>Click to Begin</b> button below.
Let's get started!
</description>
</intro>
- <item href="/org.eclipse.dali.doc.user/ref_persistence_perspective.htm" title="Open the Persistence Perspective" skip="true">
- <action pluginId="org.eclipse.ui.cheatsheets" class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" param1="org.eclipse.dali.ui.PersistencePerspective"/>
+ <item title="Create a JPA Project" skip="true">
<description>
-When working with Java persistence, you should use the Persistence perspective. If you already have the Persistence perspective active, you may skip this step by clicking the "Click to Skip" button.
-If not, Select Window->Open Perspective->Other in the menubar at the top of the workbench. In the Select Perspectives dialog, select Persistence and click OK. This step changes the perspective to set up the Eclipse workbench for Java persistence development.
-You can click the "Click to Perform" button to have the "Persistence" perspective opened automatically.
- </description>
+To create a Persistent entity, you must create a JPA project. If you already have a JPA project, you may skip this step by clicking the "Click to Skip" button.
+If not, select <b>File->New->Project...</b> and choose <b>JPA->JPA Project</b> in the list. Complete each page of the Create JPA Project wizard to create a new JPA project.
+ </description>
</item>
- <item href="/org.eclipse.dali.doc.user/create_new_entity.htm" title="Create a Persistent Entity" skip="true">
- <action pluginId="org.eclipse.ui.cheatsheets" class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" param1="org.eclipse.dali.ui.PersistencePerspective"/>
+ <item title="Open the JPA Development Perspective" skip="true" href="/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm">
+ <action pluginId="org.eclipse.ui.cheatsheets" class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" param1="org.eclipse.jpt.ui.PersistencePerspective"/>
<description>
-To create a new Java persistent entity, use the Create Java Persistent Entity wizard.
-If you already have a Java persistent entity that you would like to use, you may skip this step by clicking the "Click to Skip" button. If not, select File->New->Other in the menubar at the top of the workbench.
-In the Select a Wizard dialog, select Java Persistence->Entity and click Next.
-The "Java Persistent Entity" wizard is automatically displayed when you click the "Click to Perform" button.
- </description>
+When working with JPA persistence, you should use the Persistence perspective. If you already have the Persistence perspective active, you may skip this step by clicking the "Click to Skip" button.
+If not, select <b>Window->Open Perspective->Other</b> in the menubar at the top of the workbench. In the Select Perspectives dialog, select <b>JPA Development</b> and click OK. This step changes the perspective to set up the Eclipse workbench for JPA development.
+You can click the "Click to Perform" button to have the "Persistence" perspective opened automatically.
+ </description>
</item>
- <item href="/org.eclipse.wst.datatools.connection.ui.doc.user/topics/ruidbconn_connpage.html" title="Add Database Connection" skip="true">
- <action pluginId="org.eclipse.ui.cheatsheets" class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" param1="org.eclipse.dali.ui.PersistencePerspective"/>
+ <item title="Create a Java Class">
<description>
-If you already have a database connection in your workspace that you would like to use, you may skip this step by clicking the "Click to Skip" button. If not, create a new database connection.
- </description>
+The next step is to create a new Java class. In the main toolbar again, click on <b>New Java Class</b> button (or the link below).
+The Java editor will automatically open showing your new class.
+ </description>
</item>
- <item href="/org.eclipse.dali.doc.user/ref_persistence_prop_view.htm" title="Specifying Persistence Properties">
- <action pluginId="org.eclipse.ui.cheatsheets" class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" param1="org.eclipse.dali.ui.PersistencePerspective"/>
+ <item title="Create a Persistent Entity">
<description>
-Now you will associate the entity with a database table.
-In the Persistence Properties view of the selected entity, use the "Table Name" field to select the database table to which the entity maps.
-The "Persistence Properties" view is automatically displayed when you click the "Click to Perform" button.
- </description>
+Finally we will make the Java class a persistent entity.
+In the JPA Structure view select the Java class.
+In the JPA Details view, use the "Map As" field to select <b>Entity</b>. Dali automatically adds the @Entity annotation to the class in the Java editor.
+Use the Table, Catalog, and Schema fields to associate the entity with a specific table in the database.
+ </description>
</item>
<item title="Finish">
<description>
-Congratulations! You have successfully added an Java persistent entity to your Java project. Complete the additional cheat sheets to map the entity's fields to database tables.
+Congratulations! You have successfully added a JPA entity to your JPA project. Complete the additional cheat sheets to map the entity's fields to database tables.
</description>
</item>
</cheatsheet>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml
index ed16679483..63307f226e 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml
@@ -1,62 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by FREDERICK (RICK) SAPIR (ORACLE BELMONT) -->
<cheatsheet title="Map a Java Persistent Entity">
- <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
- <description>
-This cheat sheet will automatically launch wizards, perform actions, and guide you through the steps to map the fields of Java persistent entity to your database..
+ <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
+ <description>
+ This cheat sheet will automatically launch wizards, perform actions, and guide you through the steps to map the fields of a JPA entity entity to your database.
+
To learn more about using cheat sheets or to see a list of available cheat sheets, click Help (?).
-To start work working on this cheat sheet, click the "Click to Begin" button below.
-Let's get started!
- </description>
- </intro>
- <item href="/org.eclipse.dali.doc.user/ref_persistence_perspective.htm" title="Open the Persistence Perspective" skip="true">
- <action pluginId="org.eclipse.ui.cheatsheets" class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" param1="org.eclipse.dali.ui.PersistencePerspective"/>
- <description>
-First, you need to use the Persistence Perspective. If you are already viewing the Persistence Perspective, you may skip this step by clicking the "Click to Skip" button. If not, select Window->Open Perspective->Other in the menubar at the top of the workbench
-In the Select Perspectives dialog, select Persistence and click OK.
-This step changes the perspective to set up the Eclipse workbench for Java persistence development.
-You can click the "Click to Perform" button to have the "Persistence" perspective opened automatically.
- </description>
- </item>
- <item href="/org.eclipse.dali.doc.user/create_new_entity.htm" title="Create a Persistent Entity" skip="true">
- <action pluginId="org.eclipse.ui.cheatsheets" class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" param1="org.eclipse.dali.ui.PersistencePerspective"/>
- <description>
-To create a new Java persistent entity, use the Create Java Persistent Entity wizard.
-If you already have a Java persistent entity that you would like to use, you may skip this step by clicking the "Click to Skip" button. If not, select File->New->Other in the menubar at the top of the workbench.
-In the Select a Wizard dialog, select Java Persistence->Entity and click Next.
-The "Java Persistent Entity" wizard is automatically displayed when you click the "Click to Perform" button.
- </description>
- </item>
- <item href="org.eclipse.wst.datatools.connection.ui.doc.user/topics/ruidbconn_connpage.html" title="Add Database Connection" skip="true">
- <action pluginId="org.eclipse.ui.cheatsheets" class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" param1="org.eclipse.dali.ui.PersistencePerspective"/>
- <description>
-If you already have a database connection in your workspace that you would like to use, you may skip this step by clicking the "Click to Skip" button. If not, create a new database connection.
- </description>
- </item>
- <item href="/org.eclipse.dali.doc.user/ref_persistence_prop_view.htm" title="Specifying Persistence Properties" skip="true">
- <action pluginId="org.eclipse.ui.cheatsheets" class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" param1="org.eclipse.dali.ui.PersistencePerspective"/>
- <description>
-Now you will associate the entity with a database table. If you already have associated the entity with a database table, you may skip this step by clicking the "Click to Skip" button.
-If not, in the Persistence Properties view of the selected entity, use the "Table Name" field to select the database table to which the entity maps.
-The "Persistence Properties" view of the wizard is automatically displayed when you click the "Click to Perform" button.
- </description>
- </item>
- <item href="" title="Add Fields to the Class" skip="true">
- <action pluginId="org.eclipse.ui.cheatsheets" class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" param1="org.eclipse.dali.ui.PersistencePerspective"/>
- <description>
-Now you will add some fields to the entity to map to rows in the database table.
-If your persistent entity already has fields to map, you may skip this step by clicking the "Click to Skip" button. If not, use the Java editor to add fields to the entity.
- </description>
- </item>
- <item href="/org.eclipse.dali.doc.user/ref_entity_page.htm" title="Create the Mapping">
- <action pluginId="org.eclipse.ui.cheatsheets" class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" param1="org.eclipse.dali.ui.PersistencePerspective"/>
- <description>
-Now you are ready to map the entity fields to columns in the database table. In the Package Explorer, select the Java class. In the Persistence Outline view, expand the persistent entity to display the fields. Select a field. The Persistence Properties view displays the information for the field. Use the Map As field to select the Basic mapping. Use the Column field to select a column from the database table.
- </description>
- </item>
- <item title="Finish">
- <description>
-Congratulations! You have successfully mapped the fields from a Java persistent entity to a column in a database table.
- </description>
- </item>
+To start work working on this cheat sheet, click the &quot;Click to Begin&quot; button below.
+
+Let&apos;s get started!
+ </description>
+ </intro>
+ <item title="Setup the Environment" dialog="false" skip="true" href="/org.eclipse.datatools.doc.user/c_database_development_setup.html">
+ <description>
+ Your environment must be set up before you can perform the steps in this cheat sheet.
+
+Create a database profile and connect to the database.
+
+If you already have (and are connected to) a database connection, you may skip this step by clicking the &quot;Click to Skip&quot; button.
+
+The Database Connection dialog automatically appears when you click the &quot;Click to Perform&quot; button.
+ </description>
+ <command serialization="org.eclipse.datatools.sqltools.sqleditor.attachProfileAction" confirm="false">
+ </command>
+ </item>
+ <item title="Create a JPA Project" dialog="false" skip="true" href="/org.eclipse.jpt.doc.user/task_create_new_project.htm">
+ <description>
+ Use the New Project Wizard to create a JPA project.
+Select <b>File-&gt;New-&gt;Project...</b> and choose <b>JPA-&gt;JPA Project</b> in the list.
+
+Complete each page of the wizard to create a new JPA project.
+
+The &quot;New JPA Project&quot; wizard is automatically displayed when you click the &quot;Click to Perform&quot; button.
+
+If you already have a JPA project, you may skip this step by clicking the &quot;Click to Skip&quot; button.
+ </description>
+ <action class="org.eclipse.jdt.internal.ui.wizards.OpenProjectWizardAction" pluginId="org.eclipse.jdt.ui" confirm="false">
+ </action>
+ </item>
+ <item title="Open the JPA Development Perspective" dialog="false" skip="true" href="/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm">
+ <description>
+ When working with JPA persistence, you should use the Persistence perspective. If you already have the Persistence perspective active, you may skip this step by clicking the &quot;Click to Skip&quot; button.
+If not, select <b>Window-&gt;Open Perspective-&gt;Other</b> in the menubar at the top of the workbench. In the Select Perspectives dialog, select <b>JPA Development</b> and click OK. This step changes the perspective to set up the Eclipse workbench for JPA development.
+You can click the &quot;Click to Perform&quot; button to have the &quot;Persistence&quot; perspective opened automatically.
+ </description>
+ <action class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" pluginId="org.eclipse.ui.cheatsheets" confirm="false" param1="org.eclipse.jpt.ui.PersistencePerspective">
+ </action>
+ </item>
+ <item title="Create a Java Class" dialog="false" skip="false">
+ <description>
+ The next step is to create a new Java class. In the main toolbar again, click on <b>New Java Class</b> button (or the link below).
+The Java editor will automatically open showing your new class.
+ </description>
+ </item>
+ <item title="Create a Persistent Entity" dialog="false" skip="false">
+ <description>
+ Finally we will make the Java class a persistent entity.
+In the JPA Structure view select the Java class.
+In the JPA Details view, use the &quot;Map As&quot; field to select <b>Entity</b>. Dali automatically adds the @Entity annotation to the class in the Java editor.
+Use the Table, Catalog, and Schema fields to associate the entity with a specific table in the database.
+ </description>
+ </item>
+ <item title="Add Fields to the Class" dialog="false" skip="true">
+ <description>
+ Now you will add some fields to the entity to map to rows in the database table.
+
+If your persistent entity already has fields to map, you may skip this step by clicking the &quot;Click to Skip&quot; button. If not, use the Java editor to add fields to the entity.
+ </description>
+ <action class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" pluginId="org.eclipse.ui.cheatsheets" confirm="false" param1="org.eclipse.dali.ui.PersistencePerspective">
+ </action>
+ </item>
+ <item title="Create the Mapping" dialog="false" skip="false" href="/org.eclipse.dali.doc.user/ref_entity_page.htm">
+ <description>
+ Now you are ready to map the entity fields to columns in the database table. In the Package Explorer, select the Java class.
+
+In the JPA Structure view, expand the persistent entity to display the fields. Select a field.
+
+The JPA Details view displays the information for the field. Use the Map As field to select the Basic mapping. Use the Column field to select a column from the database table.
+ </description>
+ <action class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" pluginId="org.eclipse.ui.cheatsheets" confirm="false" param1="org.eclipse.dali.ui.PersistencePerspective">
+ </action>
+ </item>
+ <item title="Finish" dialog="false" skip="false">
+ <description>
+ Congratulations! You have successfully mapped the fields from a Java persistent entity to a column in a database table.
+ </description>
+ </item>
</cheatsheet>
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 d66eb6735b..1768357cbc 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concept_mapping.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:08 -->
+<!-- Run date = May 9, 2007 10:03:40 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Understanding OR mappings</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
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 31cae4208e..e94fa2bbbd 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concept_persistence.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:08 -->
+<!-- Run date = May 9, 2007 10:03:40 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Understanding Java persistence</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
index ee626f0da3..45697fcfa5 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:08 -->
+<!-- Run date = May 9, 2007 10:03:40 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Concepts</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
index 3089c43a5a..b6f0a24da8 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts001.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:08 -->
+<!-- Run date = May 9, 2007 10:03:40 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Understanding EJB 3.0 Java Persistence API</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
index dc0f17a757..6770bede34 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts002.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:08 -->
+<!-- Run date = May 9, 2007 10:03:40 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>The persistence.xml file</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
index a0277ed3c4..bfc6ee123b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/concepts003.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:08 -->
+<!-- Run date = May 9, 2007 10:03:40 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>The orm.xml file</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,7 +29,7 @@
</td>
</tr>
</table>
-<p>Although the JPA specification emphasizes the use of annotations to specify persistence, you can also the <code>orm.xml</code> 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 <a href="task_manage_persistence001.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
+<p>Although the JPA specification emphasizes the use of annotations to specify persistence, you can also the <code>orm.xml</code> 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 <a href="task_manage_orm.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
<a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a><br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml b/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml
index d9b21d4b85..6ab28a3051 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml
@@ -377,32 +377,43 @@
<topic label="Understanding persistence" href="concept_persistence.htm"/>
</context>
<context id="orm_package">
- <description>.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
- </context>
- <context id="orm_package">
- <description>.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <description>The Java package that contains the persitent entities to which the orm.xml file applies.</description>
+ <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
+ <topic label="JPA Details" href="ref_details_orm.htm"/>
</context>
<context id="orm_schema">
- <description>.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <description>The database schema to use as the default for all entities managed by this persistence unit.</description>
+ <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
+ <topic label="JPA Details" href="ref_details_orm.htm"/>
</context>
<context id="orm_catalog">
- <description>.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <description>The database catalog to use as the default for all entities managed by this persistence unit.</description>
+ <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
+ <topic label="JPA Details" href="ref_details_orm.htm"/>
</context>
<context id="orm_access">
- <description>.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <description>The default access method for variables in this project: Property or Field.</description>
+ <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
+ <topic label="JPA Details" href="ref_details_orm.htm"/>
</context>
<context id="orm_cascade">
- <description>.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <description>Adds cascade-persist to the set of cascade options in entity relationships of the persistence unit.</description>
+ <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
+ <topic label="JPA Details" href="ref_details_orm.htm"/>
</context>
<context id="orm_xml">
- <description>.</description>
- <topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
+ <description>Specifies that the Java classes in this persistence unit are fully specified by their metadata. Any annotations will be ignored.</description>
+ <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
+ <topic label="JPA Details" href="ref_details_orm.htm"/>
+ </context>
+ <context id="dialog_JPAPlatform">
+ <description>Specify the vendor-specific JPA implementation.Default is Generic..</description>
+ <topic label="JPA Facet page" href="ref_jpa_facet.htm"/>
+ </context>
+ <context id="dialog_createORM">
+ <description>Create an initial orm.xml file. Use this file to specify project and persistence unit defaults.</description>
+ <topic label="Managing the orm.xml file" href="task_manage_orm.htm"/>
+ <topic label="JPA Facet page" href="ref_jpa_facet.htm"/>
</context>
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 70f49d8fca..981a170691 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:06 -->
+<!-- Run date = May 9, 2007 10:03:39 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Getting started</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
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 44a260e947..1fd620c658 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started001.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:06 -->
+<!-- Run date = May 9, 2007 10:03:39 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Requirements and installation</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
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 96cbcdfcc2..2a61d3510f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started002.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:06 -->
+<!-- Run date = May 9, 2007 10:03:39 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Dali quick start</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm
index c263d68c50..642019fc99 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started003.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:06 -->
+<!-- Run date = May 9, 2007 10:03:39 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Creating a new project</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -38,7 +38,7 @@
<p>On the <span class="gui-object-title">New Project</span> dialog, select <span class="gui-object-action">JPA &gt; JPA Project</span> and click <span class="gui-object-action">Next</span>. The Create a Java Project dialog appears.</p>
<div class="figure"><a id="sthref7" name="sthref7"></a>
<p class="titleinfigure">New JPA Project</p>
-<img src="img/new_jpa_project_dialog.png" alt="Using the Java Persistence &gt; Add Java Persistence menu option." title="Using the Java Persistence &gt; Add Java Persistence menu option." /><br /></div>
+<img src="img/new_jpa_project_dialog.png" alt="New JPA Project dialog." title="New JPA Project dialog." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>On the <span class="gui-object-title">Create a JPA Project</span> dialog, enter a <span class="gui-object-action">Project name</span> (such as <code>QuickStart</code>).</p>
@@ -63,17 +63,16 @@ You must configure your project to use Java version 5.0 (or higher). See <a href
<!-- class="inftblnote" --></div>
</li>
<li>
-<p>On the JPA Facet dialog, select your database connection (or create a new connection) and JPA implementation library (such as TopLink Essentials), and click <span class="bold">Finish</span>.</p>
-<p><span class="italic">INFORMATION_PENDING</span></p>
+<p>On the JPA Facet dialog, select your database connection (or create a new connection), JPA implementation library (such as TopLink Essentials), define how Dali should manage persistent classes, and click <span class="bold">Finish</span>.</p>
<div class="figure"><a id="sthref8" name="sthref8"></a>
<p class="titleinfigure">JPA Facet Dialog</p>
-<img src="img/jpa_facet_dialog.png" alt="" title="" /><br /></div>
+<img src="img/jpa_facet_dialog.png" alt="JPA Facet dialog." title="JPA Facet dialog." /><br /></div>
<!-- class="figure" --></li>
</ol>
<p>Eclipse adds the project to the workbench and opens the JPA perspective.</p>
<div class="figure"><a id="sthref9" name="sthref9"></a>
<p class="titleinfigure">Project in Package Explorer</p>
-<img src="img/quickstart_project.png" alt="Package Explorer showing the Java persistent project." title="Package Explorer showing the Java persistent project." /><br /></div>
+<img src="img/quickstart_project.png" alt="Package Explorer showing the JPA project." title="Package Explorer showing the JPA project." /><br /></div>
<!-- class="figure" -->
<p>Now that you have created a project with persistence, you can continue with <a href="getting_started004.htm#BABFGDDG">Creating a Java persistent entity</a>.</p>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm
index eee2ce891e..b81e1fe627 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started004.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:07 -->
+<!-- Run date = May 9, 2007 10:03:39 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Creating a Java persistent entity</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -38,37 +38,33 @@
<p>On the Java Class page, enter a package name (such as <code>quickstart.demo.model</code>), class name (such as <code>Address</code>), and click <span class="bold">Finish</span>.</p>
</li>
<li>
-<p>synchronize <code>persistence.xml</code></p>
-<p><span class="italic">informationPending...</span></p>
-</li>
-<li>
<p>Right-click the <code>Address.java</code> file in the Package Explorer and select <span class="bold">Open</span>.</p>
<div class="figure"><a id="sthref11" name="sthref11"></a>
<p class="titleinfigure">Open Address.java</p>
-<img src="img/address_java_open.png" alt="" title="" /><br /></div>
+<img src="img/address_java_open.png" alt="Opening a Java class." title="Opening a Java class." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>Select the <code>Address</code> entity in the JPA Structure view.</p>
<div class="figure"><a id="sthref12" name="sthref12"></a>
<p class="titleinfigure">Address Class in JPA Structure View</p>
-<img src="img/address_jpa_structure.png" alt="" title="" /><br /></div>
+<img src="img/address_jpa_structure.png" alt="Address class in JPA Structure view." title="Address class in JPA Structure view." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>In the JPA Details view, in the Map As field, select <span class="bold">Entity</span>. In the Table field, select the <span class="bold">ADDRESS</span> database table.</p>
<div class="figure"><a id="sthref13" name="sthref13"></a>
<p class="titleinfigure">Address Entity in JPA Details View</p>
-<img src="img/address_jpa_details.png" alt="" title="" /><br /></div>
+<img src="img/address_jpa_details.png" alt="JPA Details view." title="JPA Details view." /><br /></div>
<!-- class="figure" --></li>
</ol>
<p>Eclipse creates the persistent entity and adds the <code>@Entity</code> annotation to the class.</p>
<div class="figure"><a id="sthref14" name="sthref14"></a>
<p class="titleinfigure">Address Entity</p>
-<img src="img/java_editor_address.png" alt="This figure shows the Java editor with the Address entity." title="This figure shows the Java editor with the Address entity." /><br /></div>
+<img src="img/java_editor_address.png" alt="Java editor with the Address entity." title="Java editor with the Address entity." /><br /></div>
<!-- class="figure" -->
<p>Eclipse also displays the <span class="bold">Address</span> entity in the JPA Structure view:</p>
<div class="figure"><a id="sthref15" name="sthref15"></a>
<p class="titleinfigure">Address Entity</p>
-<img src="img/persistence_outline_entity.png" alt="This figure shows the Address entity in the Persistence Outline view." title="This figure shows the Address entity in the Persistence Outline view." /><br /></div>
+<img src="img/persistence_outline_entity.png" alt="Address entity in the JPA Structure view." title="Address entity in the JPA Structure view." /><br /></div>
<!-- class="figure" -->
<p>After creating the entity, you must associate it with a database table.</p>
<ol type="1" start="1">
@@ -91,10 +87,14 @@ Depending on your database connection type, you may need to specify the <span cl
<br /></div>
<!-- class="inftblnote" --></div>
<div class="figure"><a id="sthref16" name="sthref16"></a>
-<p class="titleinfigure">Persistence Properties View for Address Entity</p>
-<img src="img/persistence_view_address.png" alt="This figure shows the Table selection for the Address entity in the Persistence Properties view." title="This figure shows the Table selection for the Address entity in the Persistence Properties view." /><br /></div>
+<p class="titleinfigure">JPA Details View for Address Entity</p>
+<img src="img/persistence_view_address.png" alt="Table selection for the Address entity in the JPA Details view." title="Table selection for the Address entity in the JPA Details view." /><br /></div>
<!-- class="figure" --></li>
</ol>
+<p>After associating the entity with the database table, you must update the <code>persistence.xml</code> file to include this JPA entity.</p>
+<p>Right-click the <code>persistence.xml</code> file in the Package Explorer and select <span class="bold">JPA Tools &gt; Synchronize Classes</span>. Dali adds the following to the <code>persistence.xml</code> file:</p>
+<p><code>&lt;class&gt;quickstart.demo.model.Address&lt;/class&gt;</code></p>
+<p>&nbsp;</p>
<p>Now that you have created a persistent entity, you can continue with <a href="getting_started005.htm#BABHACAF">Mapping an entity</a> to map the entity's fields to columns on the database table.</p>
</div>
<!-- class="sect2" -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started005.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started005.htm
index 12374b121f..05e4b2e6a5 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started005.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started005.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:07 -->
+<!-- Run date = May 9, 2007 10:03:39 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Mapping an entity</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -42,7 +42,7 @@ private String street;
<p>Eclipse updates the Address entity in the JPA Structure view to show its fields:</p>
<div class="figure"><a id="sthref19" name="sthref19"></a>
<p class="titleinfigure">Address Entity and Fields</p>
-<img src="img/persistence_outline_fields.png" alt="This figure shows the Address entity and its fields in the Persistence Outline view." title="This figure shows the Address entity and its fields in the Persistence Outline view." /><br /></div>
+<img src="img/persistence_outline_fields.png" alt="Address entity and its fields in the JPA Structure view." title="Address entity and its fields in the JPA Structure view." /><br /></div>
<!-- class="figure" -->
<p>You will also need to add the following columns to the ADDRESS database table:</p>
<pre xml:space="preserve" class="oac_no_warn">
@@ -71,8 +71,8 @@ VARCHAR2(80) CITY
</li>
</ul>
<div class="figure"><a id="sthref20" name="sthref20"></a>
-<p class="titleinfigure">Persistence Properties View for addressId Field</p>
-<img src="img/persistence_view_addressid.png" alt="This figure shows the Persistence Properties view for the id field." title="This figure shows the Persistence Properties view for the id field." /><br /></div>
+<p class="titleinfigure">JPA Details View for addressId Field</p>
+<img src="img/persistence_view_addressid.png" alt="JPA Details view for the id field." title="JPA Details view for the id field." /><br /></div>
<!-- class="figure" -->
<p>Eclipse adds the following annotations to the Address entity:</p>
<pre xml:space="preserve" class="oac_no_warn">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started006.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started006.htm
index f231c0d7c8..91bc280ae4 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started006.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started006.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:07 -->
+<!-- Run date = May 9, 2007 10:03:39 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Dali basic tutorial</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started007.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started007.htm
index 22888904ed..5b910cefff 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started007.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started007.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:07 -->
+<!-- Run date = May 9, 2007 10:03:39 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Generate the tutorial database schema</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started008.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started008.htm
index 0860ff17c3..24390d0770 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started008.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started008.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:07 -->
+<!-- Run date = May 9, 2007 10:03:39 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Create a database connection</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started009.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started009.htm
index 469f2debe3..4322ab3c0e 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started009.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started009.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:07 -->
+<!-- Run date = May 9, 2007 10:03:39 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Create a JPA project</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -50,7 +50,7 @@
<p>Eclipse adds the project to the workbench and opens the Java perspective.</p>
<div class="figure"><a id="sthref24" name="sthref24"></a>
<p class="titleinfigure">Persistence Perspective</p>
-<img src="img/persistence_perspective.png" alt="This figure shows the main parts of the Persistence Perspective: The Persistence Outline and Persistence Properties views." title="This figure shows the main parts of the Persistence Perspective: The Persistence Outline and Persistence Properties views." /><br /></div>
+<img src="img/persistence_perspective.png" alt="This figure shows the main parts of the JPA Development Perspective: The JPA Structure and JPA Details views." title="This figure shows the main parts of the JPA Development Perspective: The JPA Structure and JPA Details views." /><br /></div>
<!-- class="figure" -->
<p>The next step is to <a href="getting_started010.htm#BABIJIGF">Create persistent Java entities</a>.</p>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started010.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started010.htm
index 8969dbef97..eb3ae4747d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started010.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started010.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:07 -->
+<!-- Run date = May 9, 2007 10:03:39 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Create persistent Java entities</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -44,7 +44,7 @@
<p>In the JPA Details view, in the Map As field, select <span class="bold">Entity</span>. In the Table field, select the <span class="bold">EMPLOYEE</span> database table.</p>
<div class="figure"><a id="sthref25" name="sthref25"></a>
<p class="titleinfigure">Employee Entity in JPA Details View</p>
-<img src="img/address_jpa_details.png" alt="" title="" /><br /></div>
+<img src="img/address_jpa_details.png" alt="Employee entity in JPA Details view." title="Employee entity in JPA Details view." /><br /></div>
<!-- class="figure" --></li>
</ol>
<p>Eclipse adds the <code>@Entity</code> annotation to the class. Repeat this procedure to add the <span class="bold">PhoneNumber</span> and <span class="bold">Address</span> entities.</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started011.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started011.htm
index ff4d793cb3..830fb7b4d3 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started011.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started011.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:07 -->
+<!-- Run date = May 9, 2007 10:03:39 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Add fields to the entities</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started012.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started012.htm
index 74ec6ba02b..146e951a96 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started012.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started012.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:07 -->
+<!-- Run date = May 9, 2007 10:03:39 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Associate the entity with a database table</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -38,7 +38,7 @@
<p>In the JPA Details view, notice that Dali has automatically selected the EMPLOYEE table as the table name.</p>
<div class="figure"><a id="sthref26" name="sthref26"></a>
<p class="titleinfigure">JPA Details View for the Employee Entity</p>
-<img src="img/persistence_view_employee.png" alt="This figure shows the Persistence Properties view for the Employee entity." title="This figure shows the Persistence Properties view for the Employee entity." /><br /></div>
+<img src="img/persistence_view_employee.png" alt="JPA Details view for the Employee entity." title="JPA Details view for the Employee entity." /><br /></div>
<!-- class="figure" --></li>
</ol>
<p>By default, Dali attempts to associate each entity with a similarly named database table. Notice that although you have not explicitly associated the <span class="bold">Address</span> entity yet, there is no error in the Problems view because the entity name, Address, is identical to the table name (ADDRESS).</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started013.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started013.htm
index 739a55b50e..a9c7f4657b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started013.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started013.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:07 -->
+<!-- Run date = May 9, 2007 10:03:39 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Create OR mappings</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started014.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started014.htm
index 7375f12d1f..e69746b908 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started014.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started014.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:07 -->
+<!-- Run date = May 9, 2007 10:03:39 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Create ID mappings</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -41,7 +41,7 @@
<p>In the <span class="gui-object-title">Map As</span> field, select <span class="gui-object-action">ID</span>.</p>
<div class="figure"><a id="sthref27" name="sthref27"></a>
<p class="titleinfigure">ID Mapping for emp_id Field</p>
-<img src="img/persistence_view_empid.png" alt="This figure shows the Persistence Properties page for the emp_id field." title="This figure shows the Persistence Properties page for the emp_id field." /><br /></div>
+<img src="img/persistence_view_empid.png" alt="JPA Details view for the emp_id field." title="JPA Details view for the emp_id field." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>Use this table to complete the remaining fields in the <span class="gui-object-title">JPA Details</span> view.</p>
@@ -72,7 +72,7 @@
<p>Leave all other fields on the tab as their defaults. Expand the <span class="bold">Primary Key Generation</span> area.</p>
<div class="figure"><a id="sthref28" name="sthref28"></a>
<p class="titleinfigure">Primary Key Generation for emp_id Field</p>
-<img src="img/persistence_view_empid_pk.png" alt="This figure shows the Persistence Properties page for the emp_id field." title="This figure shows the Persistence Properties page for the emp_id field." /><br /></div>
+<img src="img/persistence_view_empid_pk.png" alt="JPA Details view (with Primary Key options) for the emp_id field." title="JPA Details view (with Primary Key options) for the emp_id field." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>Use this table to complete the Primary Key Generation fields in the <span class="gui-object-title">JPA Details</span> view.</p>
@@ -105,7 +105,7 @@
<p>In the JPA Structure view, the <span class="bold">id</span> field is identified as the primary key by the following icon:</p>
<div class="figure"><a id="sthref29" name="sthref29"></a>
<p class="titleinfigure">JPA Structure for Employee Entity</p>
-<img src="img/persistence_outline_empid.png" alt="This figure shows the emp_id attribute of the Employee entity in the Persistence Outline view." title="This figure shows the emp_id attribute of the Employee entity in the Persistence Outline view." /><br /></div>
+<img src="img/persistence_outline_empid.png" alt="emp_id attribute of the Employee entity in the JPA Structure view." title="emp_id attribute of the Employee entity in the JPA Structure view." /><br /></div>
<!-- class="figure" -->
<p>Repeat this procedure to map the following primary keys (as shown in <a href="getting_started007.htm#BABDEFDF">Table: Tutorial Database Schema</a>):</p>
<ul>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started015.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started015.htm
index 7c6f4b69c2..def95737c5 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started015.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started015.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:07 -->
+<!-- Run date = May 9, 2007 10:03:39 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Create basic mappings</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -41,13 +41,13 @@
<p>In the <span class="gui-object-title">Map As</span> field, select <span class="gui-object-action">Basic</span>. In the Column field, select <span class="bold">F_NAME</span>.</p>
<div class="figure"><a id="sthref30" name="sthref30"></a>
<p class="titleinfigure">Basic Mapping for firstName</p>
-<img src="img/persistence_view_firstname.png" alt="This figure shows the Persistence Properties page for the firstName field." title="This figure shows the Persistence Properties page for the firstName field." /><br /></div>
+<img src="img/persistence_view_firstname.png" alt="JPA Details view for the firstName field." title="JPA Details view for the firstName field." /><br /></div>
<!-- class="figure" --></li>
</ol>
<p>Dali adds the <code>@Column(name="F_NAME")</code> annotation to the entity. In the JPA Structure, the <span class="bold">firstName</span> field is identified as a basic mapping as shown in the following figure:</p>
<div class="figure"><a id="sthref31" name="sthref31"></a>
<p class="titleinfigure">JPA Structure for Employee Entity</p>
-<img src="img/persistence_outline_fname.png" alt="This figure shows the firstName attribute of the Employee entity in the Persistence Outline view." title="This figure shows the firstName attribute of the Employee entity in the Persistence Outline view." /><br /></div>
+<img src="img/persistence_outline_fname.png" alt="The firstName attribute of the Employee entity in the JPA Structure view." title="The firstName attribute of the Employee entity in the JPA Structure view." /><br /></div>
<!-- class="figure" -->
<p>Repeat this procedure to map each of the following fields as <span class="bold">Basic</span> mappings:</p>
<ul>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started016.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started016.htm
index 6b407d710c..62c814ec4a 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started016.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started016.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:07 -->
+<!-- Run date = May 9, 2007 10:03:40 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Create one-to-one mappings</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -41,7 +41,7 @@
<p>In the <span class="gui-object-title">Map As</span> field, select <span class="gui-object-action">One-to-One</span>.</p>
<div class="figure"><a id="sthref32" name="sthref32"></a>
<p class="titleinfigure">One-to-one Mapping for address</p>
-<img src="img/persistence_view_onetoone.png" alt="This figure shows the Persistence Properties page for the address field." title="This figure shows the Persistence Properties page for the address field." /><br /></div>
+<img src="img/persistence_view_onetoone.png" alt="JPA Details view for the address field." title="JPA Details view for the address field." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>For the Target Entity, click <span class="bold">Browse</span> and select the <span class="bold">Address</span> persistent entity. Dali adds the <code>@OneToOne(targetEntity=dali.tutorial.model.Address.class)</code> entity to the class.</p>
@@ -68,13 +68,13 @@
</ul>
<div class="figure"><a id="sthref33" name="sthref33"></a>
<p class="titleinfigure">Editing Join Column for Address Mapping</p>
-<img src="img/edit_join_column_dialog.png" alt="This figure shows the Edit Join Column dialog for the address 1:1 mapping." title="This figure shows the Edit Join Column dialog for the address 1:1 mapping." /><br /></div>
+<img src="img/edit_join_column_dialog.png" alt="Edit Join Column dialog for the address 1:1 mapping." title="Edit Join Column dialog for the address 1:1 mapping." /><br /></div>
<!-- class="figure" --></li>
</ol>
<p>In the JPA Structure, the <span class="bold">address</span> field is identified as a one-to-one mapping, as shown in the following figure:</p>
<div class="figure"><a id="sthref34" name="sthref34"></a>
<p class="titleinfigure">JPA Structure for Employee Entity</p>
-<img src="img/persistence_outline_address.png" alt="This figure shows the address attribute of the Employee entity in the Persistence Outline view." title="This figure shows the address attribute of the Employee entity in the Persistence Outline view." /><br /></div>
+<img src="img/persistence_outline_address.png" alt="The address attribute of the Employee entity in the JPA Structure view." title="The address attribute of the Employee entity in the JPA Structure view." /><br /></div>
<!-- class="figure" -->
<p>Next, you will <a href="getting_started017.htm#BABBEHEG">Create one-to-many mappings</a>.</p>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started017.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started017.htm
index b32513556c..7edff32243 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started017.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started017.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:08 -->
+<!-- Run date = May 9, 2007 10:03:40 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Create one-to-many mappings</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -41,7 +41,7 @@
<p>In the <span class="gui-object-title">Map As</span> field, select <span class="gui-object-action">One-to-Many</span>.</p>
<div class="figure"><a id="sthref35" name="sthref35"></a>
<p class="titleinfigure">One-to-many Mapping for phoneNumbers</p>
-<img src="img/persistence_view_onetomany.png" alt="This figure shows the Persistence Properties page for the phoneNumbers field." title="This figure shows the Persistence Properties page for the phoneNumbers field." /><br /></div>
+<img src="img/persistence_view_onetomany.png" alt="JPA Details view for the phoneNumbers field." title="JPA Details view for the phoneNumbers field." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>Select <span class="bold">PhoneNumber</span> as the Target Entity. Leave the other fields with their default values.</p>
@@ -53,7 +53,7 @@
<p>In the JPA Structure, the <span class="bold">phoneNumbers</span> field is identified as a one-to-many mapping as shown in the following figure:</p>
<div class="figure"><a id="sthref36" name="sthref36"></a>
<p class="titleinfigure">JPA Structure for Employee Entity</p>
-<img src="img/persistence_outline_phone.png" alt="This figure shows the phoneNumbers attribute of the Employee entity in the Persistence Outline view." title="This figure shows the phoneNumbers attribute of the Employee entity in the Persistence Outline view." /><br /></div>
+<img src="img/persistence_outline_phone.png" alt="The phoneNumbers attribute of the Employee entity in the JPA Structure view." title="The phoneNumbers attribute of the Employee entity in the JPA Structure view." /><br /></div>
<!-- class="figure" -->
<p>Next, you will <a href="getting_started018.htm#BABCHIHI">Create many-to-one mappings</a>.</p>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started018.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started018.htm
index 93ea9d8163..93bd6b524d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started018.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started018.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:08 -->
+<!-- Run date = May 9, 2007 10:03:40 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Create many-to-one mappings</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -42,7 +42,7 @@
<p>In the <span class="gui-object-title">Map As</span> field, select <span class="gui-object-action">Many to One</span>.</p>
<div class="figure"><a id="sthref37" name="sthref37"></a>
<p class="titleinfigure">Many to One Mapping for owner</p>
-<img src="img/persistence_view_manytoone.png" alt="This figure shows the Persistence Properties page for the owner field." title="This figure shows the Persistence Properties page for the owner field." /><br /></div>
+<img src="img/persistence_view_manytoone.png" alt="The JPA Details view for the owner field." title="The JPA Details view for the owner field." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>Leave the other fields with their default values. Dali correctly completes the information based on the database structure and previously defined mappings.</p>
@@ -71,7 +71,7 @@
<p>In the JPA Structure, the <span class="bold">owner</span> field is identified as a many-to-one mapping as shown in the following figure:</p>
<div class="figure"><a id="sthref38" name="sthref38"></a>
<p class="titleinfigure">JPA Structure for PhoneNumber Entity</p>
-<img src="img/persistence_outline_owner.png" alt="This figure shows the owner attribute of the PhoneNumber entity in the Persistence Outline view." title="This figure shows the owner attribute of the PhoneNumber entity in the Persistence Outline view." /><br /></div>
+<img src="img/persistence_outline_owner.png" alt="The owner attribute of the PhoneNumber entity in the JPA Structure view." title="The owner attribute of the PhoneNumber entity in the JPA Structure view." /><br /></div>
<!-- class="figure" -->
<p>Next, you will <a href="getting_started019.htm#BABIDFFG">Create version mappings</a></p>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started019.htm b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started019.htm
index 152da137af..bfaae5bb7f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/getting_started019.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/getting_started019.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:08 -->
+<!-- Run date = May 9, 2007 10:03:40 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Create version mappings</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -41,13 +41,13 @@
<p>In the <span class="gui-object-title">Map As</span> field, select <span class="gui-object-action">Version</span>.</p>
<div class="figure"><a id="sthref39" name="sthref39"></a>
<p class="titleinfigure">Version Mapping for version</p>
-<img src="img/persistence_view_version.png" alt="This figure shows the Persistence Properties page for the version field." title="This figure shows the Persistence Properties page for the version field." /><br /></div>
+<img src="img/persistence_view_version.png" alt="JPA Details view for the version field." title="JPA Details view for the version field." /><br /></div>
<!-- class="figure" --></li>
</ol>
<p>Dali automatically selects the Version column in the EMPLOYEE database table. In the JPA Structure, the <span class="bold">Version</span> field is identified as a version mapping, as shown in the following figure:</p>
<div class="figure"><a id="sthref40" name="sthref40"></a>
<p class="titleinfigure">JPA Structure for Employee Entity</p>
-<img src="img/persistence_outline_version.png" alt="This figure shows the version attribute of the Employee entity in the Persistence Outline view." title="This figure shows the version attribute of the Employee entity in the Persistence Outline view." /><br /></div>
+<img src="img/persistence_outline_version.png" alt="The version attribute of the Employee entity in the JPA Structure view." title="The version attribute of the Employee entity in the JPA Structure view." /><br /></div>
<!-- class="figure" -->
<p>Congratulations! All of the entities have been successfully mapped.</p>
</div>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/add_persistence_dialog_xml.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/add_persistence_dialog_xml.png
deleted file mode 100644
index fd53486c09..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/add_persistence_dialog_xml.png
+++ /dev/null
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl.png
deleted file mode 100644
index 3040dba5d1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl.png
+++ /dev/null
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl_objects.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl_objects.png
deleted file mode 100644
index f81031fdc7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl_objects.png
+++ /dev/null
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl_options.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl_options.png
deleted file mode 100644
index cea3a6ca20..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl_options.png
+++ /dev/null
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl_save.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl_save.png
deleted file mode 100644
index e5963955ff..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl_save.png
+++ /dev/null
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl_summary.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl_summary.png
deleted file mode 100644
index 5ead4a82b0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/generate_ddl_summary.png
+++ /dev/null
Binary files 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
new file mode 100644
index 0000000000..ad3ab04aa9
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/new_project_2.png
Binary files 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
index 525e918221..fcc9886484 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/img/properties_persistence.png
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/properties_persistence.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/img/secondary_tables.png b/jpa/plugins/org.eclipse.jpt.doc.user/img/secondary_tables.png
new file mode 100644
index 0000000000..e6a9159fd8
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/img/secondary_tables.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/index.xml b/jpa/plugins/org.eclipse.jpt.doc.user/index.xml
index 61597df154..14f115fb47 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/index.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/index.xml
@@ -1,540 +1,542 @@
<?xml version='1.0' encoding='iso-8859-1'?>
<index version="1.0">
<entry keyword="@Basic">
- <entry keyword="Basic mapping"><topic href="tasks007.htm#sthref112" />
+ <entry keyword="Basic mapping"><topic href="tasks007.htm#sthref115"/></entry>
</entry>
<entry keyword="@Column">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref207" />
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref205"/></entry>
</entry>
<entry keyword="@DiscriminatorColumn">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref99" />
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance001.htm#sthref102"/></entry>
</entry>
<entry keyword="@DiscriminatorValue">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref101" />
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance001.htm#sthref104"/></entry>
</entry>
<entry keyword="@Embeddable">
- <entry keyword="Embeddable"><topic href="tasks005.htm#sthref86" />
+ <entry keyword="Embeddable"><topic href="tasks005.htm#sthref86"/></entry>
</entry>
<entry keyword="@Embedded">
- <entry keyword="Embedded mapping"><topic href="tasks008.htm#sthref116" />
+ <entry keyword="Embedded mapping"><topic href="tasks008.htm#sthref119"/></entry>
</entry>
<entry keyword="@EmbeddedId">
- <entry keyword="Embedded ID mapping"><topic href="tasks009.htm#sthref120" />
+ <entry keyword="Embedded ID mapping"><topic href="tasks009.htm#sthref123"/></entry>
</entry>
<entry keyword="@Entity">
- <entry keyword="Entity"><topic href="tasks004.htm#sthref80" />
+ <entry keyword="Entity"><topic href="tasks004.htm#sthref80"/></entry>
</entry>
<entry keyword="@GeneratedValue">
- <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref223" />
+ <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref221"/></entry>
</entry>
<entry keyword="@Id">
- <entry keyword="ID mapping"><topic href="tasks010.htm#sthref124" />
+ <entry keyword="ID mapping"><topic href="tasks010.htm#sthref127"/></entry>
</entry>
<entry keyword="@Inheritance">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref97" />
+ <entry keyword="Specifying additional tables"><topic href="task_inheritance.htm#sthref97"/></entry>
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance001.htm#sthref100"/></entry>
</entry>
<entry keyword="@JoinColumn">
- <entry keyword="Many-to-one mapping"><topic href="tasks012.htm#sthref135" />
- <entry keyword="One-to-one mapping"><topic href="tasks014.htm#sthref145" />
- <entry keyword="Join Table Information"><topic href="reference005.htm#sthref220" />
- <entry keyword="Join Columns Information"><topic href="reference006.htm#sthref222" />
+ <entry keyword="Many-to-one mapping"><topic href="tasks012.htm#sthref138"/></entry>
+ <entry keyword="One-to-one mapping"><topic href="tasks014.htm#sthref148"/></entry>
+ <entry keyword="Join Table Information"><topic href="reference006.htm#sthref218"/></entry>
+ <entry keyword="Join Columns Information"><topic href="reference007.htm#sthref220"/></entry>
</entry>
<entry keyword="@Lob">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref212" />
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref210"/></entry>
</entry>
<entry keyword="@ManyToMany">
- <entry keyword="Many-to-many mapping"><topic href="tasks011.htm#sthref128" />
+ <entry keyword="Many-to-many mapping"><topic href="tasks011.htm#sthref131"/></entry>
</entry>
<entry keyword="@ManyToOne">
- <entry keyword="Many-to-one mapping"><topic href="tasks012.htm#sthref133" />
+ <entry keyword="Many-to-one mapping"><topic href="tasks012.htm#sthref136"/></entry>
</entry>
<entry keyword="@MappedSuperclass">
- <entry keyword="Mapped superclass"><topic href="tasks006.htm#sthref92" />
+ <entry keyword="Mapped superclass"><topic href="tasks006.htm#sthref92"/></entry>
</entry>
<entry keyword="@OneToMany">
- <entry keyword="One-to-many mapping"><topic href="tasks013.htm#sthref138" />
+ <entry keyword="One-to-many mapping"><topic href="tasks013.htm#sthref141"/></entry>
</entry>
<entry keyword="@OneToOne">
- <entry keyword="One-to-one mapping"><topic href="tasks014.htm#sthref142" />
+ <entry keyword="One-to-one mapping"><topic href="tasks014.htm#sthref145"/></entry>
</entry>
<entry keyword="@SequenceGenerator">
- <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref225" />
+ <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref223"/></entry>
</entry>
<entry keyword="@Transient">
- <entry keyword="Transient mapping"><topic href="tasks015.htm#sthref148" />
+ <entry keyword="Transient mapping"><topic href="tasks015.htm#sthref151"/></entry>
</entry>
<entry keyword="@Version">
- <entry keyword="Version mapping"><topic href="tasks016.htm#sthref152" />
+ <entry keyword="Version mapping"><topic href="tasks016.htm#sthref155"/></entry>
</entry>
<entry keyword="@Temporal">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref214" />
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref216" />
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref218" />
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref212"/></entry>
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref214"/></entry>
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref216"/></entry>
</entry>
<entry keyword="architecture of Dali feature">
- <entry keyword="Dali Developer Documentation"><topic href="reference018.htm#sthref249" />
+ <entry keyword="Dali Developer Documentation"><topic href="reference018.htm#sthref247"/></entry>
</entry>
<entry keyword="attributes">
<entry keyword="mapping">
- <entry keyword="Understanding OR mappings"><topic href="concept_mapping.htm#sthref44" />
+ <entry keyword="Understanding OR mappings"><topic href="concept_mapping.htm#sthref44"/></entry>
</entry>
<entry keyword="Persistence Properties view">
- <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref206" />
+ <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref204"/></entry>
</entry>
</entry>
<entry keyword="basic mapping">
<entry keyword="@Basic">
- <entry keyword="Basic mapping"><topic href="tasks007.htm#sthref113" />
+ <entry keyword="Basic mapping"><topic href="tasks007.htm#sthref116"/></entry>
</entry>
<entry keyword="about">
- <entry keyword="Basic mapping"><topic href="tasks007.htm#sthref111" />
+ <entry keyword="Basic mapping"><topic href="tasks007.htm#sthref114"/></entry>
</entry>
</entry>
<entry keyword="classes">
<entry keyword="adding persistence to">
- <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref75" />
+ <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref75"/></entry>
</entry>
<entry keyword="embeddable">
- <entry keyword="Embeddable"><topic href="tasks005.htm#sthref85" />
+ <entry keyword="Embeddable"><topic href="tasks005.htm#sthref85"/></entry>
</entry>
<entry keyword="entity">
- <entry keyword="Entity"><topic href="tasks004.htm#sthref78" />
+ <entry keyword="Entity"><topic href="tasks004.htm#sthref78"/></entry>
</entry>
<entry keyword="synchronizing">
- <entry keyword="Synchronizing classes"><topic href="tasks002.htm#sthref65" />
+ <entry keyword="Synchronizing classes"><topic href="tasks002.htm#sthref65"/></entry>
</entry>
</entry>
<entry keyword="columns">
<entry keyword="discriminator">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref100" />
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance001.htm#sthref103"/></entry>
</entry>
<entry keyword="join">
- <entry keyword="Many-to-one mapping"><topic href="tasks012.htm#sthref134" />
- <entry keyword="One-to-one mapping"><topic href="tasks014.htm#sthref144" />
- <entry keyword="Join Table Information"><topic href="reference005.htm#sthref219" />
- <entry keyword="Join Columns Information"><topic href="reference006.htm#sthref221" />
+ <entry keyword="Many-to-one mapping"><topic href="tasks012.htm#sthref137"/></entry>
+ <entry keyword="One-to-one mapping"><topic href="tasks014.htm#sthref147"/></entry>
+ <entry keyword="Join Table Information"><topic href="reference006.htm#sthref217"/></entry>
+ <entry keyword="Join Columns Information"><topic href="reference007.htm#sthref219"/></entry>
</entry>
<entry keyword="mapping to">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref208" />
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref206"/></entry>
</entry>
<entry keyword="value">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref102" />
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance001.htm#sthref105"/></entry>
</entry>
</entry>
<entry keyword="Database Connection dialog">
- <entry keyword="Database Connection Dialog"><topic href="reference013.htm#sthref243" />
+ <entry keyword="Database Connection Dialog"><topic href="reference013.htm#sthref241"/></entry>
</entry>
<entry keyword="database tables">
<entry keyword="generating entities from">
- <entry keyword="Generating entities from tables"><topic href="tasks017.htm#sthref158" />
- </entry>
- <entry keyword="generating from entities">
- <entry keyword="Generating tables (DDL scripts) from entities"><topic href="task_generate_ddl.htm#sthref161" />
+ <entry keyword="Generating entities from tables"><topic href="tasks017.htm#sthref161"/></entry>
</entry>
</entry>
<entry keyword="database - persistence">
<entry keyword="connection">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref235" />
+ <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref233"/></entry>
</entry>
<entry keyword="schema">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref237" />
+ <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref235"/></entry>
</entry>
</entry>
<entry keyword="developer documentation">
- <entry keyword="Dali Developer Documentation"><topic href="reference018.htm#sthref248" />
+ <entry keyword="Dali Developer Documentation"><topic href="reference018.htm#sthref246"/></entry>
</entry>
<entry keyword="eager fetch">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref210" />
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref208"/></entry>
</entry>
<entry keyword="embeddable class">
<entry keyword="@Embeddable">
- <entry keyword="Embeddable"><topic href="tasks005.htm#sthref87" />
+ <entry keyword="Embeddable"><topic href="tasks005.htm#sthref87"/></entry>
</entry>
<entry keyword="about">
- <entry keyword="Embeddable"><topic href="tasks005.htm#sthref84" />
+ <entry keyword="Embeddable"><topic href="tasks005.htm#sthref84"/></entry>
</entry>
</entry>
<entry keyword="embedded ID mapping">
<entry keyword="@EmbeddedId">
- <entry keyword="Embedded ID mapping"><topic href="tasks009.htm#sthref121" />
+ <entry keyword="Embedded ID mapping"><topic href="tasks009.htm#sthref124"/></entry>
</entry>
<entry keyword="about">
- <entry keyword="Embedded ID mapping"><topic href="tasks009.htm#sthref119" />
+ <entry keyword="Embedded ID mapping"><topic href="tasks009.htm#sthref122"/></entry>
</entry>
</entry>
<entry keyword="embedded mapping">
<entry keyword="@Embedded">
- <entry keyword="Embedded mapping"><topic href="tasks008.htm#sthref117" />
+ <entry keyword="Embedded mapping"><topic href="tasks008.htm#sthref120"/></entry>
</entry>
<entry keyword="about">
- <entry keyword="Embedded mapping"><topic href="tasks008.htm#sthref115" />
+ <entry keyword="Embedded mapping"><topic href="tasks008.htm#sthref118"/></entry>
</entry>
</entry>
<entry keyword="entities">
<entry keyword="@Entity annotation">
- <entry keyword="Entity"><topic href="tasks004.htm#sthref81" />
+ <entry keyword="Entity"><topic href="tasks004.htm#sthref81"/></entry>
</entry>
<entry keyword="about">
- <entry keyword="Understanding Java persistence"><topic href="concept_persistence.htm#sthref43" />
- </entry>
- <entry keyword="creating tables from">
- <entry keyword="Generating tables (DDL scripts) from entities"><topic href="task_generate_ddl.htm#sthref160" />
+ <entry keyword="Understanding Java persistence"><topic href="concept_persistence.htm#sthref43"/></entry>
</entry>
<entry keyword="embeddable">
- <entry keyword="Embeddable"><topic href="tasks005.htm#sthref88" />
+ <entry keyword="Embeddable"><topic href="tasks005.htm#sthref88"/></entry>
</entry>
<entry keyword="from tables">
- <entry keyword="Generating entities from tables"><topic href="tasks017.htm#sthref154" />
- <entry keyword="Generate Entities from Tables dialog"><topic href="task_generate_entities.htm#sthref241" />
+ <entry keyword="Generating entities from tables"><topic href="tasks017.htm#sthref157"/></entry>
+ <entry keyword="Generate Entities from Tables dialog"><topic href="task_generate_entities.htm#sthref239"/></entry>
</entry>
<entry keyword="mapped superclass">
- <entry keyword="Mapped superclass"><topic href="tasks006.htm#sthref93" />
+ <entry keyword="Mapped superclass"><topic href="tasks006.htm#sthref93"/></entry>
</entry>
<entry keyword="mapping">
- <entry keyword="Mapping an entity"><topic href="getting_started005.htm#sthref18" />
+ <entry keyword="Mapping an entity"><topic href="getting_started005.htm#sthref18"/></entry>
</entry>
<entry keyword="persistence">
- <entry keyword="Creating a Java persistent entity"><topic href="getting_started004.htm#sthref10" />
+ <entry keyword="Creating a Java persistent entity"><topic href="getting_started004.htm#sthref10"/></entry>
</entry>
<entry keyword="Persistence Properties view">
- <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref201" />
+ <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref196"/></entry>
</entry>
<entry keyword="persistent">
- <entry keyword="Entity"><topic href="tasks004.htm#sthref76" />
- <entry keyword="Entity"><topic href="tasks004.htm#sthref82" />
+ <entry keyword="Entity"><topic href="tasks004.htm#sthref76"/></entry>
+ <entry keyword="Entity"><topic href="tasks004.htm#sthref82"/></entry>
+ </entry>
+ <entry keyword="secondary tables">
+ <entry keyword="Secondary table information"><topic href="reference004.htm#sthref199"/></entry>
</entry>
</entry>
<entry keyword="enumerated">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref215" />
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref213"/></entry>
</entry>
<entry keyword="error messages - Dali">
- <entry keyword="Validating mappings and reporting problems"><topic href="tasks018.htm#sthref166" />
- <entry keyword="Error messages"><topic href="tasks019.htm#sthref171" />
+ <entry keyword="Validating mappings and reporting problems"><topic href="tasks018.htm#sthref162"/></entry>
+ <entry keyword="Error messages"><topic href="tasks019.htm#sthref167"/></entry>
</entry>
<entry keyword="extension points - Dali feature">
- <entry keyword="Dali Developer Documentation"><topic href="reference018.htm#sthref250" />
+ <entry keyword="Dali Developer Documentation"><topic href="reference018.htm#sthref248"/></entry>
</entry>
<entry keyword="fetch type">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref209" />
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref207"/></entry>
</entry>
<entry keyword="Generate Entities from Tables dialog">
- <entry keyword="Generating entities from tables"><topic href="tasks017.htm#sthref157" />
- <entry keyword="Generate Entities from Tables dialog"><topic href="task_generate_entities.htm#sthref240" />
+ <entry keyword="Generating entities from tables"><topic href="tasks017.htm#sthref160"/></entry>
+ <entry keyword="Generate Entities from Tables dialog"><topic href="task_generate_entities.htm#sthref238"/></entry>
</entry>
<entry keyword="generated values">
<entry keyword="ID mappings">
- <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref224" />
+ <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref222"/></entry>
</entry>
<entry keyword="sequence">
- <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref226" />
+ <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref224"/></entry>
</entry>
</entry>
<entry keyword="ID mapping">
<entry keyword="@Id">
- <entry keyword="ID mapping"><topic href="tasks010.htm#sthref125" />
+ <entry keyword="ID mapping"><topic href="tasks010.htm#sthref128"/></entry>
</entry>
<entry keyword="about">
- <entry keyword="ID mapping"><topic href="tasks010.htm#sthref123" />
+ <entry keyword="ID mapping"><topic href="tasks010.htm#sthref126"/></entry>
</entry>
</entry>
<entry keyword="inheritance">
<entry keyword="entity">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref96" />
- <entry keyword="Inheritance information"><topic href="reference004.htm#sthref203" />
+ <entry keyword="Specifying additional tables"><topic href="task_inheritance.htm#sthref96"/></entry>
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance001.htm#sthref99"/></entry>
+ <entry keyword="Inheritance information"><topic href="reference005.htm#sthref201"/></entry>
</entry>
<entry keyword="joined tables">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref108" />
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance001.htm#sthref111"/></entry>
</entry>
<entry keyword="single table">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref103" />
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance001.htm#sthref106"/></entry>
</entry>
</entry>
<entry keyword="Inheritance tab">
- <entry keyword="Inheritance information"><topic href="reference004.htm#sthref202" />
+ <entry keyword="Inheritance information"><topic href="reference005.htm#sthref200"/></entry>
</entry>
<entry keyword="installation - Dali">
- <entry keyword="Requirements and installation"><topic href="getting_started001.htm#sthref3" />
+ <entry keyword="Requirements and installation"><topic href="getting_started001.htm#sthref3"/></entry>
</entry>
<entry keyword="joined tables - inheritance">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref109" />
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance001.htm#sthref112"/></entry>
</entry>
<entry keyword="JPA">
<entry keyword="platform">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref234" />
+ <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref232"/></entry>
</entry>
</entry>
<entry keyword="JPA Facet dialog">
- <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref56" />
+ <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref56"/></entry>
</entry>
<entry keyword="JPA perspective">
- <entry keyword="JPA perspective"><topic href="ref_persistence_perspective.htm#sthref244" />
+ <entry keyword="JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref242"/></entry>
</entry>
<entry keyword="JPA project">
<entry keyword="creating new">
- <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref50" />
+ <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref50"/></entry>
</entry>
</entry>
<entry keyword="JPA Project dialog">
- <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref54" />
+ <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref54"/></entry>
</entry>
<entry keyword="lazy fetch">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref211" />
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref209"/></entry>
</entry>
<entry keyword="many-to-many mapping">
<entry keyword="@ManyToMany">
- <entry keyword="Many-to-many mapping"><topic href="tasks011.htm#sthref129" />
+ <entry keyword="Many-to-many mapping"><topic href="tasks011.htm#sthref132"/></entry>
</entry>
<entry keyword="about">
- <entry keyword="Many-to-many mapping"><topic href="tasks011.htm#sthref127" />
+ <entry keyword="Many-to-many mapping"><topic href="tasks011.htm#sthref130"/></entry>
</entry>
</entry>
<entry keyword="many-to-one mapping">
<entry keyword="@ManyToOne">
- <entry keyword="Many-to-one mapping"><topic href="tasks012.htm#sthref132" />
+ <entry keyword="Many-to-one mapping"><topic href="tasks012.htm#sthref135"/></entry>
</entry>
<entry keyword="about">
- <entry keyword="Many-to-one mapping"><topic href="tasks012.htm#sthref131" />
+ <entry keyword="Many-to-one mapping"><topic href="tasks012.htm#sthref134"/></entry>
</entry>
</entry>
<entry keyword="mapped superclass">
<entry keyword="@MappedSuperclass">
- <entry keyword="Mapped superclass"><topic href="tasks006.htm#sthref91" />
+ <entry keyword="Mapped superclass"><topic href="tasks006.htm#sthref91"/></entry>
</entry>
<entry keyword="about">
- <entry keyword="Mapped superclass"><topic href="tasks006.htm#sthref90" />
+ <entry keyword="Mapped superclass"><topic href="tasks006.htm#sthref90"/></entry>
</entry>
</entry>
<entry keyword="mapping entities">
- <entry keyword="Mapping an entity"><topic href="getting_started005.htm#sthref17" />
+ <entry keyword="Mapping an entity"><topic href="getting_started005.htm#sthref17"/></entry>
</entry>
<entry keyword="mappings">
<entry keyword="about">
- <entry keyword="Understanding OR mappings"><topic href="concept_mapping.htm#sthref45" />
+ <entry keyword="Understanding OR mappings"><topic href="concept_mapping.htm#sthref45"/></entry>
</entry>
<entry keyword="basic">
- <entry keyword="Basic mapping"><topic href="tasks007.htm#sthref110" />
+ <entry keyword="Basic mapping"><topic href="tasks007.htm#sthref113"/></entry>
</entry>
<entry keyword="embedded">
- <entry keyword="Embedded mapping"><topic href="tasks008.htm#sthref114" />
+ <entry keyword="Embedded mapping"><topic href="tasks008.htm#sthref117"/></entry>
</entry>
<entry keyword="embedded ID">
- <entry keyword="Embedded ID mapping"><topic href="tasks009.htm#sthref118" />
+ <entry keyword="Embedded ID mapping"><topic href="tasks009.htm#sthref121"/></entry>
</entry>
<entry keyword="ID">
- <entry keyword="ID mapping"><topic href="tasks010.htm#sthref122" />
+ <entry keyword="ID mapping"><topic href="tasks010.htm#sthref125"/></entry>
</entry>
<entry keyword="many-to-many">
- <entry keyword="Many-to-many mapping"><topic href="tasks011.htm#sthref126" />
+ <entry keyword="Many-to-many mapping"><topic href="tasks011.htm#sthref129"/></entry>
</entry>
<entry keyword="many-to-one">
- <entry keyword="Many-to-one mapping"><topic href="tasks012.htm#sthref130" />
+ <entry keyword="Many-to-one mapping"><topic href="tasks012.htm#sthref133"/></entry>
</entry>
<entry keyword="one-to-many">
- <entry keyword="One-to-many mapping"><topic href="tasks013.htm#sthref136" />
+ <entry keyword="One-to-many mapping"><topic href="tasks013.htm#sthref139"/></entry>
</entry>
<entry keyword="one-to-one">
- <entry keyword="One-to-one mapping"><topic href="tasks014.htm#sthref140" />
+ <entry keyword="One-to-one mapping"><topic href="tasks014.htm#sthref143"/></entry>
</entry>
<entry keyword="problems">
- <entry keyword="Validating mappings and reporting problems"><topic href="tasks018.htm#sthref169" />
+ <entry keyword="Validating mappings and reporting problems"><topic href="tasks018.htm#sthref165"/></entry>
</entry>
<entry keyword="transient">
- <entry keyword="Transient mapping"><topic href="tasks015.htm#sthref146" />
+ <entry keyword="Transient mapping"><topic href="tasks015.htm#sthref149"/></entry>
</entry>
<entry keyword="version">
- <entry keyword="Version mapping"><topic href="tasks016.htm#sthref150" />
+ <entry keyword="Version mapping"><topic href="tasks016.htm#sthref153"/></entry>
</entry>
</entry>
<entry keyword="New JPA Project wizard">
- <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref52" />
+ <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref52"/></entry>
</entry>
<entry keyword="nonpersistent">
<entry keyword="classes">
- <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref74" />
+ <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref74"/></entry>
</entry>
<entry keyword="fields. See transient"></entry>
</entry>
<entry keyword="one-to-many mapping">
<entry keyword="@OneToMany">
- <entry keyword="One-to-many mapping"><topic href="tasks013.htm#sthref139" />
+ <entry keyword="One-to-many mapping"><topic href="tasks013.htm#sthref142"/></entry>
</entry>
<entry keyword="about">
- <entry keyword="One-to-many mapping"><topic href="tasks013.htm#sthref137" />
+ <entry keyword="One-to-many mapping"><topic href="tasks013.htm#sthref140"/></entry>
</entry>
</entry>
<entry keyword="one-to-one mapping">
<entry keyword="@OneToOne">
- <entry keyword="One-to-one mapping"><topic href="tasks014.htm#sthref143" />
+ <entry keyword="One-to-one mapping"><topic href="tasks014.htm#sthref146"/></entry>
</entry>
<entry keyword="about">
- <entry keyword="One-to-one mapping"><topic href="tasks014.htm#sthref141" />
+ <entry keyword="One-to-one mapping"><topic href="tasks014.htm#sthref144"/></entry>
</entry>
</entry>
<entry keyword="ordering">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref217" />
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref215"/></entry>
</entry>
<entry keyword="orm.xml file">
<entry keyword="about">
- <entry keyword="The orm.xml file"><topic href="concepts003.htm#sthref47" />
+ <entry keyword="The orm.xml file"><topic href="concepts003.htm#sthref47"/></entry>
</entry>
<entry keyword="managing">
- <entry keyword="Managing the orm.xml file"><topic href="task_manage_persistence001.htm#sthref68" />
+ <entry keyword="Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref68"/></entry>
</entry>
<entry keyword="sample">
- <entry keyword="Managing the orm.xml file"><topic href="task_manage_persistence001.htm#sthref69" />
+ <entry keyword="Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref69"/></entry>
</entry>
</entry>
<entry keyword="outline - persistence">
- <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref229" />
+ <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref227"/></entry>
</entry>
<entry keyword="persistence">
<entry keyword="about">
- <entry keyword="Understanding Java persistence"><topic href="concept_persistence.htm#sthref42" />
+ <entry keyword="Understanding Java persistence"><topic href="concept_persistence.htm#sthref42"/></entry>
</entry>
<entry keyword="database connection">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref236" />
+ <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref234"/></entry>
</entry>
<entry keyword="database schema">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref239" />
+ <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref237"/></entry>
</entry>
<entry keyword="entity class">
- <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref73" />
+ <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref73"/></entry>
</entry>
<entry keyword="options">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref231" />
+ <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref229"/></entry>
</entry>
</entry>
<entry keyword="Persistence Outline view">
- <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref228" />
+ <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref226"/></entry>
</entry>
<entry keyword="Persistence Properties view">
<entry keyword="attributes">
- <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref204" />
+ <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref202"/></entry>
</entry>
<entry keyword="entities">
- <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref199" />
+ <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref194"/></entry>
</entry>
</entry>
<entry keyword="Persistence XML Editor">
- <entry keyword="Working with persistence.xml file"><topic href="tasks001.htm#sthref62" />
+ <entry keyword="Working with persistence.xml file"><topic href="tasks001.htm#sthref62"/></entry>
</entry>
<entry keyword="persistence.xml">
<entry keyword="managing">
- <entry keyword="Working with persistence.xml file"><topic href="tasks001.htm#sthref60" />
- <entry keyword="Working with orm.xml file"><topic href="tasks003.htm#sthref71" />
+ <entry keyword="Working with persistence.xml file"><topic href="tasks001.htm#sthref60"/></entry>
+ <entry keyword="Working with orm.xml file"><topic href="tasks003.htm#sthref71"/></entry>
</entry>
</entry>
<entry keyword="persistence.xml file">
<entry keyword="about">
- <entry keyword="The persistence.xml file"><topic href="concepts002.htm#sthref46" />
+ <entry keyword="The persistence.xml file"><topic href="concepts002.htm#sthref46"/></entry>
</entry>
<entry keyword="editor">
- <entry keyword="Working with persistence.xml file"><topic href="tasks001.htm#sthref63" />
+ <entry keyword="Working with persistence.xml file"><topic href="tasks001.htm#sthref63"/></entry>
</entry>
<entry keyword="managing">
- <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref57" />
+ <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref57"/></entry>
</entry>
<entry keyword="sample">
- <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref58" />
+ <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref58"/></entry>
</entry>
<entry keyword="synchronizing with classes">
- <entry keyword="Synchronizing classes"><topic href="tasks002.htm#sthref66" />
+ <entry keyword="Synchronizing classes"><topic href="tasks002.htm#sthref66"/></entry>
</entry>
</entry>
<entry keyword="persistent entity">
- <entry keyword="Entity"><topic href="tasks004.htm#sthref77" />
+ <entry keyword="Entity"><topic href="tasks004.htm#sthref77"/></entry>
</entry>
<entry keyword="perspective - JPA">
- <entry keyword="JPA perspective"><topic href="ref_persistence_perspective.htm#sthref245" />
+ <entry keyword="JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref243"/></entry>
</entry>
<entry keyword="platform - JPA">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref233" />
+ <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref231"/></entry>
</entry>
<entry keyword="problems">
- <entry keyword="Validating mappings and reporting problems"><topic href="tasks018.htm#sthref168" />
+ <entry keyword="Validating mappings and reporting problems"><topic href="tasks018.htm#sthref164"/></entry>
</entry>
<entry keyword="projects">
<entry keyword="creating new">
- <entry keyword="Creating a new project"><topic href="getting_started003.htm#sthref6" />
- <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref49" />
+ <entry keyword="Creating a new project"><topic href="getting_started003.htm#sthref6"/></entry>
+ <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref49"/></entry>
</entry>
<entry keyword="options">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref232" />
+ <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref230"/></entry>
</entry>
</entry>
<entry keyword="quick start">
- <entry keyword="Dali quick start"><topic href="getting_started002.htm#sthref5" />
+ <entry keyword="Dali quick start"><topic href="getting_started002.htm#sthref5"/></entry>
</entry>
<entry keyword="requirements">
<entry keyword="persistent entities">
- <entry keyword="Entity"><topic href="tasks004.htm#sthref79" />
+ <entry keyword="Entity"><topic href="tasks004.htm#sthref79"/></entry>
</entry>
</entry>
<entry keyword="requirements - Dali">
- <entry keyword="Requirements and installation"><topic href="getting_started001.htm#sthref4" />
+ <entry keyword="Requirements and installation"><topic href="getting_started001.htm#sthref4"/></entry>
</entry>
<entry keyword="schema - database">
- <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref238" />
+ <entry keyword="Project Properties page - JPA Options"><topic href="ref_project_properties.htm#sthref236"/></entry>
+ </entry>
+ <entry keyword="secondary tables">
+ <entry keyword="Secondary table information"><topic href="reference004.htm#sthref197"/></entry>
</entry>
<entry keyword="single table inheritance">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref104" />
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance001.htm#sthref107"/></entry>
</entry>
<entry keyword="superclass">
- <entry keyword="Mapped superclass"><topic href="tasks006.htm#sthref94" />
+ <entry keyword="Mapped superclass"><topic href="tasks006.htm#sthref94"/></entry>
</entry>
<entry keyword="tables">
<entry keyword="creating entities from">
- <entry keyword="Generating entities from tables"><topic href="tasks017.htm#sthref155" />
- <entry keyword="Generate Entities from Tables dialog"><topic href="task_generate_entities.htm#sthref242" />
- </entry>
- <entry keyword="from entities">
- <entry keyword="Generating tables (DDL scripts) from entities"><topic href="task_generate_ddl.htm#sthref159" />
+ <entry keyword="Generating entities from tables"><topic href="tasks017.htm#sthref158"/></entry>
+ <entry keyword="Generate Entities from Tables dialog"><topic href="task_generate_entities.htm#sthref240"/></entry>
</entry>
<entry keyword="inheritance">
- <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref105" />
+ <entry keyword="Specifying entity inheritance"><topic href="task_inheritance001.htm#sthref108"/></entry>
</entry>
</entry>
+ <entry keyword="tables - secondary">
+ <entry keyword="Secondary table information"><topic href="reference004.htm#sthref198"/></entry>
+ </entry>
<entry keyword="temporal">
- <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref213" />
+ <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref211"/></entry>
</entry>
<entry keyword="transient mapping">
<entry keyword="@Transient">
- <entry keyword="Transient mapping"><topic href="tasks015.htm#sthref149" />
+ <entry keyword="Transient mapping"><topic href="tasks015.htm#sthref152"/></entry>
</entry>
<entry keyword="about">
- <entry keyword="Transient mapping"><topic href="tasks015.htm#sthref147" />
+ <entry keyword="Transient mapping"><topic href="tasks015.htm#sthref150"/></entry>
</entry>
</entry>
<entry keyword="tutorial - Dali">
- <entry keyword="Dali basic tutorial"><topic href="getting_started006.htm#sthref21" />
+ <entry keyword="Dali basic tutorial"><topic href="getting_started006.htm#sthref21"/></entry>
</entry>
<entry keyword="version mapping">
<entry keyword="@Version">
- <entry keyword="Version mapping"><topic href="tasks016.htm#sthref153" />
+ <entry keyword="Version mapping"><topic href="tasks016.htm#sthref156"/></entry>
</entry>
<entry keyword="about">
- <entry keyword="Version mapping"><topic href="tasks016.htm#sthref151" />
+ <entry keyword="Version mapping"><topic href="tasks016.htm#sthref154"/></entry>
</entry>
</entry>
<entry keyword="views">
<entry keyword="Persistence Outline view">
- <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref227" />
+ <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref225"/></entry>
</entry>
<entry keyword="Persistence Properties view">
- <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref200" />
- <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref205" />
+ <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref195"/></entry>
+ <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref203"/></entry>
</entry>
</entry>
<entry keyword="warning messages - Dali">
- <entry keyword="Validating mappings and reporting problems"><topic href="tasks018.htm#sthref167" />
+ <entry keyword="Validating mappings and reporting problems"><topic href="tasks018.htm#sthref163"/></entry>
</entry>
<entry keyword="wizards">
<entry keyword="New JPA Project wizard">
- <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref51" />
+ <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref51"/></entry>
</entry>
</entry>
<entry keyword="XML editor">
- <entry keyword="Working with persistence.xml file"><topic href="tasks001.htm#sthref59" />
- <entry keyword="Working with orm.xml file"><topic href="tasks003.htm#sthref70" />
+ <entry keyword="Working with persistence.xml file"><topic href="tasks001.htm#sthref59"/></entry>
+ <entry keyword="Working with orm.xml file"><topic href="tasks003.htm#sthref70"/></entry>
</entry>
</index>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm b/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm
index 5094707297..5125e2ffbf 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/legal.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:14 -->
+<!-- Run date = May 9, 2007 10:03:47 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Legal</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -20,7 +20,7 @@
<link rel="contents" href="toc.htm" title="Contents" type="text/html" />
</head>
<body>
-<p><a id="sthref255" name="sthref255"></a></p>
+<p><a id="sthref254" name="sthref254"></a></p>
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<tr valign="bottom">
<td align="left" width="86%">
@@ -28,7 +28,7 @@
</td>
</tr>
</table>
-<p><a id="sthref256" name="sthref256"></a></p>
+<p><a id="sthref255" name="sthref255"></a></p>
<p class="subhead2">Notices</p>
<p>The material in this guide is copyright &copy; 2006, 2007 by Oracle.</p>
<p><a href="about.htm">Terms and conditions regarding the use of this guide.</a></p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml b/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
index ae22ab174b..e7d121acd2 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
@@ -23,9 +23,9 @@
<!-- Cheatsheets -->
<!-- =========== -->
<extension point="org.eclipse.ui.cheatsheets.cheatSheetContent">
- <category name="Persistence" id="com.jpa.category"/>
- <cheatsheet name="Add persistence to a project" category="com.jpa.category" contentFile="$nl$/cheatsheets/add_persistence.xml" id="org.eclipse.jpa.cheatsheet.createproject1">
- <description>This cheat sheet helps you add persistence to a Java project.</description>
+ <category name="JPA Development" id="com.jpa.category"/>
+ <cheatsheet name="Create a JPA project" category="com.jpa.category" contentFile="$nl$/cheatsheets/add_persistence.xml" id="org.eclipse.jpa.cheatsheet.createproject1">
+ <description>This cheat sheet helps you create a JPA project.</description>
</cheatsheet>
<cheatsheet name="Create a persistent entity" category="com.jpa.category" contentFile="$nl$/cheatsheets/create_entity.xml" id="org.eclipse.jpa.cheatsheet.addentity">
<description>This cheat sheet helps you create a Java persistent entity.</description>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm
new file mode 100644
index 0000000000..7cd74d0d14
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_details_orm.htm
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<!-- Run date = May 9, 2007 10:03:45 -->
+<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
+<title>JPA Details view (for orm.xml)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<meta name="generator" content="Oracle DARB XHTML Converter - Version 4.5.3 Build 02" />
+<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<meta name="robots" content="all" scheme="http://www.robotstxt.org/" />
+<meta name="doctitle" content="JPA Details view (for orm.xml)" />
+<meta name="relnum" content="Release 1.0.0" />
+<meta name="partnum" content="" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<link rel="start" href="../../index.htm" title="Home" type="text/html" />
+<link rel="contents" href="toc.htm" title="Contents" type="text/html" />
+</head>
+<body>
+<p><a id="CACGDGHC" name="CACGDGHC"></a></p>
+<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<tr valign="bottom">
+<td align="left" width="86%">
+<h1>JPA Details view (for orm.xml)</h1>
+</td>
+</tr>
+</table>
+<p>The <span class="gui-object-title">JPA Details</span> view displays the default mapping and persistence information for the project and contains the following areas:</p>
+<ul>
+<li type="disc">
+<p><a href="reference008.htm#CACCACGH">General information</a></p>
+</li>
+<li type="disc">
+<p><a href="reference009.htm#CACEAGBG">Persistence Unit information</a></p>
+</li>
+</ul>
+<p>These defaults can be overridden by the settings on a specific entity or mapping.</p>
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<tr>
+<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2007,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" --></div>
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm
index 7517624e44..7442131f8d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_jpa_facet.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>JPA Facet page</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -53,16 +53,23 @@
<td align="left" headers="r3c1-t3 r1c3-t3"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t3" headers="r1c1-t3">JPA Implementation Library</td>
-<td align="left" headers="r4c1-t3 r1c2-t3">Select the libraries or JARs that contain the Java Persistence API (JPA) and entities to be added to the project's Java Build Path.
+<td align="left" id="r4c1-t3" headers="r1c1-t3">JPA Implementation</td>
+<td align="left" headers="r4c1-t3 r1c2-t3">Select to use the <span class="bold">JPA implementation provided by the server at runtime</span>, or select a specific <span class="bold">implementation library</span> that contain the Java Persistence API (JPA) and entities to be added to the project's Java Build Path.
<p>Click <span class="bold">Configure default JPA implementation library</span> to create a default library for the project or click <span class="bold">Configure user libraries</span> to define additional libraries.</p>
</td>
-<td align="left" headers="r4c1-t3 r1c3-t3"><br /></td>
+<td align="left" headers="r4c1-t3 r1c3-t3">Determined by server.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t3" headers="r1c1-t3">Create orm.xml</td>
-<td align="left" headers="r5c1-t3 r1c2-t3">Specify if Dali should create a default <code>orm.xml</code> file for your entity mappings and persistence unit defaults.</td>
-<td align="left" headers="r5c1-t3 r1c3-t3">Selected</td>
+<td align="left" id="r5c1-t3" headers="r1c1-t3">Persistent class management</td>
+<td align="left" headers="r5c1-t3 r1c2-t3">Specify if Dali will <span class="bold">discover annotated classes automatically</span>, or if the <span class="bold">annotated classes must be listed in the persistence.xml</span> file.
+<p><span class="bold">Note</span>: To insure application portability, you should explicitly list the managed persistence classes that are included in the persistence unit.</p>
+</td>
+<td align="left" headers="r5c1-t3 r1c3-t3">Determined by server.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t3" headers="r1c1-t3">Create orm.xml</td>
+<td align="left" headers="r6c1-t3 r1c2-t3">Specify if Dali should create a default <code>orm.xml</code> file for your entity mappings and persistence unit defaults.</td>
+<td align="left" headers="r6c1-t3 r1c3-t3">Selected</td>
</tr>
</tbody>
</table>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm
index ede4020932..ca8b28f1be 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_mapping_general.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>General information</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -49,7 +49,7 @@
</tr>
<tr align="left" valign="top">
<td align="left" id="r3c1-t6" headers="r1c1-t6"><a id="CACGCBHB" name="CACGCBHB"></a>Column</td>
-<td align="left" headers="r3c1-t6 r1c2-t6"><a id="sthref207" name="sthref207"></a><a id="sthref208" name="sthref208"></a>The database column that contains the value for the attribute. This field corresponds to the <code>@Column</code> annotation.</td>
+<td align="left" headers="r3c1-t6 r1c2-t6"><a id="sthref205" name="sthref205"></a><a id="sthref206" name="sthref206"></a>The database column that contains the value for the attribute. This field corresponds to the <code>@Column</code> annotation.</td>
<td align="left" headers="r3c1-t6 r1c3-t6">By default, the Column is assumed to be named identically to the attribute.</td>
<td align="left" headers="r3c1-t6 r1c4-t6"><a href="tasks007.htm#BABBABCE">Basic mapping</a>, <a href="tasks008.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks010.htm#BABGCBHG">ID mapping</a>, <a href="tasks016.htm#BABHIBII">Version mapping</a></td>
</tr>
@@ -68,7 +68,7 @@
<td align="left" headers="r5c1-t6 r1c4-t6"><a href="tasks007.htm#BABBABCE">Basic mapping</a>, <a href="tasks008.htm#BABCBHDF">Embedded mapping</a>, <a href="tasks010.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t6" headers="r1c1-t6"><a id="CACGGGHB" name="CACGGGHB"></a><a id="sthref209" name="sthref209"></a><a id="sthref210" name="sthref210"></a><a id="sthref211" name="sthref211"></a>Fetch Type</td>
+<td align="left" id="r6c1-t6" headers="r1c1-t6"><a id="CACGGGHB" name="CACGGGHB"></a><a id="sthref207" name="sthref207"></a><a id="sthref208" name="sthref208"></a><a id="sthref209" name="sthref209"></a>Fetch Type</td>
<td align="left" headers="r6c1-t6 r1c2-t6">Defines how data is loaded from the database:
<ul>
<li type="disc">
@@ -89,7 +89,7 @@
<td align="left" headers="r7c1-t6 r1c4-t6"><a href="tasks007.htm#BABBABCE">Basic mapping</a>, <a href="tasks014.htm#BABFHBCJ">One-to-one mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t6" headers="r1c1-t6"><a id="CACBBIBI" name="CACBBIBI"></a><a id="sthref212" name="sthref212"></a>Lob</td>
+<td align="left" id="r8c1-t6" headers="r1c1-t6"><a id="CACBBIBI" name="CACBBIBI"></a><a id="sthref210" name="sthref210"></a>Lob</td>
<td align="left" headers="r8c1-t6 r1c2-t6">Specify if the field is mapped to <code>java.sql.Clob</code> or <code>java.sql.Blob</code>.
<p>This field corresponds to the <code>@Lob</code> annotation.</p>
</td>
@@ -97,7 +97,7 @@
<td align="left" headers="r8c1-t6 r1c4-t6"><a href="tasks007.htm#BABBABCE">Basic mapping</a><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r9c1-t6" headers="r1c1-t6"><a id="CACEAJGD" name="CACEAJGD"></a><a id="sthref213" name="sthref213"></a><a id="sthref214" name="sthref214"></a>Temporal</td>
+<td align="left" id="r9c1-t6" headers="r1c1-t6"><a id="CACEAJGD" name="CACEAJGD"></a><a id="sthref211" name="sthref211"></a><a id="sthref212" name="sthref212"></a>Temporal</td>
<td align="left" headers="r9c1-t6 r1c2-t6">Specifies if this field is one of the following:
<ul>
<li type="disc">
@@ -116,7 +116,7 @@
<td align="left" headers="r9c1-t6 r1c4-t6"><a href="tasks007.htm#BABBABCE">Basic mapping</a>, <a href="tasks010.htm#BABGCBHG">ID mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r10c1-t6" headers="r1c1-t6"><a id="sthref215" name="sthref215"></a><a id="sthref216" name="sthref216"></a>Enumerated</td>
+<td align="left" id="r10c1-t6" headers="r1c1-t6"><a id="sthref213" name="sthref213"></a><a id="sthref214" name="sthref214"></a>Enumerated</td>
<td align="left" headers="r10c1-t6 r1c2-t6">Specify how to persist enumerated constraints if the <code>String</code> value suits your application requirements or to match an existing database schema.
<ul>
<li type="disc">
@@ -165,7 +165,7 @@
<td align="left" headers="r13c1-t6 r1c4-t6"><a href="tasks014.htm#BABFHBCJ">One-to-one mapping</a>, <a href="tasks013.htm#BABHGEBD">One-to-many mapping</a></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r14c1-t6" headers="r1c1-t6"><a id="CACDADIH" name="CACDADIH"></a><a id="sthref217" name="sthref217"></a><a id="sthref218" name="sthref218"></a>Order By</td>
+<td align="left" id="r14c1-t6" headers="r1c1-t6"><a id="CACDADIH" name="CACDADIH"></a><a id="sthref215" name="sthref215"></a><a id="sthref216" name="sthref216"></a>Order By</td>
<td align="left" headers="r14c1-t6 r1c2-t6">Specify the default order for objects returned from a query:
<ul>
<li type="disc">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project.htm
index 74f3b061b0..3c25acb738 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>New JPA Project page</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project_wizard.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project_wizard.htm
index 475f6e0488..7e5a09ff17 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project_wizard.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_new_jpa_project_wizard.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Create New JPA Project wizard</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm
index 67275dd877..295f0ad5a2 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_map_view.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>JPA Details view (for attributes)</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,16 +29,16 @@
</td>
</tr>
</table>
-<p><a id="sthref204" name="sthref204"></a><a id="sthref205" name="sthref205"></a><a id="sthref206" name="sthref206"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected mapped attribute and contains the following areas:</p>
+<p><a id="sthref202" name="sthref202"></a><a id="sthref203" name="sthref203"></a><a id="sthref204" name="sthref204"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected mapped attribute and contains the following areas:</p>
<ul>
<li type="disc">
<p><a href="ref_mapping_general.htm#CACBHFIJ">General information</a></p>
</li>
<li type="disc">
-<p><a href="reference005.htm#CACBAEBC">Join Table Information</a></p>
+<p><a href="reference006.htm#CACBAEBC">Join Table Information</a></p>
</li>
<li type="disc">
-<p><a href="reference006.htm#CACFCEJC">Join Columns Information</a></p>
+<p><a href="reference007.htm#CACFCEJC">Join Columns Information</a></p>
</li>
<li type="disc">
<p><a href="ref_primary_key.htm#CACFCCAB">Primary Key Generation information</a></p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_outline.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_outline.htm
index a3d25124a8..dc4f166981 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_outline.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_outline.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>JPA Structure view</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,15 +29,15 @@
</td>
</tr>
</table>
-<p><a id="sthref227" name="sthref227"></a><a id="sthref228" name="sthref228"></a><a id="sthref229" name="sthref229"></a>The <span class="gui-object-title">JPA Structure</span> view displays an outline of the structure (its attributes and mappings) of the entity that is currently selected or opened in the editor. The structural elements shown in the outline are the entity and its fields.</p>
-<div class="figure"><a id="sthref230" name="sthref230"></a>
+<p><a id="sthref225" name="sthref225"></a><a id="sthref226" name="sthref226"></a><a id="sthref227" name="sthref227"></a>The <span class="gui-object-title">JPA Structure</span> view displays an outline of the structure (its attributes and mappings) of the entity that is currently selected or opened in the editor. The structural elements shown in the outline are the entity and its fields.</p>
+<div class="figure"><a id="sthref228" name="sthref228"></a>
<p class="titleinfigure">Sample JPA Structure View</p>
-<img src="img/persistence_outline_view.png" alt="This figure shows a sample Persistence Outline view for an entity." title="This figure shows a sample Persistence Outline view for an entity." /><br /></div>
+<img src="img/persistence_outline_view.png" alt="Sample JPA Structure view for an entity." title="Sample JPA Structure view for an entity." /><br /></div>
<!-- class="figure" -->
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
-<a href="ref_persistence_perspective.htm#BABIFBDB">JPA perspective</a>
+<a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a>
<p>&nbsp;</p>
</div>
<!-- class="sect2" -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm
index b87c6c3c1e..eaf7836816 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm
@@ -2,16 +2,16 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:13 -->
+<!-- Run date = May 9, 2007 10:03:46 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
-<title>JPA perspective</title>
+<title>JPA Development perspective</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<meta name="generator" content="Oracle DARB XHTML Converter - Version 4.5.3 Build 02" />
<meta name="date" content="2005-07-10T12:57:20+08:00" />
<meta name="robots" content="all" scheme="http://www.robotstxt.org/" />
-<meta name="doctitle" content="JPA perspective" />
+<meta name="doctitle" content="JPA Development perspective" />
<meta name="relnum" content="Release 1.0.0" />
<meta name="partnum" content="" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -25,11 +25,11 @@
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<tr valign="bottom">
<td align="left" width="86%">
-<h1>JPA perspective</h1>
+<h1>JPA Development perspective</h1>
</td>
</tr>
</table>
-<p><a id="sthref244" name="sthref244"></a><a id="sthref245" name="sthref245"></a>The <span class="bold">JPA perspective</span> defines the initial set and layout of views in the Workbench window when using Dali. By default, the <span class="gui-object-title">JPA perspective</span> includes the following vies:</p>
+<p><a id="sthref242" name="sthref242"></a><a id="sthref243" name="sthref243"></a>The <span class="bold">JPA Development perspective</span> defines the initial set and layout of views in the Workbench window when using Dali. By default, the <span class="gui-object-title">JPA Development perspective</span> includes the following vies:</p>
<ul>
<li type="disc">
<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
@@ -37,10 +37,16 @@
<li type="disc">
<p><a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></p>
</li>
+<li type="disc">
+<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
+</li>
+<li type="disc">
+<p><a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
+</li>
</ul>
-<div class="figure"><a id="sthref246" name="sthref246"></a>
-<p class="titleinfigure">Sample JPA Perspective</p>
-<img src="img/persistence_perspective.png" alt="This figure shows the Persistence perspective with the Persistence Properties and Outline views." title="This figure shows the Persistence perspective with the Persistence Properties and Outline views." /><br /></div>
+<div class="figure"><a id="sthref244" name="sthref244"></a>
+<p class="titleinfigure">Sample JPA Development Perspective</p>
+<img src="img/persistence_perspective.png" alt="JPA Development perspective with the JPA Structure and JPA Details views." title="JPA Development perspective with the JPA Structure and JPA Details views." /><br /></div>
<!-- class="figure" -->
<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
<p><a href="../org.eclipse.platform.doc.user/concepts/concepts-4.htm">Perspectives</a></p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_prop_view.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_prop_view.htm
index 45891656dc..e43822370b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_prop_view.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_persistence_prop_view.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>JPA Details view (for entities)</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,13 +29,16 @@
</td>
</tr>
</table>
-<p><a id="sthref199" name="sthref199"></a><a id="sthref200" name="sthref200"></a><a id="sthref201" name="sthref201"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected entity and contains the following tabs:</p>
+<p><a id="sthref194" name="sthref194"></a><a id="sthref195" name="sthref195"></a><a id="sthref196" name="sthref196"></a>The <span class="gui-object-title">JPA Details</span> view displays the persistence information for the currently selected entity and contains the following tabs:</p>
<ul>
<li type="disc">
<p><a href="reference003.htm#CACCAGGC">General information</a></p>
</li>
<li type="disc">
-<p><a href="reference004.htm#CACFHGHE">Inheritance information</a></p>
+<p><a href="reference004.htm#CACBHIDA">Secondary table information</a></p>
+</li>
+<li type="disc">
+<p><a href="reference005.htm#CACFHGHE">Inheritance information</a></p>
</li>
</ul>
<!-- Start Footer -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_primary_key.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_primary_key.htm
index c590f4e50f..e8f1ab16fd 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_primary_key.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_primary_key.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Primary Key Generation information</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -42,7 +42,7 @@
<tbody>
<tr align="left" valign="top">
<td align="left" id="r2c1-t9" headers="r1c1-t9"><a id="CACBAJBC" name="CACBAJBC"></a>Primary Key Generation</td>
-<td align="left" headers="r2c1-t9 r1c2-t9"><a id="sthref223" name="sthref223"></a><a id="sthref224" name="sthref224"></a>These fields define how the primary key is generated. These fields correspond to the <code>@GeneratedValue</code> annotation.</td>
+<td align="left" headers="r2c1-t9 r1c2-t9"><a id="sthref221" name="sthref221"></a><a id="sthref222" name="sthref222"></a>These fields define how the primary key is generated. These fields correspond to the <code>@GeneratedValue</code> annotation.</td>
<td align="left" headers="r2c1-t9 r1c3-t9">Generated Value</td>
</tr>
<tr align="left" valign="top">
@@ -102,7 +102,7 @@
</tr>
<tr align="left" valign="top">
<td align="left" id="r11c1-t9" headers="r1c1-t9"><a id="CACFFHEH" name="CACFFHEH"></a>Sequence&nbsp;Generator</td>
-<td align="left" headers="r11c1-t9 r1c2-t9"><a id="sthref225" name="sthref225"></a><a id="sthref226" name="sthref226"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.
+<td align="left" headers="r11c1-t9 r1c2-t9"><a id="sthref223" name="sthref223"></a><a id="sthref224" name="sthref224"></a>These fields define the specific sequence used for generating the primary key and correspond to the <code>@SequenceGenerator</code> annotation.
<p>These fields apply only when <span class="bold">Strategy</span> = <span class="bold">Sequence</span>.</p>
</td>
<td align="left" headers="r11c1-t9 r1c3-t9"><br /></td>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_project_properties.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_project_properties.htm
index 593e7ed982..7a9def246e 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/ref_project_properties.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_project_properties.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:13 -->
+<!-- Run date = May 9, 2007 10:03:46 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Project Properties page - JPA Options</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,7 +29,7 @@
</td>
</tr>
</table>
-<p><a id="sthref231" name="sthref231"></a><a id="sthref232" name="sthref232"></a>Use the <span class="gui-object-title">JPA</span> options on the <span class="gui-object-title">Properties</span> page to select the database connection to use with the project.</p>
+<p><a id="sthref229" name="sthref229"></a><a id="sthref230" name="sthref230"></a>Use the <span class="gui-object-title">JPA</span> options on the <span class="gui-object-title">Properties</span> page to select the database connection to use with the project.</p>
<p>This table lists the properties available in the <span class="gui-object-title">Persistence Properties page</span>.</p>
<div class="inftblinformal">
<table class="Informal" title="This table describes the options on the Persistence Properties page." summary="This table describes the options on the Persistence Properties page." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
@@ -41,11 +41,11 @@
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t12" headers="r1c1-t12"><a id="sthref233" name="sthref233"></a><a id="sthref234" name="sthref234"></a><a id="sthref235" name="sthref235"></a><a id="sthref236" name="sthref236"></a>Platform</td>
+<td align="left" id="r2c1-t12" headers="r1c1-t12"><a id="sthref231" name="sthref231"></a><a id="sthref232" name="sthref232"></a><a id="sthref233" name="sthref233"></a><a id="sthref234" name="sthref234"></a>Platform</td>
<td align="left" headers="r2c1-t12 r1c2-t12">Select the vendor-specific platform.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t12" headers="r1c1-t12"><a id="sthref237" name="sthref237"></a><a id="sthref238" name="sthref238"></a><a id="sthref239" name="sthref239"></a>Connection</td>
+<td align="left" id="r3c1-t12" headers="r1c1-t12"><a id="sthref235" name="sthref235"></a><a id="sthref236" name="sthref236"></a><a id="sthref237" name="sthref237"></a>Connection</td>
<td align="left" headers="r3c1-t12 r1c2-t12">The database connection used to map the persistent entities.
<ul>
<li type="disc">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
index 04af0ce95b..cd82b4c8cf 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Reference</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -20,7 +20,7 @@
<link rel="contents" href="toc.htm" title="Contents" type="text/html" />
</head>
<body>
-<p><a id="sthref198" name="sthref198"></a></p>
+<p><a id="sthref193" name="sthref193"></a></p>
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<tr valign="bottom">
<td align="left" width="86%">
@@ -43,7 +43,7 @@
<p><a href="reference011.htm#CACGEJDA">Dialogs</a></p>
</li>
<li type="disc">
-<p><a href="ref_persistence_perspective.htm#BABIFBDB">JPA perspective</a></p>
+<p><a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a></p>
</li>
<li type="disc">
<p><a href="reference014.htm#CACDHCIA">Icons and buttons</a></p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm
index 41f8b45475..a75d3c4a54 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Wizards</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
index 4171532a71..1cc147903d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference002.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Property pages</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -38,7 +38,7 @@
<p><a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a></p>
</li>
<li type="disc">
-<p><a href="reference007.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
+<p><a href="ref_details_orm.htm#CACGDGHC">JPA Details view (for orm.xml)</a></p>
</li>
<li type="disc">
<p><a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a></p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
index 079990f493..5e409f68e4 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference003.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>General information</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
index 5f778e518a..bef65fe694 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference004.htm
@@ -2,16 +2,16 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
-<title>Inheritance information</title>
+<title>Secondary table information</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<meta name="generator" content="Oracle DARB XHTML Converter - Version 4.5.3 Build 02" />
<meta name="date" content="2005-07-10T12:57:20+08:00" />
<meta name="robots" content="all" scheme="http://www.robotstxt.org/" />
-<meta name="doctitle" content="Inheritance information" />
+<meta name="doctitle" content="Secondary table information" />
<meta name="relnum" content="Release 1.0.0" />
<meta name="partnum" content="" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -20,81 +20,26 @@
<link rel="contents" href="toc.htm" title="Contents" type="text/html" />
</head>
<body>
-<p><a id="CACFHGHE" name="CACFHGHE"></a></p>
+<p><a id="CACBHIDA" name="CACBHIDA"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<tr valign="bottom">
<td align="left" width="86%">
-<h1>Inheritance information</h1>
+<h1>Secondary table information</h1>
</td>
</tr>
</table>
-<p><a id="sthref202" name="sthref202"></a><a id="sthref203" name="sthref203"></a>This table lists the fields available on the <span class="gui-object-title">Inheritance</span> area in the <span class="gui-object-title">Java Details</span> view for each entity type.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, Inheritance tab." summary="This table describes the options on the Persistence Properties view, Inheritance tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t5">Property</th>
-<th align="left" valign="bottom" id="r1c2-t5">Description</th>
-<th align="left" valign="bottom" id="r1c3-t5">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t5" headers="r1c1-t5">Strategy</td>
-<td align="left" headers="r2c1-t5 r1c2-t5">Specify the strategy to use when mapping a class or class hierarchy:
-<ul>
-<li type="disc">
-<p>Single table &ndash; All classes in the hierarchy are mapped to a single table.</p>
-</li>
-<li type="disc">
-<p>Joined &ndash; The root of the hierarchy is mapped to a single table; each child maps to its own table.</p>
-</li>
-<li type="disc">
-<p>Table per class &ndash; Each class is mapped to a separate table.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r2c1-t5 r1c3-t5">Single table</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t5" headers="r1c1-t5">Discriminator Column</td>
-<td align="left" headers="r3c1-t5 r1c2-t5">Use to specify the name of the discriminator column when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.</td>
-<td align="left" headers="r3c1-t5 r1c3-t5"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t5" headers="r1c1-t5">Discriminator Type</td>
-<td align="left" headers="r4c1-t5 r1c2-t5">Set this field to set the discriminator type to <code>Char</code> or <code>Integer</code> (instead of its default: <code>String</code>). The <span class="bold">Discriminator Value</span> must conform to this type.</td>
-<td align="left" headers="r4c1-t5 r1c3-t5">String</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t5" headers="r1c1-t5">Discriminator Value</td>
-<td align="left" headers="r5c1-t5 r1c2-t5">Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified <span class="bold">Discriminator Type</span>.</td>
-<td align="left" headers="r5c1-t5 r1c3-t5"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t5" headers="r1c1-t5">Primary Key Join Columns</td>
-<td align="left" headers="r6c1-t5 r1c2-t5">
-<p>Select <span class="bold">Override Default</span>.</p>
-<p>This field corresponds with @PrimaryKeyJoinColumn annotation.</p>
-</td>
-<td align="left" headers="r6c1-t5 r1c3-t5"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" -->
+<p><a id="sthref197" name="sthref197"></a><a id="sthref198" name="sthref198"></a><a id="sthref199" name="sthref199"></a>Use the <span class="gui-object-title">Secondary Tables</span> area in the <span class="gui-object-title">Java Details</span> view to associate additional tables with an entity. Use this area if the data associated with an entity is spread across multiple tables.</p>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a><br />
+<a href="task_inheritance.htm#CIHGBIEI">Specifying additional tables</a><br />
<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
<!-- class="sect3" -->
-<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
index a18ca1d738..b549b67411 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference005.htm
@@ -2,16 +2,16 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
-<title>Join Table Information</title>
+<title>Inheritance information</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<meta name="generator" content="Oracle DARB XHTML Converter - Version 4.5.3 Build 02" />
<meta name="date" content="2005-07-10T12:57:20+08:00" />
<meta name="robots" content="all" scheme="http://www.robotstxt.org/" />
-<meta name="doctitle" content="Join Table Information" />
+<meta name="doctitle" content="Inheritance information" />
<meta name="relnum" content="Release 1.0.0" />
<meta name="partnum" content="" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -20,43 +20,65 @@
<link rel="contents" href="toc.htm" title="Contents" type="text/html" />
</head>
<body>
-<p><a id="CACBAEBC" name="CACBAEBC"></a></p>
+<p><a id="CACFHGHE" name="CACFHGHE"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<tr valign="bottom">
<td align="left" width="86%">
-<h1>Join Table Information</h1>
+<h1>Inheritance information</h1>
</td>
</tr>
</table>
-<p>Use area to specify a mapped column for joining an entity association. By default, the mapping is assumed to have a single join.</p>
-<p>This table lists the fields available on the <span class="gui-object-title">Join Table</span> area in <span class="gui-object-title">the JPA Details</span> view for <a href="tasks013.htm#BABHGEBD">One-to-many mapping</a> and <a href="tasks011.htm#BABEIEGD">Many-to-many mapping</a> mapping types.</p>
+<p><a id="sthref200" name="sthref200"></a><a id="sthref201" name="sthref201"></a>This table lists the fields available on the <span class="gui-object-title">Inheritance</span> area in the <span class="gui-object-title">Java Details</span> view for each entity type.</p>
<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Join Table tab." summary="This table describes the options on the Join Table tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, Inheritance tab." summary="This table describes the options on the Persistence Properties view, Inheritance tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t7">Property</th>
-<th align="left" valign="bottom" id="r1c2-t7">Description</th>
-<th align="left" valign="bottom" id="r1c3-t7">Default</th>
+<th align="left" valign="bottom" id="r1c1-t5">Property</th>
+<th align="left" valign="bottom" id="r1c2-t5">Description</th>
+<th align="left" valign="bottom" id="r1c3-t5">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t7" headers="r1c1-t7">Name</td>
-<td align="left" headers="r2c1-t7 r1c2-t7">Name of the join table that contains the foreign key column.</td>
-<td align="left" headers="r2c1-t7 r1c3-t7">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
+<td align="left" id="r2c1-t5" headers="r1c1-t5">Strategy</td>
+<td align="left" headers="r2c1-t5 r1c2-t5">Specify the strategy to use when mapping a class or class hierarchy:
+<ul>
+<li type="disc">
+<p>Single table &ndash; All classes in the hierarchy are mapped to a single table.</p>
+</li>
+<li type="disc">
+<p>Joined &ndash; The root of the hierarchy is mapped to a single table; each child maps to its own table.</p>
+</li>
+<li type="disc">
+<p>Table per class &ndash; Each class is mapped to a separate table.</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r2c1-t5 r1c3-t5">Single table</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t7" headers="r1c1-t7"><a id="CACBBDFG" name="CACBBDFG"></a>Join Columns</td>
-<td align="left" headers="r3c1-t7 r1c2-t7"><a id="sthref219" name="sthref219"></a><a id="sthref220" name="sthref220"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
-<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
-</td>
-<td align="left" headers="r3c1-t7 r1c3-t7">By default, the mapping is assumed to have a single join.</td>
+<td align="left" id="r3c1-t5" headers="r1c1-t5">Discriminator Column</td>
+<td align="left" headers="r3c1-t5 r1c2-t5">Use to specify the name of the discriminator column when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.</td>
+<td align="left" headers="r3c1-t5 r1c3-t5"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t5" headers="r1c1-t5">Discriminator Type</td>
+<td align="left" headers="r4c1-t5 r1c2-t5">Set this field to set the discriminator type to <code>Char</code> or <code>Integer</code> (instead of its default: <code>String</code>). The <span class="bold">Discriminator Value</span> must conform to this type.</td>
+<td align="left" headers="r4c1-t5 r1c3-t5">String</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t7" headers="r1c1-t7">Inverse Join Columns</td>
-<td align="left" headers="r4c1-t7 r1c2-t7">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
-<td align="left" headers="r4c1-t7 r1c3-t7"><br /></td>
+<td align="left" id="r5c1-t5" headers="r1c1-t5">Discriminator Value</td>
+<td align="left" headers="r5c1-t5 r1c2-t5">Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified <span class="bold">Discriminator Type</span>.</td>
+<td align="left" headers="r5c1-t5 r1c3-t5"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t5" headers="r1c1-t5">Primary Key Join Columns</td>
+<td align="left" headers="r6c1-t5 r1c2-t5">
+<p>Select <span class="bold">Override Default</span>.</p>
+<p>This field corresponds with @PrimaryKeyJoinColumn annotation.</p>
+</td>
+<td align="left" headers="r6c1-t5 r1c3-t5"><br /></td>
</tr>
</tbody>
</table>
@@ -65,12 +87,14 @@
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
<br />
-<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
+<a href="task_inheritance001.htm#CIHCCCJD">Specifying entity inheritance</a><br />
+<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
-<a href="reference012.htm#CACCGEHC">Edit Join Columns Dialog</a></div>
+<a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a></div>
<!-- class="sect3" -->
+<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
index f8e1499c1c..9bed4257bb 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference006.htm
@@ -2,16 +2,16 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
-<title>Join Columns Information</title>
+<title>Join Table Information</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<meta name="generator" content="Oracle DARB XHTML Converter - Version 4.5.3 Build 02" />
<meta name="date" content="2005-07-10T12:57:20+08:00" />
<meta name="robots" content="all" scheme="http://www.robotstxt.org/" />
-<meta name="doctitle" content="Join Columns Information" />
+<meta name="doctitle" content="Join Table Information" />
<meta name="relnum" content="Release 1.0.0" />
<meta name="partnum" content="" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -20,32 +20,43 @@
<link rel="contents" href="toc.htm" title="Contents" type="text/html" />
</head>
<body>
-<p><a id="CACFCEJC" name="CACFCEJC"></a></p>
+<p><a id="CACBAEBC" name="CACBAEBC"></a></p>
<div class="sect3"><!-- infolevel="all" infotype="General" -->
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<tr valign="bottom">
<td align="left" width="86%">
-<h1>Join Columns Information</h1>
+<h1>Join Table Information</h1>
</td>
</tr>
</table>
-<p>This table lists the fields available in the <span class="gui-object-title">Join Table</span> area in <span class="gui-object-title">JPA Details</span> view for <a href="tasks012.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks014.htm#BABFHBCJ">One-to-one mapping</a> mapping types.</p>
+<p>Use area to specify a mapped column for joining an entity association. By default, the mapping is assumed to have a single join.</p>
+<p>This table lists the fields available on the <span class="gui-object-title">Join Table</span> area in <span class="gui-object-title">the JPA Details</span> view for <a href="tasks013.htm#BABHGEBD">One-to-many mapping</a> and <a href="tasks011.htm#BABEIEGD">Many-to-many mapping</a> mapping types.</p>
<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Join Columns tab." summary="This table describes the options on the Join Columns tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<table class="RuleInformal" title="This table describes the options on the Join Table tab." summary="This table describes the options on the Join Table tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t8">Property</th>
-<th align="left" valign="bottom" id="r1c2-t8">Description</th>
-<th align="left" valign="bottom" id="r1c3-t8">Default</th>
+<th align="left" valign="bottom" id="r1c1-t7">Property</th>
+<th align="left" valign="bottom" id="r1c2-t7">Description</th>
+<th align="left" valign="bottom" id="r1c3-t7">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t8" headers="r1c1-t8">Join Column</td>
-<td align="left" headers="r2c1-t8 r1c2-t8"><a id="sthref221" name="sthref221"></a><a id="sthref222" name="sthref222"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
+<td align="left" id="r2c1-t7" headers="r1c1-t7">Name</td>
+<td align="left" headers="r2c1-t7 r1c2-t7">Name of the join table that contains the foreign key column.</td>
+<td align="left" headers="r2c1-t7 r1c3-t7">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t7" headers="r1c1-t7"><a id="CACBBDFG" name="CACBBDFG"></a>Join Columns</td>
+<td align="left" headers="r3c1-t7 r1c2-t7"><a id="sthref217" name="sthref217"></a><a id="sthref218" name="sthref218"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
</td>
-<td align="left" headers="r2c1-t8 r1c3-t8">By default, the mapping is assumed to have a single join.</td>
+<td align="left" headers="r3c1-t7 r1c3-t7">By default, the mapping is assumed to have a single join.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t7" headers="r1c1-t7">Inverse Join Columns</td>
+<td align="left" headers="r4c1-t7 r1c2-t7">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
+<td align="left" headers="r4c1-t7 r1c3-t7"><br /></td>
</tr>
</tbody>
</table>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
index 13d22e8470..8156b0d0db 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference007.htm
@@ -2,16 +2,16 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
-<title>JPA Details view (for orm.xml)</title>
+<title>Join Columns Information</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<meta name="generator" content="Oracle DARB XHTML Converter - Version 4.5.3 Build 02" />
<meta name="date" content="2005-07-10T12:57:20+08:00" />
<meta name="robots" content="all" scheme="http://www.robotstxt.org/" />
-<meta name="doctitle" content="JPA Details view (for orm.xml)" />
+<meta name="doctitle" content="Join Columns Information" />
<meta name="relnum" content="Release 1.0.0" />
<meta name="partnum" content="" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -20,25 +20,46 @@
<link rel="contents" href="toc.htm" title="Contents" type="text/html" />
</head>
<body>
-<p><a id="CACGDGHC" name="CACGDGHC"></a></p>
-<div class="sect2"><!-- infolevel="all" infotype="General" -->
+<p><a id="CACFCEJC" name="CACFCEJC"></a></p>
+<div class="sect3"><!-- infolevel="all" infotype="General" -->
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<tr valign="bottom">
<td align="left" width="86%">
-<h1>JPA Details view (for orm.xml)</h1>
+<h1>Join Columns Information</h1>
</td>
</tr>
</table>
-<p>The <span class="gui-object-title">JPA Details</span> view displays the default mapping and persistence information for the project and contains the following areas:</p>
-<ul>
-<li type="disc">
-<p><a href="reference008.htm#CACCACGH">General information</a></p>
-</li>
-<li type="disc">
-<p><a href="reference009.htm#CACEAGBG">Persistence Unit information</a></p>
-</li>
-</ul>
-<p>These defaults can be overridden by the settings on a specific entity or mapping.</p>
+<p>This table lists the fields available in the <span class="gui-object-title">Join Table</span> area in <span class="gui-object-title">JPA Details</span> view for <a href="tasks012.htm#BABHFAFJ">Many-to-one mapping</a> and <a href="tasks014.htm#BABFHBCJ">One-to-one mapping</a> mapping types.</p>
+<div class="inftblruleinformal">
+<table class="RuleInformal" title="This table describes the options on the Join Columns tab." summary="This table describes the options on the Join Columns tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t8">Property</th>
+<th align="left" valign="bottom" id="r1c2-t8">Description</th>
+<th align="left" valign="bottom" id="r1c3-t8">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t8" headers="r1c1-t8">Join Column</td>
+<td align="left" headers="r2c1-t8 r1c2-t8"><a id="sthref219" name="sthref219"></a><a id="sthref220" name="sthref220"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
+<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
+</td>
+<td align="left" headers="r2c1-t8 r1c3-t8">By default, the mapping is assumed to have a single join.</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblruleinformal" -->
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a>
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="reference012.htm#CACCGEHC">Edit Join Columns Dialog</a></div>
+<!-- class="sect3" -->
<!-- Start Footer -->
<div class="footer">
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
@@ -47,6 +68,6 @@
</tr>
</table>
</div>
-<!-- class="footer" --></div>
+<!-- class="footer" -->
</body>
</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
index 61b3deffca..871347e8a5 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference008.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>General information</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
index 62cd4f30e6..27bbb68c59 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference009.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Persistence Unit information</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -42,7 +42,7 @@
<tbody>
<tr align="left" valign="top">
<td align="left" id="r2c1-t11" headers="r1c1-t11">XML Mapping Data Complete</td>
-<td align="left" headers="r2c1-t11 r1c2-t11">
+<td align="left" headers="r2c1-t11 r1c2-t11">Specifies that the Java classes in this persistence unit are fully specified by their metadata. Any annotations will be ignored.
<p>This field corresponds to the <code>&lt;xml-mapping-metadata-complete&gt;</code> element in the <code>orm.xml</code> file.</p>
</td>
<td align="left" headers="r2c1-t11 r1c3-t11"><br /></td>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
index b95c8808de..85c869a0cf 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference010.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:13 -->
+<!-- Run date = May 9, 2007 10:03:46 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Preferences</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
index 250ed86092..5e391b19fd 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference011.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:13 -->
+<!-- Run date = May 9, 2007 10:03:46 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Dialogs</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
index 52b7587ea8..c479750b99 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference012.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:13 -->
+<!-- Run date = May 9, 2007 10:03:46 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Edit Join Columns Dialog</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -54,8 +54,8 @@
<!-- class="inftblinformal" -->
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
-<a href="reference005.htm#CACBAEBC">Join Table Information</a><br />
-<a href="reference006.htm#CACFCEJC">Join Columns Information</a></div>
+<a href="reference006.htm#CACBAEBC">Join Table Information</a><br />
+<a href="reference007.htm#CACFCEJC">Join Columns Information</a></div>
<!-- class="sect2" -->
<!-- Start Footer -->
<div class="footer">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
index ca4d9b36c9..d4b218339d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference013.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:13 -->
+<!-- Run date = May 9, 2007 10:03:46 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Database Connection Dialog</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,7 +29,7 @@
</td>
</tr>
</table>
-<p><a id="sthref243" name="sthref243"></a>Use the <span class="gui-object-title">Database Connection</span> dialog to create a new database connection or reconnect to an existing database connection.</p>
+<p><a id="sthref241" name="sthref241"></a>Use the <span class="gui-object-title">Database Connection</span> dialog to create a new database connection or reconnect to an existing database connection.</p>
<p>This table lists the properties available in the <span class="gui-object-title">Database Connection</span> dialog.</p>
<div class="inftblinformal">
<table class="Informal" title="This table describes the options on the Join Columns dialog." summary="This table describes the options on the Join Columns dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
index a59edab238..5ef99eaff4 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference014.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:13 -->
+<!-- Run date = May 9, 2007 10:03:46 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Icons and buttons</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
index e168f5ee9f..cd232741ad 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference015.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:13 -->
+<!-- Run date = May 9, 2007 10:03:46 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Icons</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
index 911fefb9e6..09c9caf516 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference016.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:13 -->
+<!-- Run date = May 9, 2007 10:03:47 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Buttons</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -41,7 +41,7 @@
<tbody>
<tr align="left" valign="top">
<td align="left" id="r2c1-t17" headers="r1c1-t17"><img src="img/button_jpa_perspective.png" alt="Persistence Perspective button" title="Persistence Perspective button" /><br /></td>
-<td align="left" headers="r2c1-t17 r1c2-t17">JPA perspective</td>
+<td align="left" headers="r2c1-t17 r1c2-t17">JPA Development perspective</td>
</tr>
</tbody>
</table>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
index e0059a8af8..cba7f73aab 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference017.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:13 -->
+<!-- Run date = May 9, 2007 10:03:47 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Javadoc</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -20,7 +20,7 @@
<link rel="contents" href="toc.htm" title="Contents" type="text/html" />
</head>
<body>
-<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref247" name="sthref247"></a>
+<div class="sect1"><!-- infolevel="all" infotype="General" --><a id="sthref245" name="sthref245"></a>
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<tr valign="bottom">
<td align="left" width="86%">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
index ae52e9bcc5..e66c8f5ecb 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference018.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:14 -->
+<!-- Run date = May 9, 2007 10:03:47 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Dali Developer Documentation</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,7 +29,7 @@
</td>
</tr>
</table>
-<p><a id="sthref248" name="sthref248"></a><a id="sthref249" name="sthref249"></a><a id="sthref250" name="sthref250"></a>Additional Dali documentation is available online at:</p>
+<p><a id="sthref246" name="sthref246"></a><a id="sthref247" name="sthref247"></a><a id="sthref248" name="sthref248"></a>Additional Dali documentation is available online at:</p>
<p><code><a href="http://wiki.eclipse.org/index.php/Dali_Developer_Documentation">http://wiki.eclipse.org/index.php/Dali_Developer_Documentation</a></code></p>
<p>This developer documentation includes information about:</p>
<ul>
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 e0f639f1d6..b54fe3e638 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,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:09 -->
+<!-- Run date = May 9, 2007 10:03:42 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Adding persistence to a class</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
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 ef83c69ef1..b30734e7a2 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,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:08 -->
+<!-- Run date = May 9, 2007 10:03:40 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Creating a new JPA project</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -39,7 +39,7 @@
<p><a id="sthref51" name="sthref51"></a><a id="sthref52" name="sthref52"></a>On the New Project dialog, select <span class="bold">JPA &gt; JPA Project</span> and click <span class="bold">Next</span>. The New JPA Project wizard appears.</p>
<div class="figure"><a id="sthref53" name="sthref53"></a>
<p class="titleinfigure"><a id="sthref54" name="sthref54"></a>New JPA Project</p>
-<img src="img/new_jpa_project_dialog.png" alt="Using the Java Persistence &gt; Add Java Persistence menu option." title="Using the Java Persistence &gt; Add Java Persistence menu option." /><br /></div>
+<img src="img/new_jpa_project_dialog.png" alt="The New JPA Project dialog." title="The New JPA Project dialog." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>Complete the fields on the <a href="ref_new_jpa_project.htm#CACBJAGC">New JPA Project page</a> to specify the project name and location, target runtime, and pre-defined configuration.</p>
@@ -48,24 +48,38 @@
<p>Click <span class="bold">Next</span>. The Project Facets page appears.</p>
</li>
<li>
-<p>Select.... informationPending</p>
-<p>The JPA Facet page appears.</p>
+<p>Select the project facets to use to create the project and click <span class="bold">Next</span>. The JPA Facet page appears.</p>
<div class="figure"><a id="sthref55" name="sthref55"></a>
<p class="titleinfigure"><a id="sthref56" name="sthref56"></a>New JPA Project</p>
-<img src="img/jpa_facet_dialog.png" alt="Using the Java Persistence &gt; Add Java Persistence menu option." title="Using the Java Persistence &gt; Add Java Persistence menu option." /><br /></div>
+<img src="img/jpa_facet_dialog.png" alt="The JPA Facet dialog" title="The JPA Facet dialog" /><br /></div>
<!-- class="figure" --></li>
<li>
<p>Complete the fields on the <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a> to specify your vender-specific platform, database connection, and JPA implementation library.</p>
+<div align="center">
+<div class="inftblnote"><br />
+<table class="Note oac_no_warn" summary="This is a layout table to format a note" title="This is a layout table to format a note" dir="ltr" border="1" width="80%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
+<tbody>
+<tr>
+<td align="left">
+<p class="notep1">Note:</p>
+If the server runtime does not provide a JPA implementation, you must explicitly select a JPA implementation library.
+<p>To insure the portability of your application, you must explicitly list the managed persistence classes that are included in the persistence unit. If the server supports EJB 3.0, the persistent classes will be discovered automatically.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblnote" --></div>
</li>
<li>
-<p>Click <span class="bold">Finish</span>. You should now open the <a href="ref_persistence_perspective.htm#BABIFBDB">JPA perspective</a>.</p>
+<p>Click <span class="bold">Finish</span>. You should now open the <a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a>.</p>
</li>
</ol>
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
<br />
-<a href="ref_persistence_perspective.htm#BABIFBDB">JPA perspective</a>
+<a href="ref_persistence_perspective.htm#BABIFBDB">JPA Development perspective</a>
<p>&nbsp;</p>
<img src="img/ngrelt.png" alt="Related tasks" title="Related tasks" /><br />
<br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_ddl.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_ddl.htm
deleted file mode 100644
index 023a872c1a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_ddl.htm
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<!-- Run date = May 3, 2007 9:19:11 -->
-<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
-<title>Generating tables (DDL scripts) from entities</title>
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
-<meta name="generator" content="Oracle DARB XHTML Converter - Version 4.5.3 Build 02" />
-<meta name="date" content="2005-07-10T12:57:20+08:00" />
-<meta name="robots" content="all" scheme="http://www.robotstxt.org/" />
-<meta name="doctitle" content="Generating tables (DDL scripts) from entities" />
-<meta name="relnum" content="Release 1.0.0" />
-<meta name="partnum" content="" />
-<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
-<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
-<link rel="start" href="../../index.htm" title="Home" type="text/html" />
-<link rel="contents" href="toc.htm" title="Contents" type="text/html" />
-</head>
-<body>
-<p><a id="BABJJIAA" name="BABJJIAA"></a></p>
-<div class="sect1">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr valign="bottom">
-<td align="left" width="86%">
-<h1>Generating tables (DDL scripts) from entities</h1>
-</td>
-</tr>
-</table>
-<p><a id="sthref159" name="sthref159"></a><a id="sthref160" name="sthref160"></a><a id="sthref161" name="sthref161"></a>Use this procedure to generate DDL script (for database tables) from your persistent entities. You must establish a database connection <span class="italic">before</span> generating DDL files.</p>
-<ol type="1" start="1">
-<li>
-<p>Right-click the persistent project in the <span class="gui-object-title">Package Explorer</span> and select <span class="gui-object-action">Java Persistence &gt; Generate DDL</span>.</p>
-<div class="figure"><a id="sthref162" name="sthref162"></a>
-<p class="titleinfigure">Generating DDL from Entities</p>
-<img src="img/generate_ddl.png" alt="Using the Java Persistence &gt; Add Java Persistence menu option." title="Using the Java Persistence &gt; Add Java Persistence menu option." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Complete the information on each page of the .</p>
-<p>Refer to the "Using web tools" section of the Web Application Development Guide for additional information.</p>
-<div class="figure"><a id="sthref163" name="sthref163"></a>
-<p class="titleinfigure">Generate DDL &ndash; Options page</p>
-<img src="img/generate_ddl_options.png" alt="This figure shows the Options page of the Generate DDL wizard." title="This figure shows the Options page of the Generate DDL wizard." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Complete the information on the page of the and click <span class="bold">Next</span>.</p>
-<div class="figure"><a id="sthref164" name="sthref164"></a>
-<p class="titleinfigure">Generate DDL &ndash; Objects page</p>
-<img src="img/generate_ddl_objects.png" alt="This figure shows the Objects page of the Generate DDL wizard." title="This figure shows the Objects page of the Generate DDL wizard." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Complete the information on the page of the and click <span class="bold">Next</span>.</p>
-<div class="figure"><a id="sthref165" name="sthref165"></a>
-<p class="titleinfigure">Generate DDL &ndash; Save and Run page</p>
-<img src="img/generate_ddl_save.png" alt="This figure shows the Save and Run page of the Generate DDL wizard." title="This figure shows the Save and Run page of the Generate DDL wizard." /><br /></div>
-<!-- class="figure" --></li>
-<li>
-<p>Review the information on the Summary page. If the information is correct, click <span class="bold">Finish</span> to generate the script. If not, click <span class="bold">Back</span> to change the necessary information.</p>
-</li>
-</ol>
-<p>&nbsp;</p>
-<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="../org.eclipse.wst.datatools.fe.ui.doc.user/topics/tddl_wiz.htm">Generating a DDL Script</a><br />
-<a href="tasks017.htm#BABBAGFI">Generating entities from tables</a>
-<p>&nbsp;</p>
-<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
-<br /></div>
-<!-- class="sect1" -->
-<!-- Start Footer -->
-<div class="footer">
-<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2007,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
-</tr>
-</table>
-</div>
-<!-- class="footer" -->
-</body>
-</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_entities.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_entities.htm
index 7b1ccc3f6b..3bf5cce59f 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,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:13 -->
+<!-- Run date = May 9, 2007 10:03:46 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Generate Entities from Tables dialog</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,7 +29,7 @@
</td>
</tr>
</table>
-<p><a id="sthref240" name="sthref240"></a><a id="sthref241" name="sthref241"></a><a id="sthref242" name="sthref242"></a>Use the <span class="gui-object-title">Generate Entities</span> dialog to create Java persistent entities from your database tables and columns.</p>
+<p><a id="sthref238" name="sthref238"></a><a id="sthref239" name="sthref239"></a><a id="sthref240" name="sthref240"></a>Use the <span class="gui-object-title">Generate Entities</span> dialog to create Java persistent entities from your database tables and columns.</p>
<p>This table lists the properties available in the <span class="gui-object-title">Generate Entities dialog</span>.</p>
<div class="inftblinformal">
<table class="Informal" title="This table describes the options on the Generate Entities dialog." summary="This table describes the options on the Generate Entities dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
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 dd54deb3e8..96e281deb8 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance.htm
@@ -2,16 +2,16 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:09 -->
+<!-- Run date = May 9, 2007 10:03:42 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
-<title>Specifying entity inheritance</title>
+<title>Specifying additional tables</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<meta name="generator" content="Oracle DARB XHTML Converter - Version 4.5.3 Build 02" />
<meta name="date" content="2005-07-10T12:57:20+08:00" />
<meta name="robots" content="all" scheme="http://www.robotstxt.org/" />
-<meta name="doctitle" content="Specifying entity inheritance" />
+<meta name="doctitle" content="Specifying additional tables" />
<meta name="relnum" content="Release 1.0.0" />
<meta name="partnum" content="" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -20,12 +20,12 @@
<link rel="contents" href="toc.htm" title="Contents" type="text/html" />
</head>
<body>
-<p><a id="CIHCCCJD" name="CIHCCCJD"></a></p>
+<p><a id="CIHGBIEI" name="CIHGBIEI"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<tr valign="bottom">
<td align="left" width="86%">
-<h1>Specifying entity inheritance</h1>
+<h1>Specifying additional tables</h1>
</td>
</tr>
</table>
@@ -36,88 +36,24 @@
<p>Select the entity in the <span class="gui-object-title">Package Explorer</span>.</p>
</li>
<li>
-<p>In the <span class="gui-object-title">JPA Details</span> view, select the <span class="gui-object-action">Inheritance</span> information.</p>
+<p>In the <span class="gui-object-title">JPA Details</span> view, select the <span class="gui-object-action">Secondary Tables</span> information.</p>
<div class="figure"><a id="sthref98" name="sthref98"></a>
-<p class="titleinfigure">Specifying Inheritance</p>
-<img src="img/inheritance_tab.png" alt="Selecting the Inheritance tab on the Persistence Properties view." title="Selecting the Inheritance tab on the Persistence Properties view." /><br /></div>
+<p class="titleinfigure">Specifying Secondary Tables</p>
+<img src="img/secondary_tables.png" alt="Secondary Tables area on the JPA Details view." title="Secondary Tables area on the JPA Details view." /><br /></div>
<!-- class="figure" --></li>
<li>
-<p>In the <span class="bold">Strategy</span> list, select one of the following the inheritance strategies:</p>
-<ul>
-<li type="disc">
-<p>A single table (default)</p>
-</li>
-<li type="disc">
-<p>Joined table</p>
-</li>
-<li type="disc">
-<p>One table per class</p>
-</li>
-</ul>
+<p>Click <span class="bold">Add</span> to associate an additional table with the entity. The Edit Secondary Table dialog appears</p>
</li>
<li>
-<p>Use the following table to complete the remaining fields on the tab. See <a href="reference004.htm#CACFHGHE">"Inheritance information"</a> for additional details.</p>
-<div class="inftblruleinformal">
-<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, Inheritance tab." summary="This table describes the options on the Persistence Properties view, Inheritance tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
-<thead>
-<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t2">Property</th>
-<th align="left" valign="bottom" id="r1c2-t2">Description</th>
-<th align="left" valign="bottom" id="r1c3-t2">Default</th>
-</tr>
-</thead>
-<tbody>
-<tr align="left" valign="top">
-<td align="left" id="r2c1-t2" headers="r1c1-t2"><a id="sthref99" name="sthref99"></a><a id="sthref100" name="sthref100"></a>Discriminator Column</td>
-<td align="left" headers="r2c1-t2 r1c2-t2">Name of the discriminator column when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.
-<p>This field corresponds to the <code>@DiscriminatorColumn</code> annotation.</p>
-</td>
-<td align="left" headers="r2c1-t2 r1c3-t2"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r3c1-t2" headers="r1c1-t2">Discriminator Type</td>
-<td align="left" headers="r3c1-t2 r1c2-t2">Set the discriminator type to <code>Char</code> or <code>Integer</code> (instead of its default: <code>String</code>). The <span class="bold">Discriminator Value</span> must conform to this type.</td>
-<td align="left" headers="r3c1-t2 r1c3-t2">String</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t2" headers="r1c1-t2"><a id="sthref101" name="sthref101"></a><a id="sthref102" name="sthref102"></a>Discriminator Value</td>
-<td align="left" headers="r4c1-t2 r1c2-t2">Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified <span class="bold">Discriminator Type</span>.
-<p>This field corresponds to the <code>@DiscriminatorValue</code> annotation.</p>
-</td>
-<td align="left" headers="r4c1-t2 r1c3-t2"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t2" headers="r1c1-t2">Override Default</td>
-<td align="left" headers="r5c1-t2 r1c2-t2">Use this field to specify custom primary key join columns.
-<p>This field corresponds to the <code>@PrimaryKeyJoinClumn</code> annotation.</p>
-</td>
-<td align="left" headers="r5c1-t2 r1c3-t2"><br /></td>
-</tr>
-</tbody>
-</table>
-<br /></div>
-<!-- class="inftblruleinformal" --></li>
+<p>Select the <span class="bold">Name</span>, <span class="bold">Catalog</span>, and <span class="bold">Schema</span> of the additional table to associate with the entity.</p>
+</li>
</ol>
-<p>Eclipse adds the following annotations the entity field:</p>
+<p>Eclipse adds the following annotations the entity:</p>
<pre xml:space="preserve" class="oac_no_warn">
-@Inheritance(strategy=InheritanceType.<span class="italic">&lt;INHERITANCE_STRATEGY&gt;</span>)
-@DiscriminatorColumn(name="<span class="italic">&lt;DISCRIMINATOR_COLUMN&gt;</span>",
- discriminatorType=<span class="italic">&lt;DISCRIMINATOR_TYPE&gt;</span>)
-@DiscriminatorValue(value-"<span class="italic">&lt;DISCRIMINATOR_VALUE&gt;</span>")
-@PrimaryKeyJoinColumn(name="<span class="italic">&lt;JOIN_COLUMN_NAME&gt;</span>",
- referencedColumnName = "<span class="italic">&lt;REFERENCED_COLUMN_NAME&gt;</span>")
+@SecondaryTable(name="NAME", catalog = "CATALOG", schema = "SCHEMA"
</pre>
-<p><a id="sthref103" name="sthref103"></a><a id="sthref104" name="sthref104"></a><a id="sthref105" name="sthref105"></a>The following figures illustrates the different inheritance strategies.</p>
-<div class="figure"><a id="sthref106" name="sthref106"></a>
-<p class="titleinfigure">Single Table Inheritance</p>
-<img src="img/inheritance_single.png" alt="This figure illustrates entity inheritance in a single table." title="This figure illustrates entity inheritance in a single table." /><br /></div>
-<!-- class="figure" -->
-<div class="figure"><a id="sthref107" name="sthref107"></a>
-<p class="titleinfigure"><a id="sthref108" name="sthref108"></a><a id="sthref109" name="sthref109"></a>Joined Table Inheritance</p>
-<img src="img/inheritance_join.png" alt="This figure shows a sample joined inheritance table strategy." title="This figure shows a sample joined inheritance table strategy." /><br /></div>
-<!-- class="figure" -->
<p>&nbsp;</p>
<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
<br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance001.htm
new file mode 100644
index 0000000000..c81f56a8e7
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_inheritance001.htm
@@ -0,0 +1,143 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<!-- Run date = May 9, 2007 10:03:42 -->
+<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
+<title>Specifying entity inheritance</title>
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<meta name="generator" content="Oracle DARB XHTML Converter - Version 4.5.3 Build 02" />
+<meta name="date" content="2005-07-10T12:57:20+08:00" />
+<meta name="robots" content="all" scheme="http://www.robotstxt.org/" />
+<meta name="doctitle" content="Specifying entity inheritance" />
+<meta name="relnum" content="Release 1.0.0" />
+<meta name="partnum" content="" />
+<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
+<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" />
+<link rel="start" href="../../index.htm" title="Home" type="text/html" />
+<link rel="contents" href="toc.htm" title="Contents" type="text/html" />
+</head>
+<body>
+<p><a id="CIHCCCJD" name="CIHCCCJD"></a></p>
+<div class="sect1"><!-- infolevel="all" infotype="General" -->
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<tr valign="bottom">
+<td align="left" width="86%">
+<h1>Specifying entity inheritance</h1>
+</td>
+</tr>
+</table>
+<p><a id="sthref99" name="sthref99"></a><a id="sthref100" name="sthref100"></a>An entity may inherit properties from other entities. You can specify a specific strategy to use for inheritance.</p>
+<p>Use this procedure to specify inheritance (<code>@Inheritance)</code> for an existing entity (<code>@Entity</code>):</p>
+<ol type="1" start="1">
+<li>
+<p>Select the entity in the <span class="gui-object-title">Package Explorer</span>.</p>
+</li>
+<li>
+<p>In the <span class="gui-object-title">JPA Details</span> view, select the <span class="gui-object-action">Inheritance</span> information.</p>
+<div class="figure"><a id="sthref101" name="sthref101"></a>
+<p class="titleinfigure">Specifying Inheritance</p>
+<img src="img/inheritance_tab.png" alt="Selecting the Inheritance area on the JPA Details view." title="Selecting the Inheritance area on the JPA Details view." /><br /></div>
+<!-- class="figure" --></li>
+<li>
+<p>In the <span class="bold">Strategy</span> list, select one of the following the inheritance strategies:</p>
+<ul>
+<li type="disc">
+<p>A single table (default)</p>
+</li>
+<li type="disc">
+<p>Joined table</p>
+</li>
+<li type="disc">
+<p>One table per class</p>
+</li>
+</ul>
+</li>
+<li>
+<p>Use the following table to complete the remaining fields on the tab. See <a href="reference005.htm#CACFHGHE">"Inheritance information"</a> for additional details.</p>
+<div class="inftblruleinformal">
+<table class="RuleInformal" title="This table describes the options on the Persistence Properties view, Inheritance tab." summary="This table describes the options on the Persistence Properties view, Inheritance tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
+<thead>
+<tr align="left" valign="top">
+<th align="left" valign="bottom" id="r1c1-t3">Property</th>
+<th align="left" valign="bottom" id="r1c2-t3">Description</th>
+<th align="left" valign="bottom" id="r1c3-t3">Default</th>
+</tr>
+</thead>
+<tbody>
+<tr align="left" valign="top">
+<td align="left" id="r2c1-t3" headers="r1c1-t3"><a id="sthref102" name="sthref102"></a><a id="sthref103" name="sthref103"></a>Discriminator Column</td>
+<td align="left" headers="r2c1-t3 r1c2-t3">Name of the discriminator column when using a <span class="bold">Single</span> or <span class="bold">Joined</span> inheritance strategy.
+<p>This field corresponds to the <code>@DiscriminatorColumn</code> annotation.</p>
+</td>
+<td align="left" headers="r2c1-t3 r1c3-t3"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t3" headers="r1c1-t3">Discriminator Type</td>
+<td align="left" headers="r3c1-t3 r1c2-t3">Set the discriminator type to <code>Char</code> or <code>Integer</code> (instead of its default: <code>String</code>). The <span class="bold">Discriminator Value</span> must conform to this type.</td>
+<td align="left" headers="r3c1-t3 r1c3-t3">String</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t3" headers="r1c1-t3"><a id="sthref104" name="sthref104"></a><a id="sthref105" name="sthref105"></a>Discriminator Value</td>
+<td align="left" headers="r4c1-t3 r1c2-t3">Specify the discriminator value used to differentiate an entity in this inheritance hierarchy. The value must conform to the specified <span class="bold">Discriminator Type</span>.
+<p>This field corresponds to the <code>@DiscriminatorValue</code> annotation.</p>
+</td>
+<td align="left" headers="r4c1-t3 r1c3-t3"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r5c1-t3" headers="r1c1-t3">Override Default</td>
+<td align="left" headers="r5c1-t3 r1c2-t3">Use this field to specify custom primary key join columns.
+<p>This field corresponds to the <code>@PrimaryKeyJoinClumn</code> annotation.</p>
+</td>
+<td align="left" headers="r5c1-t3 r1c3-t3"><br /></td>
+</tr>
+</tbody>
+</table>
+<br /></div>
+<!-- class="inftblruleinformal" --></li>
+</ol>
+<p>Eclipse adds the following annotations the entity field:</p>
+<pre xml:space="preserve" class="oac_no_warn">
+@Inheritance(strategy=InheritanceType.<span class="italic">&lt;INHERITANCE_STRATEGY&gt;</span>)
+@DiscriminatorColumn(name="<span class="italic">&lt;DISCRIMINATOR_COLUMN&gt;</span>",
+ discriminatorType=<span class="italic">&lt;DISCRIMINATOR_TYPE&gt;</span>)
+@DiscriminatorValue(value-"<span class="italic">&lt;DISCRIMINATOR_VALUE&gt;</span>")
+@PrimaryKeyJoinColumn(name="<span class="italic">&lt;JOIN_COLUMN_NAME&gt;</span>",
+ referencedColumnName = "<span class="italic">&lt;REFERENCED_COLUMN_NAME&gt;</span>")
+
+
+</pre>
+<p><a id="sthref106" name="sthref106"></a><a id="sthref107" name="sthref107"></a><a id="sthref108" name="sthref108"></a>The following figures illustrates the different inheritance strategies.</p>
+<div class="figure"><a id="sthref109" name="sthref109"></a>
+<p class="titleinfigure">Single Table Inheritance</p>
+<img src="img/inheritance_single.png" alt="This figure illustrates entity inheritance in a single table." title="This figure illustrates entity inheritance in a single table." /><br /></div>
+<!-- class="figure" -->
+<div class="figure"><a id="sthref110" name="sthref110"></a>
+<p class="titleinfigure"><a id="sthref111" name="sthref111"></a><a id="sthref112" name="sthref112"></a>Joined Table Inheritance</p>
+<img src="img/inheritance_join.png" alt="This figure shows a sample joined inheritance table strategy." title="This figure shows a sample joined inheritance table strategy." /><br /></div>
+<!-- class="figure" -->
+<p>&nbsp;</p>
+<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br />
+<br />
+<p>&nbsp;</p>
+<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
+<br />
+<a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a>
+<p>&nbsp;</p>
+<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
+<br />
+<a href="concept_persistence.htm#BABCAHIC">Understanding Java persistence</a><br /></div>
+<!-- class="sect1" -->
+<!-- Start Footer -->
+<div class="footer">
+<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
+<tr>
+<td align="left" width="86%"><a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Copyright&nbsp;&copy;&nbsp;2006, 2007,&nbsp;Oracle.&nbsp;All&nbsp;rights&nbsp;reserved.</span></a></td>
+</tr>
+</table>
+</div>
+<!-- class="footer" -->
+</body>
+</html>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm
index 5ab188e1e7..6e0f5c06b5 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_persistence001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_manage_orm.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:09 -->
+<!-- Run date = May 9, 2007 10:03:41 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Managing the orm.xml file</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
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 b040173e26..defdff33dc 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,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:08 -->
+<!-- Run date = May 9, 2007 10:03:40 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Managing the persistence.xml file</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
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 ff32861280..219974bd16 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_mapping.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:10 -->
+<!-- Run date = May 9, 2007 10:03:42 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Mapping an entity</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm
index 925b683c32..396e7b7d13 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:08 -->
+<!-- Run date = May 9, 2007 10:03:40 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Tasks</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -37,13 +37,13 @@
<p><a href="task_manage_persistence.htm#CIHDAJID">Managing the persistence.xml file</a></p>
</li>
<li type="disc">
-<p><a href="task_manage_persistence001.htm#CIHDGDCD">Managing the orm.xml file</a></p>
+<p><a href="task_manage_orm.htm#CIHDGDCD">Managing the orm.xml file</a></p>
</li>
<li type="disc">
<p><a href="task_add_persistence.htm#BABHICAI">Adding persistence to a class</a></p>
</li>
<li type="disc">
-<p><a href="task_inheritance.htm#CIHCCCJD">Specifying entity inheritance</a></p>
+<p><a href="task_inheritance001.htm#CIHCCCJD">Specifying entity inheritance</a></p>
</li>
<li type="disc">
<p><a href="task_mapping.htm#BABDGBIJ">Mapping an entity</a></p>
@@ -52,9 +52,6 @@
<p><a href="tasks017.htm#BABBAGFI">Generating entities from tables</a></p>
</li>
<li type="disc">
-<p><a href="task_generate_ddl.htm#BABJJIAA">Generating tables (DDL scripts) from entities</a></p>
-</li>
-<li type="disc">
<p><a href="tasks018.htm#BABFAIBA">Validating mappings and reporting problems</a></p>
</li>
<li type="disc">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm
index 015ee3eebc..213e5cb9ee 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks001.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:08 -->
+<!-- Run date = May 9, 2007 10:03:40 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Working with persistence.xml file</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm
index 1a244be3e0..f3fc89f889 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks002.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:09 -->
+<!-- Run date = May 9, 2007 10:03:41 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Synchronizing classes</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -36,7 +36,7 @@
<p>Right-click the <code>persistence.xml</code> file in the <span class="gui-object-title">Package Explorer</span> and select <span class="gui-object-action">JPA Tools &gt; Synchronize Classes</span>.</p>
<div class="figure"><a id="sthref67" name="sthref67"></a>
<p class="titleinfigure">Synchronizing the persistence.xml File</p>
-<img src="img/synchornize_classes.png" alt="This figure shows the Java Persistence &gt; Synchronize Classes option." title="This figure shows the Java Persistence &gt; Synchronize Classes option." /><br /></div>
+<img src="img/synchornize_classes.png" alt="This figure shows the JPA Tools &gt; Synchronize Classes option." title="This figure shows the JPA Tools &gt; Synchronize Classes option." /><br /></div>
<!-- class="figure" -->
<p>Dali adds the necessary <code>&lt;class&gt;</code> elements to the <code>persistence.xml</code> file.</p>
</li>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm
index c6ba430d93..6b35db0515 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks003.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:09 -->
+<!-- Run date = May 9, 2007 10:03:41 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Working with orm.xml file</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -42,7 +42,7 @@
<p>Use the JPA Details view to configure the entity mapping and persistence unit defaults.</p>
<div class="figure"><a id="sthref72" name="sthref72"></a>
<p class="titleinfigure">JPA Details view for EntityMappings (orm.xml)</p>
-<img src="img/details_entitymappings.png" alt="This figure shows the Persistence XML Editor." title="This figure shows the Persistence XML Editor." /><br /></div>
+<img src="img/details_entitymappings.png" alt="JPA Details view for orm.xml file." title="JPA Details view for orm.xml file." /><br /></div>
<!-- class="figure" --></li>
</ol>
<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm
index d2beafee6e..4e9e91675c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks004.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:09 -->
+<!-- Run date = May 9, 2007 10:03:42 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Entity</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -55,7 +55,7 @@
<p>In the <span class="gui-object-title">JPA Details</span> view, use the <span class="gui-object-action">Map As</span> field to select <span class="gui-object-action">Entity</span>.</p>
<div class="figure"><a id="sthref83" name="sthref83"></a>
<p class="titleinfigure">Selecting Entity Persistence</p>
-<img src="img/persistence_view_entity.png" alt="Selecting entity persistence on the Persistence Properties view." title="Selecting entity persistence on the Persistence Properties view." /><br /></div>
+<img src="img/persistence_view_entity.png" alt="Selecting entity persistence on the JPA Details view." title="Selecting entity persistence on the JPA Details view." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>Complete the remaining <a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>.</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm
index 768d565c88..1eb115b74e 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks005.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:09 -->
+<!-- Run date = May 9, 2007 10:03:42 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Embeddable</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -44,7 +44,7 @@
<p>In the <span class="gui-object-title">JPA Details</span> view, use the <span class="gui-object-action">Map As</span> drop-list to select <span class="gui-object-action">Embeddable</span>.</p>
<div class="figure"><a id="sthref89" name="sthref89"></a>
<p class="titleinfigure">Selecting Embeddable Persistence</p>
-<img src="img/persistence_view_embedded.png" alt="Selecting embedded persistence on the Persistence Properties view." title="Selecting embedded persistence on the Persistence Properties view." /><br /></div>
+<img src="img/persistence_view_embedded.png" alt="Selecting embedded persistence on the JPA Details view." title="Selecting embedded persistence on the JPA Details view." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>Complete the remaining <a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>.</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm
index 2161753f16..66b832b4e2 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks006.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:09 -->
+<!-- Run date = May 9, 2007 10:03:42 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Mapped superclass</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -59,7 +59,7 @@
<p>In the <span class="gui-object-title">JPA Details</span> view, use the <span class="gui-object-action">Map As</span> drop-list to select <span class="gui-object-action">Mapped Superclass</span>.</p>
<div class="figure"><a id="sthref95" name="sthref95"></a>
<p class="titleinfigure">Selecting Mapped Superclass Persistence</p>
-<img src="img/persistence_view_mappedsprc.png" alt="Selecting embedded persistence on the Persistence Properties view." title="Selecting embedded persistence on the Persistence Properties view." /><br /></div>
+<img src="img/persistence_view_mappedsprc.png" alt="Selecting embedded persistence on the JPA Details view." title="Selecting embedded persistence on the JPA Details view." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>Complete the remaining <a href="ref_persistence_prop_view.htm#BABFAEBB">JPA Details view (for entities)</a>.</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm
index 2dbfc37566..d484863df9 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks007.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:10 -->
+<!-- Run date = May 9, 2007 10:03:42 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Basic mapping</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,7 +29,7 @@
</td>
</tr>
</table>
-<p><a id="sthref110" name="sthref110"></a><a id="sthref111" name="sthref111"></a><a id="sthref112" name="sthref112"></a><a id="sthref113" name="sthref113"></a>Use a <span class="bold">Basic Mapping</span> to map an attribute directly to a database column. Basic mappings may be used only with the following attribute types:</p>
+<p><a id="sthref113" name="sthref113"></a><a id="sthref114" name="sthref114"></a><a id="sthref115" name="sthref115"></a><a id="sthref116" name="sthref116"></a>Use a <span class="bold">Basic Mapping</span> to map an attribute directly to a database column. Basic mappings may be used only with the following attribute types:</p>
<ul>
<li type="disc">
<p>Java primitive types and wrappers of the primitive types</p>
@@ -85,22 +85,22 @@
<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t3">Property</th>
-<th align="left" valign="bottom" id="r1c2-t3">Description</th>
-<th align="left" valign="bottom" id="r1c3-t3">Default</th>
+<th align="left" valign="bottom" id="r1c1-t4">Property</th>
+<th align="left" valign="bottom" id="r1c2-t4">Description</th>
+<th align="left" valign="bottom" id="r1c3-t4">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t3" headers="r1c1-t3">Map As</td>
-<td align="left" headers="r2c1-t3 r1c2-t3">Defines this mapping as a <span class="bold">Basic Mapping</span>.
+<td align="left" id="r2c1-t4" headers="r1c1-t4">Map As</td>
+<td align="left" headers="r2c1-t4 r1c2-t4">Defines this mapping as a <span class="bold">Basic Mapping</span>.
<p>This field corresponds to the <code>@Basic</code> annotation.</p>
</td>
-<td align="left" headers="r2c1-t3 r1c3-t3">Basic</td>
+<td align="left" headers="r2c1-t4 r1c3-t4">Basic</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t3" headers="r1c1-t3">Column</td>
-<td align="left" headers="r3c1-t3 r1c2-t3">The database column mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.
+<td align="left" id="r3c1-t4" headers="r1c1-t4">Column</td>
+<td align="left" headers="r3c1-t4 r1c2-t4">The database column mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.
<ul>
<li type="disc">
<p>Name &ndash; Name of the database column.</p>
@@ -116,16 +116,16 @@
</li>
</ul>
</td>
-<td align="left" headers="r3c1-t3 r1c3-t3">By default, the Column is assumed to be named identically to the attribute and always included in the <code>INSERT</code> and <code>UPDATE</code> statements.</td>
+<td align="left" headers="r3c1-t4 r1c3-t4">By default, the Column is assumed to be named identically to the attribute and always included in the <code>INSERT</code> and <code>UPDATE</code> statements.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t3" headers="r1c1-t3">Table</td>
-<td align="left" headers="r4c1-t3 r1c2-t3">Name of the database table.</td>
-<td align="left" headers="r4c1-t3 r1c3-t3"><br /></td>
+<td align="left" id="r4c1-t4" headers="r1c1-t4">Table</td>
+<td align="left" headers="r4c1-t4 r1c2-t4">Name of the database table.</td>
+<td align="left" headers="r4c1-t4 r1c3-t4"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t3" headers="r1c1-t3">Fetch</td>
-<td align="left" headers="r5c1-t3 r1c2-t3">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
+<td align="left" id="r5c1-t4" headers="r1c1-t4">Fetch</td>
+<td align="left" headers="r5c1-t4 r1c2-t4">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
<ul>
<li type="disc">
<p>Eager</p>
@@ -135,21 +135,21 @@
</li>
</ul>
</td>
-<td align="left" headers="r5c1-t3 r1c3-t3">Eager</td>
+<td align="left" headers="r5c1-t4 r1c3-t4">Eager</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t3" headers="r1c1-t3">Optional</td>
-<td align="left" headers="r6c1-t3 r1c2-t3">Specifies if this field is can be null.</td>
-<td align="left" headers="r6c1-t3 r1c3-t3">Yes</td>
+<td align="left" id="r6c1-t4" headers="r1c1-t4">Optional</td>
+<td align="left" headers="r6c1-t4 r1c2-t4">Specifies if this field is can be null.</td>
+<td align="left" headers="r6c1-t4 r1c3-t4">Yes</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r7c1-t3" headers="r1c1-t3">Lob</td>
-<td align="left" headers="r7c1-t3 r1c2-t3">Specifies if this is a large objects (BLOB or CLOB). See <a href="ref_mapping_general.htm#CACBBIBI">"Lob"</a> for details.</td>
-<td align="left" headers="r7c1-t3 r1c3-t3"><br /></td>
+<td align="left" id="r7c1-t4" headers="r1c1-t4">Lob</td>
+<td align="left" headers="r7c1-t4 r1c2-t4">Specifies if this is a large objects (BLOB or CLOB). See <a href="ref_mapping_general.htm#CACBBIBI">"Lob"</a> for details.</td>
+<td align="left" headers="r7c1-t4 r1c3-t4"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r8c1-t3" headers="r1c1-t3">Temporal</td>
-<td align="left" headers="r8c1-t3 r1c2-t3">Specifies the type of data. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.
+<td align="left" id="r8c1-t4" headers="r1c1-t4">Temporal</td>
+<td align="left" headers="r8c1-t4 r1c2-t4">Specifies the type of data. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.
<ul>
<li type="disc">
<p>Date</p>
@@ -162,7 +162,7 @@
</li>
</ul>
</td>
-<td align="left" headers="r8c1-t3 r1c3-t3"><br /></td>
+<td align="left" headers="r8c1-t4 r1c3-t4"><br /></td>
</tr>
</tbody>
</table>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm
index f90e5d11d1..d3cc4bd7d2 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks008.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:10 -->
+<!-- Run date = May 9, 2007 10:03:43 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Embedded mapping</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,7 +29,7 @@
</td>
</tr>
</table>
-<p><a id="sthref114" name="sthref114"></a><a id="sthref115" name="sthref115"></a><a id="sthref116" name="sthref116"></a><a id="sthref117" name="sthref117"></a>Use an <span class="bold">Embedded Mapping</span> to specify a persistent field or property of an entity whose value is an instance of an embeddable class.</p>
+<p><a id="sthref117" name="sthref117"></a><a id="sthref118" name="sthref118"></a><a id="sthref119" name="sthref119"></a><a id="sthref120" name="sthref120"></a>Use an <span class="bold">Embedded Mapping</span> to specify a persistent field or property of an entity whose value is an instance of an embeddable class.</p>
<ol type="1" start="1">
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
@@ -43,27 +43,27 @@
<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t4">Property</th>
-<th align="left" valign="bottom" id="r1c2-t4">Description</th>
-<th align="left" valign="bottom" id="r1c3-t4">Default</th>
+<th align="left" valign="bottom" id="r1c1-t5">Property</th>
+<th align="left" valign="bottom" id="r1c2-t5">Description</th>
+<th align="left" valign="bottom" id="r1c3-t5">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t4" headers="r1c1-t4">Map As</td>
-<td align="left" headers="r2c1-t4 r1c2-t4">Defines this mapping as a <span class="bold">Embedded</span>.
+<td align="left" id="r2c1-t5" headers="r1c1-t5">Map As</td>
+<td align="left" headers="r2c1-t5 r1c2-t5">Defines this mapping as a <span class="bold">Embedded</span>.
<p>This field corresponds to the <code>@Embedded</code> annotation.</p>
</td>
-<td align="left" headers="r2c1-t4 r1c3-t4">Embedded</td>
+<td align="left" headers="r2c1-t5 r1c3-t5">Embedded</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t4" headers="r1c1-t4">Attribute Overrides</td>
-<td align="left" headers="r3c1-t4 r1c2-t4">Specify to override the default mapping of an entity's attribute. Select <span class="bold">Override Default</span>.</td>
-<td align="left" headers="r3c1-t4 r1c3-t4"><br /></td>
+<td align="left" id="r3c1-t5" headers="r1c1-t5">Attribute Overrides</td>
+<td align="left" headers="r3c1-t5 r1c2-t5">Specify to override the default mapping of an entity's attribute. Select <span class="bold">Override Default</span>.</td>
+<td align="left" headers="r3c1-t5 r1c3-t5"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t4" headers="r1c1-t4">Columns</td>
-<td align="left" headers="r4c1-t4 r1c2-t4">The database column (and its table) mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.
+<td align="left" id="r4c1-t5" headers="r1c1-t5">Columns</td>
+<td align="left" headers="r4c1-t5 r1c2-t5">The database column (and its table) mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.
<ul>
<li type="disc">
<p>Name &ndash; Name of the database column.</p>
@@ -79,7 +79,7 @@
</li>
</ul>
</td>
-<td align="left" headers="r4c1-t4 r1c3-t4">By default, the Column is assumed to be named identically to the attribute and always included in the <code>INSERT</code> and <code>UPDATE</code> statements.</td>
+<td align="left" headers="r4c1-t5 r1c3-t5"><br /></td>
</tr>
</tbody>
</table>
@@ -89,6 +89,7 @@
<p>Eclipse adds the following annotations to the field:</p>
<pre xml:space="preserve" class="oac_no_warn">
@Embedded
+@AttributeOverride(column=@Column(table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>", name = "<span class="italic">&lt;COLUMN_NAME&gt;</span>"))
</pre>
<p>&nbsp;</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm
index b27efd9c49..efe5d45860 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks009.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:10 -->
+<!-- Run date = May 9, 2007 10:03:43 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Embedded ID mapping</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,7 +29,7 @@
</td>
</tr>
</table>
-<p><a id="sthref118" name="sthref118"></a><a id="sthref119" name="sthref119"></a><a id="sthref120" name="sthref120"></a><a id="sthref121" name="sthref121"></a>Use an <span class="bold">Embedded ID Mapping</span> to specify the primary key of an embedded ID. These mappings may be used with a <a href="tasks005.htm#BABFEICE">Embeddable</a> entities.</p>
+<p><a id="sthref121" name="sthref121"></a><a id="sthref122" name="sthref122"></a><a id="sthref123" name="sthref123"></a><a id="sthref124" name="sthref124"></a>Use an <span class="bold">Embedded ID Mapping</span> to specify the primary key of an embedded ID. These mappings may be used with a <a href="tasks005.htm#BABFEICE">Embeddable</a> entities.</p>
<ol type="1" start="1">
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected field.</p>
@@ -43,18 +43,18 @@
<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t5">Property</th>
-<th align="left" valign="bottom" id="r1c2-t5">Description</th>
-<th align="left" valign="bottom" id="r1c3-t5">Default</th>
+<th align="left" valign="bottom" id="r1c1-t6">Property</th>
+<th align="left" valign="bottom" id="r1c2-t6">Description</th>
+<th align="left" valign="bottom" id="r1c3-t6">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t5" headers="r1c1-t5">Map As</td>
-<td align="left" headers="r2c1-t5 r1c2-t5">Defines this mapping as a <span class="bold">Embedded Id</span>.
+<td align="left" id="r2c1-t6" headers="r1c1-t6">Map As</td>
+<td align="left" headers="r2c1-t6 r1c2-t6">Defines this mapping as a <span class="bold">Embedded Id</span>.
<p>This field corresponds to the <code>@EmbeddedId</code> annotation.</p>
</td>
-<td align="left" headers="r2c1-t5 r1c3-t5">Embedded Id</td>
+<td align="left" headers="r2c1-t6 r1c3-t6">Embedded Id</td>
</tr>
</tbody>
</table>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm
index aef8ffb35c..4d57baab82 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks010.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:10 -->
+<!-- Run date = May 9, 2007 10:03:43 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>ID mapping</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,7 +29,7 @@
</td>
</tr>
</table>
-<p><a id="sthref122" name="sthref122"></a><a id="sthref123" name="sthref123"></a><a id="sthref124" name="sthref124"></a><a id="sthref125" name="sthref125"></a>Use an <span class="bold">ID Mapping</span> to specify the primary key of an entity. ID mappings may be used with a <a href="tasks004.htm#BABGBIEE">Entity</a> or <a href="tasks006.htm#BABDAGCI">Mapped superclass</a>. Each <a href="tasks004.htm#BABGBIEE">Entity</a> must have an ID mapping.</p>
+<p><a id="sthref125" name="sthref125"></a><a id="sthref126" name="sthref126"></a><a id="sthref127" name="sthref127"></a><a id="sthref128" name="sthref128"></a>Use an <span class="bold">ID Mapping</span> to specify the primary key of an entity. ID mappings may be used with a <a href="tasks004.htm#BABGBIEE">Entity</a> or <a href="tasks006.htm#BABDAGCI">Mapped superclass</a>. Each <a href="tasks004.htm#BABGBIEE">Entity</a> must have an ID mapping.</p>
<ol type="1" start="1">
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
@@ -43,47 +43,32 @@
<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t6">Property</th>
-<th align="left" valign="bottom" id="r1c2-t6">Description</th>
-<th align="left" valign="bottom" id="r1c3-t6">Default</th>
+<th align="left" valign="bottom" id="r1c1-t7">Property</th>
+<th align="left" valign="bottom" id="r1c2-t7">Description</th>
+<th align="left" valign="bottom" id="r1c3-t7">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t6" headers="r1c1-t6">Map As</td>
-<td align="left" headers="r2c1-t6 r1c2-t6">Defines this mapping as an <span class="bold">ID Mapping</span>.
+<td align="left" id="r2c1-t7" headers="r1c1-t7">Map As</td>
+<td align="left" headers="r2c1-t7 r1c2-t7">Defines this mapping as an <span class="bold">ID Mapping</span>.
<p>This field corresponds to the <code>@Id</code> annotation.</p>
</td>
-<td align="left" headers="r2c1-t6 r1c3-t6">ID</td>
+<td align="left" headers="r2c1-t7 r1c3-t7">ID</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t6" headers="r1c1-t6">Column</td>
-<td align="left" headers="r3c1-t6 r1c2-t6">The database column (and its table) mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.
-<ul>
-<li type="disc">
-<p>Name &ndash; Name of the database column.</p>
-</li>
-<li type="disc">
-<p>Table &ndash; Name of the database table.</p>
-</li>
-<li type="disc">
-<p>Insertable &ndash; Specify if the column is always included in <code>SQL INSERT</code> statements.</p>
-</li>
-<li type="disc">
-<p>Updatable &ndash; Specify if the column is always included in <code>SQL UPDATE</code> statements.</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r3c1-t6 r1c3-t6">By default, the Column is assumed to be named identically to the attribute and always included in the <code>INSERT</code> and <code>UPDATE</code> statements.</td>
+<td align="left" id="r3c1-t7" headers="r1c1-t7">Column</td>
+<td align="left" headers="r3c1-t7 r1c2-t7">The database column mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.</td>
+<td align="left" headers="r3c1-t7 r1c3-t7">By default, the Column is assumed to be named identically to the attribute.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t6" headers="r1c1-t6">Table</td>
-<td align="left" headers="r4c1-t6 r1c2-t6"><br /></td>
-<td align="left" headers="r4c1-t6 r1c3-t6"><br /></td>
+<td align="left" id="r4c1-t7" headers="r1c1-t7">Table</td>
+<td align="left" headers="r4c1-t7 r1c2-t7">The database table mapped to the entity attribute.</td>
+<td align="left" headers="r4c1-t7 r1c3-t7">By default, the Table is assumed to be identical to the table associated with the entity.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t6" headers="r1c1-t6">Temporal</td>
-<td align="left" headers="r5c1-t6 r1c2-t6">Specifies the type of data. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.
+<td align="left" id="r5c1-t7" headers="r1c1-t7">Temporal</td>
+<td align="left" headers="r5c1-t7 r1c2-t7">Specifies the type of data. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.
<ul>
<li type="disc">
<p>Date</p>
@@ -96,7 +81,7 @@
</li>
</ul>
</td>
-<td align="left" headers="r5c1-t6 r1c3-t6"><br /></td>
+<td align="left" headers="r5c1-t7 r1c3-t7"><br /></td>
</tr>
</tbody>
</table>
@@ -108,20 +93,20 @@
<table class="RuleInformal" title="This table lists the fields in the PK Generation tab." summary="This table lists the fields in the PK Generation tab." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t7">Property</th>
-<th align="left" valign="bottom" id="r1c2-t7">Description</th>
-<th align="left" valign="bottom" id="r1c3-t7">Default</th>
+<th align="left" valign="bottom" id="r1c1-t8">Property</th>
+<th align="left" valign="bottom" id="r1c2-t8">Description</th>
+<th align="left" valign="bottom" id="r1c3-t8">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t7" headers="r1c1-t7">Primary Key Generation</td>
-<td align="left" headers="r2c1-t7 r1c2-t7">These fields define how the primary key is generated.</td>
-<td align="left" headers="r2c1-t7 r1c3-t7"><br /></td>
+<td align="left" id="r2c1-t8" headers="r1c1-t8">Primary Key Generation</td>
+<td align="left" headers="r2c1-t8 r1c2-t8">These fields define how the primary key is generated.</td>
+<td align="left" headers="r2c1-t8 r1c3-t8"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t7" headers="r1c1-t7">&nbsp;&nbsp;Strategy</td>
-<td align="left" headers="r3c1-t7 r1c2-t7">See <a href="ref_primary_key.htm#CACBAJBC">"Primary Key Generation"</a> for details.
+<td align="left" id="r3c1-t8" headers="r1c1-t8">&nbsp;&nbsp;Strategy</td>
+<td align="left" headers="r3c1-t8 r1c2-t8">See <a href="ref_primary_key.htm#CACBAJBC">"Primary Key Generation"</a> for details.
<ul>
<li type="disc">
<p>Auto</p>
@@ -137,12 +122,12 @@
</li>
</ul>
</td>
-<td align="left" headers="r3c1-t7 r1c3-t7">Auto</td>
+<td align="left" headers="r3c1-t8 r1c3-t8">Auto</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t7" headers="r1c1-t7">&nbsp;&nbsp;Generator&nbsp;Name</td>
-<td align="left" headers="r4c1-t7 r1c2-t7">Name of the primary key generator specified in the <span class="bold">Strategy</span></td>
-<td align="left" headers="r4c1-t7 r1c3-t7"><br /></td>
+<td align="left" id="r4c1-t8" headers="r1c1-t8">&nbsp;&nbsp;Generator&nbsp;Name</td>
+<td align="left" headers="r4c1-t8 r1c2-t8">Name of the primary key generator specified in the <span class="bold">Strategy</span></td>
+<td align="left" headers="r4c1-t8 r1c3-t8"><br /></td>
</tr>
</tbody>
</table>
@@ -155,7 +140,7 @@
@Id
@Column(name="<span class="italic">&lt;COLUMN_NAME&gt;</span>", table="<span class="italic">&lt;TABLE_NAME&gt;</span>", insertable=<span class="italic">&lt;INSERTABLE&gt;</span>,
updatable=<span class="italic">&lt;UPDATABLE&gt;</span>)
-@Temporal(TemporalType.<span class="italic">&lt;TEMPORAL&gt;</span>)
+@Temporal(<span class="italic">&lt;TEMPORAL&gt;</span>)
@GeneratedValue(strategy=GeneratorType.<span class="italic">&lt;STRATEGY&gt;</span>, generator="<span class="italic">&lt;GENERATOR_NAME&gt;</span>")@TableGenerator(name="<span class="italic">&lt;TABLE_GENERATOR_NAME&gt;</span>", table = "<span class="italic">&lt;TABLE_GENERATOR_TABLE&gt;</span>",
pkColumnName = "<span class="italic">&lt;TABLE_GENERATOR_PK&gt;</span>",
valueColumnName = "<span class="italic">&lt;TABLE_GENERATOR_VALUE_COLUMN&gt;</span>",
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm
index cb21d3e933..a7191764be 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks011.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:10 -->
+<!-- Run date = May 9, 2007 10:03:43 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Many-to-many mapping</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,7 +29,7 @@
</td>
</tr>
</table>
-<p><a id="sthref126" name="sthref126"></a><a id="sthref127" name="sthref127"></a><a id="sthref128" name="sthref128"></a><a id="sthref129" name="sthref129"></a>Use a <span class="bold">Many-to-Many Mapping</span> to define a many-valued association with many-to-many multiplicity. A many-to-many mapping has two sides: the <span class="italic">owning side</span> and <span class="italic">non-owning side</span>. You must specify the join table on the owning side. For bidirectional mappings, either side may be the owning side.</p>
+<p><a id="sthref129" name="sthref129"></a><a id="sthref130" name="sthref130"></a><a id="sthref131" name="sthref131"></a><a id="sthref132" name="sthref132"></a>Use a <span class="bold">Many-to-Many Mapping</span> to define a many-valued association with many-to-many multiplicity. A many-to-many mapping has two sides: the <span class="italic">owning side</span> and <span class="italic">non-owning side</span>. You must specify the join table on the owning side. For bidirectional mappings, either side may be the owning side.</p>
<ol type="1" start="1">
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
@@ -43,29 +43,29 @@
<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t8">Property</th>
-<th align="left" valign="bottom" id="r1c2-t8">Description</th>
-<th align="left" valign="bottom" id="r1c3-t8">Default</th>
+<th align="left" valign="bottom" id="r1c1-t9">Property</th>
+<th align="left" valign="bottom" id="r1c2-t9">Description</th>
+<th align="left" valign="bottom" id="r1c3-t9">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t8" headers="r1c1-t8">Map As</td>
-<td align="left" headers="r2c1-t8 r1c2-t8">Defines this mapping as a <span class="bold">Many to Many Mapping</span>.
+<td align="left" id="r2c1-t9" headers="r1c1-t9">Map As</td>
+<td align="left" headers="r2c1-t9 r1c2-t9">Defines this mapping as a <span class="bold">Many to Many Mapping</span>.
<p>This field corresponds to the <code>@ManyToMany</code> annotation.</p>
</td>
-<td align="left" headers="r2c1-t8 r1c3-t8">Many to Many</td>
+<td align="left" headers="r2c1-t9 r1c3-t9">Many to Many</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t8" headers="r1c1-t8">Target Entity</td>
-<td align="left" headers="r3c1-t8 r1c2-t8">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r3c1-t8 r1c3-t8">null
+<td align="left" id="r3c1-t9" headers="r1c1-t9">Target Entity</td>
+<td align="left" headers="r3c1-t9 r1c2-t9">The entity to which this attribute is mapped.</td>
+<td align="left" headers="r3c1-t9 r1c3-t9">null
<p>You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t8" headers="r1c1-t8">Fetch</td>
-<td align="left" headers="r4c1-t8 r1c2-t8">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
+<td align="left" id="r4c1-t9" headers="r1c1-t9">Fetch</td>
+<td align="left" headers="r4c1-t9 r1c2-t9">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
<ul>
<li type="disc">
<p>Eager</p>
@@ -75,45 +75,62 @@
</li>
</ul>
</td>
-<td align="left" headers="r4c1-t8 r1c3-t8">Eager</td>
+<td align="left" headers="r4c1-t9 r1c3-t9">Lazy</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t8" headers="r1c1-t8">Mapped By</td>
-<td align="left" headers="r5c1-t8 r1c2-t8">The database field that owns the relationship.</td>
-<td align="left" headers="r5c1-t8 r1c3-t8"><br /></td>
+<td align="left" id="r5c1-t9" headers="r1c1-t9">Mapped By</td>
+<td align="left" headers="r5c1-t9 r1c2-t9">The database field that owns the relationship.</td>
+<td align="left" headers="r5c1-t9 r1c3-t9"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r6c1-t9" headers="r1c1-t9">Order By</td>
+<td align="left" headers="r6c1-t9 r1c2-t9">Specify the default order for objects returned from a query. See <a href="ref_mapping_general.htm#CACDADIH">"Order By"</a> for details.
+<ul>
+<li type="disc">
+<p>No ordering</p>
+</li>
+<li type="disc">
+<p>Primary key</p>
+</li>
+<li type="disc">
+<p>Custom</p>
+</li>
+</ul>
+</td>
+<td align="left" headers="r6c1-t9 r1c3-t9">No ordering</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblruleinformal" --></li>
<li>
-<p>Use this table to complete the fields in the <a href="reference005.htm#CACBAEBC">Join Table Information</a> area in the <span class="gui-object-title">JPA Details</span> view.</p>
+<p>Use this table to complete the fields in the <a href="reference006.htm#CACBAEBC">Join Table Information</a> area in the <span class="gui-object-title">JPA Details</span> view.</p>
<div class="inftblruleinformal">
<table class="RuleInformal" title="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." summary="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t9">Property</th>
-<th align="left" valign="bottom" id="r1c2-t9">Description</th>
-<th align="left" valign="bottom" id="r1c3-t9">Default</th>
+<th align="left" valign="bottom" id="r1c1-t10">Property</th>
+<th align="left" valign="bottom" id="r1c2-t10">Description</th>
+<th align="left" valign="bottom" id="r1c3-t10">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t9" headers="r1c1-t9">Name</td>
-<td align="left" headers="r2c1-t9 r1c2-t9">Name of the join table that contains the foreign key column.</td>
-<td align="left" headers="r2c1-t9 r1c3-t9">You must specify the join table on the owning side.
+<td align="left" id="r2c1-t10" headers="r1c1-t10">Name</td>
+<td align="left" headers="r2c1-t10 r1c2-t10">Name of the join table that contains the foreign key column.</td>
+<td align="left" headers="r2c1-t10 r1c3-t10">You must specify the join table on the owning side.
<p>By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t9" headers="r1c1-t9">Join Columns</td>
-<td align="left" headers="r3c1-t9 r1c2-t9">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
-<td align="left" headers="r3c1-t9 r1c3-t9">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
+<td align="left" id="r3c1-t10" headers="r1c1-t10">Join Columns</td>
+<td align="left" headers="r3c1-t10 r1c2-t10">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
+<td align="left" headers="r3c1-t10 r1c3-t10">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t9" headers="r1c1-t9">Inverse Join Columns</td>
-<td align="left" headers="r4c1-t9 r1c2-t9">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
-<td align="left" headers="r4c1-t9 r1c3-t9">By default, the mapping is assumed to have a single join.</td>
+<td align="left" id="r4c1-t10" headers="r1c1-t10">Inverse Join Columns</td>
+<td align="left" headers="r4c1-t10 r1c2-t10">Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</td>
+<td align="left" headers="r4c1-t10 r1c3-t10">By default, the mapping is assumed to have a single join.</td>
</tr>
</tbody>
</table>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm
index 15bcd589b9..9a48136628 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks012.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:10 -->
+<!-- Run date = May 9, 2007 10:03:43 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Many-to-one mapping</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,7 +29,7 @@
</td>
</tr>
</table>
-<p><a id="sthref130" name="sthref130"></a><a id="sthref131" name="sthref131"></a><a id="sthref132" name="sthref132"></a><a id="sthref133" name="sthref133"></a>Use a <span class="bold">Many-to-One</span> mapping to defines a single-valued association to another entity class that has many-to-one multiplicity.</p>
+<p><a id="sthref133" name="sthref133"></a><a id="sthref134" name="sthref134"></a><a id="sthref135" name="sthref135"></a><a id="sthref136" name="sthref136"></a>Use a <span class="bold">Many-to-One</span> mapping to defines a single-valued association to another entity class that has many-to-one multiplicity.</p>
<ol type="1" start="1">
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
@@ -43,22 +43,22 @@
<table class="RuleInformal" title="This table lists the fields ion the General tab for this mapping." summary="This table lists the fields ion the General tab for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t10">Property</th>
-<th align="left" valign="bottom" id="r1c2-t10">Description</th>
-<th align="left" valign="bottom" id="r1c3-t10">Default</th>
+<th align="left" valign="bottom" id="r1c1-t11">Property</th>
+<th align="left" valign="bottom" id="r1c2-t11">Description</th>
+<th align="left" valign="bottom" id="r1c3-t11">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t10" headers="r1c1-t10">Target Entity</td>
-<td align="left" headers="r2c1-t10 r1c2-t10">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r2c1-t10 r1c3-t10">null
+<td align="left" id="r2c1-t11" headers="r1c1-t11">Target Entity</td>
+<td align="left" headers="r2c1-t11 r1c2-t11">The entity to which this attribute is mapped.</td>
+<td align="left" headers="r2c1-t11 r1c3-t11">null
<p>You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t10" headers="r1c1-t10">Fetch Type</td>
-<td align="left" headers="r3c1-t10 r1c2-t10">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
+<td align="left" id="r3c1-t11" headers="r1c1-t11">Fetch Type</td>
+<td align="left" headers="r3c1-t11 r1c2-t11">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
<ul>
<li type="disc">
<p>Eager</p>
@@ -68,58 +68,30 @@
</li>
</ul>
</td>
-<td align="left" headers="r3c1-t10 r1c3-t10">Eager</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t10" headers="r1c1-t10">Cascade Type</td>
-<td align="left" headers="r4c1-t10 r1c2-t10">See <a href="ref_mapping_general.htm#CACJAIHB">"Cascade Type"</a> for details.
-<ul>
-<li type="disc">
-<p>Default</p>
-</li>
-<li type="disc">
-<p>All</p>
-</li>
-<li type="disc">
-<p>Persist</p>
-</li>
-<li type="disc">
-<p>Merge</p>
-</li>
-<li type="disc">
-<p>Remove</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r4c1-t10 r1c3-t10">Default</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r5c1-t10" headers="r1c1-t10">Optional</td>
-<td align="left" headers="r5c1-t10 r1c2-t10">Specifies if this field is can be null.</td>
-<td align="left" headers="r5c1-t10 r1c3-t10">Yes</td>
+<td align="left" headers="r3c1-t11 r1c3-t11">Eager</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblruleinformal" --></li>
<li>
-<p>Use this table to complete the fields on the <a href="reference006.htm#CACFCEJC">Join Columns Information</a> tab in the <span class="gui-object-title">JPA Details</span> view.</p>
+<p>Use this table to complete the fields on the <a href="reference007.htm#CACFCEJC">Join Columns Information</a> tab in the <span class="gui-object-title">JPA Details</span> view.</p>
<div class="inftblruleinformal">
<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t11">Property</th>
-<th align="left" valign="bottom" id="r1c2-t11">Description</th>
-<th align="left" valign="bottom" id="r1c3-t11">Default</th>
+<th align="left" valign="bottom" id="r1c1-t12">Property</th>
+<th align="left" valign="bottom" id="r1c2-t12">Description</th>
+<th align="left" valign="bottom" id="r1c3-t12">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t11" headers="r1c1-t11">Join Column</td>
-<td align="left" headers="r2c1-t11 r1c2-t11"><a id="sthref134" name="sthref134"></a><a id="sthref135" name="sthref135"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
+<td align="left" id="r2c1-t12" headers="r1c1-t12">Join Column</td>
+<td align="left" headers="r2c1-t12 r1c2-t12"><a id="sthref137" name="sthref137"></a><a id="sthref138" name="sthref138"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
</td>
-<td align="left" headers="r2c1-t11 r1c3-t11">By default, the mapping is assumed to have a single join.</td>
+<td align="left" headers="r2c1-t12 r1c3-t12">By default, the mapping is assumed to have a single join.</td>
</tr>
</tbody>
</table>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm
index b115ef0ff5..86f234e88b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks013.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:10 -->
+<!-- Run date = May 9, 2007 10:03:43 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>One-to-many mapping</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,7 +29,7 @@
</td>
</tr>
</table>
-<p><a id="sthref136" name="sthref136"></a><a id="sthref137" name="sthref137"></a><a id="sthref138" name="sthref138"></a><a id="sthref139" name="sthref139"></a>Use a <span class="bold">One-to-Many Mapping</span> to define a relationship with one-to-many multiplicity.</p>
+<p><a id="sthref139" name="sthref139"></a><a id="sthref140" name="sthref140"></a><a id="sthref141" name="sthref141"></a><a id="sthref142" name="sthref142"></a>Use a <span class="bold">One-to-Many Mapping</span> to define a relationship with one-to-many multiplicity.</p>
<ol type="1" start="1">
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
@@ -43,43 +43,20 @@
<table class="RuleInformal" title="This table lists the fields in the General tab of the Persistence Properties view for this mapping." summary="This table lists the fields in the General tab of the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t12">Property</th>
-<th align="left" valign="bottom" id="r1c2-t12">Description</th>
-<th align="left" valign="bottom" id="r1c3-t12">Default</th>
+<th align="left" valign="bottom" id="r1c1-t13">Property</th>
+<th align="left" valign="bottom" id="r1c2-t13">Description</th>
+<th align="left" valign="bottom" id="r1c3-t13">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t12" headers="r1c1-t12">Target Entity</td>
-<td align="left" headers="r2c1-t12 r1c2-t12">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r2c1-t12 r1c3-t12"><br /></td>
+<td align="left" id="r2c1-t13" headers="r1c1-t13">Target Entity</td>
+<td align="left" headers="r2c1-t13 r1c2-t13">The entity to which this attribute is mapped.</td>
+<td align="left" headers="r2c1-t13 r1c3-t13"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t12" headers="r1c1-t12">Cascade Type</td>
-<td align="left" headers="r3c1-t12 r1c2-t12">See <a href="ref_mapping_general.htm#CACJAIHB">"Cascade Type"</a> for details.
-<ul>
-<li type="disc">
-<p>Default</p>
-</li>
-<li type="disc">
-<p>All</p>
-</li>
-<li type="disc">
-<p>Persist</p>
-</li>
-<li type="disc">
-<p>Merge</p>
-</li>
-<li type="disc">
-<p>Remove</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r3c1-t12 r1c3-t12"><br /></td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t12" headers="r1c1-t12">Fetch Type</td>
-<td align="left" headers="r4c1-t12 r1c2-t12">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
+<td align="left" id="r3c1-t13" headers="r1c1-t13">Fetch Type</td>
+<td align="left" headers="r3c1-t13 r1c2-t13">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
<ul>
<li type="disc">
<p>Eager</p>
@@ -89,54 +66,60 @@
</li>
</ul>
</td>
-<td align="left" headers="r4c1-t12 r1c3-t12">Eager</td>
+<td align="left" headers="r3c1-t13 r1c3-t13">Eager</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t12" headers="r1c1-t12">Mapped By</td>
-<td align="left" headers="r5c1-t12 r1c2-t12">The database field that owns the relationship.</td>
-<td align="left" headers="r5c1-t12 r1c3-t12"><br /></td>
+<td align="left" id="r4c1-t13" headers="r1c1-t13">Mapped By</td>
+<td align="left" headers="r4c1-t13 r1c2-t13">The database field that owns the relationship.</td>
+<td align="left" headers="r4c1-t13 r1c3-t13"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r6c1-t12" headers="r1c1-t12">Order By</td>
-<td align="left" headers="r6c1-t12 r1c2-t12">Specify the default order for objects returned from a query. See <a href="ref_mapping_general.htm#CACDADIH">"Order By"</a> for details.
+<td align="left" id="r5c1-t13" headers="r1c1-t13">Order By</td>
+<td align="left" headers="r5c1-t13 r1c2-t13">Specify the default order for objects returned from a query. See <a href="ref_mapping_general.htm#CACDADIH">"Order By"</a> for details.
<ul>
<li type="disc">
+<p>No ordering</p>
+</li>
+<li type="disc">
<p>Primary key</p>
</li>
+<li type="disc">
+<p>Custom</p>
+</li>
</ul>
</td>
-<td align="left" headers="r6c1-t12 r1c3-t12">Primary key</td>
+<td align="left" headers="r5c1-t13 r1c3-t13">No ordering</td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblruleinformal" --></li>
<li>
-<p>Use this table to complete the <a href="reference005.htm#CACBAEBC">Join Table Information</a> fields in the JPA Details view.</p>
+<p>Use this table to complete the <a href="reference006.htm#CACBAEBC">Join Table Information</a> fields in the JPA Details view.</p>
<div class="inftblruleinformal">
<table class="RuleInformal" title="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." summary="This table lists the fields in the Join Table tab of the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t13">Property</th>
-<th align="left" valign="bottom" id="r1c2-t13">Description</th>
-<th align="left" valign="bottom" id="r1c3-t13">Default</th>
+<th align="left" valign="bottom" id="r1c1-t14">Property</th>
+<th align="left" valign="bottom" id="r1c2-t14">Description</th>
+<th align="left" valign="bottom" id="r1c3-t14">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t13" headers="r1c1-t13">Name</td>
-<td align="left" headers="r2c1-t13 r1c2-t13">Name of the join table</td>
-<td align="left" headers="r2c1-t13 r1c3-t13">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
+<td align="left" id="r2c1-t14" headers="r1c1-t14">Name</td>
+<td align="left" headers="r2c1-t14 r1c2-t14">Name of the join table</td>
+<td align="left" headers="r2c1-t14 r1c3-t14">By default, the name is assumed to be the primary tables associated with the entities concatenated with an underscore.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t13" headers="r1c1-t13">Join Columns</td>
-<td align="left" headers="r3c1-t13 r1c2-t13">Specify two or more join columns (that is, a primary key).</td>
-<td align="left" headers="r3c1-t13 r1c3-t13"><br /></td>
+<td align="left" id="r3c1-t14" headers="r1c1-t14">Join Columns</td>
+<td align="left" headers="r3c1-t14 r1c2-t14">Specify two or more join columns (that is, a primary key).</td>
+<td align="left" headers="r3c1-t14 r1c3-t14"><br /></td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r4c1-t13" headers="r1c1-t13">Inverse Join Columns</td>
-<td align="left" headers="r4c1-t13 r1c2-t13">The join column on the owned (or inverse) side of the association: the owned entity's primary key column.</td>
-<td align="left" headers="r4c1-t13 r1c3-t13"><br /></td>
+<td align="left" id="r4c1-t14" headers="r1c1-t14">Inverse Join Columns</td>
+<td align="left" headers="r4c1-t14 r1c2-t14">The join column on the owned (or inverse) side of the association: the owned entity's primary key column.</td>
+<td align="left" headers="r4c1-t14 r1c3-t14"><br /></td>
</tr>
</tbody>
</table>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm
index a02c8fe0e4..0dec6fd656 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks014.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:11 -->
+<!-- Run date = May 9, 2007 10:03:44 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>One-to-one mapping</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,7 +29,7 @@
</td>
</tr>
</table>
-<p><a id="sthref140" name="sthref140"></a><a id="sthref141" name="sthref141"></a><a id="sthref142" name="sthref142"></a><a id="sthref143" name="sthref143"></a>Use a <span class="bold">One-to-One Mapping</span> to define a relationship with one-to-many multiplicity.</p>
+<p><a id="sthref143" name="sthref143"></a><a id="sthref144" name="sthref144"></a><a id="sthref145" name="sthref145"></a><a id="sthref146" name="sthref146"></a>Use a <span class="bold">One-to-One Mapping</span> to define a relationship with one-to-many multiplicity.</p>
<ol type="1" start="1">
<li>
<p>In the <a href="ref_persistence_outline.htm#BABEGGFE">JPA Structure view</a>, select the field to map. The <a href="ref_persistence_map_view.htm#BABIFBAF">JPA Details view (for attributes)</a> displays the properties for the selected.</p>
@@ -43,45 +43,22 @@
<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t14">Property</th>
-<th align="left" valign="bottom" id="r1c2-t14">Description</th>
-<th align="left" valign="bottom" id="r1c3-t14">Default</th>
+<th align="left" valign="bottom" id="r1c1-t15">Property</th>
+<th align="left" valign="bottom" id="r1c2-t15">Description</th>
+<th align="left" valign="bottom" id="r1c3-t15">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t14" headers="r1c1-t14">Target Entity</td>
-<td align="left" headers="r2c1-t14 r1c2-t14">The entity to which this attribute is mapped.</td>
-<td align="left" headers="r2c1-t14 r1c3-t14">null
+<td align="left" id="r2c1-t15" headers="r1c1-t15">Target Entity</td>
+<td align="left" headers="r2c1-t15 r1c2-t15">The entity to which this attribute is mapped.</td>
+<td align="left" headers="r2c1-t15 r1c3-t15">null
<p>You do not need to explicitly specify the target entity, since it can be inferred from the type of object being referenced.</p>
</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t14" headers="r1c1-t14">Cascade Type</td>
-<td align="left" headers="r3c1-t14 r1c2-t14">See <a href="ref_mapping_general.htm#CACJAIHB">"Cascade Type"</a> for details.
-<ul>
-<li type="disc">
-<p>Default</p>
-</li>
-<li type="disc">
-<p>All</p>
-</li>
-<li type="disc">
-<p>Persist</p>
-</li>
-<li type="disc">
-<p>Merge</p>
-</li>
-<li type="disc">
-<p>Remove</p>
-</li>
-</ul>
-</td>
-<td align="left" headers="r3c1-t14 r1c3-t14">Default</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r4c1-t14" headers="r1c1-t14">Fetch Type</td>
-<td align="left" headers="r4c1-t14 r1c2-t14">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
+<td align="left" id="r3c1-t15" headers="r1c1-t15">Fetch Type</td>
+<td align="left" headers="r3c1-t15 r1c2-t15">Defines how data is loaded from the database. See <a href="ref_mapping_general.htm#CACGGGHB">"Fetch Type"</a> for details.
<ul>
<li type="disc">
<p>Eager</p>
@@ -91,40 +68,35 @@
</li>
</ul>
</td>
-<td align="left" headers="r4c1-t14 r1c3-t14">Eager</td>
+<td align="left" headers="r3c1-t15 r1c3-t15">Eager</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r5c1-t14" headers="r1c1-t14">Optional</td>
-<td align="left" headers="r5c1-t14 r1c2-t14">Specifies if this field is can be null.</td>
-<td align="left" headers="r5c1-t14 r1c3-t14">Yes</td>
-</tr>
-<tr align="left" valign="top">
-<td align="left" id="r6c1-t14" headers="r1c1-t14">Mapped By</td>
-<td align="left" headers="r6c1-t14 r1c2-t14">The database field that owns the relationship.</td>
-<td align="left" headers="r6c1-t14 r1c3-t14"><br /></td>
+<td align="left" id="r4c1-t15" headers="r1c1-t15">Mapped By</td>
+<td align="left" headers="r4c1-t15 r1c2-t15">The database field that owns the relationship.</td>
+<td align="left" headers="r4c1-t15 r1c3-t15"><br /></td>
</tr>
</tbody>
</table>
<br /></div>
<!-- class="inftblruleinformal" --></li>
<li>
-<p>Use this table to complete the <a href="reference006.htm#CACFCEJC">Join Columns Information</a> fields in the <span class="gui-object-title">JPA Details</span> view.</p>
+<p>Use this table to complete the <a href="reference007.htm#CACFCEJC">Join Columns Information</a> fields in the <span class="gui-object-title">JPA Details</span> view.</p>
<div class="inftblruleinformal">
<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t15">Property</th>
-<th align="left" valign="bottom" id="r1c2-t15">Description</th>
-<th align="left" valign="bottom" id="r1c3-t15">Default</th>
+<th align="left" valign="bottom" id="r1c1-t16">Property</th>
+<th align="left" valign="bottom" id="r1c2-t16">Description</th>
+<th align="left" valign="bottom" id="r1c3-t16">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t15" headers="r1c1-t15">Join Column</td>
-<td align="left" headers="r2c1-t15 r1c2-t15"><a id="sthref144" name="sthref144"></a><a id="sthref145" name="sthref145"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
+<td align="left" id="r2c1-t16" headers="r1c1-t16">Join Column</td>
+<td align="left" headers="r2c1-t16 r1c2-t16"><a id="sthref147" name="sthref147"></a><a id="sthref148" name="sthref148"></a>Specify a mapped column for joining an entity association. This field corresponds to the <code>@JoinColum</code> attribute.
<p>Select <span class="bold">Override Default</span>, then Add, Edit, or Remove the join columns.</p>
</td>
-<td align="left" headers="r2c1-t15 r1c3-t15">By default, the mapping is assumed to have a single join.</td>
+<td align="left" headers="r2c1-t16 r1c3-t16">By default, the mapping is assumed to have a single join.</td>
</tr>
</tbody>
</table>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm
index c0ce649c80..6240c77754 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks015.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:11 -->
+<!-- Run date = May 9, 2007 10:03:44 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Transient mapping</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,7 +29,7 @@
</td>
</tr>
</table>
-<p><a id="sthref146" name="sthref146"></a><a id="sthref147" name="sthref147"></a><a id="sthref148" name="sthref148"></a><a id="sthref149" name="sthref149"></a>Use the Transient Mapping to specify a or field of the entity class that <span class="italic">is not</span> persistent.</p>
+<p><a id="sthref149" name="sthref149"></a><a id="sthref150" name="sthref150"></a><a id="sthref151" name="sthref151"></a><a id="sthref152" name="sthref152"></a>Use the Transient Mapping to specify a or field of the entity class that <span class="italic">is not</span> persistent.</p>
<p>To create a version mapping:</p>
<ol type="1" start="1">
<li>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm
index bdd0b205fc..6b0613759b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks016.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:11 -->
+<!-- Run date = May 9, 2007 10:03:44 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Version mapping</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,7 +29,7 @@
</td>
</tr>
</table>
-<p><a id="sthref150" name="sthref150"></a><a id="sthref151" name="sthref151"></a><a id="sthref152" name="sthref152"></a><a id="sthref153" name="sthref153"></a>Use a <span class="bold">Version Mapping</span> to specify the field used for optimistic locking. If the entity is associated with multiple tables, you should use a version mapping only with the primary table. You should have only a single version mapping per persistent entity. Version mappings may be used only with the following attribute types:</p>
+<p><a id="sthref153" name="sthref153"></a><a id="sthref154" name="sthref154"></a><a id="sthref155" name="sthref155"></a><a id="sthref156" name="sthref156"></a>Use a <span class="bold">Version Mapping</span> to specify the field used for optimistic locking. If the entity is associated with multiple tables, you should use a version mapping only with the primary table. You should have only a single version mapping per persistent entity. Version mappings may be used only with the following attribute types:</p>
<ul>
<li type="disc">
<p><code>int</code></p>
@@ -61,31 +61,38 @@
<table class="RuleInformal" title="This table lists the fields in the Persistence Properties view for this mapping." summary="This table lists the fields in the Persistence Properties view for this mapping." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t16">Property</th>
-<th align="left" valign="bottom" id="r1c2-t16">Description</th>
-<th align="left" valign="bottom" id="r1c3-t16">Default</th>
+<th align="left" valign="bottom" id="r1c1-t17">Property</th>
+<th align="left" valign="bottom" id="r1c2-t17">Description</th>
+<th align="left" valign="bottom" id="r1c3-t17">Default</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t16" headers="r1c1-t16">Column</td>
-<td align="left" headers="r2c1-t16 r1c2-t16">The database column (and its table) mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.
+<td align="left" id="r2c1-t17" headers="r1c1-t17">Column</td>
+<td align="left" headers="r2c1-t17 r1c2-t17">The database column mapped to the entity attribute. See <a href="ref_mapping_general.htm#CACGCBHB">"Column"</a> for details.</td>
+<td align="left" headers="r2c1-t17 r1c3-t17">By default, the Column is assumed to be named identically to the attribute and always included in the <code>INSERT</code> and <code>UPDATE</code> statements.</td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r3c1-t17" headers="r1c1-t17">Table</td>
+<td align="left" headers="r3c1-t17 r1c2-t17">Name of the database table. This must be the primary table associated with the attribute's entity.</td>
+<td align="left" headers="r3c1-t17 r1c3-t17"><br /></td>
+</tr>
+<tr align="left" valign="top">
+<td align="left" id="r4c1-t17" headers="r1c1-t17">Temporal</td>
+<td align="left" headers="r4c1-t17 r1c2-t17">Specifies the type of data. See <a href="ref_mapping_general.htm#CACEAJGD">"Temporal"</a> for details.
<ul>
<li type="disc">
-<p>Name &ndash; Name of the database column.</p>
-</li>
-<li type="disc">
-<p>Table &ndash; Name of the database table. This must be the primary table associated with the attribute's entity.</p>
+<p>Date</p>
</li>
<li type="disc">
-<p>Insertable &ndash; Specify if the column is always included in <code>SQL INSERT</code> statements.</p>
+<p>Time</p>
</li>
<li type="disc">
-<p>Updatable &ndash; Specify if the column is always included in <code>SQL UPDATE</code> statements.</p>
+<p>Timestamp</p>
</li>
</ul>
</td>
-<td align="left" headers="r2c1-t16 r1c3-t16">By default, the Column is assumed to be named identically to the attribute and always included in the <code>INSERT</code> and <code>UPDATE</code> statements.</td>
+<td align="left" headers="r4c1-t17 r1c3-t17"><br /></td>
</tr>
</tbody>
</table>
@@ -95,8 +102,7 @@
<p>Eclipse adds the following annotations to the field:</p>
<pre xml:space="preserve" class="oac_no_warn">
@Version
-@Column(table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>", name="&lt;<span class="italic">COLUMN_NAME</span>&gt;", insertable=false,
- updatable=false)
+@Column(table="<span class="italic">&lt;COLUMN_TABLE&gt;</span>", name="&lt;<span class="italic">COLUMN_NAME</span>&gt;")
</pre>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm
index f78f1a6eff..84a2fa40b4 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks017.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:11 -->
+<!-- Run date = May 9, 2007 10:03:44 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Generating entities from tables</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,13 +29,13 @@
</td>
</tr>
</table>
-<p><a id="sthref154" name="sthref154"></a><a id="sthref155" name="sthref155"></a>Use this procedure to generate Java persistent entities from database tables. You must create a JPA project and establish a database connection <span class="italic">before</span> generating persistent entities. See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> for more information.</p>
+<p><a id="sthref157" name="sthref157"></a><a id="sthref158" name="sthref158"></a>Use this procedure to generate Java persistent entities from database tables. You must create a JPA project and establish a database connection <span class="italic">before</span> generating persistent entities. See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> for more information.</p>
<ol type="1" start="1">
<li>
<p>Right-click the JPA project in the <span class="gui-object-title">Package Explorer</span> and select <span class="gui-object-action">JPA Tools &gt; Generate Entities</span>.</p>
-<div class="figure"><a id="sthref156" name="sthref156"></a>
+<div class="figure"><a id="sthref159" name="sthref159"></a>
<p class="titleinfigure">Generating Entities</p>
-<img src="img/generate_entities.png" alt="Using the Java Persistence &gt; Generate Entities menu option." title="Using the Java Persistence &gt; Generate Entities menu option." /><br /></div>
+<img src="img/generate_entities.png" alt="Using the JPA Tools &gt; Generate Entities menu option." title="Using the JPA Tools &gt; Generate Entities menu option." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>If you are not currently connected to the database, the Database Connection page appears. Select your database connection and schema, and click <span class="bold">Reconnect</span>.</p>
@@ -43,7 +43,7 @@
<p>After connecting to the database, click <span class="bold">Next</span>.</p>
</li>
<li>
-<p><a id="sthref157" name="sthref157"></a><a id="sthref158" name="sthref158"></a>On the <a href="task_generate_entities.htm#CACDAFJD">Generate Entities from Tables dialog</a> dialog, select the tables from which to generate Java persistent entities and click <span class="bold">Finish</span>.</p>
+<p><a id="sthref160" name="sthref160"></a><a id="sthref161" name="sthref161"></a>On the <a href="task_generate_entities.htm#CACDAFJD">Generate Entities from Tables dialog</a> dialog, select the tables from which to generate Java persistent entities and click <span class="bold">Finish</span>.</p>
</li>
</ol>
<p>Eclipse creates a Java persistent entity for each database table. Each entity contains fields based on the table's columns. Eclipse will also generate entity relationships (such as one-to-one) based on the table constraints. <a href="#CIHJIJJC">Figure: Generating Entities from Tables</a> illustrates how Eclipse generates entities from tables.</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm
index 1835c972c1..dec0f8155c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks018.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:11 -->
+<!-- Run date = May 9, 2007 10:03:44 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Validating mappings and reporting problems</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,8 +29,8 @@
</td>
</tr>
</table>
-<p><a id="sthref166" name="sthref166"></a><a id="sthref167" name="sthref167"></a><a id="sthref168" name="sthref168"></a><a id="sthref169" name="sthref169"></a>Errors and warnings on persistent entities and mappings are indicated with a red error or yellow warning next to the resource with the error, as well as the parent containers up to the project.</p>
-<div class="figure"><a id="sthref170" name="sthref170"></a>
+<p><a id="sthref162" name="sthref162"></a><a id="sthref163" name="sthref163"></a><a id="sthref164" name="sthref164"></a><a id="sthref165" name="sthref165"></a>Errors and warnings on persistent entities and mappings are indicated with a red error or yellow warning next to the resource with the error, as well as the parent containers up to the project.</p>
+<div class="figure"><a id="sthref166" name="sthref166"></a>
<p class="titleinfigure">Sample Errors and Warnings</p>
<img src="img/error_sample.png" alt="This figure shows sample error and warning icons in the Explorer view." title="This figure shows sample error and warning icons in the Explorer view." /><br /></div>
<!-- class="figure" -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm
index 7122d145dc..194b27adcc 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks019.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:11 -->
+<!-- Run date = May 9, 2007 10:03:44 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Error messages</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -25,84 +25,86 @@
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<tr valign="bottom">
<td align="left" width="86%">
-<h1>Error messages<a id="sthref171" name="sthref171"></a></h1>
+<h1>Error messages<a id="sthref167" name="sthref167"></a></h1>
</td>
</tr>
</table>
<p>This section contains information on error messages (including how to resolve the issue) you may encounter while working with Dali.</p>
-<a id="sthref172" name="sthref172"></a>
+<a id="sthref168" name="sthref168"></a>
<p class="subhead2">Attribute "<span class="italic">&lt;ATTRIBUTE__NAME&gt;</span>" has invalid mapping type in this context</p>
-<p>Meaning</p>
-<a id="sthref173" name="sthref173"></a>
+<p>The mapped attribute is invalid. Either change the mapping type or change the entity type.</p>
+<p>See <a href="task_mapping.htm#BABDGBIJ">"Mapping an entity"</a> for more information.</p>
+<a id="sthref169" name="sthref169"></a>
<p class="subhead2">Attribute "<span class="italic">&lt;ATTRIBUTE_NAME&gt;</span>" cannot be resolved.</p>
-<p>Meaning</p>
-<a id="sthref174" name="sthref174"></a>
-<p class="subhead2">Class "<span class="italic">&lt;CLASS_NAME&gt;</span>" cannot be resolved.</p>
-<p>Meaning</p>
-<a id="sthref175" name="sthref175"></a>
+<p>Dali cannot map the attribute to a database table and column. Verify that you database connection information is correct.</p>
+<p>See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> for more information.</p>
+<a id="sthref170" name="sthref170"></a>
<p class="subhead2">Class "<span class="italic">&lt;CLASS_NAME&gt;</span>" is not annotated as a persistent class.</p>
<p>The class has not been identified as a persistent class. Configure the class as an Entity, Mapped Superclass, or Embeddable persistent entity.</p>
<p>See <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a>.</p>
-<a id="sthref176" name="sthref176"></a>
+<a id="sthref171" name="sthref171"></a>
<p class="subhead2">Column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" cannot be resolved.</p>
<p>You mapped an entity's field to an incorrect or invalid column in the database table. By default, Dali will attempt to map each field in the entity with an identically named row in the database table. If the field's name differs from the row's name, you must explicitly create the mapping.</p>
<p>Map the field to a valid row in the database table as shown in <a href="task_mapping.htm#BABDGBIJ">"Mapping an entity"</a>.</p>
-<a id="sthref177" name="sthref177"></a>
+<a id="sthref172" name="sthref172"></a>
<p class="subhead2">Duplicate class "<span class="italic">&lt;CLASS_NAME&gt;</span>".</p>
<p>You created to persistence classes with the same name. Each Java class must have a unique name. See <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a> for more information.</p>
-<a id="sthref178" name="sthref178"></a>
+<a id="sthref173" name="sthref173"></a>
<p class="subhead2">Duplicate mapping file "<span class="italic">&lt;FILE_NAME&gt;</span>".</p>
<p>Meaning</p>
-<a id="sthref179" name="sthref179"></a>
+<a id="sthref174" name="sthref174"></a>
<p class="subhead2">Entity does not have an Id or Embedded Id.</p>
<p>You created a persistent entity without identifying its primary key. A persistent entity must have a primary key field designated with an <code>@Id</code> or <code>@EmbeddedId</code> annotation.</p>
<p>Add an ID mapping to the entity as shown in <a href="tasks010.htm#BABGCBHG">"ID mapping"</a> or <a href="tasks009.htm#CIHDIAEE">"Embedded ID mapping"</a>.</p>
-<a id="sthref180" name="sthref180"></a>
+<a id="sthref175" name="sthref175"></a>
<p class="subhead2">In virtual association override "<span class="italic">&lt;ITEM&gt;</span>" cannot be resolved.</p>
<p>Meaning</p>
-<a id="sthref181" name="sthref181"></a>
+<a id="sthref176" name="sthref176"></a>
<p class="subhead2">In virtual attribute "<span class="italic">&lt;ITEM&gt;</span>" cannot be resolved.</p>
<p>Meaning</p>
-<a id="sthref182" name="sthref182"></a>
+<a id="sthref177" name="sthref177"></a>
<p class="subhead2">Invalid content (no root node).</p>
<p>Meaning</p>
-<a id="sthref183" name="sthref183"></a>
+<a id="sthref178" name="sthref178"></a>
<p class="subhead2">Join column/table "<span class="italic">&lt;COLUMN/TABLE_NAME&gt;</span>" cannot be resolved.</p>
<p>Meaning</p>
-<a id="sthref184" name="sthref184"></a>
+<a id="sthref179" name="sthref179"></a>
<p class="subhead2">Mapping file "<span class="italic">&lt;MAPPING_FILE&gt;</span>" cannot be resolved.</p>
<p>Meaning</p>
-<a id="sthref185" name="sthref185"></a>
+<a id="sthref180" name="sthref180"></a>
<p class="subhead2">Mapping file "<span class="italic">&lt;MAPPING_FILE&gt;</span>" does not have ORM content.</p>
<p>Meaning</p>
-<a id="sthref186" name="sthref186"></a>
+<a id="sthref181" name="sthref181"></a>
<p class="subhead2">Metadata for persistence unit "<span class="italic">&lt;PERSISTENCE_UNIT&gt;</span>" specified in multiple mapping files.</p>
<p>Meaning</p>
-<a id="sthref187" name="sthref187"></a>
+<a id="sthref182" name="sthref182"></a>
<p class="subhead2">Multiple persistence units defined.</p>
<p>informationPending</p>
-<a id="sthref188" name="sthref188"></a>
+<a id="sthref183" name="sthref183"></a>
<p class="subhead2">Multiple persistence.xml files in project.</p>
<p>You created a JPA project with more than one <code>persistence.xml</code> file. Each JPA project must contain a <span class="italic">single</span> <code>persistence.xml</code> file.</p>
<p>See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for more information.</p>
-<a id="sthref189" name="sthref189"></a>
+<a id="sthref184" name="sthref184"></a>
<p class="subhead2">No generator named "<span class="italic">&lt;GENERATOR_NAME&gt;</span>" is defined in persistence unit.</p>
-<p>You created a persistence entity that uses sequencing, but did not define include the sequence generator in the <code>psersistence.xml</code> file. Synchronize the <code>persistence.xml</code> file with your current project. See <a href="tasks002.htm#CIHFEBAI">"Synchronizing classes"</a> for more information.</p>
-<a id="sthref190" name="sthref190"></a>
+<p>You created a persistence entity that uses sequencing, but did not define include the sequence generator in the <code>psersistence.xml</code> file. Synchronize the <code>persistence.xml</code> file with your current project.</p>
+<p>See <a href="tasks002.htm#CIHFEBAI">"Synchronizing classes"</a> for more information.</p>
+<a id="sthref185" name="sthref185"></a>
<p class="subhead2">No persistence unit defined.</p>
-<p>informationPending</p>
-<a id="sthref191" name="sthref191"></a>
+<p>There is no <code>&lt;persistence-unit-metadata&gt;</code> information in the <code>orm.xml</code> file. Add the default persistence unit information.</p>
+<p>See <a href="task_manage_orm.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
+<a id="sthref186" name="sthref186"></a>
<p class="subhead2">No persistence.xml file in project.</p>
<p>You created a JPA project without a <code>persistence.xml</code> file. Each JPA project must contain a <span class="italic">single</span> <code>persistence.xml</code> file.</p>
<p>See <a href="task_manage_persistence.htm#CIHDAJID">"Managing the persistence.xml file"</a> for more information.</p>
-<a id="sthref192" name="sthref192"></a>
+<a id="sthref187" name="sthref187"></a>
<p class="subhead2">Referenced column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" in join column "<span class="italic">&lt;COLUMN_NAME&gt;</span>" cannot be resolved.</p>
-<p>The column that you selected to join a relationship mapping does not exist on the database table. Either select a different column on the <a href="reference005.htm#CACBAEBC">Join Table Information</a> or create the necessary column on the database table.</p>
+<p>The column that you selected to join a relationship mapping does not exist on the database table. Either select a different column on the <a href="reference006.htm#CACBAEBC">Join Table Information</a> or create the necessary column on the database table.</p>
<p>See <a href="ref_persistence_map_view.htm#BABIFBAF">"JPA Details view (for attributes)"</a> for more information.</p>
-<a id="sthref193" name="sthref193"></a>
+<a id="sthref188" name="sthref188"></a>
<p class="subhead2">Schema "&lt;<span class="italic">SCHEMA_NAME</span>&gt;" cannot be resolved for table/join table "&lt;<span class="italic">TABLE_NAME</span>&gt;".</p>
-<p>informationPending</p>
-<a id="sthref194" name="sthref194"></a>
+<p>Define the default database schema information in the persistence unit.</p>
+<p>See <a href="task_manage_orm.htm#CIHDGDCD">"Managing the orm.xml file"</a> for more information.</p>
+<a id="sthref189" name="sthref189"></a>
<p class="subhead2">Table "<span class="italic">&lt;TABLE_NAME&gt;</span>" cannot be resolved.</p>
<p>You associated a persistent entity to an incorrect or invalid database table. By default, Dali will attempt to associate each persistent entity with an identically named database table. If the entity's name differs from the table's name, you must explicitly create the association.</p>
<p>Associate the entity with a valid database table as shown in <a href="task_add_persistence.htm#BABHICAI">"Adding persistence to a class"</a>.</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm
index c1f404a110..9c157ff794 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks020.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:44 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Warning messages</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -30,10 +30,10 @@
</tr>
</table>
<p>This section contains information on warning messages (including how to resolve the issue) you may encounter while working with Dali.</p>
-<a id="sthref195" name="sthref195"></a>
+<a id="sthref190" name="sthref190"></a>
<p class="subhead2">Connection "<span class="italic">&lt;CONNECTION_NAME&gt;</span>" is not active. No validation will be done against the data source.</p>
<p>The database connection you specified to use with the JPA project is not active. The JPA project requires an active connection.</p>
-<a id="sthref196" name="sthref196"></a>
+<a id="sthref191" name="sthref191"></a>
<p class="subhead2">No connection specified for the project. No data-specific validation will be performed.</p>
<p>You created a JPA project without specifying a database connection. The JPA project requires an active connection.</p>
<p>See <a href="task_create_new_project.htm#CIHHEJCJ">"Creating a new JPA project"</a> or <a href="tasks021.htm#BABDBCBI">"Modifying persistent project properties"</a> for information on specifying a database connection.</p>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm
index 401313a003..800d50d6e2 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks021.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:12 -->
+<!-- Run date = May 9, 2007 10:03:45 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Modifying persistent project properties</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -34,9 +34,9 @@
<ol type="1" start="1">
<li>
<p>Right-click the project in the <span class="gui-object-title">Explorer</span> view and select <span class="gui-object-action">Properties</span>. The Properties page appears.</p>
-<div class="figure"><a id="sthref197" name="sthref197"></a>
+<div class="figure"><a id="sthref192" name="sthref192"></a>
<p class="titleinfigure">Properties &ndash; Persistence Page</p>
-<img src="img/properties_persistence.png" alt="This figure shows the Java Persistence options on the Properties dialog." title="This figure shows the Java Persistence options on the Properties dialog." /><br /></div>
+<img src="img/properties_persistence.png" alt="This figure shows the JPA options on the Properties dialog." title="This figure shows the JPA options on the Properties dialog." /><br /></div>
<!-- class="figure" --></li>
<li>
<p>Use this table to complete the remaining fields on the Properties &ndash; JPA page and click <span class="bold">OK</span>.</p>
@@ -44,18 +44,18 @@
<table class="RuleInformal" title="This table lists the fields in the Properties - Java Persistence dialog." summary="This table lists the fields in the Properties - Java Persistence dialog." dir="ltr" border="1" width="100%" frame="border" rules="all" cellpadding="3" cellspacing="0">
<thead>
<tr align="left" valign="top">
-<th align="left" valign="bottom" id="r1c1-t17">Property</th>
-<th align="left" valign="bottom" id="r1c2-t17">Description</th>
+<th align="left" valign="bottom" id="r1c1-t18">Property</th>
+<th align="left" valign="bottom" id="r1c2-t18">Description</th>
</tr>
</thead>
<tbody>
<tr align="left" valign="top">
-<td align="left" id="r2c1-t17" headers="r1c1-t17">Platform</td>
-<td align="left" headers="r2c1-t17 r1c2-t17">Select the vendor-specific platform for the JPA implementation.</td>
+<td align="left" id="r2c1-t18" headers="r1c1-t18">Platform</td>
+<td align="left" headers="r2c1-t18 r1c2-t18">Select the vendor-specific platform for the JPA implementation.</td>
</tr>
<tr align="left" valign="top">
-<td align="left" id="r3c1-t17" headers="r1c1-t17">Database Connection</td>
-<td align="left" headers="r3c1-t17 r1c2-t17">Database connection to use to store the persistent entities. To create a new connection, click <span class="bold">Add Connection</span>.</td>
+<td align="left" id="r3c1-t18" headers="r1c1-t18">Database Connection</td>
+<td align="left" headers="r3c1-t18 r1c2-t18">Database connection to use to store the persistent entities. To create a new connection, click <span class="bold">Add Connection</span>.</td>
</tr>
</tbody>
</table>
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 5fe7ef6e8e..56e1127307 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,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:14 -->
+<!-- Run date = May 9, 2007 10:03:47 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Tips and tricks</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml b/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml
index 665a299bf7..f2f8033ede 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml
@@ -41,7 +41,7 @@
<topic href="tasks001.htm#CIHEJAIE" label="Working with persistence.xml file" />
<topic href="tasks002.htm#CIHFEBAI" label="Synchronizing classes" />
</topic>
- <topic href="task_manage_persistence001.htm#CIHDGDCD" label="Managing the orm.xml file">
+ <topic href="task_manage_orm.htm#CIHDGDCD" label="Managing the orm.xml file">
<topic href="tasks003.htm#CIHBCDCE" label="Working with orm.xml file" />
</topic>
<topic href="task_add_persistence.htm#BABHICAI" label="Adding persistence to a class">
@@ -49,7 +49,8 @@
<topic href="tasks005.htm#BABFEICE" label="Embeddable" />
<topic href="tasks006.htm#BABDAGCI" label="Mapped superclass" />
</topic>
- <topic href="task_inheritance.htm#CIHCCCJD" label="Specifying entity inheritance" />
+ <topic href="task_inheritance.htm#CIHGBIEI" label="Specifying additional tables" />
+ <topic href="task_inheritance001.htm#CIHCCCJD" label="Specifying entity inheritance" />
<topic href="task_mapping.htm#BABDGBIJ" label="Mapping an entity">
<topic href="tasks007.htm#BABBABCE" label="Basic mapping" />
<topic href="tasks008.htm#BABCBHDF" label="Embedded mapping" />
@@ -63,7 +64,6 @@
<topic href="tasks016.htm#BABHIBII" label="Version mapping" />
</topic>
<topic href="tasks017.htm#BABBAGFI" label="Generating entities from tables" />
- <topic href="task_generate_ddl.htm#BABJJIAA" label="Generating tables (DDL scripts) from entities" />
<topic href="tasks018.htm#BABFAIBA" label="Validating mappings and reporting problems">
<topic href="tasks019.htm#CIHFEDEI" label="Error messages" />
<topic href="tasks020.htm#CIHGEAIJ" label="Warning messages" />
@@ -80,15 +80,16 @@
<topic label="Property pages">
<topic href="ref_persistence_prop_view.htm#BABFAEBB" label="JPA Details view (for entities)">
<topic href="reference003.htm#CACCAGGC" label="General information" />
- <topic href="reference004.htm#CACFHGHE" label="Inheritance information" />
+ <topic href="reference004.htm#CACBHIDA" label="Secondary table information" />
+ <topic href="reference005.htm#CACFHGHE" label="Inheritance information" />
</topic>
<topic href="ref_persistence_map_view.htm#BABIFBAF" label="JPA Details view (for attributes)">
<topic href="ref_mapping_general.htm#CACBHFIJ" label="General information" />
- <topic href="reference005.htm#CACBAEBC" label="Join Table Information" />
- <topic href="reference006.htm#CACFCEJC" label="Join Columns Information" />
+ <topic href="reference006.htm#CACBAEBC" label="Join Table Information" />
+ <topic href="reference007.htm#CACFCEJC" label="Join Columns Information" />
<topic href="ref_primary_key.htm#CACFCCAB" label="Primary Key Generation information" />
</topic>
- <topic href="reference007.htm#CACGDGHC" label="JPA Details view (for orm.xml)">
+ <topic href="ref_details_orm.htm#CACGDGHC" label="JPA Details view (for orm.xml)">
<topic href="reference008.htm#CACCACGH" label="General information" />
<topic href="reference009.htm#CACEAGBG" label="Persistence Unit information" />
</topic>
@@ -102,12 +103,12 @@
<topic href="reference012.htm#CACCGEHC" label="Edit Join Columns Dialog" />
<topic href="reference013.htm#CACHJAGB" label="Database Connection Dialog" />
</topic>
- <topic href="ref_persistence_perspective.htm#BABIFBDB" label="JPA perspective" />
+ <topic href="ref_persistence_perspective.htm#BABIFBDB" label="JPA Development perspective" />
<topic label="Icons and buttons">
<topic href="reference015.htm#CACGEACG" label="Icons" />
<topic href="reference016.htm#CACDJCEI" label="Buttons" />
</topic>
- <topic href="reference017.htm#sthref247" label="Javadoc" />
+ <topic href="reference017.htm#sthref245" label="Javadoc" />
<topic href="reference018.htm#CACBBDIB" label="Dali Developer Documentation" />
</topic>
<topic href="tips_and_tricks.htm" label="Tips and tricks" />
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 c8928739b8..efe48fa9b0 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:14 -->
+<!-- Run date = May 9, 2007 10:03:47 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>What's new</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -34,10 +34,10 @@
<p><a href="whats_new001.htm#BGGCJJBD">Generate Persistent Entities from Tables wizard</a></p>
</li>
<li type="disc">
-<p><a href="whats_new002.htm#CEGIDCCE">Generate DDL from Entities wizard</a></p>
+<p><a href="whats_new002.htm#CEGBCIBB">Create and Manage the persistence.xml file</a></p>
</li>
<li type="disc">
-<p><a href="whats_new003.htm#CEGBCIBB">Create and Manage the persistence.xml file</a></p>
+<p><a href="whats_new003.htm#CEGJJBEE">Create and Manage the orm.xml file</a></p>
</li>
</ul>
<!-- Start Footer -->
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm
index 464046314a..aa704ee2d2 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new001.htm
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:14 -->
+<!-- Run date = May 9, 2007 10:03:47 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
<title>Generate Persistent Entities from Tables wizard</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
@@ -29,10 +29,10 @@
</td>
</tr>
</table>
-<p>Use the <span class="gui-object-title">Generate Entities from Tables</span> wizard to quickly create Java persistent entities from your database tables.</p>
-<div class="figure"><a id="sthref251" name="sthref251"></a>
+<p>Use the <span class="gui-object-title">Generate Entities from Tables</span> wizard to quickly create JPA entities from your database tables.</p>
+<div class="figure"><a id="sthref249" name="sthref249"></a>
<p class="titleinfigure">Generating Entities</p>
-<img src="img/generate_entities.png" alt="This figure shows selecting the Java Persistence &gt; Generate Entities option." title="This figure shows selecting the Java Persistence &gt; Generate Entities option." /><br /></div>
+<img src="img/generate_entities.png" alt="Selecting the JPA Tools &gt; Generate Entities option." title="Selecting the JPA Tools &gt; Generate Entities option." /><br /></div>
<!-- class="figure" -->
<p>Dali automatically creates the necessary OR mappings, based on your database table constraints.</p>
<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm
index 89342852e0..7c0965d731 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new002.htm
@@ -2,16 +2,16 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:14 -->
+<!-- Run date = May 9, 2007 10:03:47 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
-<title>Generate DDL from Entities wizard</title>
+<title>Create and Manage the persistence.xml file</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<meta name="generator" content="Oracle DARB XHTML Converter - Version 4.5.3 Build 02" />
<meta name="date" content="2005-07-10T12:57:20+08:00" />
<meta name="robots" content="all" scheme="http://www.robotstxt.org/" />
-<meta name="doctitle" content="Generate DDL from Entities wizard" />
+<meta name="doctitle" content="Create and Manage the persistence.xml file" />
<meta name="relnum" content="Release 1.0.0" />
<meta name="partnum" content="" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -20,26 +20,29 @@
<link rel="contents" href="toc.htm" title="Contents" type="text/html" />
</head>
<body>
-<p><a id="CEGIDCCE" name="CEGIDCCE"></a></p>
+<p><a id="CEGBCIBB" name="CEGBCIBB"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<tr valign="bottom">
<td align="left" width="86%">
-<h1>Generate DDL from Entities wizard</h1>
+<h1>Create and Manage the persistence.xml file</h1>
</td>
</tr>
</table>
-<p>Use the <span class="gui-object-title">Generate DDL</span> wizard to quickly create DDL scripts from your persistent entities.</p>
-<div class="figure"><a id="sthref252" name="sthref252"></a>
-<p class="titleinfigure">Generating DDL</p>
-<img src="img/generate_ddl_summary.png" alt="This figure shows the Summary page from the Generating DDL wizard." title="This figure shows the Summary page from the Generating DDL wizard." /><br /></div>
+<p>When creating a JPA project, Dali automatically creates the <code>perssistence.xml</code> file.</p>
+<div class="figure"><a id="sthref250" name="sthref250"></a>
+<p class="titleinfigure">JPA Project with persistence.xml File</p>
+<img src="img/new_project_2.png" alt="JPA project with persistence.xml file." title="JPA project with persistence.xml file." /><br /></div>
+<!-- class="figure" -->
+<p>Use the XML editor to edit the <code>persistence.xml</code> file.</p>
+<p>After adding your JPA entities, use the <span class="gui-object-action">Java Persistence &gt; Synchronize Classes</span> option to add the classes to the <code>persistence.xml</code> file.</p>
+<div class="figure"><a id="sthref251" name="sthref251"></a>
+<p class="titleinfigure">Synchronizing the persistence.xml File.</p>
+<img src="img/synchornize_classes.png" alt="The JPA Tools &gt; Synchronize Classes option." title="The JPA Tools &gt; Synchronize Classes option." /><br /></div>
<!-- class="figure" -->
-<p>Dali automatically creates the necessary primary and foreign keys, based on your entity mappings.</p>
<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
<br />
-<a href="whats_new.htm#BGGEDBGF">What's new</a> <img src="img/ngrelt.png" alt="Related task" title="Related task" /><br />
-<br />
-<a href="task_generate_ddl.htm#BABJJIAA">Generating tables (DDL scripts) from entities</a></div>
+<a href="whats_new.htm#BGGEDBGF">What's new</a></div>
<!-- class="sect1" -->
<!-- Start Footer -->
<div class="footer">
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 28165d7f27..f84519576a 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/whats_new003.htm
@@ -2,16 +2,16 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<!-- Run date = May 3, 2007 9:19:14 -->
+<!-- Run date = May 9, 2007 10:03:47 -->
<meta name="OAC_IGNORE_SKIP_NAV" content="true" />
-<title>Create and Manage the persistence.xml file</title>
+<title>Create and Manage the orm.xml file</title>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<meta name="generator" content="Oracle DARB XHTML Converter - Version 4.5.3 Build 02" />
<meta name="date" content="2005-07-10T12:57:20+08:00" />
<meta name="robots" content="all" scheme="http://www.robotstxt.org/" />
-<meta name="doctitle" content="Create and Manage the persistence.xml file" />
+<meta name="doctitle" content="Create and Manage the orm.xml file" />
<meta name="relnum" content="Release 1.0.0" />
<meta name="partnum" content="" />
<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" />
@@ -20,24 +20,24 @@
<link rel="contents" href="toc.htm" title="Contents" type="text/html" />
</head>
<body>
-<p><a id="CEGBCIBB" name="CEGBCIBB"></a></p>
+<p><a id="CEGJJBEE" name="CEGJJBEE"></a></p>
<div class="sect1"><!-- infolevel="all" infotype="General" -->
<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%">
<tr valign="bottom">
<td align="left" width="86%">
-<h1>Create and Manage the persistence.xml file</h1>
+<h1>Create and Manage the orm.xml file</h1>
</td>
</tr>
</table>
-<p>When adding persistence to a Java project, you can also create the <code>perssistence.xml</code> file.</p>
-<div class="figure"><a id="sthref253" name="sthref253"></a>
-<p class="titleinfigure">Add Java Persistence Dialog</p>
-<img src="img/add_persistence_dialog_xml.png" alt="This figure shows the Add Java Persistence dialog." title="This figure shows the Add Java Persistence dialog." /><br /></div>
+<p>When creating a JPA project, you can also create the <code>orm.xml</code> file. Select the <span class="bold">Create orm.xml</span> option on the <a href="ref_jpa_facet.htm#CACIFDIF">JPA Facet page</a> page of the <a href="ref_new_jpa_project_wizard.htm#CACBJGBG">Create New JPA Project wizard</a>.</p>
+<div class="figure"><a id="sthref252" name="sthref252"></a>
+<p class="titleinfigure">JPA Facet Dialog</p>
+<img src="img/jpa_facet_dialog.png" alt="JPA Facet dialog." title="JPA Facet dialog." /><br /></div>
<!-- class="figure" -->
-<p>Use the Packaging Settings options to create the <code>persistence.xml</code> file. After adding your persistent classes, use the <span class="gui-object-action">Java Persistence &gt; Synchronize Classes</span> option to add the classes to the <code>persistence.xml</code> file.</p>
-<div class="figure"><a id="sthref254" name="sthref254"></a>
-<p class="titleinfigure">Synchronizing the persistence.xml File.</p>
-<img src="img/synchornize_classes.png" alt="This figure shows the Java Persistence &gt; Synchronize Classes option." title="This figure shows the Java Persistence &gt; Synchronize Classes option." /><br /></div>
+<p>Use the <code>orm.xml</code> file to define the project and persistence unit defaults.</p>
+<div class="figure"><a id="sthref253" name="sthref253"></a>
+<p class="titleinfigure">JPA Details view for orm.xml file.</p>
+<img src="img/details_entitymappings.png" alt="JPA Details view for orm.xml file." title="JPA Details view for orm.xml file." /><br /></div>
<!-- class="figure" -->
<img src="img/ngrelc.png" alt="Related concept" title="Related concept" /><br />
<br />

Back to the top