Repository: cayenne Updated Branches: refs/heads/master 62652ff77 -> 437bc348e
Clean getting-started guide - fix PDF output - fix wrong screenshot Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7b677483 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7b677483 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7b677483 Branch: refs/heads/master Commit: 7b6774835da47b2216d2ac2c0ca38af38af850cf Parents: fb4db81 Author: Nikita Timofeev <stari...@gmail.com> Authored: Fri Dec 16 11:49:23 2016 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Fri Dec 16 11:49:23 2016 +0300 ---------------------------------------------------------------------- .../getting-started/src/docbkx/java-classes.xml | 2 +- .../getting-started/src/docbkx/object-context.xml | 15 ++++++++++++--- .../src/docbkx/object-relational-mapping.xml | 14 +++++++------- .../src/docbkx/starting-project.xml | 4 ++-- docs/docbook/getting-started/src/docbkx/webapp.xml | 15 +++++---------- .../src/images/idea-configuration-menu.png | Bin 32911 -> 0 bytes .../src/images/idea-edit-configurations.png | Bin 0 -> 17245 bytes .../src/images/idea-file-run-menu.png | Bin 0 -> 32911 bytes 8 files changed, 27 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/7b677483/docs/docbook/getting-started/src/docbkx/java-classes.xml ---------------------------------------------------------------------- diff --git a/docs/docbook/getting-started/src/docbkx/java-classes.xml b/docs/docbook/getting-started/src/docbkx/java-classes.xml index 8c71104..1868d33 100644 --- a/docs/docbook/getting-started/src/docbkx/java-classes.xml +++ b/docs/docbook/getting-started/src/docbkx/java-classes.xml @@ -74,7 +74,7 @@ result, all the errors should disappear.</para> <para><inlinemediaobject> <imageobject> - <imagedata fileref="images/idea-generated-classes.png" scalefit="0" width="100%"/> + <imagedata fileref="images/idea-generated-classes.png" scalefit="1" width="100%"/> </imageobject> </inlinemediaobject></para> <para>Now let's check the entity class pairs. Each one is made of a superclass (e.g. Artist) http://git-wip-us.apache.org/repos/asf/cayenne/blob/7b677483/docs/docbook/getting-started/src/docbkx/object-context.xml ---------------------------------------------------------------------- diff --git a/docs/docbook/getting-started/src/docbkx/object-context.xml b/docs/docbook/getting-started/src/docbkx/object-context.xml index b859989..0996f6b 100644 --- a/docs/docbook/getting-started/src/docbkx/object-context.xml +++ b/docs/docbook/getting-started/src/docbkx/object-context.xml @@ -75,9 +75,18 @@ public class Main { <artifactId>derby</artifactId> <version>10.13.1.1</version> </dependency></programlisting>Now - we are ready to run. Right click the "Main" class in IDEA and select "Run 'Main.main()'". In the console you'll see output similar to this, indicating that - Cayenne stack has been - started:<screen>INFO: Loading XML configuration resource from file:/.../cayenne-project.xml + we are ready to run. Right click the "Main" class in IDEA and select "Run 'Main.main()'". + </para> + <para> + <inlinemediaobject> + <imageobject> + <imagedata fileref="images/idea-file-run-menu.png"/> + </imageobject> + </inlinemediaobject> + </para> + <para> + In the console you'll see output similar to this, indicating that Cayenne stack has been started: + <screen>INFO: Loading XML configuration resource from file:/.../cayenne-project.xml INFO: Loading XML DataMap resource from file:/.../datamap.map.xml INFO: loading user name and password. INFO: Connecting to 'jdbc:derby:memory:testdb;create=true' as 'null' http://git-wip-us.apache.org/repos/asf/cayenne/blob/7b677483/docs/docbook/getting-started/src/docbkx/object-relational-mapping.xml ---------------------------------------------------------------------- diff --git a/docs/docbook/getting-started/src/docbkx/object-relational-mapping.xml b/docs/docbook/getting-started/src/docbkx/object-relational-mapping.xml index ca579aa..75622dd 100644 --- a/docs/docbook/getting-started/src/docbkx/object-relational-mapping.xml +++ b/docs/docbook/getting-started/src/docbkx/object-relational-mapping.xml @@ -42,13 +42,13 @@ </para> <para>Select "datamap" on the left-hand side project tree and click "Create DbEntity" button <inlinemediaobject> <imageobject> - <imagedata fileref="images/icon-dbentity.gif" scalefit="0" valign="bottom" width="100%"/> + <imagedata fileref="images/icon-dbentity.gif"/> </imageobject> </inlinemediaobject> (or use "Project > Create DbEntity" menu). A new DbEntity is created. In "DbEntity Name" field enter "ARTIST". Then click on "Create Attribute" button <inlinemediaobject> <imageobject> - <imagedata fileref="images/icon-attribute.gif" scalefit="0" valign="bottom" width="100%"/> + <imagedata fileref="images/icon-attribute.gif"/> </imageobject> </inlinemediaobject> on the entity toolbar. This action changes the view to the "Attribute" @@ -82,7 +82,7 @@ <listitem> <para>Click on "Create Relationship" button on the entity toolbar <inlinemediaobject> <imageobject> - <imagedata fileref="images/icon-relationship.png" scalefit="0" valign="bottom" width="100%"/> + <imagedata fileref="images/icon-relationship.png"/> </imageobject> </inlinemediaobject> - a relationship called "untitledRel" is created.</para> </listitem> @@ -92,7 +92,7 @@ <listitem> <para>Click on the "Database Mapping" button <inlinemediaobject> <imageobject> - <imagedata fileref="images/icon-info.png" scalefit="0" valign="bottom" width="100%"/> + <imagedata fileref="images/icon-info.png"/> </imageobject> </inlinemediaobject> - relationship configuration dialog is presented. Here you can assign a name to the @@ -115,7 +115,7 @@ </itemizedlist> <para><inlinemediaobject> <imageobject> - <imagedata fileref="images/modeler-dbrelationship.png" scalefit="0" width="100%"/> + <imagedata fileref="images/modeler-dbrelationship.png" scalefit="1" width="100%"/> </imageobject> </inlinemediaobject></para> <itemizedlist> @@ -146,7 +146,7 @@ <listitem> <para>Select "ARTIST" DbEntity and click on "Create ObjEntity" button <inlinemediaobject> <imageobject> - <imagedata fileref="images/icon-objentity.gif" scalefit="0" valign="bottom" width="100%"/> + <imagedata fileref="images/icon-objentity.gif"/> </imageobject> </inlinemediaobject> either on the entity toolbar or on the main toolbar. An ObjEntity called "Artist" is created with a Java class field set to @@ -169,7 +169,7 @@ <para>Click on the "Artist" ObjEntity. Now click on "Sync ObjEntity with DbEntity" button on the toolbar <inlinemediaobject> <imageobject> - <imagedata fileref="images/icon-sync.gif" scalefit="0" valign="bottom" width="100%"/> + <imagedata fileref="images/icon-sync.gif"/> </imageobject> </inlinemediaobject> - you will see the "paintings" relationship appear.</para> http://git-wip-us.apache.org/repos/asf/cayenne/blob/7b677483/docs/docbook/getting-started/src/docbkx/starting-project.xml ---------------------------------------------------------------------- diff --git a/docs/docbook/getting-started/src/docbkx/starting-project.xml b/docs/docbook/getting-started/src/docbkx/starting-project.xml index 843d960..b976fa9 100644 --- a/docs/docbook/getting-started/src/docbkx/starting-project.xml +++ b/docs/docbook/getting-started/src/docbkx/starting-project.xml @@ -87,7 +87,7 @@ we'll only use one. With "project" selected on the left, click on "Create DataNode" button <inlinemediaobject> <imageobject> - <imagedata fileref="images/icon-node.gif" scalefit="0" width="100%"/> + <imagedata fileref="images/icon-node.gif"/> </imageobject> </inlinemediaobject> on the toolbar (or select "Project > Create DataNode" from the menu. </para> @@ -125,7 +125,7 @@ that holds all the mapping information. To create it, click on "Create DataMap" button <inlinemediaobject> <imageobject> - <imagedata fileref="images/icon-datamap.gif" scalefit="0" width="100%"/> + <imagedata fileref="images/icon-datamap.gif"/> </imageobject> </inlinemediaobject> (or select a corresponding menu item). Note that the newly created DataMap is http://git-wip-us.apache.org/repos/asf/cayenne/blob/7b677483/docs/docbook/getting-started/src/docbkx/webapp.xml ---------------------------------------------------------------------- diff --git a/docs/docbook/getting-started/src/docbkx/webapp.xml b/docs/docbook/getting-started/src/docbkx/webapp.xml index 2695354..73dc225 100644 --- a/docs/docbook/getting-started/src/docbkx/webapp.xml +++ b/docs/docbook/getting-started/src/docbkx/webapp.xml @@ -218,7 +218,7 @@ <para>Go to "Select Run/Debug Configuration" menu, and then "Edit Configuration..."</para> <para><inlinemediaobject> <imageobject> - <imagedata fileref="images/idea-configuration-menu.png" scalefit="0" width="100%"/> + <imagedata fileref="images/idea-edit-configurations.png"/> </imageobject> </inlinemediaobject> </para> @@ -227,7 +227,7 @@ <para>Click "+" button and select "Maven". Enter "Name" and "Command line" as shown on screenshot:</para> <para><inlinemediaobject> <imageobject> - <imagedata fileref="images/idea-run-configuration.png" scalefit="0" width="100%"/> + <imagedata fileref="images/idea-run-configuration.png" scalefit="1" width="100%"/> </imageobject> </inlinemediaobject></para> </listitem> @@ -237,9 +237,7 @@ <para>Click "Apply" and "Run". On the first execution it may take a few minutes for Jetty plugin to download all dependencies, but eventually you'll see the logs like this:</para> - <screen>[INFO] Scanning for projects... -[INFO] -[INFO] ------------------------------------------------------------------------ + <screen>[INFO] ------------------------------------------------------------------------ [INFO] Building tutorial 0.0.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ ... @@ -285,10 +283,7 @@ INFO: ALTER TABLE PAINTING ADD FOREIGN KEY (ARTIST_ID) REFERENCES ARTIST (ID) INFO: ALTER TABLE PAINTING ADD FOREIGN KEY (GALLERY_ID) REFERENCES GALLERY (ID) INFO: CREATE TABLE AUTO_PK_SUPPORT ( TABLE_NAME CHAR(100) NOT NULL, NEXT_ID BIGINT NOT NULL, PRIMARY KEY(TABLE_NAME)) -INFO: DELETE FROM AUTO_PK_SUPPORT WHERE TABLE_NAME IN ('ARTIST', 'GALLERY', 'PAINTING') -INFO: INSERT INTO AUTO_PK_SUPPORT (TABLE_NAME, NEXT_ID) VALUES ('ARTIST', 200) -INFO: INSERT INTO AUTO_PK_SUPPORT (TABLE_NAME, NEXT_ID) VALUES ('GALLERY', 200) -INFO: INSERT INTO AUTO_PK_SUPPORT (TABLE_NAME, NEXT_ID) VALUES ('PAINTING', 200) +... INFO: SELECT t0.DATE_OF_BIRTH, t0.NAME, t0.ID FROM ARTIST t0 ORDER BY t0.NAME INFO: === returned 0 rows. - took 17 ms. INFO: +++ transaction committed.</screen> @@ -300,7 +295,7 @@ INFO: +++ transaction committed.</screen> can be edited by clicking on their name:</para> <para><inlinemediaobject> <imageobject> - <imagedata fileref="images/chrome-webapp.png" width="100%"/> + <imagedata fileref="images/chrome-webapp.png" scalefit="1" width="100%"/> </imageobject> </inlinemediaobject></para> </listitem> http://git-wip-us.apache.org/repos/asf/cayenne/blob/7b677483/docs/docbook/getting-started/src/images/idea-configuration-menu.png ---------------------------------------------------------------------- diff --git a/docs/docbook/getting-started/src/images/idea-configuration-menu.png b/docs/docbook/getting-started/src/images/idea-configuration-menu.png deleted file mode 100644 index 30cf05e..0000000 Binary files a/docs/docbook/getting-started/src/images/idea-configuration-menu.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/cayenne/blob/7b677483/docs/docbook/getting-started/src/images/idea-edit-configurations.png ---------------------------------------------------------------------- diff --git a/docs/docbook/getting-started/src/images/idea-edit-configurations.png b/docs/docbook/getting-started/src/images/idea-edit-configurations.png new file mode 100644 index 0000000..df1d524 Binary files /dev/null and b/docs/docbook/getting-started/src/images/idea-edit-configurations.png differ http://git-wip-us.apache.org/repos/asf/cayenne/blob/7b677483/docs/docbook/getting-started/src/images/idea-file-run-menu.png ---------------------------------------------------------------------- diff --git a/docs/docbook/getting-started/src/images/idea-file-run-menu.png b/docs/docbook/getting-started/src/images/idea-file-run-menu.png new file mode 100644 index 0000000..30cf05e Binary files /dev/null and b/docs/docbook/getting-started/src/images/idea-file-run-menu.png differ
