You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ko...@apache.org on 2015/05/04 23:29:31 UTC
[2/2] cayenne git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/bd38bad4
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/bd38bad4
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/bd38bad4
Branch: refs/heads/master
Commit: bd38bad4abac6d9a667b22b6f799def859a38322
Parents: 02ab8df 9d20977
Author: kolonitsky <Al...@gmail.com>
Authored: Tue May 5 00:29:27 2015 +0300
Committer: kolonitsky <Al...@gmail.com>
Committed: Tue May 5 00:29:27 2015 +0300
----------------------------------------------------------------------
.../CryptoBatchTranslatorFactoryDecorator.java | 8 +-
.../crypto/transformer/BindingsTransformer.java | 4 +-
.../transformer/DefaultBindingsTransformer.java | 6 +-
.../transformer/DefaultTransformerFactory.java | 6 +-
.../crypto/transformer/TransformerFactory.java | 4 +-
.../apache/cayenne/di/ScopeEventListener.java | 19 +-
.../org/apache/cayenne/access/DbGenerator.java | 2 +-
.../apache/cayenne/access/jdbc/BatchAction.java | 10 +-
.../cayenne/access/jdbc/ParameterBinding.java | 68 -
.../access/jdbc/SQLParameterBinding.java | 62 +
.../cayenne/access/jdbc/SQLStatement.java | 10 +-
.../cayenne/access/jdbc/SQLTemplateAction.java | 2 +-
.../cayenne/access/jdbc/SelectAction.java | 344 ++--
.../access/translator/ParameterBinding.java | 81 +
.../translator/batch/BatchParameterBinding.java | 79 -
.../translator/batch/BatchTranslator.java | 5 +-
.../batch/DefaultBatchTranslator.java | 11 +-
.../translator/batch/DeleteBatchTranslator.java | 11 +-
.../translator/batch/InsertBatchTranslator.java | 11 +-
.../batch/SoftDeleteBatchTranslator.java | 13 +-
.../translator/batch/UpdateBatchTranslator.java | 11 +-
.../select/DefaultSelectTranslator.java | 630 +++++++
.../access/translator/select/JoinStack.java | 349 ++--
.../translator/select/OrderingTranslator.java | 166 +-
.../translator/select/QualifierTranslator.java | 949 +++++------
.../translator/select/QueryAssembler.java | 302 ++--
.../translator/select/QueryAssemblerHelper.java | 885 +++++-----
.../translator/select/SelectTranslator.java | 631 +------
.../select/TrimmingQualifierTranslator.java | 113 +-
.../apache/cayenne/configuration/Constants.java | 5 +
.../server/PropertyDataSourceFactory.java | 107 +-
.../server/ServerRuntimeBuilder.java | 93 +-
.../server/XMLPoolingDataSourceFactory.java | 59 +-
.../apache/cayenne/conn/ConnectionWrapper.java | 749 ---------
.../org/apache/cayenne/conn/DataSourceInfo.java | 758 ++++-----
.../apache/cayenne/conn/DriverDataSource.java | 298 ----
.../org/apache/cayenne/conn/PoolDataSource.java | 85 -
.../org/apache/cayenne/conn/PoolManager.java | 649 --------
.../cayenne/conn/PooledConnectionImpl.java | 201 ---
.../java/org/apache/cayenne/conn/package.html | 26 -
.../datasource/BadValidationQueryException.java | 41 +
.../cayenne/datasource/DataSourceBuilder.java | 136 ++
.../cayenne/datasource/DriverDataSource.java | 298 ++++
.../datasource/ManagedPoolingDataSource.java | 120 ++
.../cayenne/datasource/PoolAwareConnection.java | 593 +++++++
.../cayenne/datasource/PoolingDataSource.java | 360 ++++
.../datasource/PoolingDataSourceManager.java | 74 +
.../datasource/PoolingDataSourceParameters.java | 64 +
.../cayenne/datasource/StoppedDataSource.java | 88 +
.../cayenne/dba/db2/DB2QualifierTranslator.java | 172 +-
.../dba/derby/DerbyQualifierTranslator.java | 59 +-
.../firebird/FirebirdQualifierTranslator.java | 30 +-
.../dba/frontbase/FrontBaseActionBuilder.java | 6 +-
.../frontbase/FrontBaseSelectTranslator.java | 41 +-
.../cayenne/dba/hsqldb/HSQLSelectAction.java | 24 +-
.../dba/hsqldb/HSQLSelectTranslator.java | 60 +-
.../cayenne/dba/ingres/IngresSelectAction.java | 6 +-
.../dba/ingres/IngresSelectTranslator.java | 13 +-
.../cayenne/dba/mysql/MySQLSelectAction.java | 24 +-
.../dba/mysql/MySQLSelectTranslator.java | 61 +-
.../dba/openbase/OpenBaseActionBuilder.java | 26 +-
.../cayenne/dba/openbase/OpenBaseJoinStack.java | 158 +-
.../openbase/OpenBaseQualifierTranslator.java | 262 ++-
.../dba/openbase/OpenBaseSelectTranslator.java | 45 +-
.../cayenne/dba/oracle/Oracle8JoinStack.java | 146 +-
.../dba/oracle/Oracle8LOBBatchAction.java | 8 +-
.../dba/oracle/Oracle8LOBBatchTranslator.java | 12 +-
.../dba/oracle/Oracle8QualifierTranslator.java | 38 +-
.../cayenne/dba/oracle/Oracle8SelectAction.java | 16 +-
.../dba/oracle/Oracle8SelectTranslator.java | 35 +-
.../dba/oracle/OracleQualifierTranslator.java | 104 +-
.../cayenne/dba/oracle/OracleSelectAction.java | 24 +-
.../dba/oracle/OracleSelectTranslator.java | 89 +-
.../postgres/PostgresQualifierTranslator.java | 188 +--
.../dba/postgres/PostgresSelectAction.java | 24 +-
.../dba/postgres/PostgresSelectTranslator.java | 46 +-
.../dba/sqlserver/SQLServerSelectAction.java | 6 +-
.../sqlserver/SQLServerSelectTranslator.java | 65 +-
.../SQLServerTrimmingQualifierTranslator.java | 164 +-
.../cayenne/log/CommonsJdbcEventLogger.java | 819 ++++-----
.../org/apache/cayenne/log/JdbcEventLogger.java | 21 +-
.../apache/cayenne/log/NoopJdbcEventLogger.java | 142 +-
.../merge/DefaultValueForNullProvider.java | 10 +-
.../apache/cayenne/velocity/BindDirective.java | 10 +-
.../cayenne/velocity/BindEqualDirective.java | 4 +-
.../cayenne/velocity/BindNotEqualDirective.java | 4 +-
.../velocity/BindObjectEqualDirective.java | 6 +-
.../velocity/BindObjectNotEqualDirective.java | 4 +-
.../velocity/VelocitySQLTemplateProcessor.java | 6 +-
.../apache/cayenne/access/DataContextIT.java | 1571 +++++++++---------
.../cayenne/access/jdbc/SQLStatementTest.java | 2 +-
.../batch/DefaultBatchTranslatorIT.java | 25 +-
.../select/DefaultSelectTranslatorIT.java | 787 +++++++++
.../translator/select/OrderingTranslatorIT.java | 216 ++-
.../select/QualifierTranslatorIT.java | 197 +--
.../translator/select/QueryAssemblerIT.java | 62 +-
.../translator/select/SelectTranslatorIT.java | 794 ---------
.../translator/select/TstQueryAssembler.java | 64 +-
.../server/ServerRuntimeBuilderIT.java | 43 +-
.../cayenne/conn/DriverDataSourceTest.java | 43 -
.../org/apache/cayenne/conn/PoolManagerIT.java | 128 --
.../cayenne/conn/PooledConnectionImplTest.java | 53 -
.../datasource/BasePoolingDataSourceIT.java | 77 +
.../datasource/DriverDataSourceTest.java | 44 +
.../ManagedPoolingDataSourceTest.java | 97 ++
.../datasource/PoolAwareConnectionTest.java | 99 ++
.../datasource/PoolDataSourceManagerTest.java | 80 +
.../cayenne/datasource/PoolingDataSourceIT.java | 172 ++
.../datasource/PoolingDataSourceTest.java | 196 +++
...lingDataSource_FailingValidationQueryIT.java | 66 +
.../PoolingDataSource_StaticsTest.java | 41 +
.../PoolingDataSource_ValidationQueryIT.java | 56 +
.../apache/cayenne/merge/ValueForNullIT.java | 6 +-
.../org/apache/cayenne/query/SelectQueryIT.java | 3 +-
.../di/server/ServerCaseDataSourceFactory.java | 89 +-
.../cayenne/velocity/ResultDirectiveIT.java | 107 +-
.../VelocitySQLTemplateProcessorTest.java | 10 +-
.../apache/cayenne/tools/DbGeneratorTask.java | 2 +-
.../configuration/DriverDataSourceFactory.java | 2 +-
.../templates/v1_2/client-superclass.vm | 3 +-
.../resources/templates/v1_2/singleclass.vm | 15 +-
.../main/resources/templates/v1_2/superclass.vm | 3 +-
.../cayenne/gen/ClassGenerationActionTest.java | 419 +++--
.../apache/cayenne/gen/ClassGenerationCase.java | 59 +
.../gen/ClientSuperClassGenerationTest.java | 86 +
.../cayenne/gen/SingleClassGenerationTest.java | 86 +
.../cayenne/gen/SuperClassGenerationTest.java | 86 +
.../cayenne/tools/AntDataPortDelegateTest.java | 1 +
.../cayenne/tools/DbImporterTaskTest.java | 10 +-
.../cayenne/tools/NamePatternMatcherTest.java | 106 +-
.../tools/dbimport/DbImportActionTest.java | 479 +++---
.../DefaultReverseEngineeringLoaderTest.java | 419 +++--
docs/doc/src/main/resources/RELEASE-NOTES.txt | 6 +-
docs/doc/src/main/resources/UPGRADE.txt | 10 +
.../modeler/dialog/db/DbLoaderHelper.java | 14 +-
.../dialog/pref/DataSourcePreferences.java | 2 +-
.../cayenne/modeler/editor/EditorView.java | 9 +-
.../cayenne/modeler/pref/DBConnectionInfo.java | 2 +-
.../apache/cayenne/tools/DbGeneratorMojo.java | 2 +-
139 files changed, 9976 insertions(+), 9547 deletions(-)
----------------------------------------------------------------------