diff options
| author | tle | 2010-06-08 04:50:14 +0000 |
|---|---|---|
| committer | tle | 2010-06-08 04:50:14 +0000 |
| commit | 66b58517a52476b020de92b433cd87e0fffb7ad7 (patch) | |
| tree | 70f47cc653d70749ef13480b74f03eaed7b564f4 /jpa/plugins | |
| parent | ac823a278461dc74b33e95fdd14d6ec6193baee1 (diff) | |
| download | webtools.dali-66b58517a52476b020de92b433cd87e0fffb7ad7.tar.gz webtools.dali-66b58517a52476b020de92b433cd87e0fffb7ad7.tar.xz webtools.dali-66b58517a52476b020de92b433cd87e0fffb7ad7.zip | |
315811 - JAXB Class Generation wizard: help icon doesn't work - Neil's patch
Diffstat (limited to 'jpa/plugins')
14 files changed, 456 insertions, 95 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/build.properties b/jpa/plugins/org.eclipse.jpt.doc.user/build.properties index e2c8808fe3..2b421082db 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/build.properties +++ b/jpa/plugins/org.eclipse.jpt.doc.user/build.properties @@ -123,5 +123,14 @@ bin.includes = cheatsheets/,\ ref_selectTables.htm,\ ref_select_cascade_dialog.htm,\ ref_tableAssociations.htm,\ - task_create_jpa_entity.htm + task_create_jpa_entity.htm,\ + ref_configure_jaxb_class_generation_dialog.htm,\ + ref_jaxb_schema_wizard.htm,\ + ref_schema_from_classes_page.htm,\ + reference033.htm,\ + task_generate_classes_from_schema.htm,\ + task_generating_schema_from_classes.htm,\ + tasks025.htm,\ + tasks026.htm,\ + whats_new006.htm generateSourceBundle=false diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml b/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml index 7a183c7747..2134b2bb05 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml +++ b/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml @@ -612,7 +612,7 @@ For example: "lastName ASC ,salary DESC" </description> <topic label="Managing the orm.xml file" href="task_manage_orm" /> </context> -<!-- Added for 3.0 --> +<!-- Added for 2.3 --> <context id="properties_canonicalMetamodel"> <description>Specifies if the project model uses the Canonical Metamodel. </description> <topic label="Project properties" href="ref_project_properties"/> @@ -628,6 +628,16 @@ For example: "lastName ASC ,salary DESC" </description> <topic label="JPA Details" href="ref_persistence_prop_view.htm"/> <topic label="Primary Key Generation information" href="ref_primary_key.htm"/> </context> + <context id="wizard_jaxbschema_classes"> + <description>Select the project, package, or classes from which to generate the XML schema. Click Finish to generate the schema</description> + <topic label="Generate Schema from JAXB Classes wizard" href="ref_jaxb_schema_wizard.htm"/> + <topic label="Generating schema from classes" href="task_generating_schema_from_classes.htm"/> + </context> + <context id="configure_jaxb_class_generation_dialog"> + <description>Enter the JAXB class generation settings and click Finish to generate classes. All fields are optional except for the source folder.</description> + <topic label="Configure JAXB Class Generation dialog" href="ref_configure_jaxb_class_generation_dialog.htm"/> + <topic label="Generating JAXB Classes from a Schema" href="task_generate_classes_from_schema.htm"/> + </context> diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/index.xml b/jpa/plugins/org.eclipse.jpt.doc.user/index.xml index 1919b02862..acf9beb953 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/index.xml +++ b/jpa/plugins/org.eclipse.jpt.doc.user/index.xml @@ -4,15 +4,15 @@ <entry keyword="Basic mapping"><topic href="tasks010.htm#sthref116" /></entry> </entry> <entry keyword="@Column"> - <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref231" /></entry> + <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref245" /></entry> </entry> <entry keyword="@DiscriminatorColumn"> <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref96" /></entry> - <entry keyword="Inheritance information"><topic href="reference009.htm#sthref225" /></entry> + <entry keyword="Inheritance information"><topic href="reference009.htm#sthref239" /></entry> </entry> <entry keyword="@DiscriminatorValue"> <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref98" /></entry> - <entry keyword="Inheritance information"><topic href="reference009.htm#sthref223" /></entry> + <entry keyword="Inheritance information"><topic href="reference009.htm#sthref237" /></entry> </entry> <entry keyword="@Embeddable"> <entry keyword="Embeddable"><topic href="tasks007.htm#sthref81" /></entry> @@ -27,10 +27,10 @@ <entry keyword="Entity"><topic href="tasks006.htm#sthref74" /></entry> </entry> <entry keyword="@Enumerated"> - <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref241" /></entry> + <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref255" /></entry> </entry> <entry keyword="@GeneratedValue"> - <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref251" /></entry> + <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref265" /></entry> </entry> <entry keyword="@Id"> <entry keyword="ID mapping"><topic href="tasks013.htm#sthref128" /></entry> @@ -41,11 +41,11 @@ <entry keyword="@JoinColumn"> <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref139" /></entry> <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref149" /></entry> - <entry keyword="Join Table Information"><topic href="reference011.htm#sthref247" /></entry> - <entry keyword="Join Columns Information"><topic href="reference012.htm#sthref250" /></entry> + <entry keyword="Join Table Information"><topic href="reference011.htm#sthref261" /></entry> + <entry keyword="Join Columns Information"><topic href="reference012.htm#sthref264" /></entry> </entry> <entry keyword="@Lob"> - <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref236" /></entry> + <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref250" /></entry> </entry> <entry keyword="@ManyToMany"> <entry keyword="Many-to-many mapping"><topic href="tasks014.htm#sthref132" /></entry> @@ -66,13 +66,13 @@ <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref146" /></entry> </entry> <entry keyword="@OrderBy"> - <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref245" /></entry> + <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref259" /></entry> </entry> <entry keyword="@SequenceGenerator"> - <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref253" /></entry> + <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref267" /></entry> </entry> <entry keyword="@Temporal"> - <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref238" /></entry> + <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref252" /></entry> </entry> <entry keyword="@Transient"> <entry keyword="Transient mapping"><topic href="tasks018.htm#sthref152" /></entry> @@ -81,20 +81,20 @@ <entry keyword="Version mapping"><topic href="tasks019.htm#sthref156" /></entry> </entry> <entry keyword="architecture of Dali feature"> - <entry keyword="Dali Developer Documentation"><topic href="reference033.htm#sthref289" /></entry> + <entry keyword="Dali Developer Documentation"><topic href="reference033.htm#sthref303" /></entry> </entry> <entry keyword="association tables"> - <entry keyword="Create New Association"><topic href="ref_create_new_association_wizard.htm#sthref207" /></entry> + <entry keyword="Create New Association"><topic href="ref_create_new_association_wizard.htm#sthref221" /></entry> </entry> <entry keyword="attribute overrides"> - <entry keyword="Attribute overrides"><topic href="reference007.htm#sthref214" /></entry> + <entry keyword="Attribute overrides"><topic href="reference007.htm#sthref228" /></entry> </entry> <entry keyword="Attribute Overrides - in Java Details view"> - <entry keyword="Attribute overrides"><topic href="reference007.htm#sthref216" /></entry> + <entry keyword="Attribute overrides"><topic href="reference007.htm#sthref230" /></entry> </entry> <entry keyword="attributes"> <entry keyword="JPA Details view"> - <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref230" /></entry> + <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref244" /></entry> </entry> <entry keyword="mapping"> <entry keyword="Understanding OR mappings"><topic href="concept_mapping.htm#sthref21" /></entry> @@ -110,13 +110,13 @@ <entry keyword="(See also mappings)"></entry> </entry> <entry keyword="caching"> - <entry keyword="Caching"><topic href="reference020.htm#sthref264" /></entry> + <entry keyword="Caching"><topic href="reference020.htm#sthref278" /></entry> </entry> <entry keyword="canonical metamodel"> - <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref284" /></entry> + <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref298" /></entry> </entry> <entry keyword="cardinality - association tables"> - <entry keyword="Association Cardinality"><topic href="ref_association_cardinality.htm#sthref210" /></entry> + <entry keyword="Association Cardinality"><topic href="ref_association_cardinality.htm#sthref224" /></entry> </entry> <entry keyword="classes"> <entry keyword="adding persistence to"> @@ -128,11 +128,15 @@ <entry keyword="entity"> <entry keyword="Entity"><topic href="tasks006.htm#sthref72" /></entry> </entry> + <entry keyword="generating schema from"> + <entry keyword="Generating Schema from Classes"><topic href="task_generating_schema_from_classes.htm#sthref190" /></entry> + <entry keyword="Generating JAXB Classes from a Schema"><topic href="task_generate_classes_from_schema.htm#sthref198" /></entry> + </entry> <entry keyword="managed"> <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref50" /></entry> </entry> <entry keyword="managing persistent classes"> - <entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref193" /></entry> + <entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref207" /></entry> </entry> <entry keyword="mapped superclass"> <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref86" /></entry> @@ -144,20 +148,20 @@ <entry keyword="columns"> <entry keyword="discriminator"> <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref97" /></entry> - <entry keyword="Inheritance information"><topic href="reference009.htm#sthref226" /></entry> + <entry keyword="Inheritance information"><topic href="reference009.htm#sthref240" /></entry> </entry> <entry keyword="join"> <entry keyword="Many-to-one mapping"><topic href="tasks015.htm#sthref138" /></entry> <entry keyword="One-to-one mapping"><topic href="tasks017.htm#sthref148" /></entry> - <entry keyword="Join Table Information"><topic href="reference011.htm#sthref246" /></entry> - <entry keyword="Join Columns Information"><topic href="reference012.htm#sthref249" /></entry> + <entry keyword="Join Table Information"><topic href="reference011.htm#sthref260" /></entry> + <entry keyword="Join Columns Information"><topic href="reference012.htm#sthref263" /></entry> </entry> <entry keyword="mapping to"> - <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref232" /></entry> + <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref246" /></entry> </entry> <entry keyword="value"> <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref99" /></entry> - <entry keyword="Inheritance information"><topic href="reference009.htm#sthref224" /></entry> + <entry keyword="Inheritance information"><topic href="reference009.htm#sthref238" /></entry> </entry> </entry> <entry keyword="connection pool"> @@ -168,9 +172,11 @@ </entry> <entry keyword="Create a JPA Project Wizard"> <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref29" /></entry> + <entry keyword="Generating Schema from Classes"><topic href="task_generating_schema_from_classes.htm#sthref194" /></entry> + <entry keyword="Generating JAXB Classes from a Schema"><topic href="task_generate_classes_from_schema.htm#sthref202" /></entry> </entry> <entry keyword="Create New JPA Project wizard"> - <entry keyword="Create New JPA Project wizard"><topic href="ref_new_jpa_project_wizard.htm#sthref190" /></entry> + <entry keyword="Create New JPA Project wizard"><topic href="ref_new_jpa_project_wizard.htm#sthref204" /></entry> </entry> <entry keyword="database tables"> <entry keyword="generating entities from"> @@ -179,20 +185,20 @@ </entry> <entry keyword="database - persistence"> <entry keyword="connection"> - <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref279" /></entry> + <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref293" /></entry> </entry> <entry keyword="schema"> - <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref281" /></entry> + <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref295" /></entry> </entry> </entry> <entry keyword="derived ID"> - <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref243" /></entry> + <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref257" /></entry> </entry> <entry keyword="developer documentation - Dali"> - <entry keyword="Dali Developer Documentation"><topic href="reference033.htm#sthref288" /></entry> + <entry keyword="Dali Developer Documentation"><topic href="reference033.htm#sthref302" /></entry> </entry> <entry keyword="eager fetch"> - <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref234" /></entry> + <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref248" /></entry> </entry> <entry keyword="embeddable class"> <entry keyword="@Embeddable"> @@ -229,20 +235,20 @@ <entry keyword="Creating a JPA Entity"><topic href="task_create_jpa_entity.htm#sthref40" /></entry> </entry> <entry keyword="customizing"> - <entry keyword="Customize Individual Entities"><topic href="ref_customizIndividualEntities.htm#sthref206" /></entry> + <entry keyword="Customize Individual Entities"><topic href="ref_customizIndividualEntities.htm#sthref220" /></entry> </entry> <entry keyword="embeddable"> <entry keyword="Embeddable"><topic href="tasks007.htm#sthref83" /></entry> </entry> <entry keyword="from tables"> <entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref158" /></entry> - <entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref202" /></entry> + <entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref216" /></entry> </entry> <entry keyword="generating"> - <entry keyword="Customize Default Entity Generation"><topic href="ref_customizeDefaultEntityGeneration.htm#sthref205" /></entry> + <entry keyword="Customize Default Entity Generation"><topic href="ref_customizeDefaultEntityGeneration.htm#sthref219" /></entry> </entry> <entry keyword="JPA Details view"> - <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref213" /></entry> + <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref227" /></entry> </entry> <entry keyword="mapped superclass"> <entry keyword="Mapped superclass"><topic href="tasks008.htm#sthref89" /></entry> @@ -258,7 +264,7 @@ <entry keyword="Entity"><topic href="tasks006.htm#sthref76" /></entry> </entry> <entry keyword="secondary tables"> - <entry keyword="Secondary table information"><topic href="reference008.htm#sthref219" /></entry> + <entry keyword="Secondary table information"><topic href="reference008.htm#sthref233" /></entry> </entry> </entry> <entry keyword="Entity Class page"> @@ -268,29 +274,33 @@ <entry keyword="<a id="sthref43" name="sthref43"></a>The Entity Class Page"><topic href="task_create_jpa_entity.htm#sthref45" /></entry> </entry> <entry keyword="enumerated"> - <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref240" /></entry> - <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref242" /></entry> + <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref254" /></entry> + <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref256" /></entry> </entry> <entry keyword="error messages - Dali"> <entry keyword="Validating mappings and reporting problems"><topic href="tasks023.htm#sthref167" /></entry> <entry keyword="Error messages"><topic href="tasks024.htm#sthref172" /></entry> </entry> <entry keyword="extension points - Dali feature"> - <entry keyword="Dali Developer Documentation"><topic href="reference033.htm#sthref290" /></entry> + <entry keyword="Dali Developer Documentation"><topic href="reference033.htm#sthref304" /></entry> </entry> <entry keyword="fetch type"> - <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref233" /></entry> + <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref247" /></entry> </entry> <entry keyword="Generate Entities from Tables dialog"> <entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref160" /></entry> - <entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref201" /></entry> + <entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref215" /></entry> + </entry> + <entry keyword="Generate Schema from Classes wizard"> + <entry keyword="Generating Schema from Classes"><topic href="task_generating_schema_from_classes.htm#sthref192" /></entry> + <entry keyword="Generating JAXB Classes from a Schema"><topic href="task_generate_classes_from_schema.htm#sthref200" /></entry> </entry> <entry keyword="generated values"> <entry keyword="ID mappings"> - <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref252" /></entry> + <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref266" /></entry> </entry> <entry keyword="sequence"> - <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref254" /></entry> + <entry keyword="Primary Key Generation information"><topic href="ref_primary_key.htm#sthref268" /></entry> </entry> </entry> <entry keyword="hints - query"> @@ -307,8 +317,8 @@ <entry keyword="inheritance"> <entry keyword="entity"> <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref93" /></entry> - <entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref195" /></entry> - <entry keyword="Inheritance information"><topic href="reference009.htm#sthref222" /></entry> + <entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref209" /></entry> + <entry keyword="Inheritance information"><topic href="reference009.htm#sthref236" /></entry> </entry> <entry keyword="joined tables"> <entry keyword="Single Table Inheritance"><topic href="task_inheritance.htm#sthref105" /></entry> @@ -318,7 +328,7 @@ </entry> </entry> <entry keyword="Inheritance - in Java Details view"> - <entry keyword="Inheritance information"><topic href="reference009.htm#sthref221" /></entry> + <entry keyword="Inheritance information"><topic href="reference009.htm#sthref235" /></entry> </entry> <entry keyword="installation - Dali"> <entry keyword="Requirements and installation"><topic href="getting_started001.htm#sthref3" /></entry> @@ -326,23 +336,27 @@ <entry keyword="Java project - converting to JPA"> <entry keyword="Converting a Java Project to a JPA Project"><topic href="tasks001.htm#sthref35" /></entry> </entry> + <entry keyword="JAXB"> + <entry keyword="Generating Schema from Classes"><topic href="task_generating_schema_from_classes.htm#sthref191" /></entry> + <entry keyword="Generating JAXB Classes from a Schema"><topic href="task_generate_classes_from_schema.htm#sthref199" /></entry> + </entry> <entry keyword="join columns"> - <entry keyword="Join Columns"><topic href="ref_join_columns.htm#sthref209" /></entry> - <entry keyword="Join Columns Information"><topic href="reference012.htm#sthref248" /></entry> + <entry keyword="Join Columns"><topic href="ref_join_columns.htm#sthref223" /></entry> + <entry keyword="Join Columns Information"><topic href="reference012.htm#sthref262" /></entry> </entry> <entry keyword="joined tables - inheritance"> <entry keyword="Single Table Inheritance"><topic href="task_inheritance.htm#sthref106" /></entry> </entry> <entry keyword="JPA Details view"> <entry keyword="attributes"> - <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref228" /></entry> + <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref242" /></entry> </entry> <entry keyword="entities"> - <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref211" /></entry> + <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref225" /></entry> </entry> </entry> <entry keyword="JPA Development perspective"> - <entry keyword="JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref286" /></entry> + <entry keyword="JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref300" /></entry> </entry> <entry keyword="JPA Facet page"> <entry keyword="The Java Source Page"><topic href="task_create_new_project.htm#sthref34" /></entry> @@ -355,23 +369,24 @@ <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref27" /></entry> </entry> <entry keyword="implementation"> - <entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref191" /></entry> + <entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref205" /></entry> </entry> <entry keyword="page"> <entry keyword="<a id="sthref29" name="sthref29"></a>Selecting the Create a JPA Project wizard"><topic href="task_create_new_project.htm#sthref31" /></entry> + <entry keyword="<a id="sthref194" name="sthref194"></a>Selecting the Schema from JAXB Classes wizard"><topic href="task_generating_schema_from_classes.htm#sthref196" /></entry> </entry> <entry keyword="platform"> - <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref278" /></entry> + <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref292" /></entry> </entry> </entry> <entry keyword="JPA Structure view"> - <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref256" /></entry> + <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref270" /></entry> </entry> <entry keyword="lazy fetch"> - <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref235" /></entry> + <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref249" /></entry> </entry> <entry keyword="library - JPA"> - <entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref192" /></entry> + <entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref206" /></entry> </entry> <entry keyword="many-to-many mapping"> <entry keyword="@ManyToMany"> @@ -402,7 +417,7 @@ </entry> <entry keyword="mapping file"> <entry keyword="<a id="sthref58" name="sthref58"></a>Managing the orm.xml file"><topic href="tasks004.htm#sthref61" /></entry> - <entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref196" /></entry> + <entry keyword="Entity Class page"><topic href="ref_EntityClassPage.htm#sthref210" /></entry> </entry> <entry keyword="mappings"> <entry keyword="about"> @@ -443,7 +458,7 @@ </entry> </entry> <entry keyword="metamodel - canonical"> - <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref285" /></entry> + <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref299" /></entry> </entry> <entry keyword="named queries"> <entry keyword="entity"> @@ -479,14 +494,14 @@ </entry> </entry> <entry keyword="ordering"> - <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref244" /></entry> + <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref258" /></entry> </entry> <entry keyword="orm.xml file"> <entry keyword="about"> <entry keyword="The orm.xml file"><topic href="concepts003.htm#sthref24" /></entry> </entry> <entry keyword="creating"> - <entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref194" /></entry> + <entry keyword="JPA Facet page"><topic href="ref_jpa_facet.htm#sthref208" /></entry> </entry> <entry keyword="managing"> <entry keyword="Managing the orm.xml file"><topic href="task_manage_orm.htm#sthref58" /></entry> @@ -496,24 +511,24 @@ </entry> </entry> <entry keyword="overrides - JPA attributes"> - <entry keyword="Attribute overrides"><topic href="reference007.htm#sthref215" /></entry> + <entry keyword="Attribute overrides"><topic href="reference007.htm#sthref229" /></entry> </entry> <entry keyword="persistence"> <entry keyword="about"> <entry keyword="Understanding Java persistence"><topic href="concept_persistence.htm#sthref19" /></entry> </entry> <entry keyword="database connection"> - <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref280" /></entry> + <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref294" /></entry> </entry> <entry keyword="database schema"> - <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref283" /></entry> + <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref297" /></entry> </entry> <entry keyword="entity class"> <entry keyword="Adding persistence to a class"><topic href="task_add_persistence.htm#sthref67" /></entry> </entry> <entry keyword="options"> - <entry keyword="Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref273" /></entry> - <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref275" /></entry> + <entry keyword="Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref287" /></entry> + <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref289" /></entry> </entry> <entry keyword="provider"> <entry keyword="Managing the persistence.xml file"><topic href="task_manage_persistence.htm#sthref49" /></entry> @@ -538,10 +553,10 @@ <entry keyword="Entity"><topic href="tasks006.htm#sthref71" /></entry> </entry> <entry keyword="perspective - JPA Development"> - <entry keyword="JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref287" /></entry> + <entry keyword="JPA Development perspective"><topic href="ref_persistence_perspective.htm#sthref301" /></entry> </entry> <entry keyword="platform - JPA"> - <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref277" /></entry> + <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref291" /></entry> </entry> <entry keyword="problems"> <entry keyword="Validating mappings and reporting problems"><topic href="tasks023.htm#sthref169" /></entry> @@ -552,10 +567,10 @@ <entry keyword="Creating a new JPA project"><topic href="task_create_new_project.htm#sthref26" /></entry> </entry> <entry keyword="options"> - <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref276" /></entry> + <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref290" /></entry> </entry> <entry keyword="validation preferences"> - <entry keyword="Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref274" /></entry> + <entry keyword="Project Properties page - Java Persistence Options"><topic href="ref_project_properties.htm#sthref288" /></entry> </entry> </entry> <entry keyword="query hints"> @@ -572,14 +587,20 @@ <entry keyword="Entity"><topic href="tasks006.htm#sthref73" /></entry> </entry> </entry> + <entry keyword="schema"> + <entry keyword="from classes"> + <entry keyword="Generating Schema from Classes"><topic href="task_generating_schema_from_classes.htm#sthref189" /></entry> + <entry keyword="Generating JAXB Classes from a Schema"><topic href="task_generate_classes_from_schema.htm#sthref197" /></entry> + </entry> + </entry> <entry keyword="schema - database"> - <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref282" /></entry> + <entry keyword="Project Properties page - Validation Preferences"><topic href="reference027.htm#sthref296" /></entry> </entry> <entry keyword="secondary tables"> - <entry keyword="Secondary table information"><topic href="reference008.htm#sthref217" /></entry> + <entry keyword="Secondary table information"><topic href="reference008.htm#sthref231" /></entry> </entry> <entry keyword="Secondary Tables - in Java Details view"> - <entry keyword="Secondary table information"><topic href="reference008.htm#sthref220" /></entry> + <entry keyword="Secondary table information"><topic href="reference008.htm#sthref234" /></entry> </entry> <entry keyword="single table inheritance"> <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref101" /></entry> @@ -592,23 +613,23 @@ </entry> <entry keyword="tables"> <entry keyword="associations"> - <entry keyword="Table Associations"><topic href="ref_tableAssociations.htm#sthref204" /></entry> - <entry keyword="Create New Association"><topic href="ref_create_new_association_wizard.htm#sthref208" /></entry> + <entry keyword="Table Associations"><topic href="ref_tableAssociations.htm#sthref218" /></entry> + <entry keyword="Create New Association"><topic href="ref_create_new_association_wizard.htm#sthref222" /></entry> </entry> <entry keyword="creating entities from"> <entry keyword="Generating entities from tables"><topic href="tasks021.htm#sthref159" /></entry> - <entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref203" /></entry> + <entry keyword="Select Tables"><topic href="ref_selectTables.htm#sthref217" /></entry> </entry> <entry keyword="inheritance"> <entry keyword="Specifying entity inheritance"><topic href="task_inheritance.htm#sthref102" /></entry> </entry> <entry keyword="secondary"> - <entry keyword="Secondary table information"><topic href="reference008.htm#sthref218" /></entry> + <entry keyword="Secondary table information"><topic href="reference008.htm#sthref232" /></entry> </entry> </entry> <entry keyword="temporal"> - <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref237" /></entry> - <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref239" /></entry> + <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref251" /></entry> + <entry keyword="General information"><topic href="ref_mapping_general.htm#sthref253" /></entry> </entry> <entry keyword="transient mapping"> <entry keyword="@Transient"> @@ -628,11 +649,11 @@ </entry> <entry keyword="views"> <entry keyword="JPA Details view"> - <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref212" /></entry> - <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref229" /></entry> + <entry keyword="JPA Details view (for entities)"><topic href="ref_persistence_prop_view.htm#sthref226" /></entry> + <entry keyword="JPA Details view (for attributes)"><topic href="ref_persistence_map_view.htm#sthref243" /></entry> </entry> <entry keyword="JPA Structure view"> - <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref255" /></entry> + <entry keyword="JPA Structure view"><topic href="ref_persistence_outline.htm#sthref269" /></entry> </entry> </entry> <entry keyword="warning messages - Dali"> diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_configure_jaxb_class_generation_dialog.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_configure_jaxb_class_generation_dialog.htm new file mode 100644 index 0000000000..7efc7a4ffa --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_configure_jaxb_class_generation_dialog.htm @@ -0,0 +1,77 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" /> + +<meta http-equiv="Content-Style-Type" content="text/css" /> +<meta http-equiv="Content-Script-Type" content="text/javascript" /> +<title>Configure JAXB Class Generation dialog</title> +<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" /> +<meta name="date" content="2010-06-04T19:33:7Z" /> +<meta name="robots" content="noarchive" /> +<meta name="doctitle" content="Configure JAXB Class Generation dialog" /> +<meta name="relnum" content="Release 2.3" /> +<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" /> +<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" /> +<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" /> +<!-- contents --> +</head> +<body> +<p><a id="CACHHHJA" name="CACHHHJA"></a></p> +<div class="sect2"><!-- infolevel="all" infotype="General" --> +<h1>Configure JAXB Class Generation dialog</h1> +<p>Use this dialog to generate JAXB classes from a schema.</p> +<div class="inftblhruleinformalmax"> +<table class="HRuleInformalMax" summary="This table lists the options on the New EclipseLink Mapping File dialog." dir="ltr" border="1" width="100%" frame="hsides" rules="rows" cellpadding="3" cellspacing="0"> +<col width="24%" /> +<col width="*" /> +<thead> +<tr align="left" valign="top"> +<th align="left" valign="bottom" id="r1c1-t41">Property</th> +<th align="left" valign="bottom" id="r1c2-t41">Description</th> +</tr> +</thead> +<tbody> +<tr align="left" valign="top"> +<td align="left" id="r2c1-t41" headers="r1c1-t41">Source folder</td> +<td align="left" headers="r2c1-t41 r1c2-t41">Location in which to generate the classes. Click <span class="bold">Browse</span> to select a location.</td> +</tr> +<tr align="left" valign="top"> +<td align="left" id="r3c1-t41" headers="r1c1-t41">Package</td> +<td align="left" headers="r3c1-t41 r1c2-t41">Name of the package. Click <span class="bold">Browse</span> to select an existing package.</td> +</tr> +<tr align="left" valign="top"> +<td align="left" id="r4c1-t41" headers="r1c1-t41">Catalog</td> +<td align="left" headers="r4c1-t41 r1c2-t41">Name of the catalog file to use to resolve external entity references.</td> +</tr> +<tr align="left" valign="top"> +<td align="left" id="r5c1-t41" headers="r1c1-t41">Bindings files</td> +<td align="left" headers="r5c1-t41 r1c2-t41">Click <span class="bold">Add</span> to select the external bindings files</td> +</tr> +</tbody> +</table> +<br /></div> +<!-- class="inftblhruleinformalmax" --> +<p> </p> +<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br /> +<br /> +<a href="task_generate_classes_from_schema.htm#CIHCBHJD">Generating JAXB Classes from a Schema</a> +<p> </p> +</div> +<!-- class="sect2" --> +<!-- class="sect1" --> +<!-- Start Footer --> +<div class="footer"> +<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%"> +<col width="86%" /> +<col width="*" /> +<tr> +<td align="left"><span class="copyrightlogo">Copyright © 2006, 2010, Oracle and/or its affiliates. All rights reserved.</span><br /> +<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td> +</tr> +</table> +</div> +<!-- class="footer" --> +</body> +</html> diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_jaxb_schema_wizard.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_jaxb_schema_wizard.htm new file mode 100644 index 0000000000..e2eb5bf134 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_jaxb_schema_wizard.htm @@ -0,0 +1,50 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" /> + +<meta http-equiv="Content-Style-Type" content="text/css" /> +<meta http-equiv="Content-Script-Type" content="text/javascript" /> +<title>Generate Schema from JAXB Classes Wizard</title> +<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" /> +<meta name="date" content="2010-06-04T16:18:13Z" /> +<meta name="robots" content="noarchive" /> +<meta name="doctitle" content="Generate Schema from JAXB Classes Wizard" /> +<meta name="relnum" content="Release 2.3" /> +<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" /> +<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" /> +<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" /> +<!-- contents --> +</head> +<body> +<p><a id="CACGADFH" name="CACGADFH"></a></p> +<div class="sect2"><!-- infolevel="all" infotype="General" --> +<h1>Generate Schema from JAXB Classes Wizard</h1> +<p>Use the Generate Schema from JAXB Classes wizard create an XML schema ( .xsd) for a set of JAXB mapped classes.</p> +<p>The wizard consists of the following pages:</p> +<ul> +<li> +<p><a href="ref_schema_from_classes_page.htm#CACHBEGJ">Generate Schema from Classes</a></p> +</li> +</ul> +<img src="img/ngrelt.png" alt="Related task" title="Related task" /><br /> +<br /> +<a href="task_generating_schema_from_classes.htm#CIHHBJCJ">Generating Schema from Classes</a> +<p> </p> +<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br /> +<br /> +<a href="#CACGADFH">Generate Schema from JAXB Classes Wizard</a> <!-- Start Footer --> +<div class="footer"> +<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%"> +<col width="86%" /> +<col width="*" /> +<tr> +<td align="left"><span class="copyrightlogo">Copyright © 2006, 2010, Oracle and/or its affiliates. All rights reserved.</span><br /> +<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td> +</tr> +</table> +</div> +<!-- class="footer" --></div> +</body> +</html> diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/ref_schema_from_classes_page.htm b/jpa/plugins/org.eclipse.jpt.doc.user/ref_schema_from_classes_page.htm new file mode 100644 index 0000000000..46ff81ed85 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/ref_schema_from_classes_page.htm @@ -0,0 +1,42 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" /> + +<meta http-equiv="Content-Style-Type" content="text/css" /> +<meta http-equiv="Content-Script-Type" content="text/javascript" /> +<title>Generate Schema from Classes</title> +<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" /> +<meta name="date" content="2010-06-04T16:18:13Z" /> +<meta name="robots" content="noarchive" /> +<meta name="doctitle" content="Generate Schema from Classes" /> +<meta name="relnum" content="Release 2.3" /> +<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" /> +<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" /> +<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" /> +<!-- contents --> +</head> +<body> +<p><a id="CACHBEGJ" name="CACHBEGJ"></a></p> +<div class="sect3"><!-- infolevel="all" infotype="General" --> +<h1>Generate Schema from Classes</h1> +<p>Use this dialog to select the classes from which to generate a schema. You can select an entire project, a package, or specific classes.</p> +</div> +<!-- class="sect3" --> +<!-- class="sect2" --> +<!-- class="sect1" --> +<!-- Start Footer --> +<div class="footer"> +<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%"> +<col width="86%" /> +<col width="*" /> +<tr> +<td align="left"><span class="copyrightlogo">Copyright © 2006, 2010, Oracle and/or its affiliates. All rights reserved.</span><br /> +<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td> +</tr> +</table> +</div> +<!-- class="footer" --> +</body> +</html> diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm b/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm index 561db8a9ae..be40229799 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/reference001.htm @@ -8,7 +8,7 @@ <meta http-equiv="Content-Script-Type" content="text/javascript" /> <title>Wizards</title> <meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" /> -<meta name="date" content="2010-05-19T8:12:46Z" /> +<meta name="date" content="2010-06-04T19:33:3Z" /> <meta name="robots" content="noarchive" /> <meta name="doctitle" content="Wizards" /> <meta name="relnum" content="Release 2.3" /> @@ -38,6 +38,9 @@ <li> <p><a href="ref_create_new_association_wizard.htm#CIAFGHIF">Create New Association</a></p> </li> +<li> +<p><a href="ref_jaxb_schema_wizard.htm#CACGADFH">Generate Schema from JAXB Classes Wizard</a></p> +</li> </ul> <!-- Start Footer --> <div class="footer"> diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_classes_from_schema.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_classes_from_schema.htm new file mode 100644 index 0000000000..429ee81d23 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_generate_classes_from_schema.htm @@ -0,0 +1,55 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" /> + +<meta http-equiv="Content-Style-Type" content="text/css" /> +<meta http-equiv="Content-Script-Type" content="text/javascript" /> +<title>Generating JAXB Classes from a Schema</title> +<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" /> +<meta name="date" content="2010-06-04T19:33:3Z" /> +<meta name="robots" content="noarchive" /> +<meta name="doctitle" content="Generating JAXB Classes from a Schema" /> +<meta name="relnum" content="Release 2.3" /> +<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" /> +<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" /> +<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" /> +<!-- contents --> +</head> +<body> +<p><a id="CIHCBHJD" name="CIHCBHJD"></a></p> +<div class="sect1"><!-- infolevel="all" infotype="General" --> +<h1>Generating JAXB Classes from a Schema</h1> +<p><a id="sthref197" name="sthref197"></a><a id="sthref198" name="sthref198"></a><a id="sthref199" name="sthref199"></a>Use the Generate Classes from XSD dialog to generate JAXB classes from an XML schema ( .xsd).<a id="sthref200" name="sthref200"></a></p> +<ol> +<li> +<p>From the Navigator or Project Explorer, right-click a schema ( .xsd file) and select <span class="bold">Generate > JAXB Classes</span>. The Generate Classes from Schema dialog appears.</p> +<div class="figure"><a id="sthref201" name="sthref201"></a> +<p class="titleinfigure"><a id="sthref202" name="sthref202"></a>Configure JAXB Class Generation dialog</p> +<img src="img/generate_classes_from_schema.png" alt="Generate classes from schema dialog." title="Generate classes from schema dialog." /><br /></div> +<!-- class="figure" --></li> +<li> +<p>Enter the JAXB settings information and click <span class="bold">Finish</span>.</p> +</li> +</ol> +<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br /> +<br /> +<a href="ref_configure_jaxb_class_generation_dialog.htm#CACHHHJA">Configure JAXB Class Generation dialog</a> +<p> </p> +</div> +<!-- class="sect1" --> +<!-- Start Footer --> +<div class="footer"> +<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%"> +<col width="86%" /> +<col width="*" /> +<tr> +<td align="left"><span class="copyrightlogo">Copyright © 2006, 2010, Oracle and/or its affiliates. All rights reserved.</span><br /> +<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td> +</tr> +</table> +</div> +<!-- class="footer" --> +</body> +</html> diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/task_generating_schema_from_classes.htm b/jpa/plugins/org.eclipse.jpt.doc.user/task_generating_schema_from_classes.htm new file mode 100644 index 0000000000..6e7cf1cca2 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.user/task_generating_schema_from_classes.htm @@ -0,0 +1,74 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" /> + +<meta http-equiv="Content-Style-Type" content="text/css" /> +<meta http-equiv="Content-Script-Type" content="text/javascript" /> +<title>Generating Schema from Classes</title> +<meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" /> +<meta name="date" content="2010-06-04T16:18:12Z" /> +<meta name="robots" content="noarchive" /> +<meta name="doctitle" content="Generating Schema from Classes" /> +<meta name="relnum" content="Release 2.3" /> +<meta name="copyright" content="Copyright (c) 2000, 2008 oracle . All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Oracle - initial API and implementation" /> +<link rel="copyright" href="dcommon/html/cpyr.htm" title="Copyright" type="text/html" /> +<link rel="stylesheet" href="dcommon/css/blafdoc.css" title="Oracle BLAFDoc" type="text/css" /> +<!-- contents --> +</head> +<body> +<p><a id="CIHHBJCJ" name="CIHHBJCJ"></a></p> +<div class="sect1"><!-- infolevel="all" infotype="General" --> +<h1>Generating Schema from Classes</h1> +<p><a id="sthref189" name="sthref189"></a><a id="sthref190" name="sthref190"></a><a id="sthref191" name="sthref191"></a>Use the Generate Schema from JAXB Classes wizard create an XML schema ( .xsd) for a set of JAXB mapped classes.<a id="sthref192" name="sthref192"></a></p> +<ol> +<li> +<p>From the Navigator or Project Explorer, select <span class="bold">File > New > Other</span>. The Select a wizard dialog appears.</p> +<div align="center"> +<div class="inftblnotealso"><br /> +<table class="NoteAlso oac_no_warn" summary="" cellpadding="3" cellspacing="0"> +<tbody> +<tr> +<td align="left"> +<p class="notep1">Tip:</p> +You can also access the Generate Schema from JAXB Classes wizard from a specific project or package.</td> +</tr> +</tbody> +</table> +<br /></div> +<!-- class="inftblnotealso" --></div> +<div class="figure"><a id="sthref193" name="sthref193"></a> +<p class="titleinfigure"><a id="sthref194" name="sthref194"></a>Selecting the Schema From JAXB Classes wizard</p> +<img src="img/select_jaxb_schema_wizard.png" alt="The Select a Wizard dialog with Schema From JAXB Classes selected." title="The Select a Wizard dialog with Schema From JAXB Classes selected." /><br /></div> +<!-- class="figure" --></li> +<li> +<p>Select <span class="bold">JAXB > Schema from JAXB Classes</span> and then click <span class="bold">Next</span>. The <a href="ref_schema_from_classes_page.htm#CACHBEGJ">Generate Schema from Classes</a> page of the <a href="ref_jaxb_schema_wizard.htm#CACGADFH">Generate Schema from JAXB Classes Wizard</a> appears.</p> +<div class="figure"><a id="sthref195" name="sthref195"></a> +<p class="titleinfigure"><a id="sthref196" name="sthref196"></a>The Generate Schema from Classes Page</p> +<img src="img/jaxb_schmea_generation_dialog.png" alt="The JPA Project page of the Create a JPA Project wizard." title="The JPA Project page of the Create a JPA Project wizard." /><br /></div> +<!-- class="figure" --></li> +<li> +<p>Select the project, package, or classes from which to generate the schema and click <span class="bold">Finish</span>.</p> +</li> +</ol> +<img src="img/ngrelr.png" alt="Related reference" title="Related reference" /><br /> +<br /> +<a href="ref_jaxb_schema_wizard.htm#CACGADFH">Generate Schema from JAXB Classes Wizard</a> +<p> </p> +</div> +<!-- class="sect1" --> +<!-- Start Footer --> +<div class="footer"> +<table class="simple oac_no_warn" summary="" cellspacing="0" cellpadding="0" width="100%"> +<col width="86%" /> +<col width="*" /> +<tr> +<td align="left"><span class="copyrightlogo">Copyright © 2006, 2010, Oracle and/or its affiliates. All rights reserved.</span><br /> +<a href="dcommon/html/cpyr.htm"><span class="copyrightlogo">Legal Notices</span></a></td> +</tr> +</table> +</div> +<!-- class="footer" --> +</body> +</html> diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm b/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm index 4951daa5d0..00e2189526 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm +++ b/jpa/plugins/org.eclipse.jpt.doc.user/tasks.htm @@ -8,7 +8,7 @@ <meta http-equiv="Content-Script-Type" content="text/javascript" /> <title>Tasks</title> <meta name="generator" content="Oracle DARB XHTML Converter (Mode = ohj/ohw) - Version 5.1.1" /> -<meta name="date" content="2010-05-19T8:12:41Z" /> +<meta name="date" content="2010-06-04T19:32:58Z" /> <meta name="robots" content="noarchive" /> <meta name="doctitle" content=" Tasks" /> <meta name="relnum" content="Release 2.3" /> @@ -58,6 +58,12 @@ <li> <p><a href="tasks026.htm#BABDBCBI">Modifying persistent project properties</a></p> </li> +<li> +<p><a href="task_generating_schema_from_classes.htm#CIHHBJCJ">Generating Schema from Classes</a></p> +</li> +<li> +<p><a href="task_generate_classes_from_schema.htm#CIHCBHJD">Generating JAXB Classes from a Schema</a></p> +</li> </ul> <!-- Start Footer --> <div class="footer"> diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml b/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml index 62e7a550f6..21100fc7f8 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml +++ b/jpa/plugins/org.eclipse.jpt.doc.user/toc.xml @@ -56,6 +56,8 @@ <topic href="tasks025.htm#CIHGEAIJ" label="Warning messages" /> </topic> <topic href="tasks026.htm#BABDBCBI" label="Modifying persistent project properties" /> + <topic href="task_generating_schema_from_classes.htm#CIHHBJCJ" label="Generating Schema from Classes" /> + <topic href="task_generate_classes_from_schema.htm#CIHCBHJD" label="Generating JAXB Classes from a Schema" /> </topic> <topic label=" Reference"> <topic label="Wizards"> @@ -83,6 +85,9 @@ <topic href="ref_join_columns.htm#CIAEGEEG" label="Join Columns" /> <topic href="ref_association_cardinality.htm#CIAFIIFH" label="Association Cardinality" /> </topic> + <topic href="ref_jaxb_schema_wizard.htm#CACGADFH" label="Generate Schema from JAXB Classes Wizard"> + <topic href="ref_schema_from_classes_page.htm#CACHBEGJ" label="Generate Schema from Classes" /> + </topic> </topic> <topic label="Property pages"> <topic href="ref_persistence_prop_view.htm#BABFAEBB" label="JPA Details view (for entities)"> @@ -90,7 +95,7 @@ <topic href="reference007.htm#CACIJBGH" label="Attribute overrides" /> <topic href="reference008.htm#CACBHIDA" label="Secondary table information" /> <topic href="reference009.htm#CACFHGHE" label="Inheritance information" /> - <topic href="reference010.htm#sthref227" label="Queries" /> + <topic href="reference010.htm#sthref241" label="Queries" /> </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" /> @@ -127,6 +132,7 @@ <topic href="ref_select_cascade_dialog.htm#CIAFDGIJ" label="Select Cascade dialog" /> <topic href="ref_eclipselink_mapping_file.htm#CIAEDEJF" label="New EclipseLink Mapping File dialog" /> <topic href="ref_add_converter.htm#CIAGCGIJ" label="Add Converter dialog" /> + <topic href="ref_configure_jaxb_class_generation_dialog.htm#CACHHHJA" label="Configure JAXB Class Generation dialog" /> </topic> <topic href="ref_persistence_perspective.htm#BABIFBDB" label="JPA Development perspective" /> <topic label="Icons and buttons"> @@ -136,15 +142,15 @@ <topic href="reference033.htm#CACBBDIB" label="Dali Developer Documentation" /> </topic> <topic href="tips_and_tricks.htm" label="Tips and tricks"> - <topic href="whats_new001.htm#sthref292" label="Improved Internationalization and Localization" /> + <topic href="whats_new001.htm#sthref306" label="Improved Internationalization and Localization" /> <topic href="whats_new002.htm#CJACEDDE" label="Multiple Improvements to the Dali Perspective" /> <topic href="whats_new003.htm#CJADIFHJ" label="Support for JPA 2.0 and EclipseLink" /> <topic href="whats_new004.htm#CJABIJEC" label="Conversion of Java Projects to JPA Projects" /> <topic href="whats_new005.htm#CJACJBDA" label="EclipseLink 2.x Support" /> - <topic href="whats_new006.htm#sthref293" label="Table-per-Concrete-Class Inheritance" /> + <topic href="whats_new006.htm#sthref307" label="Table-per-Concrete-Class Inheritance" /> </topic> <topic href="legal.htm" label=" Legal"> - <topic href="about.htm#sthref295" label="About this content" /> + <topic href="about.htm#sthref309" label="About this content" /> </topic> </topic> </toc> diff --git a/jpa/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF index b64e592722..e57e30c4fd 100644 --- a/jpa/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF +++ b/jpa/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF @@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.jpt.utility;bundle-version="[1.2.0,2.0.0)", org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)", - org.eclipse.jpt.core;bundle-version="[2.3.0,3.0.0)" + org.eclipse.jpt.core;bundle-version="[2.3.0,3.0.0)", + org.eclipse.help;bundle-version="[3.5.0,4.0.0)" Export-Package: org.eclipse.jpt.jaxb.core.internal;x-internal:=true, org.eclipse.jpt.jaxb.ui;x-internal:=true, org.eclipse.jpt.jaxb.ui.internal;x-internal:=true, diff --git a/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/ClassesGeneratorWizardPage.java b/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/ClassesGeneratorWizardPage.java index 1361ae1bca..1574703c62 100644 --- a/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/ClassesGeneratorWizardPage.java +++ b/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/ClassesGeneratorWizardPage.java @@ -46,6 +46,7 @@ import org.eclipse.jface.window.Window; import org.eclipse.jpt.jaxb.core.internal.ClassesGenerator; import org.eclipse.jpt.jaxb.ui.JptJaxbUiPlugin; import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiMessages; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.ui.internal.util.SWTUtil; import org.eclipse.jpt.ui.internal.util.TableLayoutComposite; import org.eclipse.jpt.utility.internal.ArrayTools; @@ -65,6 +66,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ElementTreeSelectionDialog; import org.osgi.framework.Bundle; @@ -75,6 +77,8 @@ public class ClassesGeneratorWizardPage extends NewTypeWizardPage { static public String JPT_ECLIPSELINK_UI_PLUGIN_ID = "org.eclipse.jpt.eclipselink.ui"; //$NON-NLS-1$ static public String XML_FILTER = "*.xml"; //$NON-NLS-1$ static public String XJB_FILTER = "*.xjb"; //$NON-NLS-1$ + + public static final String HELP_CONTEXT_ID = JptUiPlugin.PLUGIN_ID + ".configure_jaxb_class_generation_dialog"; //$NON-NLS-1$ private final IJavaProject javaProject; @@ -113,6 +117,8 @@ public class ClassesGeneratorWizardPage extends NewTypeWizardPage { private Control buildTopLevelControl(Composite parent) { Composite composite = new Composite(parent, SWT.NULL); composite.setLayout(new GridLayout()); + + PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, HELP_CONTEXT_ID); this.settingsGroup = new SettingsGroup(composite); @@ -287,11 +293,6 @@ public class ClassesGeneratorWizardPage extends NewTypeWizardPage { super.setVisible(visible); validateProjectClasspath(); } - - @Override - public final void performHelp() { - //TODO We need a help ID for JAXB Generation - } /** * Override to allow selection of source folder in current project only diff --git a/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java b/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java index f4b06f3f83..32945adac1 100644 --- a/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java +++ b/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java @@ -44,6 +44,7 @@ import org.eclipse.jpt.jaxb.ui.internal.filters.EmptyInnerPackageFilter; import org.eclipse.jpt.jaxb.ui.internal.filters.NonArchiveOrExternalElementFilter; import org.eclipse.jpt.jaxb.ui.internal.filters.NonContainerFilter; import org.eclipse.jpt.jaxb.ui.internal.filters.NonJavaElementFilter; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.utility.internal.ArrayTools; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.swt.SWT; @@ -61,6 +62,7 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.TreeItem; +import org.eclipse.ui.PlatformUI; import org.osgi.framework.Bundle; public class SchemaGeneratorWizardPage extends AbstractJarDestinationWizardPage { @@ -80,6 +82,8 @@ public class SchemaGeneratorWizardPage extends AbstractJarDestinationWizardPage private static final int SIZING_SELECTION_WIDGET_WIDTH = 480; private static final int SIZING_SELECTION_WIDGET_HEIGHT = 150; + public static final String HELP_CONTEXT_ID = JptUiPlugin.PLUGIN_ID + ".wizard_jaxbschema_classes"; //$NON-NLS-1$ + // ********** constructor ********** public SchemaGeneratorWizardPage(IStructuredSelection selection) { @@ -240,6 +244,8 @@ public class SchemaGeneratorWizardPage extends AbstractJarDestinationWizardPage Composite composite = new Composite(parent, SWT.NULL); composite.setLayout(new GridLayout()); + PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, HELP_CONTEXT_ID); + this.settingsGroup = new SettingsGroup(composite); this.usesMoxyCheckBox = this.buildUsesMoxyCheckBox(composite); |