You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/12/14 19:12:42 UTC
[06/16] cayenne git commit: Merge branch 'master' of
https://github.com/apache/cayenne into dbmerger-refactor
Merge branch 'master' of https://github.com/apache/cayenne into dbmerger-refactor
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/34ae195c
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/34ae195c
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/34ae195c
Branch: refs/heads/master
Commit: 34ae195ced669e4dc3300505c624ceb5637c458f
Parents: 46c8ded 43b3080
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Dec 12 10:00:51 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Dec 12 10:00:51 2016 +0300
----------------------------------------------------------------------
.travis.yml | 6 +-
README.md | 1 +
assembly/pom.xml | 2 +-
build-tools/cayenne-checkers/pom.xml | 2 +-
build-tools/cayenne-coverage/pom.xml | 1 +
build-tools/cayenne-legal/pom.xml | 2 +-
build-tools/cayenne-test-utilities/pom.xml | 2 +-
build-tools/pom.xml | 2 +-
cayenne-client-jetty/pom.xml | 2 +-
.../rop/JettyHttp2ClientConnectionProvider.java | 6 +-
.../rop/JettyHttpClientConnectionProvider.java | 16 +-
cayenne-client/pom.xml | 2 +-
.../rop/client/CayenneContextFactory.java | 4 +-
.../rop/client/ClientChannelProvider.java | 2 +-
.../rop/client/ClientConstants.java | 50 +
.../rop/client/ClientLocalRuntime.java | 59 +-
.../configuration/rop/client/ClientModule.java | 3 +-
.../configuration/rop/client/ClientRuntime.java | 40 +-
.../rop/HttpClientConnectionProvider.java | 16 +-
.../CayenneContextClientChannelEventsIT.java | 11 +-
.../rop/client/ClientLocalRuntimeTest.java | 3 +-
.../rop/client/ClientModuleTest.java | 4 +-
.../rop/client/ClientRuntimeTest.java | 7 +-
cayenne-crypto/pom.xml | 11 +-
.../org/apache/cayenne/crypto/CryptoModule.java | 177 ++++
.../cayenne/crypto/CryptoModuleBuilder.java | 280 ++----
.../cayenne/crypto/CryptoModuleProvider.java | 47 +
.../org.apache.cayenne.di.spi.ModuleProvider | 1 +
.../cayenne/crypto/CryptoModuleBuilderTest.java | 14 +-
.../crypto/CryptoModuleProviderTest.java | 30 +
.../cayenne/crypto/Runtime_AES128_Base.java | 7 +-
.../value/DefaultValueTransformerFactoryIT.java | 2 +-
cayenne-dbcp2/pom.xml | 2 +-
cayenne-dbsync/pom.xml | 17 +-
.../org/apache/cayenne/dbsync/DbSyncModule.java | 7 +-
.../cayenne/dbsync/DbSyncModuleProvider.java | 48 +
.../org.apache.cayenne.di.spi.ModuleProvider | 1 +
.../dbsync/DbSyncModuleProviderTest.java | 29 +
cayenne-di/pom.xml | 2 +-
.../java/org/apache/cayenne/di/spi/DIGraph.java | 21 +-
.../org/apache/cayenne/di/spi/ListProvider.java | 3 -
.../org/apache/cayenne/di/spi/ModuleLoader.java | 87 ++
.../apache/cayenne/di/spi/ModuleProvider.java | 43 +
.../org/apache/cayenne/di/spi/DIGraphTest.java | 58 ++
.../apache/cayenne/di/spi/ModuleLoaderTest.java | 158 +++
.../org.apache.cayenne.di.spi.ModuleProvider | 4 +
cayenne-java8/pom.xml | 24 +-
.../cayenne/java8/CayenneJava8Module.java | 43 -
.../org/apache/cayenne/java8/Java8Module.java | 40 +
.../cayenne/java8/Java8ModuleProvider.java | 46 +
.../org.apache.cayenne.di.spi.ModuleProvider | 1 +
.../cayenne/java8/Java8ModuleProviderTest.java | 30 +
.../org/apache/cayenne/java8/RuntimeBase.java | 7 +-
cayenne-joda/pom.xml | 27 +-
.../apache/cayenne/joda/CayenneJodaModule.java | 48 -
.../org/apache/cayenne/joda/JodaModule.java | 44 +
.../apache/cayenne/joda/JodaModuleProvider.java | 46 +
.../org.apache.cayenne.di.spi.ModuleProvider | 1 +
.../org/apache/cayenne/joda/JodaModuleIT.java | 122 +++
.../cayenne/joda/JodaModuleProviderTest.java | 30 +
.../org/apache/cayenne/joda/JodaTimeIT.java | 126 ---
cayenne-lifecycle/pom.xml | 2 +-
.../postcommit/PostCommitModuleBuilder.java | 14 +-
.../lifecycle/unit/AuditableServerCase.java | 2 +-
.../lifecycle/unit/FlattenedServerCase.java | 2 +-
cayenne-project/pom.xml | 124 ++-
.../cayenne/project/CayenneProjectModule.java | 55 +-
.../apache/cayenne/project/ProjectModule.java | 44 +
.../cayenne/project/ProjectModuleProvider.java | 46 +
.../org.apache.cayenne.di.spi.ModuleProvider | 1 +
.../project/ProjectModuleProviderTest.java | 30 +
cayenne-protostuff/pom.xml | 2 +-
.../cayenne/rop/protostuff/RuntimeBase.java | 16 +-
cayenne-server/pom.xml | 2 +-
.../cayenne/configuration/CayenneRuntime.java | 242 +++--
.../apache/cayenne/configuration/Constants.java | 404 ++++----
.../cayenne/configuration/ModuleCollection.java | 82 --
.../rop/server/ROPServerModule.java | 16 +-
.../configuration/server/ServerModule.java | 349 ++++---
.../server/ServerModuleProvider.java | 48 +
.../configuration/server/ServerRuntime.java | 287 +++---
.../server/ServerRuntimeBuilder.java | 539 +++++-----
.../apache/cayenne/exp/ExpressionFactory.java | 18 +
.../java/org/apache/cayenne/exp/Property.java | 977 ++++++++++---------
.../org.apache.cayenne.di.spi.ModuleProvider | 1 +
.../rop/server/ROPServletTest.java | 43 +-
.../server/DataDomainProviderTest.java | 14 +-
.../server/DefaultDbAdapterFactoryTest.java | 20 +-
.../server/ServerModuleProviderTest.java | 30 +
.../server/ServerRuntimeBuilderTest.java | 46 +-
.../configuration/server/ServerRuntimeTest.java | 247 +++--
.../configuration/web/CayenneFilterTest.java | 19 +-
.../cayenne/exp/ExpressionFactoryTest.java | 20 +-
.../org/apache/cayenne/exp/PropertyTest.java | 377 +++----
.../org/apache/cayenne/query/SelectQueryIT.java | 212 ++--
.../unit/di/server/ServerCaseModule.java | 10 +-
.../unit/util/ModuleProviderChecker.java | 62 ++
.../src/test/resources/simplelogger.properties | 24 -
cayenne-tools/pom.xml | 113 ++-
.../tools/configuration/ToolsModule.java | 11 +-
docs/doc/pom.xml | 2 +-
docs/doc/src/main/resources/RELEASE-NOTES.txt | 13 +
docs/doc/src/main/resources/UPGRADE.txt | 16 +
docs/docbook/cayenne-guide/pom.xml | 2 +-
.../cayenne-guide/src/docbkx/expressions.xml | 187 ++--
.../src/docbkx/including-cayenne-in-project.xml | 54 +-
docs/docbook/cayenne-guide/src/docbkx/part4.xml | 7 +-
.../cayenne-guide/src/docbkx/re-filtering.xml | 336 +++----
.../src/docbkx/re-introduction.xml | 149 +--
.../cayenne-guide/src/docbkx/re-modeler.xml | 10 +-
.../src/docbkx/re-name-generator.xml | 79 --
.../src/docbkx/re-other-settings.xml | 65 ++
.../docbkx/re-relationships-loading-control.xml | 93 --
.../cayenne-guide/src/docbkx/re-table-types.xml | 40 -
.../src/docbkx/re-types-mapping.xml | 120 ---
docs/docbook/docbook-stylesheets/pom.xml | 2 +-
.../getting-started-reverse-engineering/pom.xml | 40 -
.../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 29330 -> 0 bytes
.../src/images/customer-order.png | Bin 16562 -> 0 bytes
.../src/images/customer1.png | Bin 9652 -> 0 bytes
.../src/images/customer2.png | Bin 11504 -> 0 bytes
docs/docbook/getting-started-rop/pom.xml | 2 +-
docs/docbook/getting-started/pom.xml | 2 +-
docs/docbook/pom.xml | 3 +-
docs/docbook/upgrade-guide/pom.xml | 2 +-
docs/pom.xml | 2 +-
itests/cayenne-tools-itest/pom.xml | 2 +-
itests/pom.xml | 2 +-
modeler/cayenne-modeler-generic-ext/pom.xml | 2 +-
modeler/cayenne-modeler-generic/pom.xml | 2 +-
modeler/cayenne-modeler-mac-ext/pom.xml | 2 +-
modeler/cayenne-modeler-mac/pom.xml | 2 +-
modeler/cayenne-modeler-win-ext/pom.xml | 2 +-
modeler/cayenne-modeler-win/pom.xml | 2 +-
modeler/cayenne-modeler/pom.xml | 2 +-
.../java/org/apache/cayenne/modeler/Main.java | 9 +-
modeler/cayenne-wocompat/pom.xml | 2 +-
modeler/pom.xml | 2 +-
plugins/maven-cayenne-modeler-plugin/pom.xml | 2 +-
plugins/maven-cayenne-plugin/pom.xml | 2 +-
plugins/pom.xml | 2 +-
pom.xml | 8 +-
tutorials/pom.xml | 2 +-
tutorials/tutorial-rop-client-http2/pom.xml | 2 +-
.../apache/cayenne/tutorial/Http2Client.java | 18 +-
tutorials/tutorial-rop-client/pom.xml | 2 +-
.../tutorial/persistent/client/Main.java | 8 +-
tutorials/tutorial-rop-server-http2/pom.xml | 2 +-
.../cayenne/tutorial/Http2ROPServlet.java | 11 +-
tutorials/tutorial-rop-server/pom.xml | 2 +-
tutorials/tutorial/pom.xml | 2 +-
154 files changed, 4405 insertions(+), 3949 deletions(-)
----------------------------------------------------------------------