You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/11/27 08:12:22 UTC
[39/39] cayenne git commit: Merge branch 'master' into CAY-1946_1
Merge branch 'master' into CAY-1946_1
Conflicts:
cayenne-server/src/main/java/org/apache/cayenne/configuration/DefaultConfigurationNameMapper.java
cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java
plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/571a1370
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/571a1370
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/571a1370
Branch: refs/heads/CAY-1946_1
Commit: 571a1370a79f98d9f45d20a84044230f3a4f7238
Parents: 67ac9ec acf54ba
Author: aadamchik <aa...@apache.org>
Authored: Thu Nov 27 10:02:57 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Thu Nov 27 10:07:05 2014 +0300
----------------------------------------------------------------------
.../apache/cayenne/CayenneContextCayenneIT.java | 13 +-
.../CayenneContextClientChannelEventsIT.java | 14 +-
.../cayenne/CayenneContextDeleteRulesIT.java | 3 +-
.../apache/cayenne/CayenneContextEJBQLIT.java | 11 +-
.../CayenneContextGraphDiffCompressorIT.java | 3 +-
.../org/apache/cayenne/CayenneContextIT.java | 3 +-
.../cayenne/CayenneContextInheritanceIT.java | 11 +-
.../CayenneContextMapRelationshipIT.java | 11 +-
.../cayenne/CayenneContextMeaningfulPKIT.java | 10 +-
.../cayenne/CayenneContextMergeHandlerIT.java | 3 +-
.../CayenneContextNamedQueryCachingIT.java | 11 +-
.../CayenneContextPaginatedListCachingIT.java | 11 +-
.../cayenne/CayenneContextPrimitiveIT.java | 10 +-
.../cayenne/CayenneContextReflexiveIT.java | 3 +-
.../cayenne/CayenneContextRefreshQueryIT.java | 11 +-
.../cayenne/CayenneContextRelationshipsIT.java | 14 +-
.../cayenne/CayenneContextSQLTemplateIT.java | 13 +-
.../cayenne/CayenneContextServerDiffsIT.java | 3 +-
.../cayenne/CayenneContextValidationIT.java | 13 +-
.../CayenneContextWithDataContextIT.java | 11 +-
.../apache/cayenne/NestedCayenneContextIT.java | 16 +-
.../cayenne/NestedCayenneContextTooneIT.java | 4 +-
.../cayenne/PersistentObjectInContextIT.java | 11 +-
.../cayenne/access/ClientServerChannelIT.java | 12 +-
.../access/ClientServerChannelQueryIT.java | 11 +-
.../cayenne/query/ClientExpressionIT.java | 13 +-
.../query/ClientSelectQueryExpressionIT.java | 11 +-
.../query/SelectQueryAbstractEntityIT.java | 13 +-
.../remote/CayenneContextDeletionIT.java | 4 +-
.../remote/ClientChannelServerDiffsIT.java | 3 +-
.../cayenne/remote/LightSuperClassIT.java | 19 +-
.../remote/NestedObjectContextLocalIT.java | 4 +-
.../NestedObjectContextParentEventsIT.java | 16 +-
.../remote/NestedObjectContextPeerEventsIT.java | 16 +-
.../remote/NestedObjectContextRollbackIT.java | 4 +-
.../cayenne/remote/ROPPrefetchToManyMapIT.java | 14 +-
.../cayenne/remote/RelationshipChangeIT.java | 4 +-
.../cayenne/remote/RemoteCallbacksIT.java | 11 +-
.../cayenne/remote/RemoteCayenneCase.java | 9 +-
.../remote/RemoteIncrementalFaultListIT.java | 11 +-
.../apache/cayenne/remote/RemoteRollbackIT.java | 4 +-
.../apache/cayenne/remote/ValueInjectorIT.java | 4 +-
.../cayenne/unit/di/client/ClientCase.java | 21 +-
.../unit/di/client/ClientCaseSelfIT.java | 7 +-
.../cayenne/util/ObjectDetachOperationIT.java | 11 +-
.../util/ShallowMergeOperation_ClientIT.java | 14 +-
.../configuration/ConfigurationNameMapper.java | 35 +-
.../apache/cayenne/configuration/Constants.java | 298 ++---
.../configuration/DataChannelDescriptor.java | 268 +++--
.../DefaultConfigurationNameMapper.java | 168 +--
.../XMLDataChannelDescriptorLoader.java | 761 ++++++-------
.../server/DataDomainProvider.java | 241 ++--
.../server/ServerRuntimeBuilder.java | 348 +++---
.../server/SyntheticNodeDataDomainProvider.java | 27 +-
.../org/apache/cayenne/dba/JdbcPkGenerator.java | 30 +-
.../apache/cayenne/ejbql/parser/Compiler.java | 3 +
.../apache/cayenne/exp/ExpressionFactory.java | 179 +--
.../cayenne/exp/LikeExpressionHelper.java | 151 +++
.../java/org/apache/cayenne/exp/Property.java | 99 +-
.../org/apache/cayenne/query/ObjectSelect.java | 47 +-
.../main/java/org/apache/cayenne/util/Util.java | 1035 +++++++++---------
.../cayenne/CDOCollectionRelationshipIT.java | 11 +-
.../java/org/apache/cayenne/CDOMany2OneIT.java | 16 +-
.../org/apache/cayenne/CDOMany2OneNoRevIT.java | 3 +-
.../apache/cayenne/CDOMapRelationshipIT.java | 14 +-
.../java/org/apache/cayenne/CDOOne2ManyIT.java | 17 +-
.../org/apache/cayenne/CDOOne2OneDepIT.java | 3 +-
.../org/apache/cayenne/CDOOneDep2OneIT.java | 3 +-
.../org/apache/cayenne/CDOOneToManyFKIT.java | 14 +-
.../org/apache/cayenne/CDOOneToOneFKIT.java | 13 +-
.../apache/cayenne/CDOQualifiedEntitiesIT.java | 11 +-
.../apache/cayenne/CDOReflexiveRelDeleteIT.java | 9 +-
.../org/apache/cayenne/CDOReflexiveRelIT.java | 3 +-
.../apache/cayenne/CDOSetRelationshipIT.java | 11 +-
.../org/apache/cayenne/CayenneCompoundIT.java | 12 +-
.../org/apache/cayenne/CayenneDOTestBase.java | 20 +-
.../CayenneDataObjectFlattenedRelIT.java | 17 +-
.../org/apache/cayenne/CayenneDataObjectIT.java | 3 +-
.../cayenne/CayenneDataObjectInContextIT.java | 14 +-
.../CayenneDataObjectRelationshipsIT.java | 14 +-
.../cayenne/CayenneDataObjectValidationIT.java | 3 +-
.../test/java/org/apache/cayenne/CayenneIT.java | 14 +-
.../org/apache/cayenne/CompoundPkChangeIT.java | 13 +-
.../cayenne/DataContextMaxIdQualifierIT.java | 14 +-
.../cayenne/DataObjectSerializationIT.java | 3 +-
.../cayenne/FlattenedRelationshipsIT.java | 16 +-
.../org/apache/cayenne/GenericMappingIT.java | 13 +-
.../org/apache/cayenne/ManyToManyNoJoinIT.java | 13 +-
.../java/org/apache/cayenne/MeaningfulFKIT.java | 12 +-
.../apache/cayenne/OneWayRelationshipsIT.java | 14 +-
.../cayenne/PersistenceByReachabilityIT.java | 3 +-
.../org/apache/cayenne/PersistentObjectIT.java | 3 +-
.../org/apache/cayenne/PregeneratedPKIT.java | 18 +-
.../cayenne/access/DataContextBinaryPKIT.java | 15 +-
.../cayenne/access/DataContextBlobIT.java | 14 +-
.../cayenne/access/DataContextCallbacksIT.java | 21 +-
.../cayenne/access/DataContextCharPKIT.java | 13 +-
.../cayenne/access/DataContextCharTypeIT.java | 12 +-
.../cayenne/access/DataContextClobIT.java | 14 +-
.../cayenne/access/DataContextCommitIT.java | 17 +-
.../access/DataContextCompoundRelIT.java | 13 +-
.../cayenne/access/DataContextCrossDBIT.java | 3 +-
.../access/DataContextDataChannelEventsIT.java | 3 +-
.../access/DataContextDecoratedStackIT.java | 16 +-
.../cayenne/access/DataContextDelegateIT.java | 21 +-
.../DataContextDelegateSharedCacheIT.java | 8 +-
.../access/DataContextDeleteRulesIT.java | 16 +-
.../DataContextDisjointByIdPrefetchIT.java | 14 +-
...ataContextDisjointByIdPrefetch_ExtrasIT.java | 15 +-
.../access/DataContextEJBQLArrayResultIT.java | 14 +-
.../access/DataContextEJBQLConditionsIT.java | 14 +-
.../DataContextEJBQLConditionsPeopleIT.java | 52 +-
...extEJBQLDateTimeFunctionalExpressionsIT.java | 12 +-
.../access/DataContextEJBQLDeleteIT.java | 14 +-
.../access/DataContextEJBQLDeletePKIT.java | 11 +-
.../access/DataContextEJBQLFetchJoinIT.java | 16 +-
...ataContextEJBQLFlattenedRelationshipsIT.java | 15 +-
...DataContextEJBQLFunctionalExpressionsIT.java | 16 +-
.../access/DataContextEJBQLGroupByHavingIT.java | 16 +-
.../access/DataContextEJBQLInheritanceIT.java | 34 +-
.../access/DataContextEJBQLIsNullIT.java | 14 +-
.../cayenne/access/DataContextEJBQLJoinsIT.java | 16 +-
.../DataContextEJBQLNumericalFunctionalIT.java | 12 +-
.../access/DataContextEJBQLOrderByIT.java | 14 +-
.../access/DataContextEJBQLQueryCompoundIT.java | 11 +-
.../cayenne/access/DataContextEJBQLQueryIT.java | 14 +-
.../access/DataContextEJBQLSubqueryIT.java | 15 +-
.../DataContextEJBQLUpdateCompoundIT.java | 11 +-
.../access/DataContextEJBQLUpdateIT.java | 14 +-
.../DataContextEntityWithMeaningfulPKIT.java | 12 +-
.../DataContextExtendedTypeOperationsIT.java | 12 +-
.../cayenne/access/DataContextExtrasIT.java | 15 +-
.../DataContextFlattenedAttributesIT.java | 14 +-
.../apache/cayenne/access/DataContextIT.java | 16 +-
.../access/DataContextJoinAliasesIT.java | 13 +-
.../access/DataContextLocalObjectIT.java | 16 +-
.../cayenne/access/DataContextNoPkIT.java | 8 +-
.../access/DataContextObjectIdQueryIT.java | 17 +-
.../access/DataContextObjectTrackingIT.java | 14 +-
.../cayenne/access/DataContextOrderingIT.java | 17 +-
.../cayenne/access/DataContextOuterJoinsIT.java | 9 +-
.../access/DataContextPaginatedQueryIT.java | 13 +-
.../access/DataContextPerformQueryAPIIT.java | 16 +-
.../access/DataContextPrefetchExtras1IT.java | 12 +-
.../access/DataContextPrefetchExtrasIT.java | 14 +-
.../cayenne/access/DataContextPrefetchIT.java | 19 +-
.../access/DataContextPrefetchMultistepIT.java | 16 +-
.../DataContextPrefetchQualifierOverlapIT.java | 13 +-
.../access/DataContextProcedureQueryIT.java | 28 +-
.../access/DataContextQualifiedEntityIT.java | 33 +-
.../DataContextQueryCachingEhCacheIT.java | 20 +-
.../access/DataContextQueryCachingIT.java | 19 +-
.../DataContextQueryCachingOSCacheIT.java | 15 +-
.../cayenne/access/DataContextQueryChainIT.java | 17 +-
.../access/DataContextRefreshQueryIT.java | 14 +-
.../cayenne/access/DataContextRefreshingIT.java | 14 +-
.../access/DataContextRelationshipQueryIT.java | 15 +-
.../cayenne/access/DataContextRollbackIT.java | 16 +-
.../DataContextSQLTemplateCompoundIT.java | 11 +-
.../access/DataContextSQLTemplateIT.java | 14 +-
.../DataContextSelectQuerySplitAliasesIT.java | 15 +-
.../access/DataContextSerializationIT.java | 19 +-
.../access/DataContextSharedCacheEmpiricIT.java | 14 +-
.../access/DataContextSharedCacheIT.java | 21 +-
.../cayenne/access/DataContextValidationIT.java | 17 +-
.../cayenne/access/DataDomainCallbacksIT.java | 18 +-
.../cayenne/access/DataDomainFiltersIT.java | 3 +-
.../org/apache/cayenne/access/DataDomainIT.java | 3 +-
.../cayenne/access/DataDomainQueryActionIT.java | 22 +-
.../org/apache/cayenne/access/DataNodeIT.java | 3 +-
.../cayenne/access/DataNodeQueriesIT.java | 14 +-
.../apache/cayenne/access/DataRowStoreIT.java | 3 +-
.../apache/cayenne/access/DataRowUtilsIT.java | 14 +-
.../apache/cayenne/access/DateTimeTypesIT.java | 13 +-
.../apache/cayenne/access/DbGeneratorIT.java | 8 +-
.../org/apache/cayenne/access/DbLoaderIT.java | 13 +-
.../cayenne/access/DbLoaderPartialIT.java | 25 +-
.../apache/cayenne/access/DeleteObjectIT.java | 14 +-
.../apache/cayenne/access/DeleteRulesIT.java | 17 +-
.../org/apache/cayenne/access/EmbeddingIT.java | 12 +-
.../cayenne/access/EntityInheritanceIT.java | 3 +-
.../java/org/apache/cayenne/access/EnumIT.java | 9 +-
.../cayenne/access/FlattenedArcKeyIT.java | 3 +-
.../cayenne/access/FlattenedPrefetchIT.java | 15 +-
.../FlattenedRelationshipInContextIT.java | 14 +-
.../cayenne/access/IdentityColumnsIT.java | 15 +-
.../cayenne/access/IncrementalFaultListIT.java | 3 +-
.../apache/cayenne/access/JointPrefetchIT.java | 14 +-
.../org/apache/cayenne/access/MiscTypesIT.java | 17 +-
.../access/NestedDataContextLocalCacheIT.java | 18 +-
.../access/NestedDataContextParentEventsIT.java | 3 +-
.../NestedDataContextParentPeerEventsIT.java | 3 +-
.../access/NestedDataContextPeerEventsIT.java | 3 +-
.../cayenne/access/NestedDataContextReadIT.java | 14 +-
.../access/NestedDataContextRollbackIT.java | 3 +-
.../access/NestedDataContextValidationIT.java | 16 +-
.../access/NestedDataContextWriteIT.java | 14 +-
.../access/NestedDataContext_DeadlockIT.java | 14 +-
.../apache/cayenne/access/NumericTypesIT.java | 13 +-
.../access/ObjectStoreDiffRetainingIT.java | 14 +-
.../apache/cayenne/access/ObjectStoreGCIT.java | 16 +-
.../apache/cayenne/access/ObjectStoreIT.java | 3 +-
.../cayenne/access/OptimisticLockingIT.java | 12 +-
.../access/PrefetchProcessorTreeBuilderIT.java | 3 +-
.../cayenne/access/PrimitiveAttributesIT.java | 12 +-
.../cayenne/access/QuotedIdentifiersIT.java | 14 +-
.../cayenne/access/ReturnTypesMappingIT.java | 16 +-
.../SimpleIdIncrementalFaultListDataRowsIT.java | 14 +-
.../access/SimpleIdIncrementalFaultListIT.java | 14 +-
.../SimpleIdIncrementalFaultListPrefetchIT.java | 14 +-
.../access/SingleTableInheritance1IT.java | 16 +-
.../access/SingleTableInheritanceIT.java | 79 +-
.../org/apache/cayenne/access/ToManyListIT.java | 16 +-
.../cayenne/access/TransactionThreadIT.java | 16 +-
.../java/org/apache/cayenne/access/UUIDIT.java | 11 +-
.../cayenne/access/UserTransactionIT.java | 3 +-
.../cayenne/access/VerticalInheritanceIT.java | 19 +-
.../access/dbsync/SchemaUpdateStrategyBase.java | 21 +-
.../access/dbsync/SchemaUpdateStrategyIT.java | 4 +-
.../ThrowOnPartialOrCreateSchemaStrategyIT.java | 4 +-
.../dbsync/ThrowOnPartialSchemaStrategyIT.java | 4 +-
.../access/jdbc/BatchActionGeneratedIT.java | 3 +-
.../cayenne/access/jdbc/BatchActionIT.java | 3 +-
.../access/jdbc/BatchActionLockingIT.java | 3 +-
.../access/jdbc/SQLTemplateActionIT.java | 14 +-
.../cayenne/access/jdbc/SelectActionIT.java | 16 +-
.../batch/DefaultBatchTranslatorIT.java | 3 +-
.../batch/DeleteBatchTranslatorIT.java | 3 +-
.../batch/InsertBatchTranslatorIT.java | 3 +-
.../batch/SoftDeleteBatchTranslatorIT.java | 3 +-
.../batch/UpdateBatchTranslatorIT.java | 3 +-
.../ejbql/EJBQLSelectTranslatorIT.java | 3 +-
.../translator/select/OrderingTranslatorIT.java | 13 +-
.../select/QualifierTranslatorIT.java | 13 +-
.../translator/select/QueryAssemblerIT.java | 13 +-
.../translator/select/SelectTranslatorIT.java | 19 +-
.../access/util/DefaultOperationObserverIT.java | 3 +-
.../cayenne/ashwood/AshwoodEntitySorterIT.java | 13 +-
.../org/apache/cayenne/cache/QueryCacheIT.java | 3 +-
.../server/JNDIDataSourceFactoryIT.java | 3 +-
.../server/ServerRuntimeBuilderIT.java | 108 ++
.../server/ServerRuntimeBuilderTest.java | 53 +-
.../ServerRuntimeBuilder_InAction_IT.java | 95 --
.../org/apache/cayenne/conn/PoolManagerIT.java | 3 +-
.../org/apache/cayenne/dba/AutoAdapterIT.java | 3 +-
.../cayenne/dba/ConcurrentPkGeneratorIT.java | 3 +-
.../org/apache/cayenne/dba/JdbcAdapterIT.java | 3 +-
.../apache/cayenne/dba/JdbcPkGeneratorIT.java | 15 +-
.../org/apache/cayenne/dba/PkGeneratorIT.java | 9 +-
.../org/apache/cayenne/dba/TypesMappingIT.java | 3 +
.../cayenne/dba/hsqldb/HSQLDBAdapterIT.java | 3 +-
.../cayenne/dba/mysql/MySQLAdapterIT.java | 3 +-
.../cayenne/dba/oracle/Oracle8AdapterIT.java | 3 +-
.../cayenne/dba/oracle/OracleAdapterIT.java | 3 +-
.../cayenne/dba/oracle/OraclePkGeneratorIT.java | 8 +-
.../cayenne/dba/postgres/PostgresAdapterIT.java | 3 +-
.../dba/sqlserver/SQLServerAdapterIT.java | 3 +-
.../dba/sqlserver/SQLServerSnifferIT.java | 3 +-
.../ejbql/EJBQLCompiledExpressionIT.java | 3 +-
.../apache/cayenne/exp/ExpressionFactoryIT.java | 125 +++
.../cayenne/exp/ExpressionFactoryTest.java | 250 ++++-
.../exp/ExpressionFactory_InContextIT.java | 353 ------
.../org/apache/cayenne/exp/ExpressionIT.java | 128 +++
.../cayenne/exp/Expression_InContextIT.java | 142 ---
.../cayenne/exp/ParsedExpQualifierCompatIT.java | 14 +-
.../org/apache/cayenne/exp/PropertyTest.java | 342 +++---
.../parser/ExpressionEvaluateInMemoryIT.java | 15 +-
.../cayenne/map/ClientEntityResolverIT.java | 3 +-
.../java/org/apache/cayenne/map/DbEntityIT.java | 3 +-
.../apache/cayenne/map/DbRelationshipIT.java | 8 +-
.../java/org/apache/cayenne/map/EntityIT.java | 3 +-
.../map/EntityResolverClassDescriptorIT.java | 3 +-
.../map/EntityResolverGenericStackIT.java | 3 +-
.../apache/cayenne/map/EntityResolverIT.java | 3 +-
.../map/EntityResolverInheritanceIT.java | 12 +-
.../apache/cayenne/map/MapLoaderLoadTest.java | 2 +-
.../org/apache/cayenne/map/ObjEntityIT.java | 16 +-
.../apache/cayenne/map/ObjRelationshipIT.java | 8 +-
.../cayenne/merge/AddColumnToModelIT.java | 4 +-
.../cayenne/merge/CreateTableToModelIT.java | 4 +-
.../cayenne/merge/DropColumnToModelIT.java | 4 +-
.../merge/DropRelationshipToModelIT.java | 4 +-
.../cayenne/merge/DropTableToModelIT.java | 4 +-
.../org/apache/cayenne/merge/MergeCase.java | 14 +-
.../apache/cayenne/merge/MergerFactoryIT.java | 4 +-
.../cayenne/merge/SetAllowNullToDbIT.java | 4 +-
.../apache/cayenne/merge/SetNotNullToDbIT.java | 19 +-
.../cayenne/merge/SetPrimaryKeyToDbIT.java | 4 +-
.../apache/cayenne/merge/ValueForNullIT.java | 4 +-
.../org/apache/cayenne/query/EJBQLQueryIT.java | 36 +-
.../cayenne/query/EJBQLQueryNumericIT.java | 10 +-
.../apache/cayenne/query/ObjectSelectTest.java | 76 +-
.../cayenne/query/ObjectSelect_CompileIT.java | 23 +-
.../cayenne/query/ObjectSelect_RunIT.java | 30 +-
.../cayenne/query/ProcedureQueryCacheKeyIT.java | 3 +-
.../org/apache/cayenne/query/QueryChainIT.java | 3 +-
.../org/apache/cayenne/query/SQLSelectIT.java | 12 +-
.../cayenne/query/SQLTemplateCacheKeyIT.java | 3 +-
.../org/apache/cayenne/query/SQLTemplateIT.java | 14 +-
.../org/apache/cayenne/query/SelectByIdIT.java | 17 +-
.../cayenne/query/SelectQueryCacheKeyIT.java | 3 +-
.../apache/cayenne/query/SelectQueryClobIT.java | 12 +-
.../query/SelectQueryFetchLimitOrderingIT.java | 14 +-
.../org/apache/cayenne/query/SelectQueryIT.java | 12 +-
.../SelectQueryPrefetchRouterActionIT.java | 3 +-
...ryPrefetchRouterActionQualifiedEntityIT.java | 12 +-
.../cayenne/query/SelectQueryReturnTypesIT.java | 8 +-
.../cayenne/query/StatementFetchSizeIT.java | 3 +-
.../reflect/LifecycleCallbackRegistryIT.java | 3 +-
...LifecycleCallbackRegistry_InheritanceIT.java | 3 +-
.../reflect/MixedPersistenceStrategyIT.java | 11 +-
.../generic/DataObjectDescriptorFactoryIT.java | 3 +-
...jectDescriptorFactory_InheritanceMapsIT.java | 3 +-
.../cayenne/tx/DefaultTransactionManagerIT.java | 3 +-
.../cayenne/unit/HSQLDBUnitDbAdapter.java | 2 +-
.../apache/cayenne/unit/MySQLUnitDbAdapter.java | 4 +-
.../cayenne/unit/OracleUnitDbAdapter.java | 2 +-
.../cayenne/unit/PostgresUnitDbAdapter.java | 2 +-
.../cayenne/unit/SybaseUnitDbAdapter.java | 4 +-
.../java/org/apache/cayenne/unit/di/DICase.java | 40 +-
.../apache/cayenne/unit/di/DICaseSelfIT.java | 4 +-
.../cayenne/unit/di/server/CayenneProjects.java | 79 ++
.../cayenne/unit/di/server/DBCleaner.java | 70 ++
.../unit/di/server/DBCleanerProvider.java | 40 +
.../unit/di/server/PeopleProjectCase.java | 38 +
.../cayenne/unit/di/server/SchemaBuilder.java | 23 +-
.../cayenne/unit/di/server/ServerCase.java | 58 +-
.../unit/di/server/ServerCaseModule.java | 14 +-
.../unit/di/server/ServerCaseSelfIT.java | 8 +-
.../unit/di/server/UseServerRuntime.java | 2 +
.../org/apache/cayenne/unit/jira/CAY_115IT.java | 13 +-
.../org/apache/cayenne/unit/jira/CAY_191IT.java | 17 +-
.../org/apache/cayenne/unit/jira/CAY_194IT.java | 8 +-
.../cayenne/util/DeepMergeOperationIT.java | 3 +-
.../util/DeepMergeOperationInheritanceIT.java | 20 +-
.../cayenne/util/EntityMergeSupportIT.java | 4 +-
.../cayenne/util/ShallowMergeOperationIT.java | 14 +-
.../cayenne/velocity/BindDirectiveIT.java | 16 +-
.../cayenne/velocity/ResultDirectiveIT.java | 19 +-
.../src/test/resources/cayenne-empty.xml | 4 +
cayenne-server/src/test/resources/empty.map.xml | 9 +
.../src/test/resources/small-testmap.map.xml | 225 ----
.../src/test/resources/testmap.map.xml | 10 +-
docs/doc/src/main/resources/RELEASE-NOTES.txt | 5 +-
docs/doc/src/main/resources/UPGRADE.txt | 19 +-
.../cayenne-guide/src/docbkx/expressions.xml | 23 +
.../src/docbkx/performance-tuning.xml | 36 +
.../cayenne-guide/src/docbkx/queries.xml | 36 +-
.../cayenne/modeler/pref/DataMapDefaults.java | 21 +-
.../cayenne/tools/DbImporterMojoTest.java | 15 +-
pom.xml | 13 +
351 files changed, 4487 insertions(+), 5024 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/571a1370/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java
----------------------------------------------------------------------
diff --cc cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java
index 04efb54,8ef7ef9..b6ba66e
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java
@@@ -50,10 -48,9 +53,10 @@@ import static org.junit.Assert.assertNo
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
- @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
+ @UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
public class DbLoaderIT extends ServerCase {
+ public static final DbLoaderConfiguration CONFIG = new DbLoaderConfiguration();
@Inject
private ServerRuntime runtime;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/571a1370/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java
----------------------------------------------------------------------
diff --cc cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java
index 4cac2b2,9a3aba7..2a56b88
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java
@@@ -19,7 -19,7 +19,13 @@@
package org.apache.cayenne.access;
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertNotNull;
++
++import java.util.Collection;
++
import org.apache.cayenne.CayenneException;
++import org.apache.cayenne.access.loader.DefaultDbLoaderDelegate;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.map.DataMap;
@@@ -28,14 -28,16 +34,11 @@@ import org.apache.cayenne.unit.di.serve
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+ import org.junit.After;
+ import org.junit.Before;
import org.junit.Test;
--import java.util.Collection;
--
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertNotNull;
--
- @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
+ @UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
public class DbLoaderPartialIT extends ServerCase {
@Inject
http://git-wip-us.apache.org/repos/asf/cayenne/blob/571a1370/cayenne-server/src/test/java/org/apache/cayenne/merge/MergeCase.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/571a1370/docs/doc/src/main/resources/UPGRADE.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/571a1370/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
----------------------------------------------------------------------