You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/12/06 13:16:32 UTC

[5/5] cayenne git commit: Merge branch '104'

Merge branch '104'


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/71f99447
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/71f99447
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/71f99447

Branch: refs/heads/master
Commit: 71f9944786f08367978459d08c595a252ed14953
Parents: ca0ef28 34be65a
Author: Savva Kolbachev <s....@gmail.com>
Authored: Tue Dec 6 16:15:51 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Tue Dec 6 16:15:51 2016 +0300

----------------------------------------------------------------------
 .../src/docbkx/cayenne-mapping-structure.xml    |   8 +-
 .../src/docbkx/cayennemodeler-application.xml   |  56 +++
 .../src/docbkx/customizing-cayenne-runtime.xml  |   4 +-
 .../cayenne-guide/src/docbkx/expressions.xml    |  32 +-
 .../src/docbkx/including-cayenne-in-project.xml | 134 +++----
 docs/docbook/cayenne-guide/src/docbkx/index.xml |   6 +-
 docs/docbook/cayenne-guide/src/docbkx/part4.xml |  27 ++
 .../src/docbkx/performance-tuning.xml           |  24 +-
 .../docbkx/persistent-objects-objectcontext.xml |   4 +-
 .../cayenne-guide/src/docbkx/queries.xml        |  40 +-
 .../cayenne-guide/src/docbkx/re-filtering.xml   | 371 +++++++++++++++++++
 .../src/docbkx/re-introduction.xml              | 143 +++++++
 .../cayenne-guide/src/docbkx/re-modeler.xml     | 113 ++++++
 .../src/docbkx/re-name-generator.xml            |  79 ++++
 .../docbkx/re-relationships-loading-control.xml |  93 +++++
 .../cayenne-guide/src/docbkx/re-table-types.xml |  40 ++
 .../src/docbkx/re-types-mapping.xml             | 120 ++++++
 .../cayenne-guide/src/docbkx/rop-deployment.xml |   2 +-
 docs/docbook/cayenne-guide/src/docbkx/setup.xml |  64 ++--
 .../src/docbkx/starting-cayenne.xml             |   2 +-
 .../src/images/re-modeler-datasource-select.png | Bin 0 -> 32658 bytes
 .../re-modeler-reverseengineering-dialog.png    | Bin 0 -> 29936 bytes
 .../src/main/resources/css/cayenne-doc.css      |   8 +
 .../getting-started-reverse-engineering/pom.xml |  41 ++
 .../src/docbkx/index.xml                        |  42 +++
 .../src/docbkx/reverse-engineering-ch1.xml      | 308 +++++++++++++++
 .../src/docbkx/reverse-engineering-ch2.xml      | 206 ++++++++++
 .../images/customer-order-ordered_product.png   | Bin 0 -> 29330 bytes
 .../src/images/customer-order.png               | Bin 0 -> 16562 bytes
 .../src/images/customer1.png                    | Bin 0 -> 9652 bytes
 .../src/images/customer2.png                    | Bin 0 -> 11504 bytes
 .../getting-started-rop/src/docbkx/index.xml    |   2 +-
 .../getting-started/src/docbkx/index.xml        |   2 +-
 docs/docbook/pom.xml                            |   8 +-
 docs/docbook/upgrade-guide/src/docbkx/index.xml |   2 +-
 35 files changed, 1829 insertions(+), 152 deletions(-)
----------------------------------------------------------------------