cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject [50/50] [abbrv] cayenne git commit: Merge remote-tracking branch 'apache/master' into CAY-1946
Date Fri, 14 Nov 2014 17:47:51 GMT
Merge remote-tracking branch 'apache/master' into CAY-1946

Conflicts:
	cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java
	cayenne-server/src/main/java/org/apache/cayenne/access/loader/filters/ExcludeFilter.java
	cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java
	cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java
	cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
	cayenne-tools/src/test/java/org/apache/cayenne/tools/NamePatternMatcherTest.java
	plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
	plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java


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

Branch: refs/heads/CAY-1946
Commit: 16a8cec661e09385811299b603672fd3115a6d50
Parents: fde7761 cfbfb68
Author: aadamchik <aadamchik@apache.org>
Authored: Fri Nov 14 20:36:05 2014 +0300
Committer: aadamchik <aadamchik@apache.org>
Committed: Fri Nov 14 20:36:05 2014 +0300

----------------------------------------------------------------------
 assembly/pom.xml                                |    2 +-
 build-tools/cayenne-checkers/pom.xml            |    2 +-
 build-tools/cayenne-coverage/pom.xml            |    2 +-
 build-tools/cayenne-legal/pom.xml               |    2 +-
 build-tools/cayenne-test-utilities/pom.xml      |    2 +-
 build-tools/pom.xml                             |    2 +-
 cayenne-client/pom.xml                          |   21 +-
 .../apache/cayenne/CayenneContextCayenneIT.java |   60 +
 .../cayenne/CayenneContextCayenneTest.java      |   55 -
 .../CayenneContextClientChannelEventsIT.java    |  362 +++++
 .../CayenneContextClientChannelEventsTest.java  |  345 -----
 .../cayenne/CayenneContextDeleteRulesIT.java    |  122 ++
 .../cayenne/CayenneContextDeleteRulesTest.java  |  111 --
 .../apache/cayenne/CayenneContextEJBQLIT.java   |   94 ++
 .../apache/cayenne/CayenneContextEJBQLTest.java |   87 --
 .../CayenneContextGraphDiffCompressorIT.java    |  102 ++
 .../CayenneContextGraphDiffCompressorTest.java  |   96 --
 .../org/apache/cayenne/CayenneContextIT.java    |  368 +++++
 .../cayenne/CayenneContextInheritanceIT.java    |  158 ++
 .../cayenne/CayenneContextInheritanceTest.java  |  151 --
 .../CayenneContextMapRelationshipIT.java        |  120 ++
 .../CayenneContextMapRelationshipTest.java      |  112 --
 .../cayenne/CayenneContextMeaningfulPKIT.java   |   72 +
 .../cayenne/CayenneContextMergeHandlerIT.java   |   97 ++
 .../cayenne/CayenneContextMergeHandlerTest.java |   90 --
 .../CayenneContextNamedQueryCachingIT.java      |  141 ++
 .../CayenneContextNamedQueryCachingTest.java    |  133 --
 .../CayenneContextPaginatedListCachingIT.java   |   79 +
 .../CayenneContextPaginatedListCachingTest.java |   75 -
 .../cayenne/CayenneContextPrimitiveIT.java      |  107 ++
 .../cayenne/CayenneContextPrimitiveTest.java    |  100 --
 .../cayenne/CayenneContextReflexiveIT.java      |   93 ++
 .../cayenne/CayenneContextRefreshQueryIT.java   |   80 ++
 .../cayenne/CayenneContextRefreshQueryTest.java |   76 -
 .../cayenne/CayenneContextRelationshipsIT.java  |  106 ++
 .../CayenneContextRelationshipsTest.java        |  100 --
 .../cayenne/CayenneContextSQLTemplateIT.java    |   59 +
 .../cayenne/CayenneContextSQLTemplateTest.java  |   54 -
 .../cayenne/CayenneContextServerDiffsIT.java    |  162 +++
 .../cayenne/CayenneContextServerDiffsTest.java  |  153 --
 .../org/apache/cayenne/CayenneContextTest.java  |  351 -----
 .../cayenne/CayenneContextValidationIT.java     |   95 ++
 .../cayenne/CayenneContextValidationTest.java   |   89 --
 .../CayenneContextWithDataContextIT.java        |  517 +++++++
 .../CayenneContextWithDataContextTest.java      |  570 --------
 .../java/org/apache/cayenne/DataRowTest.java    |    9 +-
 .../apache/cayenne/NestedCayenneContextIT.java  |  758 ++++++++++
 .../cayenne/NestedCayenneContextTest.java       |  864 -----------
 .../cayenne/NestedCayenneContextTooneIT.java    |  223 +++
 .../cayenne/ObjectContextChangeLogTest.java     |   10 +-
 .../java/org/apache/cayenne/ObjectIdTest.java   |   17 +-
 .../cayenne/PersistentObjectInContextIT.java    |  152 ++
 .../cayenne/PersistentObjectInContextTest.java  |  142 --
 .../cayenne/access/ClientServerChannelIT.java   |  275 ++++
 .../access/ClientServerChannelQueryIT.java      |  255 ++++
 .../access/ClientServerChannelQueryTest.java    |  239 ----
 .../cayenne/access/ClientServerChannelTest.java |  260 ----
 .../apache/cayenne/access/types/EnumTest.java   |   20 +-
 .../rop/client/ClientLocalRuntimeTest.java      |   21 +-
 .../rop/client/ClientModuleTest.java            |   20 +-
 .../rop/client/ClientRuntimeTest.java           |   30 +-
 .../apache/cayenne/event/EventSubjectTest.java  |    9 +-
 .../org/apache/cayenne/graph/NodeDiffTest.java  |    9 +-
 .../cayenne/map/ClientEntityResolverTest.java   |   16 +-
 .../map/ClientObjectRelationshipTest.java       |    9 +-
 .../org/apache/cayenne/map/DataMapTest.java     |    9 +-
 .../org/apache/cayenne/map/DbEntityTest.java    |   10 +-
 .../java/org/apache/cayenne/map/EntityTest.java |    9 +-
 .../cayenne/query/ClientExpressionIT.java       |  334 +++++
 .../cayenne/query/ClientExpressionTest.java     |  319 -----
 .../query/ClientSelectQueryExpressionIT.java    |   75 +
 .../query/ClientSelectQueryExpressionTest.java  |   71 -
 .../apache/cayenne/query/NamedQueryTest.java    |   10 +-
 .../apache/cayenne/query/ObjectIdQueryTest.java |   10 +-
 .../cayenne/query/PrefetchTreeNodeTest.java     |  170 ++-
 .../apache/cayenne/query/RefreshQueryTest.java  |    9 +-
 .../cayenne/query/RelationshipQueryTest.java    |    9 +-
 .../apache/cayenne/query/SQLTemplateTest.java   |   17 +-
 .../apache/cayenne/query/SelectByIdTest.java    |    8 +-
 .../query/SelectQueryAbstractEntityIT.java      |  116 ++
 .../query/SelectQueryAbstractEntityTest.java    |  110 --
 .../remote/CayenneContextDeletionIT.java        |   63 +
 .../remote/CayenneContextDeletionTest.java      |   38 -
 .../remote/ClientChannelServerDiffsIT.java      |  273 ++++
 .../remote/ClientChannelServerDiffsTest.java    |  263 ----
 .../cayenne/remote/ClientChannelTest.java       |   32 +-
 .../cayenne/remote/LightSuperClassIT.java       |  112 ++
 .../cayenne/remote/LightSuperClassTest.java     |   95 --
 .../cayenne/remote/LocalConnectionTest.java     |    8 +-
 .../org/apache/cayenne/remote/MockMessage.java  |   50 -
 .../remote/NestedObjectContextLocalIT.java      |   83 ++
 .../remote/NestedObjectContextLocalTest.java    |   58 -
 .../NestedObjectContextParentEventsIT.java      |   92 ++
 .../NestedObjectContextParentEventsTest.java    |   64 -
 .../remote/NestedObjectContextPeerEventsIT.java |  180 +++
 .../NestedObjectContextPeerEventsTest.java      |  149 --
 .../remote/NestedObjectContextRollbackIT.java   |   98 ++
 .../remote/NestedObjectContextRollbackTest.java |   71 -
 .../cayenne/remote/ROPPrefetchToManyMapIT.java  |   96 ++
 .../remote/ROPPrefetchToManyMapTest.java        |   70 -
 .../cayenne/remote/RelationshipChangeIT.java    |   86 ++
 .../cayenne/remote/RelationshipChangeTest.java  |   60 -
 .../cayenne/remote/RemoteCallbacksIT.java       |  143 ++
 .../cayenne/remote/RemoteCallbacksTest.java     |  118 --
 .../cayenne/remote/RemoteCayenneCase.java       |   17 +-
 .../remote/RemoteIncrementalFaultListIT.java    |  289 ++++
 .../remote/RemoteIncrementalFaultListTest.java  |  266 ----
 .../apache/cayenne/remote/RemoteRollbackIT.java |  178 +++
 .../cayenne/remote/RemoteRollbackTest.java      |  147 --
 .../apache/cayenne/remote/SyncMessageTest.java  |   17 +-
 .../apache/cayenne/remote/ValueInjectorIT.java  |  100 ++
 .../cayenne/remote/ValueInjectorTest.java       |   73 -
 .../remote/hessian/HessianConnectionTest.java   |   19 +-
 .../cayenne/unit/di/client/ClientCase.java      |    8 +
 .../di/client/ClientCaseLifecycleManager.java   |   10 +-
 .../unit/di/client/ClientCaseSelfIT.java        |   52 +
 .../unit/di/client/ClientCaseSelfTest.java      |   46 -
 .../cayenne/util/GenericResponseTest.java       |   15 +-
 .../apache/cayenne/util/ListResponseTest.java   |   10 +-
 .../cayenne/util/ObjectDetachOperationIT.java   |  121 ++
 .../cayenne/util/ObjectDetachOperationTest.java |  112 --
 .../cayenne/util/PersistentObjectListTest.java  |   19 +-
 .../util/ShallowMergeOperation_ClientIT.java    |  218 +++
 .../util/ShallowMergeOperation_ClientTest.java  |  210 ---
 cayenne-crypto/pom.xml                          |   17 +-
 .../cayenne/crypto/CayenneCryptoException.java  |    2 +-
 .../apache/cayenne/crypto/CryptoConstants.java  |    2 +-
 .../cayenne/crypto/CryptoModuleBuilder.java     |    2 +-
 .../CryptoBatchTranslatorFactoryDecorator.java  |    2 +-
 .../cayenne/crypto/cipher/CipherFactory.java    |    2 +-
 .../crypto/cipher/DefaultCipherFactory.java     |    2 +-
 .../cayenne/crypto/key/JceksKeySource.java      |    2 +-
 .../apache/cayenne/crypto/map/ColumnMapper.java |    2 +-
 .../cayenne/crypto/map/PatternColumnMapper.java |    2 +-
 .../crypto/transformer/BindingsTransformer.java |    2 +-
 .../transformer/DefaultBindingsTransformer.java |    2 +-
 .../transformer/DefaultMapTransformer.java      |    2 +-
 .../transformer/DefaultTransformerFactory.java  |    2 +-
 .../crypto/transformer/MapTransformer.java      |    2 +-
 .../crypto/transformer/TransformerFactory.java  |    2 +-
 .../transformer/bytes/BytesDecryptor.java       |    2 +-
 .../transformer/bytes/BytesEncryptor.java       |    2 +-
 .../bytes/BytesTransformerFactory.java          |    2 +-
 .../bytes/CbcBytesTransformerFactory.java       |    2 +-
 .../crypto/transformer/bytes/CbcDecryptor.java  |    2 +-
 .../crypto/transformer/bytes/CbcEncryptor.java  |    2 +-
 .../bytes/DefaultBytesTransformerFactory.java   |    2 +-
 .../crypto/transformer/bytes/GzipDecryptor.java |    2 +-
 .../crypto/transformer/bytes/GzipEncryptor.java |    2 +-
 .../crypto/transformer/bytes/Header.java        |    2 +-
 .../transformer/bytes/HeaderDecryptor.java      |    2 +-
 .../value/Base64StringConverter.java            |    2 +-
 .../transformer/value/BytesConverter.java       |    2 +-
 .../value/BytesToBytesConverter.java            |    2 +-
 .../value/DefaultValueDecryptor.java            |    2 +-
 .../value/DefaultValueEncryptor.java            |    2 +-
 .../value/DefaultValueTransformerFactory.java   |    2 +-
 .../transformer/value/Utf8StringConverter.java  |    2 +-
 .../transformer/value/ValueDecryptor.java       |    2 +-
 .../transformer/value/ValueEncryptor.java       |    2 +-
 .../value/ValueTransformerFactory.java          |    2 +-
 cayenne-di/pom.xml                              |    2 +-
 .../apache/cayenne/di/AdhocObjectFactory.java   |    2 +-
 .../main/java/org/apache/cayenne/di/Binder.java |    4 +-
 .../apache/cayenne/di/ClassLoaderManager.java   |    2 +-
 .../apache/cayenne/di/DIRuntimeException.java   |    2 +-
 .../org/apache/cayenne/di/DecoratorBuilder.java |    2 +-
 .../ConstructorInjectingDecoratorProvider.java  |    2 +-
 .../cayenne/di/spi/DecoratorProvider.java       |    2 +-
 .../di/spi/DefaultAdhocObjectFactory.java       |    2 +-
 .../di/spi/DefaultClassLoaderManager.java       |    2 +-
 .../cayenne/di/spi/DefaultDecoratorBuilder.java |    2 +-
 .../di/spi/FieldInjectingDecoratorProvider.java |    2 +-
 .../cayenne/di/spi/FieldInjectingProvider.java  |    2 +-
 .../org/apache/cayenne/di/DIBootstrapTest.java  |   10 +-
 .../java/org/apache/cayenne/di/KeyTest.java     |   11 +-
 .../di/spi/DefaultInjectorBindingTest.java      |   14 +-
 .../DefaultInjectorCircularInjectionTest.java   |   14 +-
 .../di/spi/DefaultInjectorDecorationTest.java   |   11 +-
 .../di/spi/DefaultInjectorInjectionTest.java    |   23 +-
 .../di/spi/DefaultInjectorScopeTest.java        |   20 +-
 .../cayenne/di/spi/DefaultInjectorTest.java     |   15 +-
 cayenne-lifecycle/pom.xml                       |   17 +-
 .../lifecycle/audit/AuditableFilter.java        |    2 +-
 .../apache/cayenne/lifecycle/id/IdCoder.java    |    2 +-
 .../lifecycle/audit/AuditableFilterTest.java    |   31 +-
 .../audit/AuditableFilter_InRuntime_Test.java   |   29 +-
 .../cayenne/lifecycle/id/EntityIdCoderTest.java |   40 +-
 .../cayenne/lifecycle/id/IdCoderTest.java       |   23 +-
 .../cayenne/lifecycle/id/StringIdQueryTest.java |   32 +-
 .../ObjectIdRelationshipHandlerTest.java        |   22 +-
 .../sort/WeightedAshwoodEntitySorterTest.java   |   24 +-
 cayenne-project/pom.xml                         |    2 +-
 .../project/DataChannelProjectLoaderTest.java   |   16 +-
 .../project/DataChannelProjectSaverTest.java    |   19 +-
 .../cayenne/project/FileProjectSaverTest.java   |   26 +-
 .../org/apache/cayenne/project/ProjectTest.java |   11 +-
 .../cayenne/project/unit/Project2Case.java      |   17 +-
 .../upgrade/v7/ProjectUpgrader_V7Test.java      |   35 +-
 cayenne-server/pom.xml                          |   21 +-
 .../java/org/apache/cayenne/BaseContext.java    |    6 +-
 .../java/org/apache/cayenne/CayenneContext.java |    2 +-
 .../cayenne/CollectionResultIterator.java       |    2 +-
 .../java/org/apache/cayenne/ObjectContext.java  |    8 +-
 .../apache/cayenne/ResultIteratorCallback.java  |    2 +-
 .../org/apache/cayenne/access/DataContext.java  |    8 +-
 .../org/apache/cayenne/access/DataDomain.java   |   14 +-
 .../access/DataDomainLegacyQueryAction.java     |    2 +-
 .../cayenne/access/DataDomainQueryAction.java   |    2 +-
 .../org/apache/cayenne/access/DataNode.java     |   30 +-
 .../org/apache/cayenne/access/DataPort.java     |    2 +-
 .../apache/cayenne/access/DataPortDelegate.java |    2 +-
 .../java/org/apache/cayenne/access/DbArcId.java |    2 +-
 .../org/apache/cayenne/access/DbLoader.java     |   17 +-
 .../apache/cayenne/access/FlattenedArcKey.java  |    2 +-
 .../cayenne/access/OperationObserver.java       |    2 +-
 .../cayenne/access/PrefetchObjectResolver.java  |    2 +-
 .../org/apache/cayenne/access/Transaction.java  |    4 +-
 .../cayenne/access/jdbc/BaseSQLAction.java      |    2 +-
 .../apache/cayenne/access/jdbc/BatchAction.java |    4 +-
 .../cayenne/access/jdbc/BindDirective.java      |  175 ---
 .../cayenne/access/jdbc/BindEqualDirective.java |   56 -
 .../access/jdbc/BindNotEqualDirective.java      |   55 -
 .../access/jdbc/BindObjectEqualDirective.java   |  163 ---
 .../jdbc/BindObjectNotEqualDirective.java       |   69 -
 .../cayenne/access/jdbc/ChainDirective.java     |  112 --
 .../cayenne/access/jdbc/ChunkDirective.java     |   75 -
 .../cayenne/access/jdbc/ColumnDescriptor.java   |    4 +-
 .../jdbc/ConnectionAwareResultIterator.java     |    2 +-
 .../access/jdbc/DistinctResultIterator.java     |    2 +-
 .../cayenne/access/jdbc/JDBCResultIterator.java |    8 +-
 .../access/jdbc/LimitResultIterator.java        |    2 +-
 .../cayenne/access/jdbc/ProcedureAction.java    |    2 +-
 .../cayenne/access/jdbc/ResultDirective.java    |  205 ---
 .../cayenne/access/jdbc/SQLTemplateAction.java  |  598 ++++----
 .../access/jdbc/SQLTemplateProcessor.java       |  160 +--
 .../access/jdbc/SQLTemplateRenderingUtils.java  |   37 -
 .../access/jdbc/SQLTemplateResourceManager.java |  106 --
 .../cayenne/access/jdbc/SelectAction.java       |    2 +-
 .../jdbc/reader/DefaultRowReaderFactory.java    |    2 +-
 .../access/jdbc/reader/RowReaderFactory.java    |    2 +-
 .../access/loader/DefaultDbLoaderDelegate.java  |    2 +-
 .../access/loader/filters/ExcludeFilter.java    |    2 +-
 .../translator/batch/BatchParameterBinding.java |    2 +-
 .../translator/batch/BatchTranslator.java       |    2 +-
 .../batch/BatchTranslatorFactory.java           |    2 +-
 .../batch/DefaultBatchTranslator.java           |    2 +-
 .../batch/DefaultBatchTranslatorFactory.java    |    2 +-
 .../batch/SoftDeleteTranslatorFactory.java      |    2 +-
 .../translator/select/QualifierTranslator.java  |    4 +-
 .../translator/select/QueryAssembler.java       |    2 +-
 .../translator/select/SelectTranslator.java     |    2 +-
 .../access/util/DefaultOperationObserver.java   |    2 +-
 .../apache/cayenne/cache/EhCacheQueryCache.java |    4 +-
 .../cayenne/configuration/CayenneRuntime.java   |    8 +-
 .../apache/cayenne/configuration/Constants.java |    2 +-
 .../configuration/DefaultRuntimeProperties.java |    2 +-
 .../cayenne/configuration/ModuleCollection.java |    2 +-
 .../configuration/RuntimeProperties.java        |    2 +-
 .../osgi/OsgiClassLoaderManager.java            |    2 +-
 .../osgi/OsgiDataDomainProvider.java            |    2 +-
 .../cayenne/configuration/osgi/OsgiModule.java  |    2 +-
 .../configuration/osgi/OsgiModuleBuilder.java   |    2 +-
 .../server/DataDomainProvider.java              |    4 +-
 .../configuration/server/DataNodeFactory.java   |    2 +-
 .../server/DefaultDataNodeFactory.java          |    7 +-
 .../server/FixedDataSourceFactory.java          |    2 +-
 .../server/FixedJNDIDataSourceFactory.java      |    2 +-
 .../configuration/server/ServerModule.java      |    4 +
 .../configuration/server/ServerRuntime.java     |    4 +-
 .../server/ServerRuntimeBuilder.java            |    2 +-
 .../server/SyntheticNodeDataDomainProvider.java |    2 +-
 .../configuration/web/CayenneFilter.java        |    2 +-
 .../web/StatelessContextRequestHandler.java     |    2 +-
 .../org/apache/cayenne/conn/DataSourceInfo.java |    2 +-
 .../apache/cayenne/conn/DriverDataSource.java   |    2 +-
 .../org/apache/cayenne/conn/PoolManager.java    |    8 +-
 .../org/apache/cayenne/dba/AutoAdapter.java     |    8 +-
 .../java/org/apache/cayenne/dba/DbAdapter.java  |    8 +-
 .../cayenne/dba/DefaultQuotingStrategy.java     |    4 +-
 .../apache/cayenne/dba/JdbcActionBuilder.java   |    2 +-
 .../org/apache/cayenne/dba/JdbcAdapter.java     |   16 +-
 .../org/apache/cayenne/dba/QuotingStrategy.java |   16 +-
 .../frontbase/FrontBaseSelectTranslator.java    |    2 +-
 .../apache/cayenne/dba/h2/H2PkGenerator.java    |    2 +-
 .../dba/hsqldb/HSQLSelectTranslator.java        |    2 +-
 .../cayenne/dba/ingres/IngresActionBuilder.java |    2 +-
 .../dba/ingres/IngresSelectTranslator.java      |    2 +-
 .../dba/mysql/MySQLSelectTranslator.java        |    2 +-
 .../dba/openbase/OpenBaseSelectTranslator.java  |    2 +-
 .../dba/oracle/Oracle8SelectTranslator.java     |    2 +-
 .../cayenne/dba/oracle/OracleBatchAction.java   |    2 +-
 .../dba/oracle/OracleSelectTranslator.java      |    2 +-
 .../dba/postgres/PostgresSelectTranslator.java  |    2 +-
 .../dba/sqlserver/SQLServerActionBuilder.java   |    2 +-
 .../dba/sqlserver/SQLServerProcedureAction.java |    2 +-
 .../sqlserver/SQLServerSelectTranslator.java    |    2 +-
 .../java/org/apache/cayenne/exp/Expression.java |   40 +-
 .../apache/cayenne/exp/ExpressionFactory.java   |   12 +-
 .../java/org/apache/cayenne/exp/Property.java   |  814 +++++------
 .../cayenne/exp/parser/ASTBitwiseLeftShift.java |    2 +-
 .../exp/parser/ASTBitwiseRightShift.java        |    2 +-
 .../apache/cayenne/exp/parser/ASTDbPath.java    |    4 +-
 .../org/apache/cayenne/exp/parser/ASTFalse.java |    4 +-
 .../org/apache/cayenne/exp/parser/ASTList.java  |    2 +-
 .../cayenne/exp/parser/ASTNamedParameter.java   |    2 +-
 .../apache/cayenne/exp/parser/ASTNegate.java    |    4 +-
 .../org/apache/cayenne/exp/parser/ASTNot.java   |    4 +-
 .../apache/cayenne/exp/parser/ASTObjPath.java   |    4 +-
 .../apache/cayenne/exp/parser/ASTScalar.java    |    4 +-
 .../org/apache/cayenne/exp/parser/ASTTrue.java  |    4 +-
 .../apache/cayenne/exp/parser/Evaluator.java    |    2 +-
 .../cayenne/exp/parser/PatternMatchNode.java    |    5 +-
 .../apache/cayenne/exp/parser/SimpleNode.java   |   10 +-
 .../org/apache/cayenne/log/JdbcEventLogger.java |  100 +-
 .../java/org/apache/cayenne/map/DataMap.java    |   20 +-
 .../org/apache/cayenne/map/DbRelationship.java  |    2 +-
 .../java/org/apache/cayenne/map/Embeddable.java |    2 +-
 .../org/apache/cayenne/map/EntityListener.java  |    2 +-
 .../cayenne/map/EntityListenerFactory.java      |    2 +-
 .../org/apache/cayenne/map/EntityResolver.java  |   32 +-
 .../org/apache/cayenne/map/MappingCache.java    |    2 +-
 .../apache/cayenne/map/MappingNamespace.java    |   10 +-
 .../java/org/apache/cayenne/map/ObjEntity.java  |   22 +-
 .../map/naming/DefaultUniqueNameGenerator.java  |    2 +-
 .../apache/cayenne/map/naming/NameChecker.java  |    2 +-
 .../apache/cayenne/map/naming/NameCheckers.java |    2 +-
 .../cayenne/map/naming/ObjectNameGenerator.java |    2 +-
 .../cayenne/map/naming/UniqueNameGenerator.java |    2 +-
 .../apache/cayenne/query/BaseQueryMetadata.java |  839 +++++------
 .../org/apache/cayenne/query/BatchQuery.java    |    8 +-
 .../org/apache/cayenne/query/BatchQueryRow.java |    2 +-
 .../org/apache/cayenne/query/EJBQLQuery.java    |    4 +-
 .../apache/cayenne/query/PrefetchTreeNode.java  | 1106 +++++++-------
 .../apache/cayenne/query/ProcedureQuery.java    |    4 +-
 .../org/apache/cayenne/query/QueryRouter.java   |    2 +-
 .../org/apache/cayenne/query/SQLSelect.java     |   59 +-
 .../org/apache/cayenne/query/SQLTemplate.java   | 1353 ++++++++++--------
 .../cayenne/query/SQLTemplateMetadata.java      |    2 +-
 .../org/apache/cayenne/query/SelectById.java    |    4 +-
 .../org/apache/cayenne/query/SelectQuery.java   |   33 +-
 .../org/apache/cayenne/reflect/ArcProperty.java |    2 +-
 .../cayenne/reflect/ConverterFactory.java       |    2 +-
 .../reflect/LifecycleCallbackRegistry.java      |    4 +-
 .../org/apache/cayenne/reflect/Property.java    |    3 +-
 .../cayenne/reflect/PropertyDescriptor.java     |    2 +-
 .../apache/cayenne/remote/RemoteSession.java    |    6 +-
 .../resource/ClassLoaderResourceLocator.java    |    2 +-
 .../org/apache/cayenne/tx/BaseTransaction.java  |    2 +-
 .../apache/cayenne/tx/CayenneTransaction.java   |    2 +-
 .../cayenne/tx/DefaultTransactionFactory.java   |    2 +-
 .../cayenne/tx/DefaultTransactionManager.java   |    2 +-
 .../apache/cayenne/tx/ExternalTransaction.java  |    2 +-
 .../java/org/apache/cayenne/tx/Transaction.java |    2 +-
 .../apache/cayenne/tx/TransactionFactory.java   |    2 +-
 .../apache/cayenne/tx/TransactionManager.java   |    2 +-
 .../cayenne/tx/TransactionalOperation.java      |    2 +-
 .../apache/cayenne/util/EntityMergeSupport.java |    8 +-
 .../main/java/org/apache/cayenne/util/Util.java |    2 +-
 .../apache/cayenne/velocity/BindDirective.java  |  165 +++
 .../cayenne/velocity/BindEqualDirective.java    |   57 +
 .../cayenne/velocity/BindNotEqualDirective.java |   56 +
 .../velocity/BindObjectEqualDirective.java      |  164 +++
 .../velocity/BindObjectNotEqualDirective.java   |   70 +
 .../apache/cayenne/velocity/ChainDirective.java |  112 ++
 .../apache/cayenne/velocity/ChunkDirective.java |   75 +
 .../cayenne/velocity/ResultDirective.java       |  206 +++
 .../velocity/SQLTemplateRenderingUtils.java     |   37 +
 .../velocity/SQLTemplateResourceManager.java    |  106 ++
 .../cayenne/velocity/VelocityParamSequence.java |   68 +
 .../velocity/VelocitySQLTemplateProcessor.java  |  209 +++
 .../org/apache/cayenne/BaseContextTest.java     |   22 +-
 .../cayenne/CDOCollectionRelationshipIT.java    |  194 +++
 .../cayenne/CDOCollectionRelationshipTest.java  |  181 ---
 .../java/org/apache/cayenne/CDOMany2OneIT.java  |  341 +++++
 .../org/apache/cayenne/CDOMany2OneNoRevIT.java  |   62 +
 .../apache/cayenne/CDOMany2OneNoRevTest.java    |   56 -
 .../org/apache/cayenne/CDOMany2OneTest.java     |  325 -----
 .../apache/cayenne/CDOMapRelationshipIT.java    |  249 ++++
 .../apache/cayenne/CDOMapRelationshipTest.java  |  234 ---
 .../java/org/apache/cayenne/CDOOne2ManyIT.java  |  311 ++++
 .../org/apache/cayenne/CDOOne2ManyTest.java     |  299 ----
 .../org/apache/cayenne/CDOOne2OneDepIT.java     |  147 ++
 .../org/apache/cayenne/CDOOne2OneDepTest.java   |  135 --
 .../org/apache/cayenne/CDOOneDep2OneIT.java     |  146 ++
 .../org/apache/cayenne/CDOOneDep2OneTest.java   |  136 --
 .../org/apache/cayenne/CDOOneToManyFKIT.java    |   90 ++
 .../org/apache/cayenne/CDOOneToManyFKTest.java  |   83 --
 .../org/apache/cayenne/CDOOneToOneFKIT.java     |  211 +++
 .../org/apache/cayenne/CDOOneToOneFKTest.java   |  197 ---
 .../apache/cayenne/CDOQualifiedEntitiesIT.java  |  132 ++
 .../cayenne/CDOQualifiedEntitiesTest.java       |  126 --
 .../apache/cayenne/CDOReflexiveRelDeleteIT.java |  101 ++
 .../cayenne/CDOReflexiveRelDeleteTest.java      |   96 --
 .../org/apache/cayenne/CDOReflexiveRelIT.java   |  127 ++
 .../org/apache/cayenne/CDOReflexiveRelTest.java |  120 --
 .../apache/cayenne/CDOSetRelationshipIT.java    |  208 +++
 .../apache/cayenne/CDOSetRelationshipTest.java  |  195 ---
 .../org/apache/cayenne/CayenneCompoundIT.java   |  168 +++
 .../CayenneDataObjectFlattenedRelIT.java        |  295 ++++
 .../CayenneDataObjectFlattenedRelTest.java      |  280 ----
 .../org/apache/cayenne/CayenneDataObjectIT.java |  167 +++
 .../cayenne/CayenneDataObjectInContextIT.java   |  333 +++++
 .../cayenne/CayenneDataObjectInContextTest.java |  308 ----
 .../CayenneDataObjectRelationshipsIT.java       |  317 ++++
 .../CayenneDataObjectRelationshipsTest.java     |  293 ----
 .../apache/cayenne/CayenneDataObjectTest.java   |  153 --
 .../cayenne/CayenneDataObjectValidationIT.java  |  129 ++
 .../CayenneDataObjectValidationTest.java        |  121 --
 .../apache/cayenne/CayenneExceptionTest.java    |   15 +-
 .../test/java/org/apache/cayenne/CayenneIT.java |  288 ++++
 .../cayenne/CayenneRuntimeExceptionTest.java    |   21 +-
 .../java/org/apache/cayenne/CayenneTest.java    |  374 -----
 .../org/apache/cayenne/CompoundPkChangeIT.java  |  167 +++
 .../apache/cayenne/CompoundPkChangeTest.java    |  162 ---
 .../org/apache/cayenne/ConfigExceptionTest.java |   13 +-
 .../cayenne/ContextStateRecorderTest.java       |   13 +-
 .../cayenne/DataContextMaxIdQualifierIT.java    |  250 ++++
 .../cayenne/DataContextMaxIdQualifierTest.java  |  240 ----
 .../cayenne/DataObjectSerializationIT.java      |  130 ++
 .../cayenne/DataObjectSerializationTest.java    |  119 --
 .../java/org/apache/cayenne/DataRowTest.java    |    7 +-
 .../cayenne/FlattenedRelationshipsIT.java       |  300 ++++
 .../cayenne/FlattenedRelationshipsTest.java     |  287 ----
 .../org/apache/cayenne/GenericMappingIT.java    |  119 ++
 .../org/apache/cayenne/GenericMappingTest.java  |  110 --
 .../org/apache/cayenne/ManyToManyNoJoinIT.java  |   61 +
 .../apache/cayenne/ManyToManyNoJoinTest.java    |   59 -
 .../java/org/apache/cayenne/MeaningfulFKIT.java |   76 +
 .../org/apache/cayenne/MeaningfulFKTest.java    |   69 -
 .../cayenne/ObjectContextChangeLogTest.java     |   13 +-
 .../apache/cayenne/ObjectIdRegressionTest.java  |    7 +-
 .../java/org/apache/cayenne/ObjectIdTest.java   |   33 +-
 .../apache/cayenne/OneWayRelationshipsIT.java   |  230 +++
 .../apache/cayenne/OneWayRelationshipsTest.java |  217 ---
 .../cayenne/PersistenceByReachabilityIT.java    |  113 ++
 .../cayenne/PersistenceByReachabilityTest.java  |  103 --
 .../org/apache/cayenne/PersistentObjectIT.java  |   63 +
 .../apache/cayenne/PersistentObjectTest.java    |   56 -
 .../org/apache/cayenne/PregeneratedPKIT.java    |   90 ++
 .../org/apache/cayenne/PregeneratedPKTest.java  |   85 --
 .../cayenne/access/DataContextBinaryPKIT.java   |  101 ++
 .../cayenne/access/DataContextBinaryPKTest.java |   95 --
 .../cayenne/access/DataContextBlobIT.java       |  199 +++
 .../cayenne/access/DataContextBlobTest.java     |  189 ---
 .../cayenne/access/DataContextCallbacksIT.java  |  191 +++
 .../access/DataContextCallbacksTest.java        |  181 ---
 .../cayenne/access/DataContextCharPKIT.java     |  127 ++
 .../cayenne/access/DataContextCharPKTest.java   |  120 --
 .../cayenne/access/DataContextCharTypeIT.java   |   80 ++
 .../cayenne/access/DataContextCharTypeTest.java |   76 -
 .../cayenne/access/DataContextClobIT.java       |  167 +++
 .../cayenne/access/DataContextClobTest.java     |  158 --
 .../cayenne/access/DataContextCommitIT.java     |  124 ++
 .../cayenne/access/DataContextCommitTest.java   |  116 --
 .../access/DataContextCompoundRelIT.java        |  159 ++
 .../access/DataContextCompoundRelTest.java      |  153 --
 .../cayenne/access/DataContextCrossDBIT.java    |   67 +
 .../cayenne/access/DataContextCrossDBTest.java  |   65 -
 .../access/DataContextDataChannelEventsIT.java  |  199 +++
 .../DataContextDataChannelEventsTest.java       |  190 ---
 .../access/DataContextDecoratedStackIT.java     |  138 ++
 .../access/DataContextDecoratedStackTest.java   |  131 --
 .../cayenne/access/DataContextDelegateIT.java   |  173 +++
 .../DataContextDelegateSharedCacheIT.java       |  227 +++
 .../DataContextDelegateSharedCacheTest.java     |  216 ---
 .../cayenne/access/DataContextDelegateTest.java |  163 ---
 .../access/DataContextDeleteRulesIT.java        |  264 ++++
 .../access/DataContextDeleteRulesTest.java      |  250 ----
 .../DataContextDisjointByIdPrefetchIT.java      |  229 +++
 .../DataContextDisjointByIdPrefetchTest.java    |  219 ---
 ...ataContextDisjointByIdPrefetch_ExtrasIT.java |  380 +++++
 ...aContextDisjointByIdPrefetch_ExtrasTest.java |  373 -----
 .../access/DataContextEJBQLArrayResultIT.java   |  132 ++
 .../access/DataContextEJBQLArrayResultTest.java |  125 --
 .../access/DataContextEJBQLConditionsIT.java    |  502 +++++++
 .../DataContextEJBQLConditionsPeopleIT.java     |  172 +++
 .../DataContextEJBQLConditionsPeopleTest.java   |  165 ---
 .../access/DataContextEJBQLConditionsTest.java  |  476 ------
 ...extEJBQLDateTimeFunctionalExpressionsIT.java |  121 ++
 .../access/DataContextEJBQLDeleteIT.java        |  129 ++
 .../access/DataContextEJBQLDeletePKIT.java      |   83 ++
 .../access/DataContextEJBQLDeleteTest.java      |  155 --
 .../access/DataContextEJBQLFetchJoinIT.java     |  428 ++++++
 .../access/DataContextEJBQLFetchJoinTest.java   |  417 ------
 ...ataContextEJBQLFlattenedRelationshipsIT.java |  335 +++++
 ...aContextEJBQLFlattenedRelationshipsTest.java |  319 -----
 .../DataContextEJBQLFunctionalExpressions.java  |  411 ------
 ...DataContextEJBQLFunctionalExpressionsIT.java |  295 ++++
 .../access/DataContextEJBQLGroupByHavingIT.java |  355 +++++
 .../DataContextEJBQLGroupByHavingTest.java      |  338 -----
 .../access/DataContextEJBQLInheritanceIT.java   |   94 ++
 .../access/DataContextEJBQLInheritanceTest.java |   90 --
 .../access/DataContextEJBQLIsNullIT.java        |  191 +++
 .../access/DataContextEJBQLIsNullTest.java      |  181 ---
 .../cayenne/access/DataContextEJBQLJoinsIT.java |  246 ++++
 .../access/DataContextEJBQLJoinsTest.java       |  234 ---
 .../DataContextEJBQLNumericalFunctionalIT.java  |  152 ++
 .../access/DataContextEJBQLOrderByIT.java       |  230 +++
 .../access/DataContextEJBQLOrderByTest.java     |  221 ---
 .../access/DataContextEJBQLQueryCompoundIT.java |  148 ++
 .../cayenne/access/DataContextEJBQLQueryIT.java |  476 ++++++
 .../access/DataContextEJBQLQueryTest.java       |  537 -------
 .../access/DataContextEJBQLSubqueryIT.java      |  258 ++++
 .../access/DataContextEJBQLSubqueryTest.java    |  248 ----
 .../DataContextEJBQLUpdateCompoundIT.java       |  106 ++
 .../access/DataContextEJBQLUpdateIT.java        |  256 ++++
 .../access/DataContextEJBQLUpdateTest.java      |  333 -----
 .../DataContextEntityWithMeaningfulPKIT.java    |  141 ++
 .../DataContextEntityWithMeaningfulPKTest.java  |  130 --
 .../DataContextExtendedTypeOperationsIT.java    |  106 ++
 .../DataContextExtendedTypeOperationsTest.java  |  100 --
 .../cayenne/access/DataContextExtrasIT.java     |  450 ++++++
 .../cayenne/access/DataContextExtrasTest.java   |  421 ------
 .../DataContextFlattenedAttributesIT.java       |  403 ++++++
 .../DataContextFlattenedAttributesTest.java     |  385 -----
 .../apache/cayenne/access/DataContextIT.java    |  848 +++++++++++
 .../access/DataContextJoinAliasesIT.java        |  119 ++
 .../access/DataContextJoinAliasesTest.java      |  115 --
 .../access/DataContextLocalObjectIT.java        |  196 +++
 .../access/DataContextLocalObjectTest.java      |  183 ---
 .../cayenne/access/DataContextNoPkIT.java       |   89 ++
 .../cayenne/access/DataContextNoPkTest.java     |   81 --
 .../access/DataContextObjectIdQueryIT.java      |  131 ++
 .../access/DataContextObjectIdQueryTest.java    |  123 --
 .../access/DataContextObjectTrackingIT.java     |  147 ++
 .../access/DataContextObjectTrackingTest.java   |  139 --
 .../cayenne/access/DataContextOrderingIT.java   |  133 ++
 .../cayenne/access/DataContextOrderingTest.java |  127 --
 .../cayenne/access/DataContextOuterJoinsIT.java |  197 +++
 .../access/DataContextOuterJoinsTest.java       |  190 ---
 .../access/DataContextPaginatedQueryIT.java     |   98 ++
 .../access/DataContextPaginatedQueryTest.java   |   93 --
 .../access/DataContextPerformQueryAPIIT.java    |  240 ++++
 .../access/DataContextPerformQueryAPITest.java  |  228 ---
 .../access/DataContextPrefetchExtras1IT.java    |   89 ++
 .../access/DataContextPrefetchExtras1Test.java  |   84 --
 .../access/DataContextPrefetchExtrasIT.java     |  184 +++
 .../access/DataContextPrefetchExtrasTest.java   |  174 ---
 .../cayenne/access/DataContextPrefetchIT.java   |  832 +++++++++++
 .../access/DataContextPrefetchMultistepIT.java  |  324 +++++
 .../DataContextPrefetchMultistepTest.java       |  311 ----
 .../DataContextPrefetchQualifierOverlapIT.java  |  128 ++
 ...DataContextPrefetchQualifierOverlapTest.java |  122 --
 .../cayenne/access/DataContextPrefetchTest.java |  801 -----------
 .../access/DataContextProcedureQueryIT.java     |  446 ++++++
 .../access/DataContextProcedureQueryTest.java   |  429 ------
 .../access/DataContextQualifiedEntityIT.java    |  124 ++
 .../access/DataContextQualifiedEntityTest.java  |  119 --
 .../DataContextQueryCachingEhCacheIT.java       |   64 +
 .../DataContextQueryCachingEhCacheTest.java     |   64 -
 .../access/DataContextQueryCachingIT.java       |  266 ++++
 .../DataContextQueryCachingOSCacheIT.java       |   53 +
 .../DataContextQueryCachingOSCacheTest.java     |   53 -
 .../access/DataContextQueryCachingTest.java     |  256 ----
 .../cayenne/access/DataContextQueryChainIT.java |   79 +
 .../access/DataContextQueryChainTest.java       |   74 -
 .../access/DataContextRefreshQueryIT.java       |  456 ++++++
 .../access/DataContextRefreshQueryTest.java     |  440 ------
 .../cayenne/access/DataContextRefreshingIT.java |  391 +++++
 .../access/DataContextRefreshingTest.java       |  371 -----
 .../access/DataContextRelationshipQueryIT.java  |  143 ++
 .../DataContextRelationshipQueryTest.java       |  137 --
 .../cayenne/access/DataContextRollbackIT.java   |  235 +++
 .../cayenne/access/DataContextRollbackTest.java |  224 ---
 .../DataContextSQLTemplateCompoundIT.java       |  124 ++
 .../access/DataContextSQLTemplateIT.java        |  590 ++++++++
 .../access/DataContextSQLTemplateTest.java      |  635 --------
 .../DataContextSelectQuerySplitAliasesIT.java   |  106 ++
 .../DataContextSelectQuerySplitAliasesTest.java |  101 --
 .../access/DataContextSerializationIT.java      |  284 ++++
 .../access/DataContextSerializationTest.java    |  268 ----
 .../access/DataContextSharedCacheEmpiricIT.java |  167 +++
 .../DataContextSharedCacheEmpiricTest.java      |  159 --
 .../access/DataContextSharedCacheIT.java        |  750 ++++++++++
 .../access/DataContextSharedCacheTest.java      |  725 ----------
 .../apache/cayenne/access/DataContextTest.java  |  804 -----------
 .../cayenne/access/DataContextValidationIT.java |  112 ++
 .../access/DataContextValidationTest.java       |  104 --
 .../cayenne/access/DataDomainCallbacksIT.java   |  490 +++++++
 .../cayenne/access/DataDomainCallbacksTest.java |  473 ------
 .../cayenne/access/DataDomainFiltersIT.java     |  209 +++
 .../cayenne/access/DataDomainFiltersTest.java   |  200 ---
 .../org/apache/cayenne/access/DataDomainIT.java |  279 ++++
 .../cayenne/access/DataDomainQueryActionIT.java |  113 ++
 .../access/DataDomainQueryActionTest.java       |  109 --
 .../apache/cayenne/access/DataDomainTest.java   |  256 ----
 .../org/apache/cayenne/access/DataNodeIT.java   |   96 ++
 .../cayenne/access/DataNodeQueriesIT.java       |  201 +++
 .../cayenne/access/DataNodeQueriesTest.java     |  189 ---
 .../org/apache/cayenne/access/DataNodeTest.java |   88 --
 .../apache/cayenne/access/DataRowStoreIT.java   |  141 ++
 .../apache/cayenne/access/DataRowStoreTest.java |  131 --
 .../apache/cayenne/access/DataRowUtilsIT.java   |  161 +++
 .../apache/cayenne/access/DataRowUtilsTest.java |  152 --
 .../apache/cayenne/access/DateTimeTypesIT.java  |  210 +++
 .../cayenne/access/DateTimeTypesTest.java       |  197 ---
 .../org/apache/cayenne/access/DbArcIdTest.java  |   11 +-
 .../apache/cayenne/access/DbGeneratorIT.java    |  108 ++
 .../apache/cayenne/access/DbGeneratorTest.java  |   96 --
 .../org/apache/cayenne/access/DbLoaderIT.java   |  576 ++++++++
 .../cayenne/access/DbLoaderPartialIT.java       |  123 ++
 .../cayenne/access/DbLoaderPartialTest.java     |  118 --
 .../org/apache/cayenne/access/DbLoaderTest.java |  561 --------
 .../apache/cayenne/access/DeleteObjectIT.java   |  236 +++
 .../apache/cayenne/access/DeleteObjectTest.java |  225 ---
 .../apache/cayenne/access/DeleteRulesIT.java    |  392 +++++
 .../apache/cayenne/access/DeleteRulesTest.java  |  374 -----
 .../org/apache/cayenne/access/EmbeddingIT.java  |  187 +++
 .../apache/cayenne/access/EmbeddingTest.java    |  179 ---
 .../cayenne/access/EntityInheritanceIT.java     |   96 ++
 .../java/org/apache/cayenne/access/EnumIT.java  |   96 ++
 .../org/apache/cayenne/access/EnumTest.java     |   89 --
 .../cayenne/access/FlattenedArcKeyIT.java       |   97 ++
 .../cayenne/access/FlattenedArcKeyTest.java     |   89 --
 .../cayenne/access/FlattenedPrefetchIT.java     |  277 ++++
 .../cayenne/access/FlattenedPrefetchTest.java   |  267 ----
 .../FlattenedRelationshipInContextIT.java       |  106 ++
 .../FlattenedRelationshipInContextTest.java     |  100 --
 .../cayenne/access/IdentityColumnsIT.java       |  347 +++++
 .../cayenne/access/IdentityColumnsTest.java     |  331 -----
 .../cayenne/access/IncrementalFaultListIT.java  |   51 +
 .../access/IncrementalFaultListTest.java        |   46 -
 .../apache/cayenne/access/JointPrefetchIT.java  |  511 +++++++
 .../cayenne/access/JointPrefetchTest.java       |  495 -------
 .../org/apache/cayenne/access/MiscTypesIT.java  |  197 +++
 .../apache/cayenne/access/MiscTypesTest.java    |  186 ---
 .../access/NestedDataContextLocalCacheIT.java   |   82 ++
 .../access/NestedDataContextLocalCacheTest.java |   77 -
 .../access/NestedDataContextParentEventsIT.java |   68 +
 .../NestedDataContextParentEventsTest.java      |   61 -
 .../NestedDataContextParentPeerEventsIT.java    |  151 ++
 .../NestedDataContextParentPeerEventsTest.java  |  141 --
 .../access/NestedDataContextPeerEventsIT.java   |  191 +++
 .../access/NestedDataContextPeerEventsTest.java |  181 ---
 .../cayenne/access/NestedDataContextReadIT.java |  391 +++++
 .../access/NestedDataContextReadTest.java       |  376 -----
 .../access/NestedDataContextRollbackIT.java     |   76 +
 .../access/NestedDataContextRollbackTest.java   |   70 -
 .../access/NestedDataContextValidationIT.java   |   80 ++
 .../access/NestedDataContextValidationTest.java |   74 -
 .../access/NestedDataContextWriteIT.java        |  694 +++++++++
 .../access/NestedDataContextWriteTest.java      |  676 ---------
 .../access/NestedDataContext_DeadlockIT.java    |  132 ++
 .../access/NestedDataContext_DeadlockTest.java  |  128 --
 .../apache/cayenne/access/NumericTypesIT.java   |  312 ++++
 .../apache/cayenne/access/NumericTypesTest.java |  295 ----
 .../access/ObjectStoreDiffRetainingIT.java      |  113 ++
 .../access/ObjectStoreDiffRetainingTest.java    |  107 --
 .../apache/cayenne/access/ObjectStoreGCIT.java  |  136 ++
 .../cayenne/access/ObjectStoreGCTest.java       |  130 --
 .../apache/cayenne/access/ObjectStoreIT.java    |  142 ++
 .../apache/cayenne/access/ObjectStoreTest.java  |  133 --
 .../cayenne/access/OptimisticLockingIT.java     |  521 +++++++
 .../cayenne/access/OptimisticLockingTest.java   |  498 -------
 .../access/PrefetchProcessorTreeBuilderIT.java  |  216 +++
 .../PrefetchProcessorTreeBuilderTest.java       |  207 ---
 .../cayenne/access/PrimitiveAttributesIT.java   |   49 +
 .../cayenne/access/PrimitiveAttributesTest.java |   47 -
 .../cayenne/access/QuotedIdentifiersIT.java     |  163 +++
 .../cayenne/access/QuotedIdentifiersTest.java   |  156 --
 .../cayenne/access/ReturnTypesMappingIT.java    |  884 ++++++++++++
 .../cayenne/access/ReturnTypesMappingTest.java  |  858 -----------
 .../SimpleIdIncrementalFaultListDataRowsIT.java |  230 +++
 ...impleIdIncrementalFaultListDataRowsTest.java |  219 ---
 .../access/SimpleIdIncrementalFaultListIT.java  |  313 ++++
 .../SimpleIdIncrementalFaultListPrefetchIT.java |  214 +++
 ...impleIdIncrementalFaultListPrefetchTest.java |  204 ---
 .../SimpleIdIncrementalFaultListTest.java       |  292 ----
 .../access/SingleTableInheritance1IT.java       |  107 ++
 .../access/SingleTableInheritance1Test.java     |  102 --
 .../access/SingleTableInheritanceIT.java        |  495 +++++++
 .../access/SingleTableInheritanceTest.java      |  533 -------
 .../org/apache/cayenne/access/ToManyListIT.java |  274 ++++
 .../apache/cayenne/access/ToManyListTest.java   |  263 ----
 .../cayenne/access/TransactionThreadIT.java     |  123 ++
 .../cayenne/access/TransactionThreadTest.java   |  118 --
 .../java/org/apache/cayenne/access/UUIDIT.java  |  100 ++
 .../org/apache/cayenne/access/UUIDTest.java     |   93 --
 .../cayenne/access/UserTransactionIT.java       |  107 ++
 .../cayenne/access/UserTransactionTest.java     |  103 --
 .../cayenne/access/VerticalInheritanceIT.java   |  544 +++++++
 .../cayenne/access/VerticalInheritanceTest.java |  528 -------
 .../access/dbsync/SchemaUpdateStrategyBase.java |  129 ++
 .../access/dbsync/SchemaUpdateStrategyIT.java   |   69 +
 .../access/dbsync/SchemaUpdateStrategyTest.java |  346 -----
 .../ThrowOnPartialOrCreateSchemaStrategyIT.java |   85 ++
 .../dbsync/ThrowOnPartialSchemaStrategyIT.java  |   93 ++
 .../cayenne/access/event/SnapshotEventTest.java |    7 +-
 .../access/jdbc/BatchActionGeneratedIT.java     |   89 ++
 .../cayenne/access/jdbc/BatchActionIT.java      |   84 ++
 .../access/jdbc/BatchActionLockingIT.java       |  159 ++
 .../access/jdbc/BatchActionLockingTest.java     |  155 --
 .../cayenne/access/jdbc/BatchActionTest.java    |   90 --
 .../cayenne/access/jdbc/BindDirectiveTest.java  |  267 ----
 .../access/jdbc/ColumnDescriptorTest.java       |   18 +-
 .../access/jdbc/JDBCResultIteratorTest.java     |   28 +-
 .../access/jdbc/MockupRuntimeServices.java      |   42 -
 .../access/jdbc/ResultDirectiveTest.java        |  187 ---
 .../cayenne/access/jdbc/SQLStatementTest.java   |   11 +-
 .../access/jdbc/SQLTemplateActionIT.java        |  380 +++++
 .../access/jdbc/SQLTemplateActionTest.java      |  365 -----
 .../jdbc/SQLTemplateProcessorChainTest.java     |  206 ---
 .../jdbc/SQLTemplateProcessorSelectTest.java    |  101 --
 .../access/jdbc/SQLTemplateProcessorTest.java   |  246 ----
 .../jdbc/SQLTemplateResourceManagerTest.java    |   61 -
 .../cayenne/access/jdbc/SelectActionIT.java     |  103 ++
 .../cayenne/access/jdbc/SelectActionTest.java   |   98 --
 .../loader/ManyToManyCandidateEntityTest.java   |   15 +-
 .../batch/DefaultBatchTranslatorIT.java         |  142 ++
 .../batch/DefaultBatchTranslatorTest.java       |  136 --
 .../batch/DeleteBatchTranslatorIT.java          |  162 +++
 .../batch/DeleteBatchTranslatorTest.java        |  154 --
 .../batch/InsertBatchTranslatorIT.java          |  100 ++
 .../batch/InsertBatchTranslatorTest.java        |   94 --
 .../batch/SoftDeleteBatchTranslatorIT.java      |  181 +++
 .../batch/SoftDeleteBatchTranslatorTest.java    |  176 ---
 .../batch/UpdateBatchTranslatorIT.java          |  168 +++
 .../batch/UpdateBatchTranslatorTest.java        |  160 ---
 .../ejbql/EJBQLSelectTranslatorIT.java          |  340 +++++
 .../ejbql/EJBQLSelectTranslatorTest.java        |  316 ----
 .../translator/select/OrderingTranslatorIT.java |  187 +++
 .../select/OrderingTranslatorTest.java          |  179 ---
 .../select/QualifierTranslatorIT.java           |  149 ++
 .../select/QualifierTranslatorTest.java         |  139 --
 .../translator/select/QueryAssemblerIT.java     |   80 ++
 .../translator/select/QueryAssemblerTest.java   |   73 -
 .../translator/select/SelectTranslatorIT.java   |  797 +++++++++++
 .../translator/select/SelectTranslatorTest.java |  771 ----------
 .../cayenne/access/types/BooleanTypeTest.java   |   11 +-
 .../cayenne/access/types/ByteArrayTypeTest.java |   10 +-
 .../cayenne/access/types/CharTypeTest.java      |    9 +-
 .../access/types/EnumTypeFactoryTest.java       |    7 +-
 .../cayenne/access/types/EnumTypeTest.java      |   26 +-
 .../access/types/ExtendedTypeMapEnumsTest.java  |   15 +-
 .../access/types/ExtendedTypeMapTest.java       |   16 +-
 .../access/util/DefaultOperationObserverIT.java |   48 +
 .../util/DefaultOperationObserverTest.java      |   42 -
 .../cayenne/ashwood/AshwoodEntitySorterIT.java  |   89 ++
 .../ashwood/AshwoodEntitySorterTest.java        |   85 --
 .../cayenne/cache/EhCacheQueryCacheTest.java    |   30 +-
 .../cache/EhCacheQueryCache_WithConfigTest.java |   29 +-
 .../apache/cayenne/cache/MapQueryCacheTest.java |   13 +-
 .../apache/cayenne/cache/OSQueryCacheTest.java  |   28 +-
 .../org/apache/cayenne/cache/QueryCacheIT.java  |   59 +
 .../apache/cayenne/cache/QueryCacheTest.java    |   55 -
 .../configuration/CayenneRuntimeTest.java       |   10 +-
 .../DefaultDataChannelDescriptorMergerTest.java |   17 +-
 .../DefaultRuntimePropertiesTest.java           |   11 +-
 .../XMLDataChannelDescriptorLoaderTest.java     |   27 +-
 .../osgi/OsgiClassLoaderManagerTest.java        |    8 +-
 .../server/DBCPDataSourceFactoryTest.java       |   23 +-
 .../server/DataContextFactoryTest.java          |   17 +-
 .../server/DataDomainProviderTest.java          |  339 ++---
 .../DefaultDataSourceFactoryLoaderTest.java     |   22 +-
 .../server/DefaultDbAdapterFactoryTest.java     |   33 +-
 .../server/JNDIDataSourceFactoryIT.java         |  109 ++
 .../server/JNDIDataSourceFactoryTest.java       |  104 --
 .../ServerRuntimeBuilder_InAction_IT.java       |   95 ++
 .../ServerRuntimeBuilder_InAction_Test.java     |   91 --
 .../configuration/web/CayenneFilterTest.java    |   32 +-
 .../web/ServletContextHandlerTest.java          |   18 +-
 .../configuration/web/WebConfigurationTest.java |   28 +-
 .../configuration/web/WebModuleTest.java        |    7 +-
 .../cayenne/configuration/web/WebUtilTest.java  |   13 +-
 .../apache/cayenne/conn/DataSourceInfoTest.java |   14 +-
 .../cayenne/conn/DriverDataSourceTest.java      |    8 +-
 .../org/apache/cayenne/conn/PoolManagerIT.java  |  127 ++
 .../apache/cayenne/conn/PoolManagerTest.java    |  118 --
 .../cayenne/conn/PooledConnectionImplTest.java  |    6 +-
 .../org/apache/cayenne/dba/AutoAdapterIT.java   |   73 +
 .../org/apache/cayenne/dba/AutoAdapterTest.java |   67 -
 .../cayenne/dba/ConcurrentPkGeneratorIT.java    |  120 ++
 .../cayenne/dba/ConcurrentPkGeneratorTest.java  |  115 --
 .../cayenne/dba/DefaultQuotingStrategyTest.java |    9 +-
 .../org/apache/cayenne/dba/JdbcAdapterIT.java   |   91 ++
 .../org/apache/cayenne/dba/JdbcAdapterTest.java |   85 --
 .../apache/cayenne/dba/JdbcPkGeneratorIT.java   |   92 ++
 .../apache/cayenne/dba/JdbcPkGeneratorTest.java |   88 --
 .../org/apache/cayenne/dba/PkGeneratorIT.java   |   90 ++
 .../org/apache/cayenne/dba/PkGeneratorTest.java |   84 --
 .../org/apache/cayenne/dba/TypesMappingIT.java  |  146 ++
 .../apache/cayenne/dba/TypesMappingTest.java    |  138 --
 .../cayenne/dba/hsqldb/HSQLDBAdapterIT.java     |   74 +
 .../cayenne/dba/hsqldb/HSQLDBAdapterTest.java   |   68 -
 .../cayenne/dba/mysql/MySQLAdapterIT.java       |   69 +
 .../cayenne/dba/mysql/MySQLAdapterTest.java     |   65 -
 .../cayenne/dba/oracle/Oracle8AdapterIT.java    |   66 +
 .../cayenne/dba/oracle/Oracle8AdapterTest.java  |   59 -
 .../cayenne/dba/oracle/OracleAdapterIT.java     |   70 +
 .../cayenne/dba/oracle/OracleAdapterTest.java   |   62 -
 .../cayenne/dba/oracle/OraclePkGeneratorIT.java |   74 +
 .../dba/oracle/OraclePkGeneratorTest.java       |   68 -
 .../dba/oracle/OracleUtilDateTypeTest.java      |    8 +-
 .../cayenne/dba/postgres/PostgresAdapterIT.java |   61 +
 .../dba/postgres/PostgresAdapterTest.java       |   56 -
 .../dba/sqlserver/SQLServerAdapterIT.java       |   60 +
 .../dba/sqlserver/SQLServerAdapterTest.java     |   55 -
 .../dba/sqlserver/SQLServerSnifferIT.java       |   77 +
 .../dba/sqlserver/SQLServerSnifferTest.java     |   72 -
 .../ejbql/EJBQLCompiledExpressionIT.java        |  121 ++
 .../ejbql/EJBQLCompiledExpressionTest.java      |  111 --
 .../cayenne/ejbql/EJBQLExpressionTest.java      |   11 +-
 .../cayenne/ejbql/EJBQLParserFactoryTest.java   |    8 +-
 .../cayenne/ejbql/parser/EJBQLPathTest.java     |    7 +-
 .../cayenne/event/DefaultEventManagerTest.java  |   85 +-
 .../apache/cayenne/event/EventBridgeTest.java   |   18 +-
 .../apache/cayenne/event/EventSubjectTest.java  |   35 +-
 .../cayenne/event/JGroupsBridgeFactoryTest.java |    7 +-
 .../cayenne/event/XMPPBridgeFactoryTest.java    |    8 +-
 .../apache/cayenne/event/XMPPBridgeTest.java    |   10 +-
 .../cayenne/exp/BooleanExpressionTest.java      |   10 +-
 .../cayenne/exp/ExpressionEqualsTest.java       |    9 +-
 .../exp/ExpressionFactory_InContextIT.java      |  353 +++++
 .../exp/ExpressionFactory_InContextTest.java    |  319 -----
 .../cayenne/exp/ExpressionParameterTest.java    |    7 +-
 .../cayenne/exp/ExpressionTraversalTest.java    |   12 +-
 .../cayenne/exp/Expression_InContextIT.java     |  142 ++
 .../cayenne/exp/Expression_InContextTest.java   |  132 --
 .../exp/Expression_ParamsLegacyTest.java        |    2 +-
 .../cayenne/exp/ParsedExpQualifierCompatIT.java |  315 ++++
 .../exp/ParsedExpQualifierCompatTest.java       |  289 ----
 .../org/apache/cayenne/exp/PropertyTest.java    |   49 +-
 .../cayenne/exp/parser/ASTDbPathTest.java       |    8 +-
 .../exp/parser/ASTLikeIgnoreCaseTest.java       |    9 +-
 .../apache/cayenne/exp/parser/ASTListTest.java  |   15 +-
 .../cayenne/exp/parser/ASTObjPathTest.java      |    8 +-
 .../cayenne/exp/parser/EvaluatorTest.java       |   24 +-
 .../parser/ExpressionEvaluateInMemoryIT.java    |  618 ++++++++
 .../parser/ExpressionEvaluateInMemoryTest.java  |  576 --------
 .../org/apache/cayenne/graph/GraphMapTest.java  |   12 +-
 .../org/apache/cayenne/graph/NodeDiffTest.java  |    9 +-
 .../cayenne/log/CommonsJdbcEventLoggerTest.java |   14 +-
 .../org/apache/cayenne/map/AttributeTest.java   |    9 +-
 .../cayenne/map/CallbackDescriptorTest.java     |    8 +-
 .../org/apache/cayenne/map/CallbackMapTest.java |    7 +-
 .../cayenne/map/ClientEntityResolverIT.java     |  102 ++
 .../cayenne/map/ClientEntityResolverTest.java   |   93 --
 .../map/ClientObjectRelationshipTest.java       |    9 +-
 .../cayenne/map/DataMapNamespaceTest.java       |   20 +-
 .../org/apache/cayenne/map/DataMapTest.java     |   50 +-
 .../org/apache/cayenne/map/DbAttributeTest.java |   22 +-
 .../java/org/apache/cayenne/map/DbEntityIT.java |  278 ++++
 .../org/apache/cayenne/map/DbEntityTest.java    |  254 ----
 .../java/org/apache/cayenne/map/DbJoinTest.java |   10 +-
 .../apache/cayenne/map/DbKeyGeneratorTest.java  |   10 +-
 .../apache/cayenne/map/DbRelationshipIT.java    |  120 ++
 .../apache/cayenne/map/DbRelationshipTest.java  |  110 --
 .../cayenne/map/EmbeddableAttributeTest.java    |    8 +-
 .../org/apache/cayenne/map/EmbeddableTest.java  |   13 +-
 .../java/org/apache/cayenne/map/EntityIT.java   |  223 +++
 .../cayenne/map/EntityInheritanceTreeTest.java  |   13 +-
 .../map/EntityResolverClassDescriptorIT.java    |  104 ++
 .../map/EntityResolverClassDescriptorTest.java  |   95 --
 .../map/EntityResolverGenericStackIT.java       |   64 +
 .../map/EntityResolverGenericStackTest.java     |   57 -
 .../apache/cayenne/map/EntityResolverIT.java    |  187 +++
 .../map/EntityResolverInheritanceIT.java        |   88 ++
 .../map/EntityResolverInheritanceTest.java      |   78 -
 .../apache/cayenne/map/EntityResolverTest.java  |  171 ---
 .../java/org/apache/cayenne/map/EntityTest.java |  204 ---
 .../apache/cayenne/map/MapLoaderLoadTest.java   |   31 +-
 .../apache/cayenne/map/ObjAttributeTest.java    |   18 +-
 .../org/apache/cayenne/map/ObjEntityIT.java     |  465 ++++++
 .../ObjEntitySingleTableInheritanceTest.java    |   16 +-
 .../org/apache/cayenne/map/ObjEntityTest.java   |  431 ------
 .../apache/cayenne/map/ObjRelationshipIT.java   |  524 +++++++
 .../apache/cayenne/map/ObjRelationshipTest.java |  495 -------
 .../org/apache/cayenne/map/ProcedureTest.java   |   10 +-
 .../org/apache/cayenne/map/QueryLoaderTest.java |   16 +-
 .../apache/cayenne/map/RelationshipTest.java    |   11 +-
 .../cayenne/map/SQLTemplateBuilderTest.java     |   16 +-
 .../cayenne/map/SelectQueryBuilderTest.java     |   14 +-
 .../apache/cayenne/map/event/MapEventTest.java  |   12 +-
 .../map/naming/LegacyNameGeneratorTest.java     |    9 +-
 .../cayenne/merge/AddColumnToModelIT.java       |  101 ++
 .../cayenne/merge/AddColumnToModelTest.java     |   94 --
 .../cayenne/merge/CreateTableToModelIT.java     |  105 ++
 .../cayenne/merge/CreateTableToModelTest.java   |   97 --
 .../cayenne/merge/DropColumnToModelIT.java      |  236 +++
 .../cayenne/merge/DropColumnToModelTest.java    |  226 ---
 .../merge/DropRelationshipToModelIT.java        |  185 +++
 .../merge/DropRelationshipToModelTest.java      |  177 ---
 .../cayenne/merge/DropTableToModelIT.java       |   97 ++
 .../cayenne/merge/DropTableToModelTest.java     |   90 --
 .../org/apache/cayenne/merge/MergeCase.java     |   18 +-
 .../apache/cayenne/merge/MergerFactoryIT.java   |  317 ++++
 .../apache/cayenne/merge/MergerFactoryTest.java |  306 ----
 .../cayenne/merge/SetAllowNullToDbIT.java       |   70 +
 .../cayenne/merge/SetAllowNullToDbTest.java     |   66 -
 .../apache/cayenne/merge/SetNotNullToDbIT.java  |   80 ++
 .../cayenne/merge/SetNotNullToDbTest.java       |   76 -
 .../cayenne/merge/SetPrimaryKeyToDbIT.java      |   61 +
 .../cayenne/merge/SetPrimaryKeyToDbTest.java    |   59 -
 .../apache/cayenne/merge/TokensReversTest.java  |    2 +-
 .../cayenne/merge/TokensToModelExecution.java   |    2 +-
 .../apache/cayenne/merge/ValueForNullIT.java    |  132 ++
 .../apache/cayenne/merge/ValueForNullTest.java  |  127 --
 .../apache/cayenne/merge/builders/Builder.java  |    2 +-
 .../cayenne/merge/builders/DataMapBuilder.java  |    2 +-
 .../merge/builders/DbAttributeBuilder.java      |    2 +-
 .../cayenne/merge/builders/DbEntityBuilder.java |    2 +-
 .../merge/builders/DbRelationshipBuilder.java   |    2 +-
 .../cayenne/merge/builders/DefaultBuilder.java  |    2 +-
 .../merge/builders/ObjAttributeBuilder.java     |    2 +-
 .../merge/builders/ObjEntityBuilder.java        |    2 +-
 .../cayenne/merge/builders/ObjectMother.java    |    2 +-
 .../apache/cayenne/query/AbstractQueryTest.java |   13 +-
 .../org/apache/cayenne/query/EJBQLQueryIT.java  |  499 +++++++
 .../cayenne/query/EJBQLQueryNumericIT.java      |   76 +
 .../apache/cayenne/query/EJBQLQueryTest.java    |  492 -------
 .../apache/cayenne/query/NamedQueryTest.java    |   14 +-
 .../apache/cayenne/query/ObjectIdQueryTest.java |   15 +-
 .../org/apache/cayenne/query/OrderingTest.java  |   30 +-
 .../cayenne/query/PrefetchTreeNodeTest.java     |   19 +-
 .../cayenne/query/ProcedureQueryCacheKeyIT.java |  117 ++
 .../query/ProcedureQueryCacheKeyTest.java       |  107 --
 .../cayenne/query/ProcedureQueryTest.java       |   19 +-
 .../org/apache/cayenne/query/QueryChainIT.java  |   70 +
 .../apache/cayenne/query/QueryChainTest.java    |   63 -
 .../apache/cayenne/query/RefreshQueryTest.java  |   22 +-
 .../cayenne/query/RelationshipQueryTest.java    |   11 +-
 .../org/apache/cayenne/query/SQLSelectIT.java   |  243 ++++
 .../org/apache/cayenne/query/SQLSelectTest.java |  213 ---
 .../cayenne/query/SQLTemplateCacheKeyIT.java    |  107 ++
 .../cayenne/query/SQLTemplateCacheKeyTest.java  |   96 --
 .../org/apache/cayenne/query/SQLTemplateIT.java |  167 +++
 .../apache/cayenne/query/SQLTemplateTest.java   |  294 ++--
 .../cayenne/query/SQLTemplate_LegacyTest.java   |  121 ++
 .../org/apache/cayenne/query/SelectByIdIT.java  |  203 +++
 .../apache/cayenne/query/SelectByIdTest.java    |  193 ---
 .../cayenne/query/SelectQueryBasicsTest.java    |   30 +-
 .../cayenne/query/SelectQueryCacheKeyIT.java    |  196 +++
 .../cayenne/query/SelectQueryCacheKeyTest.java  |  181 ---
 .../apache/cayenne/query/SelectQueryClobIT.java |  127 ++
 .../query/SelectQueryFetchLimitOrderingIT.java  |   85 ++
 .../SelectQueryFetchLimitOrderingTest.java      |   81 --
 .../org/apache/cayenne/query/SelectQueryIT.java |  663 +++++++++
 .../SelectQueryPrefetchRouterActionIT.java      |   97 ++
 ...ryPrefetchRouterActionQualifiedEntityIT.java |   81 ++
 ...PrefetchRouterActionQualifiedEntityTest.java |   75 -
 .../SelectQueryPrefetchRouterActionTest.java    |   90 --
 .../cayenne/query/SelectQueryReturnTypesIT.java |  168 +++
 .../apache/cayenne/query/SelectQueryTest.java   |  796 -----------
 .../cayenne/query/StatementFetchSizeIT.java     |   77 +
 .../cayenne/query/StatementFetchSizeTest.java   |   73 -
 .../cayenne/reflect/BasePropertyTest.java       |   10 +-
 .../cayenne/reflect/BeanAccessorTest.java       |   11 +-
 .../cayenne/reflect/CallbackOnEntityTest.java   |   13 +-
 .../cayenne/reflect/CallbackOnListenerTest.java |    8 +-
 .../cayenne/reflect/EnumConverterTest.java      |   14 +-
 .../cayenne/reflect/FieldAccessorTest.java      |   13 +-
 .../LifecycleCallbackEventHandlerTest.java      |   19 +-
 .../reflect/LifecycleCallbackRegistryIT.java    |  120 ++
 .../reflect/LifecycleCallbackRegistryTest.java  |  115 --
 ...LifecycleCallbackRegistry_InheritanceIT.java |   83 ++
 ...fecycleCallbackRegistry_InheritanceTest.java |   79 -
 .../reflect/MixedPersistenceStrategyIT.java     |  112 ++
 .../reflect/MixedPersistenceStrategyTest.java   |  106 --
 .../reflect/PersistentDescriptorTest.java       |   13 +-
 .../cayenne/reflect/PropertyUtilsTest.java      |   38 +-
 .../DataObjectAttributePropertyTest.java        |   11 +-
 .../generic/DataObjectDescriptorFactoryIT.java  |  144 ++
 .../DataObjectDescriptorFactoryTest.java        |  138 --
 ...jectDescriptorFactory_InheritanceMapsIT.java |   80 ++
 ...ctDescriptorFactory_InheritanceMapsTest.java |   78 -
 .../cayenne/remote/RemoteSessionTest.java       |   11 +-
 .../remote/hessian/HessianConfigTest.java       |   16 +-
 .../hessian/service/HessianServiceTest.java     |   22 +-
 .../remote/service/BaseRemoteServiceTest.java   |   17 +-
 .../remote/service/DispatchHelperTest.java      |   12 +-
 .../ClassLoaderResourceLocatorTest.java         |   12 +-
 .../resource/FilesystemResourceLocatorTest.java |   13 +-
 .../cayenne/resource/URLResourceTest.java       |   13 +-
 .../cayenne/testdo/binary_pk/BinaryPKTest1.java |   28 +
 .../cayenne/testdo/binary_pk/BinaryPKTest2.java |   28 +
 .../testdo/binary_pk/auto/_BinaryPKTest1.java   |   48 +
 .../testdo/binary_pk/auto/_BinaryPKTest2.java   |   43 +
 .../testdo/compound/CharFkTestEntity.java       |   28 +
 .../testdo/compound/CharPkTestEntity.java       |   28 +
 .../testdo/compound/CompoundFkTestEntity.java   |   28 +
 .../testdo/compound/CompoundPkTestEntity.java   |   28 +
 .../testdo/compound/auto/_CharFkTestEntity.java |   43 +
 .../testdo/compound/auto/_CharPkTestEntity.java |   58 +
 .../compound/auto/_CompoundFkTestEntity.java    |   43 +
 .../compound/auto/_CompoundPkTestEntity.java    |   69 +
 .../testdo/date_time/CalendarEntity.java        |   28 +
 .../testdo/date_time/DateTestEntity.java        |   28 +
 .../testdo/date_time/auto/_CalendarEntity.java  |   32 +
 .../testdo/date_time/auto/_DateTestEntity.java  |   52 +
 .../testdo/deleterules/ClientDeleteCascade.java |   28 +
 .../testdo/deleterules/ClientDeleteDeny.java    |   28 +
 .../testdo/deleterules/ClientDeleteNullify.java |   28 +
 .../testdo/deleterules/ClientDeleteRule.java    |   28 +
 .../testdo/deleterules/DeleteCascade.java       |   28 +
 .../cayenne/testdo/deleterules/DeleteDeny.java  |   28 +
 .../testdo/deleterules/DeleteNullify.java       |   28 +
 .../cayenne/testdo/deleterules/DeleteRule.java  |   28 +
 .../deleterules/auto/_ClientDeleteCascade.java  |   56 +
 .../deleterules/auto/_ClientDeleteDeny.java     |   56 +
 .../deleterules/auto/_ClientDeleteNullify.java  |   56 +
 .../deleterules/auto/_ClientDeleteRule.java     |  114 ++
 .../testdo/deleterules/auto/_DeleteCascade.java |   35 +
 .../testdo/deleterules/auto/_DeleteDeny.java    |   35 +
 .../testdo/deleterules/auto/_DeleteNullify.java |   35 +
 .../testdo/deleterules/auto/_DeleteRule.java    |   68 +
 .../apache/cayenne/testdo/enum_test/Enum1.java  |   23 +
 .../cayenne/testdo/enum_test/EnumEntity.java    |   25 +
 .../testdo/enum_test/auto/_EnumEntity.java      |   31 +
 .../extended_type/ExtendedTypeEntity.java       |   25 +
 .../cayenne/testdo/extended_type/StringET1.java |   35 +
 .../extended_type/StringET1ExtendedType.java    |   62 +
 .../extended_type/auto/_ExtendedTypeEntity.java |   31 +
 .../generated/GeneratedColumnCompKey.java       |   28 +
 .../generated/GeneratedColumnCompMaster.java    |   28 +
 .../testdo/generated/GeneratedColumnDep.java    |   28 +
 .../testdo/generated/GeneratedColumnTest2.java  |   28 +
 .../generated/GeneratedColumnTestEntity.java    |   28 +
 .../cayenne/testdo/generated/GeneratedF1.java   |   25 +
 .../cayenne/testdo/generated/GeneratedF2.java   |   25 +
 .../generated/auto/_GeneratedColumnCompKey.java |   45 +
 .../auto/_GeneratedColumnCompMaster.java        |   48 +
 .../generated/auto/_GeneratedColumnDep.java     |   43 +
 .../generated/auto/_GeneratedColumnTest2.java   |   30 +
 .../auto/_GeneratedColumnTestEntity.java        |   43 +
 .../testdo/generated/auto/_GeneratedF1.java     |   38 +
 .../testdo/generated/auto/_GeneratedF2.java     |   38 +
 .../horizontalinherit/AbstractSuperEntity.java  |   25 -
 .../testdo/horizontalinherit/SubEntity1.java    |   25 -
 .../testdo/horizontalinherit/SubEntity2.java    |   25 -
 .../testdo/horizontalinherit/SubEntity3.java    |   25 -
 .../auto/_AbstractSuperEntity.java              |   32 -
 .../horizontalinherit/auto/_SubEntity1.java     |   24 -
 .../horizontalinherit/auto/_SubEntity2.java     |   25 -
 .../horizontalinherit/auto/_SubEntity3.java     |   25 -
 .../cayenne/testdo/inherit/AbstractPerson.java  |   26 -
 .../apache/cayenne/testdo/inherit/Address.java  |   26 -
 .../cayenne/testdo/inherit/BaseEntity.java      |   25 -
 .../cayenne/testdo/inherit/ClientCompany.java   |   26 -
 .../testdo/inherit/CustomerRepresentative.java  |   26 -
 .../cayenne/testdo/inherit/Department.java      |   26 -
 .../testdo/inherit/DirectToSubEntity.java       |   25 -
 .../apache/cayenne/testdo/inherit/Employee.java |   26 -
 .../apache/cayenne/testdo/inherit/Manager.java  |   26 -
 .../apache/cayenne/testdo/inherit/People.java   |   36 -
 .../cayenne/testdo/inherit/PersonNotes.java     |   25 -
 .../cayenne/testdo/inherit/RelatedEntity.java   |   25 -
 .../cayenne/testdo/inherit/SubEntity.java       |   25 -
 .../testdo/inherit/auto/_AbstractPerson.java    |   48 -
 .../cayenne/testdo/inherit/auto/_Address.java   |   35 -
 .../testdo/inherit/auto/_BaseEntity.java        |   46 -
 .../testdo/inherit/auto/_ClientCompany.java     |   40 -
 .../inherit/auto/_CustomerRepresentative.java   |   35 -
 .../testdo/inherit/auto/_Department.java        |   51 -
 .../testdo/inherit/auto/_DirectToSubEntity.java |   32 -
 .../cayenne/testdo/inherit/auto/_Employee.java  |   51 -
 .../cayenne/testdo/inherit/auto/_Manager.java   |   32 -
 .../cayenne/testdo/inherit/auto/_People.java    |   12 -
 .../testdo/inherit/auto/_PersonNotes.java       |   35 -
 .../testdo/inherit/auto/_RelatedEntity.java     |   46 -
 .../cayenne/testdo/inherit/auto/_SubEntity.java |   16 -
 .../cayenne/testdo/inheritance/BaseEntity.java  |   25 +
 .../testdo/inheritance/DirectToSubEntity.java   |   25 +
 .../testdo/inheritance/RelatedEntity.java       |   25 +
 .../cayenne/testdo/inheritance/SubEntity.java   |   25 +
 .../testdo/inheritance/auto/_BaseEntity.java    |   46 +
 .../inheritance/auto/_DirectToSubEntity.java    |   32 +
 .../testdo/inheritance/auto/_RelatedEntity.java |   46 +
 .../testdo/inheritance/auto/_SubEntity.java     |   16 +
 .../vertical/InheritanceVertical.java           |   36 -
 .../testdo/inheritance/vertical/Iv1Root.java    |   25 -
 .../testdo/inheritance/vertical/Iv1Sub1.java    |   25 -
 .../testdo/inheritance/vertical/Iv2Root.java    |   25 -
 .../testdo/inheritance/vertical/Iv2Sub1.java    |   25 -
 .../testdo/inheritance/vertical/Iv2X.java       |   25 -
 .../testdo/inheritance/vertical/IvRoot.java     |   25 -
 .../testdo/inheritance/vertical/IvSub1.java     |   25 -
 .../testdo/inheritance/vertical/IvSub1Sub1.java |   25 -
 .../testdo/inheritance/vertical/IvSub2.java     |   25 -
 .../vertical/auto/_InheritanceVertical.java     |   12 -
 .../inheritance/vertical/auto/_Iv1Root.java     |   32 -
 .../inheritance/vertical/auto/_Iv1Sub1.java     |   24 -
 .../inheritance/vertical/auto/_Iv2Root.java     |   24 -
 .../inheritance/vertical/auto/_Iv2Sub1.java     |   27 -
 .../testdo/inheritance/vertical/auto/_Iv2X.java |   16 -
 .../inheritance/vertical/auto/_IvRoot.java      |   32 -
 .../inheritance/vertical/auto/_IvSub1.java      |   24 -
 .../inheritance/vertical/auto/_IvSub1Sub1.java  |   24 -
 .../inheritance/vertical/auto/_IvSub2.java      |   32 -
 .../AbstractSuperEntity.java                    |   25 +
 .../inheritance_horizontal/SubEntity1.java      |   25 +
 .../inheritance_horizontal/SubEntity2.java      |   25 +
 .../inheritance_horizontal/SubEntity3.java      |   25 +
 .../auto/_AbstractSuperEntity.java              |   32 +
 .../auto/_SubEntity1.java                       |   24 +
 .../auto/_SubEntity2.java                       |   25 +
 .../auto/_SubEntity3.java                       |   25 +
 .../inheritance_people/AbstractPerson.java      |   26 +
 .../testdo/inheritance_people/Address.java      |   26 +
 .../inheritance_people/ClientCompany.java       |   26 +
 .../CustomerRepresentative.java                 |   26 +
 .../testdo/inheritance_people/Department.java   |   26 +
 .../testdo/inheritance_people/Employee.java     |   26 +
 .../testdo/inheritance_people/Manager.java      |   26 +
 .../testdo/inheritance_people/People.java       |   36 +
 .../testdo/inheritance_people/PersonNotes.java  |   25 +
 .../auto/_AbstractPerson.java                   |   48 +
 .../inheritance_people/auto/_Address.java       |   35 +
 .../inheritance_people/auto/_ClientCompany.java |   40 +
 .../auto/_CustomerRepresentative.java           |   35 +
 .../inheritance_people/auto/_Department.java    |   51 +
 .../inheritance_people/auto/_Employee.java      |   51 +
 .../inheritance_people/auto/_Manager.java       |   32 +
 .../testdo/inheritance_people/auto/_People.java |   12 +
 .../inheritance_people/auto/_PersonNotes.java   |   35 +
 .../InheritanceVertical.java                    |   36 +
 .../testdo/inheritance_vertical/Iv1Root.java    |   25 +
 .../testdo/inheritance_vertical/Iv1Sub1.java    |   25 +
 .../testdo/inheritance_vertical/Iv2Root.java    |   25 +
 .../testdo/inheritance_vertical/Iv2Sub1.java    |   25 +
 .../testdo/inheritance_vertical/Iv2X.java       |   25 +
 .../testdo/inheritance_vertical/IvRoot.java     |   25 +
 .../testdo/inheritance_vertical/IvSub1.java     |   25 +
 .../testdo/inheritance_vertical/IvSub1Sub1.java |   25 +
 .../testdo/inheritance_vertical/IvSub2.java     |   25 +
 .../auto/_InheritanceVertical.java              |   12 +
 .../inheritance_vertical/auto/_Iv1Root.java     |   32 +
 .../inheritance_vertical/auto/_Iv1Sub1.java     |   24 +
 .../inheritance_vertical/auto/_Iv2Root.java     |   24 +
 .../inheritance_vertical/auto/_Iv2Sub1.java     |   27 +
 .../testdo/inheritance_vertical/auto/_Iv2X.java |   16 +
 .../inheritance_vertical/auto/_IvRoot.java      |   32 +
 .../inheritance_vertical/auto/_IvSub1.java      |   24 +
 .../inheritance_vertical/auto/_IvSub1Sub1.java  |   24 +
 .../inheritance_vertical/auto/_IvSub2.java      |   32 +
 .../testdo/lifecycles/ClientLifecycles.java     |   28 +
 .../cayenne/testdo/lifecycles/Lifecycles.java   |   25 +
 .../lifecycles/auto/_ClientLifecycles.java      |   37 +
 .../testdo/lifecycles/auto/_Lifecycles.java     |   24 +
 .../cayenne/testdo/lob/BlobTestEntity.java      |   28 +
 .../cayenne/testdo/lob/ClobTestEntity.java      |   28 +
 .../cayenne/testdo/lob/ClobTestRelation.java    |   25 +
 .../testdo/lob/auto/_BlobTestEntity.java        |   30 +
 .../testdo/lob/auto/_ClobTestEntity.java        |   48 +
 .../testdo/lob/auto/_ClobTestRelation.java      |   53 +
 .../testdo/locking/DateLockingTestEntity.java   |   28 -
 .../cayenne/testdo/locking/SoftDelete.java      |   30 -
 .../testdo/locking/TimeLockingTestEntity.java   |   28 -
 .../locking/auto/_DateLockingTestEntity.java    |   34 -
 .../testdo/locking/auto/_SoftDelete.java        |   34 -
 .../locking/auto/_TimeLockingTestEntity.java    |   34 -
 .../testdo/map_to_many/ClientIdMapToMany.java   |   28 +
 .../map_to_many/ClientIdMapToManyTarget.java    |   28 +
 .../cayenne/testdo/map_to_many/IdMapToMany.java |   28 +
 .../testdo/map_to_many/IdMapToManyTarget.java   |   28 +
 .../cayenne/testdo/map_to_many/MapToMany.java   |   28 +
 .../testdo/map_to_many/MapToManyTarget.java     |   28 +
 .../map_to_many/auto/_ClientIdMapToMany.java    |   41 +
 .../auto/_ClientIdMapToManyTarget.java          |   33 +
 .../testdo/map_to_many/auto/_IdMapToMany.java   |   32 +
 .../map_to_many/auto/_IdMapToManyTarget.java    |   27 +
 .../testdo/map_to_many/auto/_MapToMany.java     |   32 +
 .../map_to_many/auto/_MapToManyTarget.java      |   35 +
 .../meaningful_pk/ClientMeaningfulPk.java       |   28 +
 .../testdo/meaningful_pk/MeaningfulPKDep.java   |   26 +
 .../testdo/meaningful_pk/MeaningfulPKTest1.java |   26 +
 .../testdo/meaningful_pk/MeaningfulPk.java      |   25 +
 .../meaningful_pk/auto/_ClientMeaningfulPk.java |   37 +
 .../meaningful_pk/auto/_MeaningfulPKDep.java    |   43 +
 .../meaningful_pk/auto/_MeaningfulPKTest1.java  |   58 +
 .../meaningful_pk/auto/_MeaningfulPk.java       |   24 +
 .../cayenne/testdo/misc_types/ArraysEntity.java |   27 +
 .../testdo/misc_types/CharacterEntity.java      |   28 +
 .../testdo/misc_types/SerializableEntity.java   |   28 +
 .../testdo/misc_types/auto/_ArraysEntity.java   |   60 +
 .../misc_types/auto/_CharacterEntity.java       |   30 +
 .../misc_types/auto/_SerializableEntity.java    |   31 +
 .../MixedPersistenceStrategy.java               |   35 +
 .../MixedPersistenceStrategy2.java              |   25 +
 .../auto/_MixedPersistenceStrategy.java         |   58 +
 .../auto/_MixedPersistenceStrategy2.java        |   43 +
 .../testdo/mt/ClientMtDeleteCascade.java        |   28 -
 .../cayenne/testdo/mt/ClientMtDeleteDeny.java   |   28 -
 .../testdo/mt/ClientMtDeleteNullify.java        |   28 -
 .../cayenne/testdo/mt/ClientMtDeleteRule.java   |   28 -
 .../cayenne/testdo/mt/ClientMtLifecycles.java   |   28 -
 .../cayenne/testdo/mt/ClientMtMapToMany.java    |   28 -
 .../testdo/mt/ClientMtMapToManyTarget.java      |   28 -
 .../cayenne/testdo/mt/ClientMtMeaningfulPk.java |   28 -
 .../cayenne/testdo/mt/ClientMtReflexive.java    |   28 -
 .../testdo/mt/ClientMtTablePrimitives.java      |   28 -
 .../cayenne/testdo/mt/ClientMtTooneDep.java     |   28 -
 .../cayenne/testdo/mt/ClientMtTooneMaster.java  |   28 -
 .../cayenne/testdo/mt/MtDeleteCascade.java      |   28 -
 .../apache/cayenne/testdo/mt/MtDeleteDeny.java  |   28 -
 .../cayenne/testdo/mt/MtDeleteNullify.java      |   28 -
 .../apache/cayenne/testdo/mt/MtDeleteRule.java  |   28 -
 .../apache/cayenne/testdo/mt/MtLifecycles.java  |   25 -
 .../apache/cayenne/testdo/mt/MtMapToMany.java   |   28 -
 .../cayenne/testdo/mt/MtMapToManyTarget.java    |   28 -
 .../cayenne/testdo/mt/MtMeaningfulPk.java       |   25 -
 .../apache/cayenne/testdo/mt/MtReflexive.java   |   28 -
 .../cayenne/testdo/mt/MtTablePrimitives.java    |   25 -
 .../apache/cayenne/testdo/mt/MtTooneDep.java    |   25 -
 .../apache/cayenne/testdo/mt/MtTooneMaster.java |   25 -
 .../testdo/mt/auto/_ClientMtDeleteCascade.java  |   56 -
 .../testdo/mt/auto/_ClientMtDeleteDeny.java     |   56 -
 .../testdo/mt/auto/_ClientMtDeleteNullify.java  |   56 -
 .../testdo/mt/auto/_ClientMtDeleteRule.java     |  114 --
 .../testdo/mt/auto/_ClientMtLifecycles.java     |   37 -
 .../testdo/mt/auto/_ClientMtMapToMany.java      |   41 -
 .../mt/auto/_ClientMtMapToManyTarget.java       |   33 -
 .../testdo/mt/auto/_ClientMtMeaningfulPk.java   |   37 -
 .../testdo/mt/auto/_ClientMtReflexive.java      |   82 --
 .../mt/auto/_ClientMtTablePrimitives.java       |   60 -
 .../testdo/mt/auto/_ClientMtTooneDep.java       |   33 -
 .../testdo/mt/auto/_ClientMtTooneMaster.java    |   33 -
 .../testdo/mt/auto/_MtDeleteCascade.java        |   35 -
 .../cayenne/testdo/mt/auto/_MtDeleteDeny.java   |   35 -
 .../testdo/mt/auto/_MtDeleteNullify.java        |   35 -
 .../cayenne/testdo/mt/auto/_MtDeleteRule.java   |   68 -
 .../cayenne/testdo/mt/auto/_MtLifecycles.java   |   24 -
 .../cayenne/testdo/mt/auto/_MtMapToMany.java    |   32 -
 .../testdo/mt/auto/_MtMapToManyTarget.java      |   27 -
 .../cayenne/testdo/mt/auto/_MtMeaningfulPk.java |   24 -
 .../cayenne/testdo/mt/auto/_MtReflexive.java    |   50 -
 .../testdo/mt/auto/_MtTablePrimitives.java      |   34 -
 .../cayenne/testdo/mt/auto/_MtTooneDep.java     |   27 -
 .../cayenne/testdo/mt/auto/_MtTooneMaster.java  |   27 -
 .../cayenne/testdo/no_pk/NoPkTestEntity.java    |   28 +
 .../testdo/no_pk/auto/_NoPkTestEntity.java      |   29 +
 .../testdo/numeric_types/BigDecimalEntity.java  |   27 +
 .../testdo/numeric_types/BigIntegerEntity.java  |   27 +
 .../numeric_types/BitNumberTestEntity.java      |   28 +
 .../testdo/numeric_types/BitTestEntity.java     |   28 +
 .../testdo/numeric_types/BooleanTestEntity.java |   28 +
 .../testdo/numeric_types/DecimalPKTest1.java    |   28 +
 .../numeric_types/DecimalPKTestEntity.java      |   28 +
 .../testdo/numeric_types/LongEntity.java        |   28 +
 .../numeric_types/SmallintTestEntity.java       |   28 +
 .../testdo/numeric_types/TinyintTestEntity.java |   28 +
 .../numeric_types/auto/_BigDecimalEntity.java   |   32 +
 .../numeric_types/auto/_BigIntegerEntity.java   |   32 +
 .../auto/_BitNumberTestEntity.java              |   30 +
 .../numeric_types/auto/_BitTestEntity.java      |   30 +
 .../numeric_types/auto/_BooleanTestEntity.java  |   30 +
 .../numeric_types/auto/_DecimalPKTest1.java     |   40 +
 .../auto/_DecimalPKTestEntity.java              |   42 +
 .../testdo/numeric_types/auto/_LongEntity.java  |   30 +
 .../numeric_types/auto/_SmallintTestEntity.java |   30 +
 .../numeric_types/auto/_TinyintTestEntity.java  |   30 +
 .../testdo/primitive/PrimitivesTestEntity.java  |   25 +
 .../primitive/auto/_PrimitivesTestEntity.java   |   42 +
 .../org/apache/cayenne/testdo/r1/Activity.java  |   25 -
 .../cayenne/testdo/r1/ActivityResult.java       |   25 -
 .../cayenne/testdo/r1/Relationships1.java       |   36 -
 .../cayenne/testdo/r1/auto/_Activity.java       |   58 -
 .../cayenne/testdo/r1/auto/_ActivityResult.java |   53 -
 .../cayenne/testdo/r1/auto/_Relationships1.java |   12 -
 .../testdo/reflexive/ClientReflexive.java       |   28 +
 .../cayenne/testdo/reflexive/Reflexive.java     |   28 +
 .../testdo/reflexive/auto/_ClientReflexive.java |   82 ++
 .../testdo/reflexive/auto/_Reflexive.java       |   50 +
 .../cayenne/testdo/relationship/Child.java      |   25 -
 .../cayenne/testdo/relationship/ClobDetail.java |   28 -
 .../cayenne/testdo/relationship/ClobMaster.java |   28 -
 .../testdo/relationship/CollectionToMany.java   |   28 -
 .../relationship/CollectionToManyTarget.java    |   28 -
 .../testdo/relationship/CyclicChild.java        |   26 -
 .../testdo/relationship/CyclicParent.java       |   26 -
 .../testdo/relationship/DeleteRuleFlatA.java    |   28 -
 .../testdo/relationship/DeleteRuleFlatB.java    |   28 -
 .../testdo/relationship/DeleteRuleTest1.java    |   26 -
 .../testdo/relationship/DeleteRuleTest2.java    |   26 -
 .../testdo/relationship/DeleteRuleTest3.java    |   26 -
 .../testdo/relationship/FkOfDifferentType.java  |   28 -
 .../testdo/relationship/FlattenedCircular.java  |   25 -
 .../testdo/relationship/FlattenedTest1.java     |   26 -
 .../testdo/relationship/FlattenedTest2.java     |   26 -
 .../testdo/relationship/FlattenedTest3.java     |   26 -
 .../testdo/relationship/FlattenedTest4.java     |   25 -
 .../testdo/relationship/IdMapToMany.java        |   28 -
 .../testdo/relationship/IdMapToManyTarget.java  |   28 -
 .../cayenne/testdo/relationship/MapToMany.java  |   28 -
 .../testdo/relationship/MapToManyTarget.java    |   28 -
 .../cayenne/testdo/relationship/Master.java     |   25 -
 .../testdo/relationship/MeaningfulFK.java       |   28 -
 .../testdo/relationship/ReflexiveAndToOne.java  |   26 -
 .../testdo/relationship/RelationshipHelper.java |   26 -
 .../testdo/relationship/Relationships.java      |   36 -
 .../cayenne/testdo/relationship/SetToMany.java  |   28 -
 .../testdo/relationship/SetToManyTarget.java    |   28 -
 .../testdo/relationship/ToManyFkDep.java        |   28 -
 .../testdo/relationship/ToManyFkRoot.java       |   28 -
 .../testdo/relationship/ToManyRoot2.java        |   28 -
 .../cayenne/testdo/relationship/ToOneFK1.java   |   26 -
 .../cayenne/testdo/relationship/ToOneFK2.java   |   26 -
 .../testdo/relationship/auto/_Child.java        |   27 -
 .../testdo/relationship/auto/_ClobDetail.java   |   35 -
 .../testdo/relationship/auto/_ClobMaster.java   |   48 -
 .../relationship/auto/_CollectionToMany.java    |   32 -
 .../auto/_CollectionToManyTarget.java           |   27 -
 .../testdo/relationship/auto/_CyclicChild.java  |   50 -
 .../testdo/relationship/auto/_CyclicParent.java |   50 -
 .../relationship/auto/_DeleteRuleFlatA.java     |   32 -
 .../relationship/auto/_DeleteRuleFlatB.java     |   32 -
 .../relationship/auto/_DeleteRuleTest1.java     |   27 -
 .../relationship/auto/_DeleteRuleTest2.java     |   46 -
 .../relationship/auto/_DeleteRuleTest3.java     |   27 -
 .../relationship/auto/_FkOfDifferentType.java   |   27 -
 .../relationship/auto/_FlattenedCircular.java   |   45 -
 .../relationship/auto/_FlattenedTest1.java      |   69 -
 .../relationship/auto/_FlattenedTest2.java      |   51 -
 .../relationship/auto/_FlattenedTest3.java      |   59 -
 .../relationship/auto/_FlattenedTest4.java      |   35 -
 .../testdo/relationship/auto/_IdMapToMany.java  |   32 -
 .../relationship/auto/_IdMapToManyTarget.java   |   27 -
 .../testdo/relationship/auto/_MapToMany.java    |   32 -
 .../relationship/auto/_MapToManyTarget.java     |   35 -
 .../testdo/relationship/auto/_Master.java       |   40 -
 .../testdo/relationship/auto/_MeaningfulFK.java |   35 -
 .../relationship/auto/_ReflexiveAndToOne.java   |   61 -
 .../relationship/auto/_RelationshipHelper.java  |   68 -
 .../relationship/auto/_Relationships.java       |   12 -
 .../testdo/relationship/auto/_SetToMany.java    |   32 -
 .../relationship/auto/_SetToManyTarget.java     |   27 -
 .../testdo/relationship/auto/_ToManyFkDep.java  |   55 -
 .../testdo/relationship/auto/_ToManyFkRoot.java |   48 -
 .../testdo/relationship/auto/_ToManyRoot2.java  |   40 -
 .../testdo/relationship/auto/_ToOneFK1.java     |   27 -
 .../testdo/relationship/auto/_ToOneFK2.java     |   27 -
 .../testdo/relationships/FkOfDifferentType.java |   28 +
 .../testdo/relationships/MeaningfulFK.java      |   28 +
 .../testdo/relationships/ReflexiveAndToOne.java |   26 +
 .../relationships/RelationshipHelper.java       |   26 +
 .../testdo/relationships/Relationships.java     |   36 +
 .../relationships/auto/_FkOfDifferentType.java  |   27 +
 .../relationships/auto/_MeaningfulFK.java       |   35 +
 .../relationships/auto/_ReflexiveAndToOne.java  |   61 +
 .../relationships/auto/_RelationshipHelper.java |   68 +
 .../relationships/auto/_Relationships.java      |   12 +
 .../testdo/relationships_activity/Activity.java |   25 +
 .../relationships_activity/ActivityResult.java  |   25 +
 .../relationships_activity/Relationships1.java  |   36 +
 .../relationships_activity/auto/_Activity.java  |   58 +
 .../auto/_ActivityResult.java                   |   53 +
 .../auto/_Relationships1.java                   |   12 +
 .../relationships_child_master/Child.java       |   25 +
 .../relationships_child_master/Master.java      |   25 +
 .../relationships_child_master/auto/_Child.java |   27 +
 .../auto/_Master.java                           |   40 +
 .../testdo/relationships_clob/ClobDetail.java   |   28 +
 .../testdo/relationships_clob/ClobMaster.java   |   28 +
 .../relationships_clob/auto/_ClobDetail.java    |   35 +
 .../relationships_clob/auto/_ClobMaster.java    |   48 +
 .../CollectionToMany.java                       |   28 +
 .../CollectionToManyTarget.java                 |   28 +
 .../auto/_CollectionToMany.java                 |   32 +
 .../auto/_CollectionToManyTarget.java           |   27 +
 .../DeleteRuleFlatA.java                        |   28 +
 .../DeleteRuleFlatB.java                        |   28 +
 .../DeleteRuleTest1.java                        |   28 +
 .../DeleteRuleTest2.java                        |   28 +
 .../DeleteRuleTest3.java                        |   28 +
 .../auto/_DeleteRuleFlatA.java                  |   32 +
 .../auto/_DeleteRuleFlatB.java                  |   32 +
 .../auto/_DeleteRuleTest1.java                  |   27 +
 .../auto/_DeleteRuleTest2.java                  |   46 +
 .../auto/_DeleteRuleTest3.java                  |   27 +
 .../FlattenedCircular.java                      |   25 +
 .../relationships_flattened/FlattenedTest1.java |   28 +
 .../relationships_flattened/FlattenedTest2.java |   28 +
 .../relationships_flattened/FlattenedTest3.java |   28 +
 .../relationships_flattened/FlattenedTest4.java |   25 +
 .../auto/_FlattenedCircular.java                |   45 +
 .../auto/_FlattenedTest1.java                   |   69 +
 .../auto/_FlattenedTest2.java                   |   51 +
 .../auto/_FlattenedTest3.java                   |   59 +
 .../auto/_FlattenedTest4.java                   |   35 +
 .../relationships_set_to_many/SetToMany.java    |   28 +
 .../SetToManyTarget.java                        |   28 +
 .../auto/_SetToMany.java                        |   32 +
 .../auto/_SetToManyTarget.java                  |   27 +
 .../relationships_to_many_fk/ToManyFkDep.java   |   28 +
 .../relationships_to_many_fk/ToManyFkRoot.java  |   28 +
 .../relationships_to_many_fk/ToManyRoot2.java   |   28 +
 .../auto/_ToManyFkDep.java                      |   55 +
 .../auto/_ToManyFkRoot.java                     |   48 +
 .../auto/_ToManyRoot2.java                      |   40 +
 .../relationships_to_one_fk/ToOneFK1.java       |   28 +
 .../relationships_to_one_fk/ToOneFK2.java       |   28 +
 .../relationships_to_one_fk/auto/_ToOneFK1.java |   27 +
 .../relationships_to_one_fk/auto/_ToOneFK2.java |   27 +
 .../testdo/return_types/ReturnTypesMap1.java    |   25 +
 .../testdo/return_types/ReturnTypesMap2.java    |   25 +
 .../return_types/ReturnTypesMapLobs1.java       |   25 +
 .../return_types/auto/_ReturnTypesMap1.java     |  193 +++
 .../return_types/auto/_ReturnTypesMap2.java     |   60 +
 .../return_types/auto/_ReturnTypesMapLobs1.java |   30 +
 .../cayenne/testdo/soft_delete/SoftDelete.java  |   30 +
 .../testdo/soft_delete/auto/_SoftDelete.java    |   34 +
 .../table_primitives/ClientTablePrimitives.java |   28 +
 .../table_primitives/TablePrimitives.java       |   25 +
 .../auto/_ClientTablePrimitives.java            |   60 +
 .../table_primitives/auto/_TablePrimitives.java |   34 +
 .../cayenne/testdo/testmap/ArraysEntity.java    |   27 -
 .../org/apache/cayenne/testdo/testmap/Bag.java  |   27 -
 .../org/apache/cayenne/testdo/testmap/Ball.java |   27 -
 .../testdo/testmap/BigDecimalEntity.java        |   27 -
 .../testdo/testmap/BigIntegerEntity.java        |   27 -
 .../cayenne/testdo/testmap/BinaryPKTest1.java   |   28 -
 .../cayenne/testdo/testmap/BinaryPKTest2.java   |   28 -
 .../testdo/testmap/BitNumberTestEntity.java     |   28 -
 .../cayenne/testdo/testmap/BitTestEntity.java   |   28 -
 .../cayenne/testdo/testmap/BlobTestEntity.java  |   28 -
 .../testdo/testmap/BooleanTestEntity.java       |   28 -
 .../org/apache/cayenne/testdo/testmap/Box.java  |   25 -
 .../apache/cayenne/testdo/testmap/BoxInfo.java  |   25 -
 .../cayenne/testdo/testmap/CalendarEntity.java  |   28 -
 .../testdo/testmap/CharFkTestEntity.java        |   28 -
 .../testdo/testmap/CharPkTestEntity.java        |   28 -
 .../cayenne/testdo/testmap/CharacterEntity.java |   28 -
 .../cayenne/testdo/testmap/ClobTestEntity.java  |   28 -
 .../testdo/testmap/ClobTestRelation.java        |   25 -
 .../testdo/testmap/CompoundFkTestEntity.java    |   28 -
 .../testdo/testmap/CompoundPkTestEntity.java    |   28 -
 .../cayenne/testdo/testmap/DateTestEntity.java  |   28 -
 .../cayenne/testdo/testmap/DecimalPKTest1.java  |   26 -
 .../testdo/testmap/DecimalPKTestEntity.java     |   28 -
 .../apache/cayenne/testdo/testmap/Enum1.java    |   23 -
 .../cayenne/testdo/testmap/EnumEntity.java      |   25 -
 .../testdo/testmap/ExtendedTypeEntity.java      |   25 -
 .../testdo/testmap/GeneratedColumnCompKey.java  |   28 -
 .../testmap/GeneratedColumnCompMaster.java      |   28 -
 .../testdo/testmap/GeneratedColumnDep.java      |   28 -
 .../testdo/testmap/GeneratedColumnTest2.java    |   28 -
 .../testmap/GeneratedColumnTestEntity.java      |   28 -
 .../cayenne/testdo/testmap/GeneratedF1.java     |   25 -
 .../cayenne/testdo/testmap/GeneratedF2.java     |   25 -
 .../cayenne/testdo/testmap/LongEntity.java      |   28 -
 .../cayenne/testdo/testmap/MeaningfulPKDep.java |   24 -
 .../testdo/testmap/MeaningfulPKTest1.java       |   24 -
 .../testmap/MixedPersistenceStrategy.java       |   35 -
 .../testmap/MixedPersistenceStrategy2.java      |   25 -
 .../cayenne/testdo/testmap/NoPkTestEntity.java  |   28 -
 .../testdo/testmap/PrimitivesTestEntity.java    |   25 -
 .../cayenne/testdo/testmap/ReturnTypesMap1.java |   25 -
 .../cayenne/testdo/testmap/ReturnTypesMap2.java |   25 -
 .../testdo/testmap/ReturnTypesMapLobs1.java     |   25 -
 .../testdo/testmap/SerializableEntity.java      |   28 -
 .../testdo/testmap/SmallintTestEntity.java      |   28 -
 .../cayenne/testdo/testmap/StringET1.java       |   35 -
 .../testdo/testmap/StringET1ExtendedType.java   |   62 -
 .../apache/cayenne/testdo/testmap/Thing.java    |   25 -
 .../testdo/testmap/TinyintTestEntity.java       |   28 -
 .../cayenne/testdo/testmap/UuidPkEntity.java    |   25 -
 .../cayenne/testdo/testmap/UuidTestEntity.java  |   25 -
 .../testdo/testmap/auto/_ArraysEntity.java      |   60 -
 .../cayenne/testdo/testmap/auto/_Bag.java       |   68 -
 .../cayenne/testdo/testmap/auto/_Ball.java      |   66 -
 .../testdo/testmap/auto/_BigDecimalEntity.java  |   32 -
 .../testdo/testmap/auto/_BigIntegerEntity.java  |   32 -
 .../testdo/testmap/auto/_BinaryPKTest1.java     |   48 -
 .../testdo/testmap/auto/_BinaryPKTest2.java     |   43 -
 .../testmap/auto/_BitNumberTestEntity.java      |   30 -
 .../testdo/testmap/auto/_BitTestEntity.java     |   30 -
 .../testdo/testmap/auto/_BlobTestEntity.java    |   30 -
 .../testdo/testmap/auto/_BooleanTestEntity.java |   30 -
 .../cayenne/testdo/testmap/auto/_Box.java       |   84 --
 .../cayenne/testdo/testmap/auto/_BoxInfo.java   |   43 -
 .../testdo/testmap/auto/_CalendarEntity.java    |   32 -
 .../testdo/testmap/auto/_CharFkTestEntity.java  |   43 -
 .../testdo/testmap/auto/_CharPkTestEntity.java  |   58 -
 .../testdo/testmap/auto/_CharacterEntity.java   |   30 -
 .../testdo/testmap/auto/_ClobTestEntity.java    |   48 -
 .../testdo/testmap/auto/_ClobTestRelation.java  |   53 -
 .../testmap/auto/_CompoundFkTestEntity.java     |   43 -
 .../testmap/auto/_CompoundPkTestEntity.java     |   69 -
 .../testdo/testmap/auto/_DateTestEntity.java    |   52 -
 .../testdo/testmap/auto/_DecimalPKTest1.java    |   40 -
 .../testmap/auto/_DecimalPKTestEntity.java      |   42 -
 .../testdo/testmap/auto/_EnumEntity.java        |   31 -
 .../testmap/auto/_ExtendedTypeEntity.java       |   31 -
 .../testmap/auto/_GeneratedColumnCompKey.java   |   45 -
 .../auto/_GeneratedColumnCompMaster.java        |   48 -
 .../testmap/auto/_GeneratedColumnDep.java       |   43 -
 .../testmap/auto/_GeneratedColumnTest2.java     |   30 -
 .../auto/_GeneratedColumnTestEntity.java        |   43 -
 .../testdo/testmap/auto/_GeneratedF1.java       |   38 -
 .../testdo/testmap/auto/_GeneratedF2.java       |   38 -
 .../testdo/testmap/auto/_LongEntity.java        |   30 -
 .../testdo/testmap/auto/_MeaningfulPKDep.java   |   43 -
 .../testdo/testmap/auto/_MeaningfulPKTest1.java |   58 -
 .../testmap/auto/_MixedPersistenceStrategy.java |   58 -
 .../auto/_MixedPersistenceStrategy2.java        |   43 -
 .../testdo/testmap/auto/_NoPkTestEntity.java    |   29 -
 .../testmap/auto/_PrimitivesTestEntity.java     |   42 -
 .../testdo/testmap/auto/_ReturnTypesMap1.java   |  193 ---
 .../testdo/testmap/auto/_ReturnTypesMap2.java   |   60 -
 .../testmap/auto/_ReturnTypesMapLobs1.java      |   30 -
 .../testmap/auto/_SerializableEntity.java       |   31 -
 .../testmap/auto/_SmallintTestEntity.java       |   30 -
 .../cayenne/testdo/testmap/auto/_Thing.java     |   65 -
 .../testdo/testmap/auto/_TinyintTestEntity.java |   30 -
 .../testdo/testmap/auto/_UuidPkEntity.java      |   32 -
 .../testdo/testmap/auto/_UuidTestEntity.java    |   32 -
 .../org/apache/cayenne/testdo/things/Bag.java   |   27 +
 .../org/apache/cayenne/testdo/things/Ball.java  |   27 +
 .../org/apache/cayenne/testdo/things/Box.java   |   25 +
 .../apache/cayenne/testdo/things/BoxInfo.java   |   25 +
 .../org/apache/cayenne/testdo/things/Thing.java |   25 +
 .../apache/cayenne/testdo/things/auto/_Bag.java |   68 +
 .../cayenne/testdo/things/auto/_Ball.java       |   66 +
 .../apache/cayenne/testdo/things/auto/_Box.java |   84 ++
 .../cayenne/testdo/things/auto/_BoxInfo.java    |   43 +
 .../cayenne/testdo/things/auto/_Thing.java      |   65 +
 .../cayenne/testdo/toone/ClientTooneDep.java    |   28 +
 .../cayenne/testdo/toone/ClientTooneMaster.java |   28 +
 .../apache/cayenne/testdo/toone/TooneDep.java   |   25 +
 .../cayenne/testdo/toone/TooneMaster.java       |   25 +
 .../testdo/toone/auto/_ClientTooneDep.java      |   33 +
 .../testdo/toone/auto/_ClientTooneMaster.java   |   33 +
 .../cayenne/testdo/toone/auto/_TooneDep.java    |   27 +
 .../cayenne/testdo/toone/auto/_TooneMaster.java |   27 +
 .../cayenne/testdo/uuid/UuidPkEntity.java       |   25 +
 .../cayenne/testdo/uuid/UuidTestEntity.java     |   25 +
 .../cayenne/testdo/uuid/auto/_UuidPkEntity.java |   32 +
 .../testdo/uuid/auto/_UuidTestEntity.java       |   32 +
 .../cayenne/tx/DefaultTransactionManagerIT.java |   80 ++
 .../tx/DefaultTransactionManagerTest.java       |   75 -
 .../cayenne/unit/HSQLDBUnitDbAdapter.java       |    6 +-
 .../apache/cayenne/unit/MySQLUnitDbAdapter.java |   12 +-
 .../cayenne/unit/OracleUnitDbAdapter.java       |   20 +-
 .../cayenne/unit/PostgresUnitDbAdapter.java     |    8 +-
 .../cayenne/unit/SybaseUnitDbAdapter.java       |   14 +-
 .../java/org/apache/cayenne/unit/di/DICase.java |   15 +-
 .../apache/cayenne/unit/di/DICaseSelfIT.java    |   87 ++
 .../apache/cayenne/unit/di/DICaseSelfTest.java  |   81 --
 .../di/DefaultUnitTestLifecycleManager.java     |    6 +-
 .../unit/di/UnitTestLifecycleManager.java       |    6 +-
 .../cayenne/unit/di/server/SchemaBuilder.java   |   37 +-
 .../cayenne/unit/di/server/ServerCase.java      |   81 +-
 .../di/server/ServerCaseDataNodeFactory.java    |    5 +
 .../di/server/ServerCaseDataSourceFactory.java  |    2 -
 .../di/server/ServerCaseLifecycleManager.java   |    4 +-
 .../unit/di/server/ServerCaseSelfIT.java        |   59 +
 .../unit/di/server/ServerCaseSelfTest.java      |   52 -
 .../cayenne/unit/jira/CAY_10062004_ExpTest.java |    9 +-
 .../org/apache/cayenne/unit/jira/CAY_115IT.java |  120 ++
 .../apache/cayenne/unit/jira/CAY_115Test.java   |  115 --
 .../org/apache/cayenne/unit/jira/CAY_191IT.java |   84 ++
 .../apache/cayenne/unit/jira/CAY_191Test.java   |   79 -
 .../org/apache/cayenne/unit/jira/CAY_194IT.java |  112 ++
 .../apache/cayenne/unit/jira/CAY_194Test.java   |  107 --
 .../cayenne/unit/jira/CAY_207Manager1.java      |    2 +-
 .../cayenne/unit/jira/CAY_207Manager2.java      |    2 +-
 .../apache/cayenne/unit/jira/CAY_743Test.java   |    9 +-
 .../apache/cayenne/util/Base64CodecTest.java    |   25 +-
 .../cayenne/util/DeepMergeOperationIT.java      |   92 ++
 .../util/DeepMergeOperationInheritanceIT.java   |  148 ++
 .../util/DeepMergeOperationInheritanceTest.java |  140 --
 .../cayenne/util/DeepMergeOperationTest.java    |   85 --
 .../cayenne/util/EntityMergeSupportIT.java      |  106 ++
 .../cayenne/util/EntityMergeSupportTest.java    |   99 --
 .../cayenne/util/GenericResponseTest.java       |   11 +-
 .../org/apache/cayenne/util/IDUtilTest.java     |   12 +-
 .../cayenne/util/IndexPropertyListTest.java     |   10 +-
 .../org/apache/cayenne/util/InvocationTest.java |   73 +-
 .../apache/cayenne/util/ListResponseTest.java   |   12 +-
 .../apache/cayenne/util/NameConverterTest.java  |   21 +-
 .../util/PersistentObjectHolderTest.java        |   14 +-
 .../org/apache/cayenne/util/RegexUtilTest.java  |   10 +-
 .../cayenne/util/ShallowMergeOperationIT.java   |  218 +++
 .../cayenne/util/ShallowMergeOperationTest.java |  210 ---
 .../java/org/apache/cayenne/util/UtilTest.java  |   50 +-
 .../ConcurrentLinkedHashMapTest.java            |    9 +-
 .../validation/BeanValidationFailureTest.java   |    8 +-
 .../validation/ValidationExceptionTest.java     |    7 +-
 .../validation/ValidationResultTest.java        |   17 +-
 .../cayenne/velocity/BindDirectiveIT.java       |  278 ++++
 .../cayenne/velocity/ResultDirectiveIT.java     |  168 +++
 .../SQLTemplateResourceManagerTest.java         |   77 +
 .../VelocitySQLTemplateProcessorTest.java       |  234 +++
 .../VelocitySQLTemplateProcessor_ChainTest.java |  184 +++
 ...VelocitySQLTemplateProcessor_SelectTest.java |  109 ++
 .../src/test/resources/binary-pk.map.xml        |   34 +
 .../src/test/resources/cayenne-binary-pk.xml    |    4 +
 .../src/test/resources/cayenne-compound.xml     |    4 +
 .../src/test/resources/cayenne-date-time.xml    |    4 +
 .../src/test/resources/cayenne-default.xml      |    7 -
 .../src/test/resources/cayenne-delete-rules.xml |    4 +
 .../src/test/resources/cayenne-embeddable.xml   |    4 +
 .../src/test/resources/cayenne-enum.xml         |    4 +
 .../test/resources/cayenne-extended-type.xml    |    4 +
 .../src/test/resources/cayenne-generated.xml    |    4 +
 .../src/test/resources/cayenne-generic.xml      |    4 +
 .../src/test/resources/cayenne-inheritance.xml  |    4 +
 .../src/test/resources/cayenne-lifecycles.xml   |    4 +
 .../src/test/resources/cayenne-lob.xml          |    4 +
 .../src/test/resources/cayenne-map-to-many.xml  |    4 +
 .../test/resources/cayenne-meaningful-pk.xml    |    4 +
 .../src/test/resources/cayenne-misc-types.xml   |    4 +
 .../cayenne-mixed-persistence-strategy.xml      |    4 +
 .../src/test/resources/cayenne-no-pk.xml        |    4 +
 .../test/resources/cayenne-numeric-types.xml    |    4 +
 .../src/test/resources/cayenne-persistent.xml   |    4 +
 .../src/test/resources/cayenne-primitive.xml    |    4 +
 .../src/test/resources/cayenne-qualified.xml    |    4 +
 .../src/test/resources/cayenne-reflexive.xml    |    4 +
 .../cayenne-relationships-activity.xml          |    4 +
 .../cayenne-relationships-child-master.xml      |    4 +
 .../resources/cayenne-relationships-clob.xml    |    4 +
 ...cayenne-relationships-collection-to-many.xml |    4 +
 .../cayenne-relationships-delete-rules.xml      |    4 +
 .../cayenne-relationships-flattened.xml         |    4 +
 .../cayenne-relationships-set-to-many.xml       |    4 +
 .../cayenne-relationships-to-many-fk.xml        |    4 +
 .../cayenne-relationships-to-one-fk.xml         |    4 +
 .../test/resources/cayenne-relationships.xml    |    1 -
 .../src/test/resources/cayenne-return-types.xml |    4 +
 .../src/test/resources/cayenne-soft-delete.xml  |    4 +
 .../src/test/resources/cayenne-sus.xml          |    4 +
 .../test/resources/cayenne-table-primitives.xml |    4 +
 .../src/test/resources/cayenne-testmap.xml      |    2 +-
 .../src/test/resources/cayenne-things.xml       |    4 +
 .../src/test/resources/cayenne-toone.xml        |    4 +
 .../src/test/resources/cayenne-uuid.xml         |    4 +
 .../src/test/resources/compound.map.xml         |   64 +
 .../src/test/resources/date-time.map.xml        |   34 +
 .../src/test/resources/delete-rules.map.xml     |   64 +
 cayenne-server/src/test/resources/enum.map.xml  |   18 +
 .../src/test/resources/extended-type.map.xml    |   18 +
 .../src/test/resources/generated.map.xml        |   93 ++
 .../test/resources/inheritance-vertical.map.xml |   18 +-
 .../src/test/resources/inheritance.map.xml      |   46 +
 .../src/test/resources/lifecycles.map.xml       |   16 +
 cayenne-server/src/test/resources/lob.map.xml   |   46 +
 .../src/test/resources/locking.map.xml          |   29 -
 .../src/test/resources/map-to-many.map.xml      |   57 +
 .../src/test/resources/meaningful-pk.map.xml    |   39 +
 .../src/test/resources/misc-types.map.xml       |   38 +
 .../mixed-persistence-strategy.map.xml          |   36 +
 .../src/test/resources/multi-tier.map.xml       |  153 --
 cayenne-server/src/test/resources/no-pk.map.xml |   17 +
 .../src/test/resources/numeric-types.map.xml    |   79 +
 .../src/test/resources/people.map.xml           |   57 +-
 .../src/test/resources/persistent.map.xml       |   32 +
 .../src/test/resources/primitive.map.xml        |   20 +
 .../src/test/resources/reflexive.map.xml        |   25 +
 .../resources/relationships-activity.map.xml    |   35 +
 .../relationships-child-master.map.xml          |   29 +
 .../test/resources/relationships-clob.map.xml   |   32 +
 .../relationships-collection-to-many.map.xml    |   26 +
 .../relationships-delete-rules.map.xml          |   71 +
 .../resources/relationships-flattened.map.xml   |  107 ++
 .../resources/relationships-set-to-many.map.xml |   26 +
 .../resources/relationships-to-many-fk.map.xml  |   48 +
 .../resources/relationships-to-one-fk.map.xml   |   26 +
 .../src/test/resources/relationships.map.xml    |  358 +----
 .../src/test/resources/relationships1.map.xml   |   35 -
 .../src/test/resources/return-types.map.xml     |   84 ++
 .../src/test/resources/small-testmap.map.xml    |   10 +-
 .../src/test/resources/soft-delete.map.xml      |   18 +
 .../src/test/resources/table-primitives.map.xml |   18 +
 .../src/test/resources/testmap.map.xml          |  302 ++++
 .../src/test/resources/things.map.xml           |  110 ++
 cayenne-server/src/test/resources/toone.map.xml |   27 +
 .../src/test/resources/tstmap.map.xml           |  868 -----------
 cayenne-server/src/test/resources/uuid.map.xml  |   24 +
 cayenne-tools/pom.xml                           |    2 +-
 .../map/naming/DefaultNameGenerator.java        |    2 +-
 .../cayenne/tools/AntDataPortDelegate.java      |    2 +-
 .../org/apache/cayenne/tools/DataPortTask.java  |    4 +-
 .../apache/cayenne/tools/DbImporterTask.java    |   18 +-
 .../configuration/DriverDataSourceFactory.java  |    2 +-
 .../tools/configuration/ToolsModule.java        |    2 +-
 .../cayenne/tools/dbimport/DbImportAction.java  |    2 +-
 .../tools/dbimport/DbImportConfiguration.java   |    2 +-
 .../dbimport/DbImportDbLoaderDelegate.java      |    2 +-
 .../cayenne/tools/dbimport/DbImportModule.java  |    2 +-
 .../cayenne/gen/ClassGenerationActionTest.java  |   45 +-
 .../org/apache/cayenne/gen/EntityUtilsTest.java |   26 +-
 .../org/apache/cayenne/gen/ImportUtilsTest.java |   34 +-
 .../org/apache/cayenne/gen/StringUtilsTest.java |   19 +-
 .../map/naming/DefaultNameGeneratorTest.java    |   10 +-
 .../cayenne/tools/AntDataPortDelegateTest.java  |   11 +-
 ...eGeneratorTaskCrossMapRelationshipsTest.java |   21 +-
 .../cayenne/tools/CayenneGeneratorTaskTest.java |   27 +-
 .../cayenne/tools/DbGeneratorTaskTest.java      |   19 +-
 .../cayenne/tools/NamePatternMatcherTest.java   |   10 +-
 .../tools/configuration/ToolsModuleTest.java    |   17 +-
 .../dbimport/DbImportDbLoaderDelegateTest.java  |   24 +-
 .../tools/dbimport/DbImportModuleTest.java      |   10 +-
 .../src/test/resources/testmap.map.xml          |   88 +-
 docs/doc/pom.xml                                |    2 +-
 docs/doc/src/main/resources/RELEASE-NOTES.txt   |    6 +-
 docs/doc/src/main/resources/UPGRADE.txt         |    7 +-
 docs/docbook/cayenne-guide/pom.xml              |    2 +-
 .../src/docbkx/including-cayenne-in-project.xml |    2 +-
 docs/docbook/cayenne-guide/src/docbkx/setup.xml |    2 +-
 docs/docbook/docbook-stylesheets/pom.xml        |    2 +-
 docs/docbook/getting-started-rop/pom.xml        |    2 +-
 docs/docbook/getting-started/pom.xml            |    2 +-
 docs/docbook/pom.xml                            |    4 +-
 docs/docbook/upgrade-guide/pom.xml              |    2 +-
 docs/pom.xml                                    |    2 +-
 itests/cayenne-tools-itest/pom.xml              |    2 +-
 .../tools/CayenneGeneratorIntegrationTest.java  |   18 +-
 .../src/test/resources/testmap-client.map.xml   |   88 +-
 .../src/test/resources/testmap.map.xml          |   88 +-
 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-legacy/pom.xml      |    2 +-
 modeler/cayenne-modeler-mac/pom.xml             |    2 +-
 modeler/cayenne-modeler-win/pom.xml             |    2 +-
 modeler/cayenne-modeler/pom.xml                 |    2 +-
 .../cayenne/modeler/ProjectController.java      |    4 +-
 .../dialog/codegen/StandardPanelComponent.java  |   19 +
 .../configuration/event/DataNodeEventTest.java  |   12 +-
 .../modeler/action/CreateNodeActionTest.java    |    9 +-
 .../modeler/event/AttributeEventTest.java       |    8 +-
 .../cayenne/modeler/event/DataMapEventTest.java |   61 +-
 .../modeler/event/DomainDisplayEventTest.java   |    8 +-
 .../cayenne/modeler/event/DomainEventTest.java  |   15 +-
 .../cayenne/modeler/event/EntityEventTest.java  |   17 +-
 .../cayenne/modeler/event/ModelerEventTest.java |   12 +-
 .../modeler/event/RelationshipEventTest.java    |    8 +-
 .../modeler/util/ApplicationFileFilterTest.java |   14 +-
 .../cayenne/modeler/util/CircularArrayTest.java |    8 +-
 .../modeler/util/DataMapFileFilterTest.java     |   16 +-
 .../modeler/util/EOModelFileFilterTest.java     |   25 +-
 .../cayenne/modeler/util/VersionTest.java       |   11 +-
 modeler/cayenne-wocompat/pom.xml                |    2 +-
 .../apache/cayenne/wocompat/EOModelHelper.java  |    2 +-
 .../cayenne/wocompat/EOModelProcessor.java      |    8 +-
 .../cayenne/wocompat/EOModelHelperTest.java     |   22 +-
 .../EOModelProcessorInheritanceTest.java        |   19 +-
 .../cayenne/wocompat/EOModelProcessorTest.java  |   28 +-
 .../cayenne/wocompat/EOModelPrototypesTest.java |   25 +-
 .../apache/cayenne/wocompat/EOQueryTest.java    |   15 +-
 .../wocompat/PropertyListSerializationTest.java |   17 +-
 .../wocompat/parser/PropertyListParserTest.java |   25 +-
 .../cayenne/wocompat/unit/WOCompatCase.java     |    8 +-
 modeler/pom.xml                                 |    2 +-
 plugins/maven-cayenne-modeler-plugin/pom.xml    |    2 +-
 plugins/maven-cayenne-plugin/pom.xml            |    2 +-
 .../cayenne/tools/CayenneGeneratorMojo.java     |   23 +-
 .../apache/cayenne/tools/DbImporterMojo.java    |   12 +-
 .../cayenne/tools/CayenneGeneratorMojoTest.java |   10 +-
 .../test/resources/cgen/cayenne-testDomain.xml  |    1 +
 .../test/resources/cgen/project-to-test/pom.xml |    1 +
 .../resources/cgen/testAdditionalMap.map.xml    |   18 +
 .../test/resources/cgen/testDomainMap.map.xml   |    5 +
 plugins/pom.xml                                 |    2 +-
 pom.xml                                         |   31 +-
 tutorials/pom.xml                               |    2 +-
 tutorials/tutorial-rop-client/pom.xml           |    4 +-
 tutorials/tutorial-rop-server/pom.xml           |    4 +-
 tutorials/tutorial/pom.xml                      |    4 +-
 1761 files changed, 76984 insertions(+), 70725 deletions(-)
----------------------------------------------------------------------



Mime
View raw message