http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/cayenne-guide.toc.html ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/cayenne-guide.toc.html b/src/main/site/content/docs/3.1/cayenne-guide.toc.html new file mode 100644 index 0000000..97a28f7 --- /dev/null +++ b/src/main/site/content/docs/3.1/cayenne-guide.toc.html @@ -0,0 +1,38 @@ +<div id="toc" class="toc toc-side"> + <div id="toctitle"> + Table of Contents + </div> + <ul class="sectlevel1 nav"> + <li><a href="#object-relational-mapping-with-cayenne" class="nav-link">1. Object Relational Mapping with Cayenne</a> + <ul class="sectlevel2 nav"> + <li><a href="#setup" class="nav-link">1.1. Setup</a></li> + <li><a href="#cayenne-mapping-structure" class="nav-link">1.2. Cayenne Mapping Structure</a></li> + <li><a href="#cayennemodeler-application" class="nav-link">1.3. CayenneModeler Application</a></li> + </ul> </li> + <li><a href="#cayenne-framework" class="nav-link">2. Cayenne Framework</a> + <ul class="sectlevel2 nav"> + <li><a href="#include" class="nav-link">2.1. Including Cayenne in a Project</a></li> + <li><a href="#starting-cayenne" class="nav-link">2.2. Starting Cayenne</a></li> + <li><a href="#persistent-objects-and-objectcontext" class="nav-link">2.3. Persistent Objects and ObjectContext</a></li> + <li><a href="#expressions" class="nav-link">2.4. Expressions</a></li> + <li><a href="#orderings" class="nav-link">2.5. Orderings</a></li> + <li><a href="#queries" class="nav-link">2.6. Queries</a></li> + <li><a href="#lifecycle-events" class="nav-link">2.7. Lifecycle Events</a></li> + <li><a href="#performance-tuning" class="nav-link">2.8. Performance Tuning</a></li> + <li><a href="#customize" class="nav-link">2.9. Customizing Cayenne Runtime</a></li> + </ul> </li> + <li><a href="#cayenne-framework-remote-object-persistence" class="nav-link">3. Cayenne Framework - Remote Object Persistence</a> + <ul class="sectlevel2 nav"> + <li><a href="#rop" class="nav-link">3.1. Introduction to ROP</a></li> + <li><a href="#implementing-rop-client" class="nav-link">3.2. Implementing ROP Client</a></li> + <li><a href="#implementing-rop-server" class="nav-link">3.3. Implementing ROP Server</a></li> + <li><a href="#implementing-rop-client-2" class="nav-link">3.4. Implementing ROP Client</a></li> + <li><a href="#rop-deployment" class="nav-link">3.5. ROP Deployment</a></li> + <li><a href="#current-limitations" class="nav-link">3.6. Current Limitations</a></li> + </ul> </li> + <li><a href="#appendix-a-configuration-properties" class="nav-link">4. Appendix A. Configuration Properties</a></li> + <li><a href="#appendix-b-service-collections" class="nav-link">5. Appendix B. Service Collections</a></li> + <li><a href="#appendix-c-expressions-bnf" class="nav-link">6. Appendix C. Expressions BNF</a></li> + <li><a href="#list-of-tables" class="nav-link">7. List of tables</a></li> + </ul> +</div> \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/cayenne-guide/images/ext-crypto-obj-entity.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/cayenne-guide/images/ext-crypto-obj-entity.png b/src/main/site/content/docs/3.1/cayenne-guide/images/ext-crypto-obj-entity.png new file mode 100644 index 0000000..2d8c32a Binary files /dev/null and b/src/main/site/content/docs/3.1/cayenne-guide/images/ext-crypto-obj-entity.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/cayenne-guide/images/re-modeler-datasource-select.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/cayenne-guide/images/re-modeler-datasource-select.png b/src/main/site/content/docs/3.1/cayenne-guide/images/re-modeler-datasource-select.png new file mode 100644 index 0000000..79ada1c Binary files /dev/null and b/src/main/site/content/docs/3.1/cayenne-guide/images/re-modeler-datasource-select.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/cayenne-guide/images/re-modeler-reverseengineering-dialog.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/cayenne-guide/images/re-modeler-reverseengineering-dialog.png b/src/main/site/content/docs/3.1/cayenne-guide/images/re-modeler-reverseengineering-dialog.png new file mode 100644 index 0000000..8b09d07 Binary files /dev/null and b/src/main/site/content/docs/3.1/cayenne-guide/images/re-modeler-reverseengineering-dialog.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/cayenne-guide/images/remote-object-persistence.jpg ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/cayenne-guide/images/remote-object-persistence.jpg b/src/main/site/content/docs/3.1/cayenne-guide/images/remote-object-persistence.jpg new file mode 100644 index 0000000..43f820d Binary files /dev/null and b/src/main/site/content/docs/3.1/cayenne-guide/images/remote-object-persistence.jpg differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide.html ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide.html b/src/main/site/content/docs/3.1/getting-started-guide.html new file mode 100644 index 0000000..43cd893 --- /dev/null +++ b/src/main/site/content/docs/3.1/getting-started-guide.html @@ -0,0 +1,1031 @@ +--- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +title: "Cayenne Getting Started Guide" +description: "Cayenne Getting Started Guide" +docsMenuTitle: "Getting Started" +cayenneVersion: "3.1" +weight: 10 +--- +<div class="sect1"> + <h2 id="setting-up-the-environment"><a class="anchor" href="#setting-up-the-environment"></a>1. Setting up the environment</h2> + <div class="sectionbody"> + <div class="paragraph"> + <p>The goal of this chapter of the tutorial is to install (or check that you already have installed) a minimally needed set of software to build a Cayenne application.</p> + </div> + <div class="sect2"> + <h3 id="install-java"><a class="anchor" href="#install-java"></a>1.1. Install Java</h3> + <div class="paragraph"> + <p>Obviously, JDK has to be installed. Cayenne 3.1 requires JDK 1.5 or newer.</p> + </div> + </div> + <div class="sect2"> + <h3 id="install-eclipse-ide-and-the-maven-plugin"><a class="anchor" href="#install-eclipse-ide-and-the-maven-plugin"></a>1.2. Install Eclipse IDE and the Maven Plugin</h3> + <div class="paragraph"> + <p>Download Eclipse. This tutorial is based on the Galileo package (Eclipse 3.5), JEE edition, still it should work with any recent vanilla Eclipse distribution.</p> + </div> + <div class="paragraph"> + <p>After downloading Eclipse, unpack it somewhere in the filesystem, and start it. The only plugin that you need for the tutorial is m2eclipse. To install it, in Eclipse go to "Help > Install New Software", then click on "Add.." to add a new download site, and enter "Maven" in the "Name" field, and "http://m2eclipse.sonatype.org/sites/m2e"; in the "Location" field. You may install any of the optional components that you think you need, but for this tutorial we only select a few basic components as shown on the following screenshot:</p> + </div> + <div class="imageblock" style="text-align: center"> + <div class="content"> + <img src="images/maven-plugin-install.png" alt="maven plugin install"> + </div> + </div> + <div class="paragraph"> + <p>From here follow the Eclipse dialog instructions to finish the installation.</p> + </div> + </div> + </div> +</div> +<div class="sect1"> + <h2 id="learning-mapping-basics"><a class="anchor" href="#learning-mapping-basics"></a>2. Learning mapping basics</h2> + <div class="sectionbody"> + <div class="sect2"> + <h3 id="starting-a-project"><a class="anchor" href="#starting-a-project"></a>2.1. Starting a project</h3> + <div class="paragraph"> + <p>The goal of this chapter is to create a new Java project in IntelliJ IDEA containing a basic Cayenne mapping. It presents an introduction to CayenneModeler GUI tool, showing how to create the initial mapping objects: <code>DataDomain</code>, <code>DataNode</code>, <code>DataMap</code>.</p> + </div> + <div class="sect3"> + <h4 id="create-a-new-project-in-eclipse"><a class="anchor" href="#create-a-new-project-in-eclipse"></a>Create a new Project in Eclipse</h4> + <div class="paragraph"> + <p>In Eclipse select "File > New > Otherâ¦â" and then "Maven > Maven Project". Click "Next". On the following screen check "Create a simple project" checkbox and click "Next" again. In the dialog shown on the screenshot below, fill the "Group Id" and "Artifact Id" fields and click "Finish".</p> + </div> + <div class="imageblock" style="text-align: center"> + <div class="content"> + <img src="images/tutorial-idea-project.png" alt="tutorial idea project"> + </div> + </div> + <div class="paragraph"> + <p>Now you should have a new empty project in the Eclipse workspace. Check that the project Java compiler settings are correct. Rightclick on the "tutorial" project, select "Properties > Java Compiler" and ensure that "Compiler compliance level" is at least "1.5" (some versions of Maven plugin seem to be setting it to 1.4 by default).</p> + </div> + </div> + <div class="sect3"> + <h4 id="download-and-start-cayennemodeler"><a class="anchor" href="#download-and-start-cayennemodeler"></a>Download and Start CayenneModeler</h4> + <div class="paragraph"> + <p>Although later in this tutorial weâll be using Maven to include Cayenne runtime jars in the project, youâll still need to download Cayenne to get access to the CayenneModeler tool.</p> + </div> + <div class="admonitionblock note"> + <table> + <tbody> + <tr> + <td class="icon"> <i class="fa fa-info-circle fa-2x" title="Note"></i> </td> + <td class="content"> If you are really into Maven, you can start CayenneModeler from Maven too. Weâll do it in a more traditional way here. </td> + </tr> + </tbody> + </table> + </div> + <div class="paragraph"> + <p>Download the latest release. Unpack the distribution somewhere in the file system and start CayenneModeler, following platform-specific instructions. On most platforms it is done simply by doubleclicking the Modeler icon. The welcome screen of the Modeler looks like this:</p> + </div> + <div class="imageblock" style="text-align: center"> + <div class="content"> + <img src="images/modeler-started.png" alt="modeler started"> + </div> + </div> + </div> + <div class="sect3"> + <h4 id="create-a-new-mapping-project-in-cayennemodeler"><a class="anchor" href="#create-a-new-mapping-project-in-cayennemodeler"></a>Create a New Mapping Project in CayenneModeler</h4> + <div class="paragraph"> + <p>Click on the <code>New Project</code> button on Welcome screen. A new mapping project will appear that contains a single <strong>DataDomain</strong>. The meaning of a DataDomain is explained elsewhere in the User Guide. For now it is sufficient to understand that DataDomain is the root of your mapping project.</p> + </div> + </div> + <div class="sect3"> + <h4 id="create-a-datanode"><a class="anchor" href="#create-a-datanode"></a>Create a DataNode</h4> + <div class="paragraph"> + <p>The next project object you will create is a <strong>DataNode</strong>. DataNode is a descriptor of a single database your application will connect to. Cayenne mapping project can use more than one database, but for now, weâll only use one. With "project" selected on the left, click on <code>Create DataNode</code> button <span class="image"><img src="images/icon-node.png" alt="icon node"></span> on the toolbar (or select <code>Project > Create DataNode</code> from the menu).</p> + </div> + <div class="paragraph"> + <p>A new DataNode is displayed. Now you need to specify JDBC connection parameters. For an in-memory Derby database you can enter the following settings:</p> + </div> + <div class="ulist"> + <ul> + <li> <p>JDBC Driver: org.apache.derby.jdbc.EmbeddedDriver</p> </li> + <li> <p>DB URL: jdbc:derby:memory:testdb;create=true</p> </li> + </ul> + </div> + <div class="admonitionblock note"> + <table> + <tbody> + <tr> + <td class="icon"> <i class="fa fa-info-circle fa-2x" title="Note"></i> </td> + <td class="content"> We are creating an in-memory database here. So when you stop your application, all the data will be lost. In most real-life cases youâll be connecting to a database that actually persists its data on disk, but an in-memory DB will do for the simple tutorial. </td> + </tr> + </tbody> + </table> + </div> + <div class="paragraph"> + <p>Also you will need to change "Schema Update Strategy". Select <code>org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy</code> from the dropdown, so that Cayenne creates a new schema on Derby based on the ORM mapping when the application starts.</p> + </div> + <div class="imageblock" style="text-align: center"> + <div class="content"> + <img src="images/base-datanode.png" alt="base datanode"> + </div> + </div> + </div> + <div class="sect3"> + <h4 id="create-a-datamap"><a class="anchor" href="#create-a-datamap"></a>Create a DataMap</h4> + <div class="paragraph"> + <p>Now you will create a <strong>DataMap</strong>. DataMap is an object that holds all the mapping information. To create it, click on "Create DataMap" button (or select a corresponding menu item). Note that the newly created DataMap is automatically linked to the DataNode that you created in the previous step. If there is more than one DataNode, you may need to link a DataMap to the correct node manually. In other words a DataMap within DataDomain must point to a database described by the map.</p> + </div> + <div class="paragraph"> + <p>You can leave all the DataMap defaults unchanged except for one - "Java Package". Enter "org.example.cayenne.persistent". This name will later be used for all persistent classes.</p> + </div> + <div class="imageblock" style="text-align: center"> + <div class="content"> + <img src="images/base-datamap.png" alt="base datamap"> + </div> + </div> + </div> + <div class="sect3"> + <h4 id="save-the-project"><a class="anchor" href="#save-the-project"></a>Save the Project</h4> + <div class="paragraph"> + <p>Before you proceed with the actual mapping, letâs save the project. Click on "Save" button in the toolbar and navigate to the "tutorial" Eclipse project folder that was created earlier in this section and its "src/main/resources" subfolder and save the project there. Now go back to Eclipse, right click on "tutorial" project and select "Refresh", you will see three Cayenne XML files.</p> + </div> + <div class="imageblock" style="float: right"> + <div class="content"> + <img src="images/eclipse-xmlfiles.png" alt="eclipse xmlfiles"> + </div> + </div> + <div class="paragraph"> + <p>Note that the location of the XML files is not coincidental. Cayenne runtime looks for <code>cayenne-*.xml</code> file in the application <code>CLASSPATH</code> and <code>src/main/resources</code> folder should already be a "class folder" in Eclipse for our project (and is also a standard location that Maven would copy to a jar file, if we were using Maven from command-line).</p> + </div> + </div> + </div> + <div class="sect2"> + <h3 id="getting-started-with-object-relational-mapping-orm"><a class="anchor" href="#getting-started-with-object-relational-mapping-orm"></a>2.2. Getting started with Object Relational Mapping (ORM)</h3> + <div class="paragraph"> + <p>The goal of this section is to learn how to create a simple Object-Relational model with CayenneModeler. We will create a complete ORM model for the following database schema:</p> + </div> + <div class="imageblock" style="text-align: center"> + <div class="content"> + <img src="images/cayenne-tutorial-model.png" alt="cayenne tutorial model"> + </div> + </div> + <div class="admonitionblock note"> + <table> + <tbody> + <tr> + <td class="icon"> <i class="fa fa-info-circle fa-2x" title="Note"></i> </td> + <td class="content"> Very often youâd have an existing database already, and it can be quickly imported in Cayenne via "Tools > Reengineer Database Schema". This will save you lots of time compared to manual mapping. However understanding how to create the mapping by hand is important, so we are showing the "manual" approach below. </td> + </tr> + </tbody> + </table> + </div> + <div class="sect3"> + <h4 id="mapping-database-tables-and-columns"><a class="anchor" href="#mapping-database-tables-and-columns"></a>Mapping Database Tables and Columns</h4> + <div class="paragraph"> + <p>Lets go back to CayenneModeler where we have the newly created project open and start by adding the ARTIST table. Database tables are called <strong>DbEntities</strong> in Cayenne mapping (those can be actual tables or database views).</p> + </div> + <div class="paragraph"> + <p>Select "datamap" on the left-hand side project tree and click "Create DbEntity" button <span class="image"><img src="images/icon-dbentity.png" alt="icon dbentity"></span> (or use "Project > Create DbEntity" menu). A new DbEntity is created. In "DbEntity Name" field enter "ARTIST". Then click on "Create Attribute" button <span class="image"><img src="images/icon-attribute.png" alt="icon attribute"></span> on the entity toolbar. This action changes the view to the "Attribute" tab and adds a new attribute (attribute means a "table column" in this case) called "untitledAttr". Letâs rename it to ID, make it an <code>INTEGER</code> and make it a PK:</p> + </div> + <div class="imageblock" style="text-align: center"> + <div class="content"> + <img src="images/modeler-artistid.png" alt="modeler artistid"> + </div> + </div> + <div class="paragraph"> + <p>Similarly add NAME <code>VARCHAR(200)</code> and DATE_OF_BIRTH <code>DATE</code> attributes. After that repeat this procedure for PAINTING and GALLERY entities to match DB schema shown above.</p> + </div> + <div class="admonitionblock note"> + <table> + <tbody> + <tr> + <td class="icon"> <i class="fa fa-info-circle fa-2x" title="Note"></i> </td> + <td class="content"> Donât forget to save your project periodically to avoid losing your work. You will also have to refresh the project in Eclipse after every CayenneModeler save, as Eclipse is by default unaware of any changes made in the Modeler. </td> + </tr> + </tbody> + </table> + </div> + </div> + <div class="sect3"> + <h4 id="mapping-database-relationships"><a class="anchor" href="#mapping-database-relationships"></a>Mapping Database Relationships</h4> + <div class="paragraph"> + <p>Now we need to specify relationships between ARTIST, PAINTING and GALLERY tables. Start by creating a one-to-many ARTIST/PAINTING relationship:</p> + </div> + <div class="ulist"> + <ul> + <li> <p>Select the ARTIST DbEntity on the left and click on the "Properties" tab.</p> </li> + <li> <p>Click on "Create Relationship" button on the entity toolbar <span class="image"><img src="images/icon-relationship.png" alt="icon relationship"></span> - a relationship called "untitledRel" is created.</p> </li> + <li> <p>Choose the "Target" to be "Painting".</p> </li> + <li> <p>Click on the "Database Mapping" button <span class="image"><img src="images/icon-edit.png" alt="icon edit"></span> - relationship configuration dialog is presented. Here you can assign a name to the relationship and also its complimentary reverse relationship. This name can be anything (this is really a symbolic name of the database referential constraint), but it is recommended to use a valid Java identifier, as this will save some typing later. Weâll call the relationship "paintings" and reverse relationship "artist".</p> </li> + <li> <p>Click on "Add" button on the right to add a join</p> </li> + <li> <p>Select "ID" column for the "Source" and "ARTIST_ID" column for the target.</p> </li> + <li> <p>Relationship information should now look like this:</p> </li> + </ul> + </div> + <div class="imageblock" style="text-align: center"> + <div class="content"> + <img src="images/modeler-dbrelationship.png" alt="modeler dbrelationship"> + </div> + </div> + <div class="ulist"> + <ul> + <li> <p>Click "Done" to confirm the changes and close the dialog.</p> </li> + <li> <p>Two complimentary relationships have been created - from ARTIST to PAINTING and back. Still you may have noticed one thing is missing - "paintings" relationship should be to-many, but "To Many" checkbox is not checked. Letâs change that - check the checkbox for "paintings" relationship, and then click on PAINTING DbEntity, and uncheck "artist" relationship "To Many" to make the reverse relationship "to-one" as it should be.</p> </li> + <li> <p>Repeat the steps above to create a many-to-one relationship from PAINTING to GALLERY, calling the relationships pair "gallery" and "paintings".</p> </li> + </ul> + </div> + </div> + <div class="sect3"> + <h4 id="mapping-java-classes"><a class="anchor" href="#mapping-java-classes"></a>Mapping Java Classes</h4> + <div class="paragraph"> + <p>Now that the database schema mapping is complete, CayenneModeler can create mappings of Java classes (aka "ObjEntities") by deriving everything from DbEntities. At present there is no way to do it for the entire DataMap in one click, so weâll do it for each table individually.</p> + </div> + <div class="ulist"> + <ul> + <li> <p>Select "ARTIST" DbEntity and click on "Create ObjEntity" button <span class="image"><img src="images/icon-new_objentity.png" alt="icon new objentity"></span> either on the entity toolbar or on the main toolbar. An ObjEntity called "Artist" is created with a Java class field set to "org.example.cayenne.persistent.Artist". The modeler transformed the database names to the Java-friendly names (e.g., if you click on the "Attributes" tab, youâll see that "DATE_OF_BIRTH" column was converted to "dateOfBirth" Java class attribute).</p> </li> + <li> <p>Select "GALLERY" DbEntity and click on "Create ObjEntity" button again - youâll see a "Gallery" ObjEntity created.</p> </li> + <li> <p>Finally, do the same thing for "PAINTING".</p> </li> + </ul> + </div> + <div class="paragraph"> + <p>Now you need to synchronize relationships. Artist and Gallery entities were created when there was no related "Painting" entity, so their relationships were not set.</p> + </div> + <div class="ulist"> + <ul> + <li> <p>Click on the "Artist" ObjEntity. Now click on "Sync ObjEntity with DbEntity" button on the toolbar <span class="image"><img src="images/icon-sync.png" alt="icon sync"></span> - you will see the "paintings" relationship appear.</p> </li> + <li> <p>Do the same for the "Gallery" entity.</p> </li> + </ul> + </div> + <div class="paragraph"> + <p>Unless you want to customize the Java class and property names (which you can do easily) the mapping is complete.</p> + </div> + </div> + </div> + <div class="sect2"> + <h3 id="creating-java-classes"><a class="anchor" href="#creating-java-classes"></a>2.3. Creating Java Classes</h3> + <div class="paragraph"> + <p>Here weâll generate the Java classes from the model that was created in the previous section. CayenneModeler can be used to also generate the database schema, but since we specified âCreateIfNoSchemaStrategyâ earlier when we created a DataNode, weâll skip the database schema step. Still be aware that you can do it if you need to via "Tools > Create Database Schema".</p> + </div> + <div class="sect3"> + <h4 id="creating-java-classes-2"><a class="anchor" href="#creating-java-classes-2"></a>Creating Java Classes</h4> + <div class="ulist"> + <ul> + <li> <p>Select "Tools > Generate Classes" menu.</p> </li> + <li> <p>For "Type" select "Standard Persistent Objects", if it is not already selected.</p> </li> + <li> <p>For the "Output Directory" select âsrc/main/javaâ folder under your IDEA project folder (this is a "peer" location to the <code>cayenne-*.xml</code> location we selected before).</p> </li> + <li> <p>Click on "Classes" tab and check the "Check All Classes" checkbox (unless it is already checked and reads "Uncheck all Classes").</p> </li> + <li> <p>Click "Generate"</p> </li> + </ul> + </div> + <div class="paragraph"> + <p>Now go back to Eclipse, right click on "tutorial" project and select "Refresh" - you should see pairs of classes generated for each mapped entity. You probably also see that thereâs a bunch of red squiggles next to the newly generated Java classes in Eclipse. This is because our project does not include Cayenne as a Maven dependency yet. Letâs fix it now by adding "cayenne-server" artifact in the bottom of the pom.xml file. The resulting POM should look like this:</p> + </div> + <div class="listingblock"> + <div class="content"> + <pre class="highlight"><code class="language-xml xml" data-lang="xml"><project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.example.cayenne</groupId> + <artifactId>tutorial</artifactId> + <version>0.0.1-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.apache.cayenne</groupId> + <artifactId>cayenne-server</artifactId> + <!-- Here specify the version of Cayenne you are actually using --> + <version>3.1.3-SNAPSHOT</version> + </dependency> + </dependencies> +</project></code></pre> + </div> + </div> + <div class="paragraph"> + <p>Your computer must be connected to the internet. Once you save the pom.xml, Eclipse will download the needed Cayenne jar file and add it to the project build path. As a result, all the errors should disappear.</p> + </div> + <div class="imageblock" style="text-align: center"> + <div class="content"> + <img src="images/eclipse-generatedclasses.png" alt="eclipse generatedclasses"> + </div> + </div> + <div class="paragraph"> + <p>Now letâs check the entity class pairs. Each one is made of a superclass (e.g. Artist) and a subclass (e.g. Artist). You should not modify the superclasses whose names start with "_" (underscore), as they will be replaced on subsequent generator runs. Instead all custom logic should be placed in the subclasses in "org.example.cayenne.persistent" package - those will never be overwritten by the class generator.</p> + </div> + <div class="admonitionblock tip"> + <table> + <tbody> + <tr> + <td class="icon"> <i class="fa fa-lightbulb-o fa-2x" title="Tip"></i> </td> + <td class="content"> + <div class="title"> + Class Generation Hint + </div> + <div class="paragraph"> + <p>Often youâd start by generating classes from the Modeler, but at the later stages of the project the generation is usually automated either via Ant cgen task or Maven cgen mojo. All three methods are interchangeable, however Ant and Maven methods would ensure that you never forget to regenerate classes on mapping changes, as they are integrated into the build cycle.</p> + </div> </td> + </tr> + </tbody> + </table> + </div> + </div> + </div> + </div> +</div> +<div class="sect1"> + <h2 id="learning-cayenne-api"><a class="anchor" href="#learning-cayenne-api"></a>3. Learning Cayenne API</h2> + <div class="sectionbody"> + <div class="sect2"> + <h3 id="getting-started-with-objectcontext"><a class="anchor" href="#getting-started-with-objectcontext"></a>3.1. Getting started with ObjectContext</h3> + <div class="paragraph"> + <p>In this section weâll write a simple main class to run our application, and get a brief introduction to Cayenne ObjectContext.</p> + </div> + <div class="sect3"> + <h4 id="creating-the-main-class"><a class="anchor" href="#creating-the-main-class"></a>Creating the Main Class</h4> + <div class="ulist"> + <ul> + <li> <p>n Eclipse create a new class called "Main" in the "org.example.cayenne" package.</p> </li> + <li> <p>Create a standard "main" method to make it a runnable class:</p> </li> + </ul> + </div> + <div class="listingblock"> + <div class="content"> + <pre class="highlight"><code class="language-java java" data-lang="java">package org.example.cayenne; + +public class Main { + + public static void main(String[] args) { + } +}</code></pre> + </div> + </div> + <div class="ulist"> + <ul> + <li> <p>The first thing you need to be able to access the database is to create a <code>ServerRuntime</code> object (which is essentially a wrapper around Cayenne stack) and use it to obtain an instance of an <code>ObjectContext</code>.</p> </li> + </ul> + </div> + <div class="listingblock"> + <div class="content"> + <pre class="highlight"><code class="language-java java" data-lang="java">package org.example.cayenne; + +import org.apache.cayenne.ObjectContext; +import org.apache.cayenne.configuration.server.ServerRuntime; + +public class Main { + + public static void main(String[] args) { + ServerRuntime cayenneRuntime = new ServerRuntime( + "cayenne-project.xml"); + ObjectContext context = cayenneRuntime.getContext(); + } +}</code></pre> + </div> + </div> + <div class="paragraph"> + <p><code>ObjectContext</code> is an isolated "session" in Cayenne that provides all needed API to work with data. ObjectContext has methods to execute queries and manage persistent objects. Weâll discuss them in the following sections. When the first ObjectContext is created in the application, Cayenne loads XML mapping files and creates a shared access stack that is later reused by other ObjectContexts.</p> + </div> + </div> + <div class="sect3"> + <h4 id="running-application"><a class="anchor" href="#running-application"></a>Running Application</h4> + <div class="paragraph"> + <p>Letâs check what happens when you run the application. But before we do that we need to add another dependency to the <code>pom.xml</code> - Apache Derby, our embedded database engine. The following piece of XML needs to be added to the <code><dependencies>â¦â</dependencies></code> section, where we already have Cayenne jars:</p> + </div> + <div class="listingblock"> + <div class="content"> + <pre class="highlight"><code class="language-xml xml" data-lang="xml"><dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>10.8.1.2</version> +</dependency></code></pre> + </div> + </div> + <div class="paragraph"> + <p>Now we are ready to run. Right click the "Main" class in Eclipse and select "Run As > Java Application". In the console youâll see output similar to this, indicating that Cayenne stack has been started: In the console youâll see output similar to this, indicating that Cayenne stack has been started:</p> + </div> + <div class="literalblock"> + <div class="content"> + <pre>INFO: Loading XML configuration resource from file:cayenne-project.xml +INFO: loading user name and password. +INFO: Created connection pool: jdbc:derby:memory:testdb;create=true + Driver class: org.apache.derby.jdbc.EmbeddedDriver + Min. connections in the pool: 1 + Max. connections in the pool: 1</pre> + </div> + </div> + </div> + <div class="sect3"> + <h4 id="how-to-configure-cayenne-logging"><a class="anchor" href="#how-to-configure-cayenne-logging"></a>How to Configure Cayenne Logging</h4> + <div class="paragraph"> + <p>Follow the instructions in the logging chapter to tweak verbosity of the logging output.</p> + </div> + </div> + </div> + <div class="sect2"> + <h3 id="getting-started-with-persistent-objects"><a class="anchor" href="#getting-started-with-persistent-objects"></a>3.2. Getting started with persistent objects</h3> + <div class="paragraph"> + <p>In this chapter weâll learn about persistent objects, how to customize them and how to create and save them in DB.</p> + </div> + <div class="sect3"> + <h4 id="inspecting-and-customizing-persistent-objects"><a class="anchor" href="#inspecting-and-customizing-persistent-objects"></a>Inspecting and Customizing Persistent Objects</h4> + <div class="paragraph"> + <p>Persistent classes in Cayenne implement a DataObject interface. If you inspect any of the classes generated earlier in this tutorial (e.g. <code>org.example.cayenne.persistent.Artist</code>), youâll see that it extends a class with the name that starts with underscore (<code>org.example.cayenne.persistent.auto._Artist</code>), which in turn extends from <code>org.apache.cayenne.CayenneDataObject</code>. Splitting each persistent class into user-customizable subclass (<code>Xyz</code>) and a generated superclass (<code>_Xyz</code>) is a useful technique to avoid overwriting the custom code when refreshing classes from the mapping model.</p> + </div> + <div class="paragraph"> + <p>Letâs for instance add a utility method to the Artist class that sets Artist date of birth, taking a string argument for the date. It will be preserved even if the model changes later:</p> + </div> + <div class="listingblock"> + <div class="content"> + <pre class="highlight"><code class="language-java java" data-lang="java">public class Artist extends _Artist { + + static final String DEFAULT_DATE_FORMAT = "yyyyMMdd"; + + /** + * Sets date of birth using a string in format yyyyMMdd. + */ + public void setDateOfBirthString(String yearMonthDay) { + if (yearMonthDay == null) { + setDateOfBirth(null); + } else { + + Date date; + try { + date = new SimpleDateFormat(DEFAULT_DATE_FORMAT) + .parse(yearMonthDay); + } catch (ParseException e) { + throw new IllegalArgumentException( + "A date argument must be in format '" + + DEFAULT_DATE_FORMAT + "': " + yearMonthDay); + } + + setDateOfBirth(date); + } + } +}</code></pre> + </div> + </div> + </div> + <div class="sect3"> + <h4 id="create-new-objects"><a class="anchor" href="#create-new-objects"></a>Create New Objects</h4> + <div class="paragraph"> + <p>Now weâll create a bunch of objects and save them to the database. An object is created and registered with <code>ObjectContext</code> using ânewObjectâ method. Objects <strong>must</strong> be registered with <code>DataContext</code> to be persisted and to allow setting relationships with other objects. Add this code to the "main" method of the Main class:</p> + </div> + <div class="listingblock"> + <div class="content"> + <pre class="highlight"><code class="language-java java" data-lang="java">Artist picasso = context.newObject(Artist.class); +picasso.setName("Pablo Picasso"); +picasso.setDateOfBirthString("18811025");</code></pre> + </div> + </div> + <div class="paragraph"> + <p>Note that at this point "picasso" object is only stored in memory and is not saved in the database. Letâs continue by adding a Metropolitan Museum âGalleryâ object and a few Picasso "Paintings":</p> + </div> + <div class="listingblock"> + <div class="content"> + <pre class="highlight"><code class="language-java java" data-lang="java">Gallery metropolitan = context.newObject(Gallery.class); +metropolitan.setName("Metropolitan Museum of Art"); + +Painting girl = context.newObject(Painting.class); +girl.setName("Girl Reading at a Table"); + +Painting stein = context.newObject(Painting.class); +stein.setName("Gertrude Stein");</code></pre> + </div> + </div> + <div class="paragraph"> + <p>Now we can link the objects together, establishing relationships. Note that in each case below relationships are automatically established in both directions (e.g. <code>picasso.addToPaintings(girl)</code> has exactly the same effect as <code>girl.setToArtist(picasso)</code>).</p> + </div> + <div class="listingblock"> + <div class="content"> + <pre class="highlight"><code class="language-java java" data-lang="java">picasso.addToPaintings(girl); +picasso.addToPaintings(stein); + +girl.setGallery(metropolitan); +stein.setGallery(metropolitan);</code></pre> + </div> + </div> + <div class="paragraph"> + <p>Now lets save all five new objects, in a single method call:</p> + </div> + <div class="listingblock"> + <div class="content"> + <pre class="highlight"><code class="language-java java" data-lang="java">context.commitChanges();</code></pre> + </div> + </div> + <div class="paragraph"> + <p>Now you can run the application again as described in the previous chapter. The new output will show a few actual DB operations:</p> + </div> + <div class="literalblock"> + <div class="content"> + <pre>... +org.apache.cayenne.configuration.XMLDataChannelDescriptorLoader load +INFO: Loading XML configuration resource from file:cayenne-project.xml +... +INFO: Opening connection: jdbc:derby:memory:testdb;create=true + Login: null + Password: ******* +INFO: +++ Connecting: SUCCESS. +INFO: Detected and installed adapter: org.apache.cayenne.dba.derby.DerbyAdapter +INFO: --- transaction started. +INFO: No schema detected, will create mapped tables +INFO: CREATE TABLE GALLERY (ID INTEGER NOT NULL, NAME VARCHAR (200), PRIMARY KEY (ID)) +INFO: CREATE TABLE ARTIST (DATE_OF_BIRTH DATE, ID INTEGER NOT NULL, NAME VARCHAR (200), PRIMARY KEY (ID)) +INFO: CREATE TABLE PAINTING (ARTIST_ID INTEGER, GALLERY_ID INTEGER, ID INTEGER NOT NULL, + NAME VARCHAR (200), PRIMARY KEY (ID)) +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 NEXT_ID FROM AUTO_PK_SUPPORT WHERE TABLE_NAME = ? FOR UPDATE [bind: 1:'ARTIST'] +INFO: SELECT NEXT_ID FROM AUTO_PK_SUPPORT WHERE TABLE_NAME = ? FOR UPDATE [bind: 1:'GALLERY'] +INFO: SELECT NEXT_ID FROM AUTO_PK_SUPPORT WHERE TABLE_NAME = ? FOR UPDATE [bind: 1:'PAINTING'] +INFO: INSERT INTO GALLERY (ID, NAME) VALUES (?, ?) +INFO: [batch bind: 1->ID:200, 2->NAME:'Metropolitan Museum of Art'] +INFO: === updated 1 row. +INFO: INSERT INTO ARTIST (DATE_OF_BIRTH, ID, NAME) VALUES (?, ?, ?) +INFO: [batch bind: 1->DATE_OF_BIRTH:'1881-10-25 00:00:00.0', 2->ID:200, 3->NAME:'Pablo Picasso'] +INFO: === updated 1 row. +INFO: INSERT INTO PAINTING (ARTIST_ID, GALLERY_ID, ID, NAME) VALUES (?, ?, ?, ?) +INFO: [batch bind: 1->ARTIST_ID:200, 2->GALLERY_ID:200, 3->ID:200, 4->NAME:'Gertrude Stein'] +INFO: [batch bind: 1->ARTIST_ID:200, 2->GALLERY_ID:200, 3->ID:201, 4->NAME:'Girl Reading at a Table'] +INFO: === updated 2 rows. +INFO: +++ transaction committed.</pre> + </div> + </div> + <div class="paragraph"> + <p>So first Cayenne creates the needed tables (remember, we used âCreateIfNoSchemaStrategyâ). Then it runs a number of inserts, generating primary keys on the fly. Not bad for just a few lines of code.</p> + </div> + </div> + </div> + <div class="sect2"> + <h3 id="selecting-objects"><a class="anchor" href="#selecting-objects"></a>3.3. Selecting Objects</h3> + <div class="paragraph"> + <p>This chapter shows how to select objects from the database using <code>ObjectSelect</code> query.</p> + </div> + <div class="sect3"> + <h4 id="introducing-objectselect"><a class="anchor" href="#introducing-objectselect"></a>Introducing ObjectSelect</h4> + <div class="paragraph"> + <p>It was shown before how to persist new objects. Cayenne queries are used to access already saved objects. The primary query type used for selecting objects is <code>ObjectSelect</code>. It can be mapped in CayenneModeler or created via the API. Weâll use the latter approach in this section. We donât have too much data in the database yet, but we can still demonstrate the main principles below.</p> + </div> + <div class="ulist"> + <ul> + <li> <p>Select all paintings (the code, and the log output it generates):</p> </li> + </ul> + </div> + <div class="listingblock"> + <div class="content"> + <pre class="highlight"><code class="language-java java" data-lang="java">SelectQuery select1 = new SelectQuery(Painting.class); +List paintings1 = context.performQuery(select1);</code></pre> + </div> + </div> + <div class="literalblock"> + <div class="content"> + <pre>INFO: SELECT t0.GALLERY_ID, t0.ARTIST_ID, t0.NAME, t0.ID FROM PAINTING t0 +INFO: === returned 2 rows. - took 18 ms.</pre> + </div> + </div> + <div class="ulist"> + <ul> + <li> <p>Select paintings that start with âgiâ, ignoring case:</p> </li> + </ul> + </div> + <div class="listingblock"> + <div class="content"> + <pre class="highlight"><code class="language-java java" data-lang="java">Expression qualifier2 = ExpressionFactory.likeIgnoreCaseExp( + Painting.NAME_PROPERTY, + "gi%"); +SelectQuery select2 = new SelectQuery(Painting.class, qualifier2); +List paintings2 = context.performQuery(select2);</code></pre> + </div> + </div> + <div class="literalblock"> + <div class="content"> + <pre>INFO: SELECT t0.GALLERY_ID, t0.NAME, t0.ARTIST_ID, t0.ID FROM PAINTING t0 WHERE UPPER(t0.NAME) LIKE UPPER(?) + [bind: 1->NAME:'gi%'] - prepared in 6 ms. +INFO: === returned 1 row. - took 18 ms.</pre> + </div> + </div> + <div class="ulist"> + <ul> + <li> <p>Select all paintings done by artists who were born more than a 100 years ago (demonstrating using Expression.fromString(..) instead of ExpressionFactory):</p> </li> + </ul> + </div> + <div class="listingblock"> + <div class="content"> + <pre>Calendar c = new GregorianCalendar(); +c.set(c.get(Calendar.YEAR) - 100, 0, 1, 0, 0, 0); + +Expression qualifier3 = Expression.fromString("artist.dateOfBirth < $date"); +qualifier3 = qualifier3.expWithParameters(Collections.singletonMap("date", c.getTime())); +SelectQuery select3 = new SelectQuery(Painting.class, qualifier3); +List paintings3 = context.performQuery(select3);</pre> + </div> + </div> + <div class="literalblock"> + <div class="content"> + <pre>INFO: SELECT t0.GALLERY_ID, t0.NAME, t0.ARTIST_ID, t0.ID FROM PAINTING t0 JOIN ARTIST t1 ON (t0.ARTIST_ID = t1.ID) + WHERE t1.DATE_OF_BIRTH < ? [bind: 1->DATE_OF_BIRTH:'1911-01-01 00:00:00.493'] - prepared in 7 ms. +INFO: === returned 2 rows. - took 25 ms.</pre> + </div> + </div> + </div> + </div> + <div class="sect2"> + <h3 id="deleting-objects"><a class="anchor" href="#deleting-objects"></a>3.4. Deleting Objects</h3> + <div class="paragraph"> + <p>This chapter explains how to model relationship delete rules and how to delete individual objects as well as sets of objects. Also demonstrated the use of Cayenne class to run a query.</p> + </div> + <div class="sect3"> + <h4 id="setting-up-delete-rules"><a class="anchor" href="#setting-up-delete-rules"></a>Setting Up Delete Rules</h4> + <div class="paragraph"> + <p>Before we discuss the API for object deletion, lets go back to CayenneModeler and set up some delete rules. Doing this is optional but will simplify correct handling of the objects related to deleted objects.</p> + </div> + <div class="paragraph"> + <p>In the Modeler go to "Artist" ObjEntity, "Relationships" tab and select "Cascade" for the "paintings" relationship delete rule:</p> + </div> + <div class="imageblock"> + <div class="content"> + <img src="images/modeler-deleterule.png" alt="modeler deleterule"> + </div> + </div> + <div class="paragraph"> + <p>Repeat this step for other relationships:</p> + </div> + <div class="ulist"> + <ul> + <li> <p>For Gallery set "paintings" relationship to be "Nullify", as a painting can exist without being displayed in a gallery.</p> </li> + <li> <p>For Painting set both relationships rules to "Nullify".</p> </li> + </ul> + </div> + <div class="paragraph"> + <p>Now save the mapping.</p> + </div> + </div> + <div class="sect3"> + <h4 id="deleting-objects-2"><a class="anchor" href="#deleting-objects-2"></a>Deleting Objects</h4> + <div class="paragraph"> + <p>While deleting objects is possible via SQL, qualifying a delete on one or more IDs, a more common way in Cayenne (or ORM in general) is to get a hold of the object first, and then delete it via the context. Letâs use utility class Cayenne to find an artist:</p> + </div> + <div class="listingblock"> + <div class="content"> + <pre class="highlight"><code class="language-java java" data-lang="java">Expression qualifier = ExpressionFactory.matchExp(Artist.NAME_PROPERTY, "Pablo Picasso"); +SelectQuery select = new SelectQuery(Artist.class, qualifier); +Artist picasso = (Artist) Cayenne.objectForQuery(context, select);</code></pre> + </div> + </div> + <div class="paragraph"> + <p>Now letâs delete the artist:</p> + </div> + <div class="listingblock"> + <div class="content"> + <pre class="highlight"><code class="language-java java" data-lang="java">if (picasso != null) { + context.deleteObject(picasso); + context.commitChanges(); +} +}</code></pre> + </div> + </div> + <div class="paragraph"> + <p>Since we set up "Cascade" delete rule for the Artist.paintings relationships, Cayenne will automatically delete all paintings of this artist. So when your run the app youâll see this output:</p> + </div> + <div class="literalblock"> + <div class="content"> + <pre>INFO: SELECT t0.DATE_OF_BIRTH, t0.NAME, t0.ID FROM ARTIST t0 + WHERE t0.NAME = ? [bind: 1->NAME:'Pablo Picasso'] - prepared in 6 ms. +INFO: === returned 1 row. - took 18 ms. +INFO: +++ transaction committed. +INFO: --- transaction started. +INFO: DELETE FROM PAINTING WHERE ID = ? +INFO: [batch bind: 1->ID:200] +INFO: [batch bind: 1->ID:201] +INFO: === updated 2 rows. +INFO: DELETE FROM ARTIST WHERE ID = ? +INFO: [batch bind: 1->ID:200] +INFO: === updated 1 row. +INFO: +++ transaction committed.</pre> + </div> + </div> + </div> + </div> + </div> +</div> +<div class="sect1"> + <h2 id="converting-to-web-application"><a class="anchor" href="#converting-to-web-application"></a>4. Converting to Web Application</h2> + <div class="sectionbody"> + <div class="paragraph"> + <p>This chapter shows how to work with Cayenne in a web application.</p> + </div> + <div class="sect2"> + <h3 id="converting-tutorial-to-a-web-application"><a class="anchor" href="#converting-tutorial-to-a-web-application"></a>4.1. Converting Tutorial to a Web Application</h3> + <div class="paragraph"> + <p>The web part of the web application tutorial is done in JSP, which is the least common denominator of the Java web technologies, and is intentionally simplistic from the UI perspective, to concentrate on Cayenne integration aspect, rather than the interface. A typical Cayenne web application works like this:</p> + </div> + <div class="ulist"> + <ul> + <li> <p>Cayenne configuration is loaded when an application context is started, using a special servlet filter.</p> </li> + <li> <p>User requests are intercepted by the filter, and the DataContext is bound to the request thread, so the application can access it easily from anywhere.</p> </li> + <li> <p>The same DataContext instance is reused within a single user session; different sessions use different DataContexts (and therefore different sets of objects). The context can be scoped differently depending on the app specifics. For the tutorial weâll be using a session-scoped context.</p> </li> + </ul> + </div> + <div class="paragraph"> + <p>So letâs convert the tutorial that we created to a web application:</p> + </div> + <div class="ulist"> + <ul> + <li> <p>In Eclipse under "tutorial" project folder create a new folder "src/main/webapp/WEB-INF".</p> </li> + <li> <p>Under <code>WEB-INF</code> create a new file <code>web.xml</code> (a standard web app descriptor):</p> </li> + </ul> + </div> + <div class="listingblock"> + <div class="title"> + web.xml + </div> + <div class="content"> + <pre class="highlight"><code class="language-xml xml" data-lang="xml"><?xml version="1.0" encoding="utf-8"?> + <!DOCTYPE web-app + PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <display-name>Cayenne Tutorial</display-name> + + <!-- This filter bootstraps ServerRuntime and then provides each request thread + with a session-bound DataContext. Note that the name of the filter is important, + as it points it to the right named configuration file. + --> + <filter> + <filter-name>cayenne-project</filter-name> + <filter-class>org.apache.cayenne.configuration.web.CayenneFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>cayenne-project</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <welcome-file-list> + <welcome-file>index.jsp</welcome-file> + </welcome-file-list> +</web-app></code></pre> + </div> + </div> + <div class="ulist"> + <ul> + <li> <p>Create the artist browser page <code>src/main/webapp/index.jsp</code> file with the following contents:</p> </li> + </ul> + </div> + <div class="listingblock"> + <div class="title"> + webapp/index.jsp + </div> + <div class="content"> + <pre class="highlight"><code class="language-jsp jsp" data-lang="jsp"><%@ page language="java" contentType="text/html" %> +<%@ page import="org.example.cayenne.persistent.*" %> +<%@ page import="org.apache.cayenne.*" %> +<%@ page import="org.apache.cayenne.query.*" %> +<%@ page import="org.apache.cayenne.exp.*" %> +<%@ page import="java.util.*" %> + +<% + SelectQuery query = new SelectQuery(Artist.class); + query.addOrdering(Artist.NAME_PROPERTY, SortOrder.ASCENDING); + + ObjectContext context = BaseContext.getThreadObjectContext(); + List<Artist> artists = context.performQuery(query); +%> +<html> + <head> + <title>Main</title> + </head> + <body> + <h2>Artists:</h2> + + <% if(artists.isEmpty()) {%> + <p>No artists found</p> + <% } else { + for(Artist a : artists) { + %> + <p><a href="detail.jsp?id=<%=Cayenne.intPKForObject(a)%>"> <%=a.getName()%> </a></p> + <% + } + } %> + <hr> + <p><a href="detail.jsp">Create new artist...</a></p> + </body> +</html></code></pre> + </div> + </div> + <div class="ulist"> + <ul> + <li> <p>Create the artist editor page <code>src/main/webapp/detail.jsp</code> with the following content:</p> </li> + </ul> + </div> + <div class="listingblock"> + <div class="title"> + webapp/detail.jsp + </div> + <div class="content"> + <pre class="highlight"><code class="language-jsp jsp" data-lang="jsp"><%@ page language="java" contentType="text/html" %> +<%@ page import="org.example.cayenne.persistent.*" %> +<%@ page import="org.apache.cayenne.*" %> +<%@ page import="java.util.*" %> +<%@ page import="java.text.*" %> + +<% + ObjectContext context = BaseContext.getThreadObjectContext(); + String id = request.getParameter("id"); + + // find artist for id + Artist artist = null; + if(id != null && id.trim().length() > 0) { + artist = Cayenne.objectForPK(context, Artist.class, Integer.parseInt(id)); + } + + if("POST".equals(request.getMethod())) { + // if no id is saved in the hidden field, we are dealing with + // create new artist request + if(artist == null) { + artist = context.newObject(Artist.class); + } + + // note that in a real application we would so dome validation ... + // here we just hope the input is correct + artist.setName(request.getParameter("name")); + artist.setDateOfBirthString(request.getParameter("dateOfBirth")); + + context.commitChanges(); + + response.sendRedirect("index.jsp"); + } + + if(artist == null) { + // create transient artist for the form response rendering + artist = new Artist(); + } + + String name = artist.getName() == null ? "" : artist.getName(); + String dob = artist.getDateOfBirth() == null + ? "" : new SimpleDateFormat("yyyyMMdd").format(artist.getDateOfBirth()); +%> +<html> + <head> + <title>Artist Details</title> + </head> + <body> + <h2>Artists Details</h2> + <form name="EditArtist" action="detail.jsp" method="POST"> + <input type="hidden" name="id" value="<%= id != null ? id : "" %>" /> + <table border="0"> + <tr> + <td>Name:</td> + <td><input type="text" name="name" value="<%= name %>"/></td> + </tr> + <tr> + <td>Date of Birth (yyyyMMdd):</td> + <td><input type="text" name="dateOfBirth" value="<%= dob %>"/></td> + </tr> + <tr> + <td></td> + <td align="right"><input type="submit" value="Save" /></td> + </tr> + </table> + </form> + </body> +</html></code></pre> + </div> + </div> + <div class="sect3"> + <h4 id="running-web-application"><a class="anchor" href="#running-web-application"></a>Running Web Application</h4> + <div class="paragraph"> + <p>To run the web application weâll use "maven-jetty-plugin". To activate it, letâs add the following piece of code to the "pom.xml" file, following the "dependencies" section and save the POM:</p> + </div> + <div class="listingblock"> + <div class="title"> + pom.xml + </div> + <div class="content"> + <pre class="highlight"><code class="language-xml xml" data-lang="xml"><build> + <plugins> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <version>6.1.22</version> + </plugin> + </plugins> +</build></code></pre> + </div> + </div> + <div class="paragraph"> + <p>Also to run the web application weâll use "maven-jetty-plugin". To activate it, letâs add the following piece of code to the <code>pom.xml</code> file, following the "dependencies" section and save the POM:</p> + </div> + <div class="listingblock"> + <div class="title"> + pom.xml + </div> + <div class="content"> + <pre class="highlight"><code class="language-xml xml" data-lang="xml"><build> + <plugins> + <plugin> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>9.3.14.v20161028</version> + </plugin> + </plugins> +</build></code></pre> + </div> + </div> + <div class="ulist"> + <ul> + <li> <p>Go to "Run > Run Configurationsâ¦â" menu, select "Maven Build", right click and select "New"</p> </li> + <li> <p>Make sure you fill "Name", "Base directory" and "Goals" fields as shown on the screenshot:</p> </li> + </ul> + </div> + <div class="imageblock" style="text-align: center"> + <div class="content"> + <img src="images/eclipse-mvnrun.png" alt="eclipse mvnrun"> + </div> + </div> + <div class="ulist"> + <ul> + <li> <p>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:</p> + <div class="literalblock"> + <div class="content"> + <pre>[INFO] Scanning for projects... +[INFO] +[INFO] ------------------------------------------------------------------------ +[INFO] Building tutorial 0.0.1-SNAPSHOT +[INFO] ------------------------------------------------------------------------ +... +[INFO] Configuring Jetty for project: tutorial +[INFO] Webapp source directory = /.../tutorial/src/main/webapp +[INFO] Reload Mechanic: automatic +[INFO] Classes = /.../tutorial/target/classes +[INFO] Context path = /tutorial +[INFO] Tmp directory = determined at runtime +[INFO] Web defaults = org/mortbay/jetty/webapp/webdefault.xml +[INFO] Web overrides = none +[INFO] web.xml file = /.../tutorial/src/main/webapp/WEB-INF/web.xml +[INFO] Webapp directory = /.../tutorial/src/main/webapp +[INFO] Starting jetty 6.1.22 ... +INFO::jetty-6.1.22 +INFO::No Transaction manager found - if your webapp requires one, please configure one. +INFO::Started SelectChannelConnector@0.0.0.0:8080 +[INFO] Started Jetty Server</pre> + </div> + </div> </li> + <li> <p>So the Jetty container just started.</p> </li> + <li> <p>Now go to <a href="http://localhost:8080/tutorial/"; class="bare">http://localhost:8080/tutorial/</a> URL. You should see "No artists found message" in the web browser and the following output in the Eclipse console:</p> + <div class="literalblock"> + <div class="content"> + <pre>INFO: Loading XML configuration resource from file:/.../tutorial/target/classes/cayenne-project.xml +INFO: loading user name and password. +INFO: Created connection pool: jdbc:derby:memory:testdb;create=true + Driver class: org.apache.derby.jdbc.EmbeddedDriver + Min. connections in the pool: 1 + Max. connections in the pool: 1 +INFO: Opening connection: jdbc:derby:memory:testdb;create=true + Login: null + Password: ******* +INFO: +++ Connecting: SUCCESS. +INFO: Detected and installed adapter: org.apache.cayenne.dba.derby.DerbyAdapter +INFO: --- transaction started. +INFO: No schema detected, will create mapped tables +INFO: CREATE TABLE GALLERY (ID INTEGER NOT NULL, NAME VARCHAR (200), PRIMARY KEY (ID)) +INFO: CREATE TABLE ARTIST (DATE_OF_BIRTH DATE, ID INTEGER NOT NULL, NAME VARCHAR (200), PRIMARY KEY (ID)) +INFO: CREATE TABLE PAINTING (ARTIST_ID INTEGER, GALLERY_ID INTEGER, ID INTEGER NOT NULL, + NAME VARCHAR (200), PRIMARY KEY (ID)) +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 - prepared in 43 ms. +INFO: === returned 0 rows. - took 56 ms. +INFO: +++ transaction committed.</pre> + </div> + </div> </li> + <li> <p>You can click on "Create new artist" link to create artists. Existing artists can be edited by clicking on their name:</p> </li> + </ul> + </div> + <div class="imageblock" style="text-align: center"> + <div class="content"> + <img src="images/firefox-webapp.png" alt="firefox webapp"> + </div> + </div> + <div class="paragraph"> + <p>You are done with the tutorial!</p> + </div> + </div> + </div> + </div> +</div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide.toc.html ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide.toc.html b/src/main/site/content/docs/3.1/getting-started-guide.toc.html new file mode 100644 index 0000000..43d36c1 --- /dev/null +++ b/src/main/site/content/docs/3.1/getting-started-guide.toc.html @@ -0,0 +1,29 @@ +<div id="toc" class="toc toc-side"> + <div id="toctitle"> + Table of Contents + </div> + <ul class="sectlevel1 nav"> + <li><a href="#setting-up-the-environment" class="nav-link">1. Setting up the environment</a> + <ul class="sectlevel2 nav"> + <li><a href="#install-java" class="nav-link">1.1. Install Java</a></li> + <li><a href="#install-eclipse-ide-and-the-maven-plugin" class="nav-link">1.2. Install Eclipse IDE and the Maven Plugin</a></li> + </ul> </li> + <li><a href="#learning-mapping-basics" class="nav-link">2. Learning mapping basics</a> + <ul class="sectlevel2 nav"> + <li><a href="#starting-a-project" class="nav-link">2.1. Starting a project</a></li> + <li><a href="#getting-started-with-object-relational-mapping-orm" class="nav-link">2.2. Getting started with Object Relational Mapping (ORM)</a></li> + <li><a href="#creating-java-classes" class="nav-link">2.3. Creating Java Classes</a></li> + </ul> </li> + <li><a href="#learning-cayenne-api" class="nav-link">3. Learning Cayenne API</a> + <ul class="sectlevel2 nav"> + <li><a href="#getting-started-with-objectcontext" class="nav-link">3.1. Getting started with ObjectContext</a></li> + <li><a href="#getting-started-with-persistent-objects" class="nav-link">3.2. Getting started with persistent objects</a></li> + <li><a href="#selecting-objects" class="nav-link">3.3. Selecting Objects</a></li> + <li><a href="#deleting-objects" class="nav-link">3.4. Deleting Objects</a></li> + </ul> </li> + <li><a href="#converting-to-web-application" class="nav-link">4. Converting to Web Application</a> + <ul class="sectlevel2 nav"> + <li><a href="#converting-tutorial-to-a-web-application" class="nav-link">4.1. Converting Tutorial to a Web Application</a></li> + </ul> </li> + </ul> +</div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/base-datamap.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/base-datamap.png b/src/main/site/content/docs/3.1/getting-started-guide/images/base-datamap.png new file mode 100644 index 0000000..98f1ffc Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/base-datamap.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/base-datanode.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/base-datanode.png b/src/main/site/content/docs/3.1/getting-started-guide/images/base-datanode.png new file mode 100644 index 0000000..e58da99 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/base-datanode.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/cayenne-tutorial-model.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/cayenne-tutorial-model.png b/src/main/site/content/docs/3.1/getting-started-guide/images/cayenne-tutorial-model.png new file mode 100644 index 0000000..454d198 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/cayenne-tutorial-model.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/database-schema.jpg ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/database-schema.jpg b/src/main/site/content/docs/3.1/getting-started-guide/images/database-schema.jpg new file mode 100644 index 0000000..9d4ee21 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/database-schema.jpg differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/datamap-enableclient.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/datamap-enableclient.png b/src/main/site/content/docs/3.1/getting-started-guide/images/datamap-enableclient.png new file mode 100644 index 0000000..62a2af2 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/datamap-enableclient.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/eclipse-generatedclasses.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/eclipse-generatedclasses.png b/src/main/site/content/docs/3.1/getting-started-guide/images/eclipse-generatedclasses.png new file mode 100644 index 0000000..89d0dd2 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/eclipse-generatedclasses.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/eclipse-mvnrun.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/eclipse-mvnrun.png b/src/main/site/content/docs/3.1/getting-started-guide/images/eclipse-mvnrun.png new file mode 100644 index 0000000..0f517d6 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/eclipse-mvnrun.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/eclipse-xmlfiles.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/eclipse-xmlfiles.png b/src/main/site/content/docs/3.1/getting-started-guide/images/eclipse-xmlfiles.png new file mode 100644 index 0000000..7cb3856 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/eclipse-xmlfiles.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/firefox-webapp.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/firefox-webapp.png b/src/main/site/content/docs/3.1/getting-started-guide/images/firefox-webapp.png new file mode 100644 index 0000000..35be692 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/firefox-webapp.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/icon-attribute.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/icon-attribute.png b/src/main/site/content/docs/3.1/getting-started-guide/images/icon-attribute.png new file mode 100644 index 0000000..77a68eb Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/icon-attribute.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/icon-datamap.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/icon-datamap.png b/src/main/site/content/docs/3.1/getting-started-guide/images/icon-datamap.png new file mode 100644 index 0000000..2ea96ca Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/icon-datamap.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/icon-dbentity.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/icon-dbentity.png b/src/main/site/content/docs/3.1/getting-started-guide/images/icon-dbentity.png new file mode 100644 index 0000000..87d9d8a Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/icon-dbentity.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/icon-edit.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/icon-edit.png b/src/main/site/content/docs/3.1/getting-started-guide/images/icon-edit.png new file mode 100644 index 0000000..027c482 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/icon-edit.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/icon-new_objentity.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/icon-new_objentity.png b/src/main/site/content/docs/3.1/getting-started-guide/images/icon-new_objentity.png new file mode 100644 index 0000000..8735d7a Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/icon-new_objentity.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/icon-node.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/icon-node.png b/src/main/site/content/docs/3.1/getting-started-guide/images/icon-node.png new file mode 100644 index 0000000..2ff4383 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/icon-node.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/icon-relationship.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/icon-relationship.png b/src/main/site/content/docs/3.1/getting-started-guide/images/icon-relationship.png new file mode 100644 index 0000000..44ed7eb Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/icon-relationship.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/icon-sync.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/icon-sync.png b/src/main/site/content/docs/3.1/getting-started-guide/images/icon-sync.png new file mode 100644 index 0000000..03e8623 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/icon-sync.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/idea-file-run-menu.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/idea-file-run-menu.png b/src/main/site/content/docs/3.1/getting-started-guide/images/idea-file-run-menu.png new file mode 100644 index 0000000..30cf05e Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/idea-file-run-menu.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/idea-run-configuration.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/idea-run-configuration.png b/src/main/site/content/docs/3.1/getting-started-guide/images/idea-run-configuration.png new file mode 100644 index 0000000..3ebbb62 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/idea-run-configuration.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/maven-plugin-install.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/maven-plugin-install.png b/src/main/site/content/docs/3.1/getting-started-guide/images/maven-plugin-install.png new file mode 100644 index 0000000..5091b52 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/maven-plugin-install.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/modeler-artistid.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/modeler-artistid.png b/src/main/site/content/docs/3.1/getting-started-guide/images/modeler-artistid.png new file mode 100644 index 0000000..287f094 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/modeler-artistid.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/modeler-dbrelationship.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/modeler-dbrelationship.png b/src/main/site/content/docs/3.1/getting-started-guide/images/modeler-dbrelationship.png new file mode 100644 index 0000000..2eecb11 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/modeler-dbrelationship.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/modeler-deleterule.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/modeler-deleterule.png b/src/main/site/content/docs/3.1/getting-started-guide/images/modeler-deleterule.png new file mode 100644 index 0000000..243bbbb Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/modeler-deleterule.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/modeler-started.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/modeler-started.png b/src/main/site/content/docs/3.1/getting-started-guide/images/modeler-started.png new file mode 100644 index 0000000..5c93629 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/modeler-started.png differ http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/b81e46fb/src/main/site/content/docs/3.1/getting-started-guide/images/tutorial-idea-project.png ---------------------------------------------------------------------- diff --git a/src/main/site/content/docs/3.1/getting-started-guide/images/tutorial-idea-project.png b/src/main/site/content/docs/3.1/getting-started-guide/images/tutorial-idea-project.png new file mode 100644 index 0000000..ef39865 Binary files /dev/null and b/src/main/site/content/docs/3.1/getting-started-guide/images/tutorial-idea-project.png differ
