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/24 18:36:55 UTC
[3/4] cayenne git commit: Merge branch '35'
Merge branch '35'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/ccb180eb
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/ccb180eb
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/ccb180eb
Branch: refs/heads/master
Commit: ccb180ebd8a013fdb21365bfecf05d0f97305f8b
Parents: 447dce9 dcaea3f
Author: aadamchik <aa...@apache.org>
Authored: Mon Nov 24 20:09:32 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Mon Nov 24 20:09:32 2014 +0300
----------------------------------------------------------------------
.../CayenneContextClientChannelEventsIT.java | 2 +-
.../apache/cayenne/CayenneContextEJBQLIT.java | 2 +-
.../cayenne/CayenneContextInheritanceIT.java | 2 +-
.../CayenneContextMapRelationshipIT.java | 2 +-
.../cayenne/CayenneContextMeaningfulPKIT.java | 2 +-
.../CayenneContextNamedQueryCachingIT.java | 2 +-
.../CayenneContextPaginatedListCachingIT.java | 2 +-
.../cayenne/CayenneContextPrimitiveIT.java | 2 +-
.../cayenne/CayenneContextRefreshQueryIT.java | 2 +-
.../cayenne/CayenneContextRelationshipsIT.java | 2 +-
.../CayenneContextWithDataContextIT.java | 2 +-
.../cayenne/PersistentObjectInContextIT.java | 2 +-
.../cayenne/access/ClientServerChannelIT.java | 2 +-
.../access/ClientServerChannelQueryIT.java | 2 +-
.../cayenne/query/ClientExpressionIT.java | 2 +-
.../query/ClientSelectQueryExpressionIT.java | 2 +-
.../query/SelectQueryAbstractEntityIT.java | 2 +-
.../cayenne/remote/RemoteCallbacksIT.java | 4 +-
.../cayenne/remote/RemoteCayenneCase.java | 6 +--
.../remote/RemoteIncrementalFaultListIT.java | 2 +-
.../cayenne/unit/di/client/ClientCase.java | 5 ++-
.../unit/di/client/ClientCaseSelfIT.java | 4 +-
.../cayenne/util/ObjectDetachOperationIT.java | 2 +-
.../util/ShallowMergeOperation_ClientIT.java | 2 +-
.../cayenne/CDOCollectionRelationshipIT.java | 2 +-
.../java/org/apache/cayenne/CDOMany2OneIT.java | 2 +-
.../apache/cayenne/CDOMapRelationshipIT.java | 2 +-
.../java/org/apache/cayenne/CDOOne2ManyIT.java | 2 +-
.../apache/cayenne/CDOQualifiedEntitiesIT.java | 2 +-
.../apache/cayenne/CDOReflexiveRelDeleteIT.java | 2 +-
.../apache/cayenne/CDOSetRelationshipIT.java | 2 +-
.../org/apache/cayenne/CayenneCompoundIT.java | 2 +-
.../CayenneDataObjectFlattenedRelIT.java | 2 +-
.../cayenne/CayenneDataObjectInContextIT.java | 2 +-
.../CayenneDataObjectRelationshipsIT.java | 2 +-
.../test/java/org/apache/cayenne/CayenneIT.java | 2 +-
.../cayenne/DataContextMaxIdQualifierIT.java | 2 +-
.../cayenne/FlattenedRelationshipsIT.java | 2 +-
.../apache/cayenne/OneWayRelationshipsIT.java | 2 +-
.../cayenne/access/DataContextCallbacksIT.java | 2 +-
.../cayenne/access/DataContextDelegateIT.java | 2 +-
.../DataContextDelegateSharedCacheIT.java | 2 +-
.../access/DataContextDeleteRulesIT.java | 2 +-
.../DataContextDisjointByIdPrefetchIT.java | 2 +-
...ataContextDisjointByIdPrefetch_ExtrasIT.java | 2 +-
.../access/DataContextEJBQLArrayResultIT.java | 2 +-
.../access/DataContextEJBQLConditionsIT.java | 2 +-
.../DataContextEJBQLConditionsPeopleIT.java | 10 ++---
.../access/DataContextEJBQLDeleteIT.java | 2 +-
.../access/DataContextEJBQLDeletePKIT.java | 2 +-
.../access/DataContextEJBQLFetchJoinIT.java | 2 +-
...ataContextEJBQLFlattenedRelationshipsIT.java | 2 +-
.../access/DataContextEJBQLGroupByHavingIT.java | 2 +-
.../access/DataContextEJBQLInheritanceIT.java | 10 ++---
.../access/DataContextEJBQLIsNullIT.java | 2 +-
.../cayenne/access/DataContextEJBQLJoinsIT.java | 2 +-
.../DataContextEJBQLNumericalFunctionalIT.java | 2 +-
.../access/DataContextEJBQLOrderByIT.java | 2 +-
.../access/DataContextEJBQLQueryCompoundIT.java | 2 +-
.../cayenne/access/DataContextEJBQLQueryIT.java | 2 +-
.../access/DataContextEJBQLSubqueryIT.java | 2 +-
.../DataContextEJBQLUpdateCompoundIT.java | 2 +-
.../access/DataContextEJBQLUpdateIT.java | 2 +-
.../cayenne/access/DataContextExtrasIT.java | 2 +-
.../apache/cayenne/access/DataContextIT.java | 2 +-
.../access/DataContextJoinAliasesIT.java | 2 +-
.../access/DataContextLocalObjectIT.java | 2 +-
.../cayenne/access/DataContextNoPkIT.java | 2 +-
.../access/DataContextObjectTrackingIT.java | 2 +-
.../cayenne/access/DataContextOuterJoinsIT.java | 2 +-
.../access/DataContextPaginatedQueryIT.java | 2 +-
.../access/DataContextPerformQueryAPIIT.java | 2 +-
.../access/DataContextPrefetchExtrasIT.java | 2 +-
.../cayenne/access/DataContextPrefetchIT.java | 2 +-
.../access/DataContextPrefetchMultistepIT.java | 2 +-
.../access/DataContextQualifiedEntityIT.java | 2 +-
.../DataContextQueryCachingEhCacheIT.java | 4 +-
.../access/DataContextQueryCachingIT.java | 4 +-
.../DataContextQueryCachingOSCacheIT.java | 2 +-
.../access/DataContextRefreshQueryIT.java | 2 +-
.../cayenne/access/DataContextRefreshingIT.java | 2 +-
.../access/DataContextRelationshipQueryIT.java | 2 +-
.../DataContextSQLTemplateCompoundIT.java | 2 +-
.../access/DataContextSQLTemplateIT.java | 2 +-
.../DataContextSelectQuerySplitAliasesIT.java | 2 +-
.../access/DataContextSerializationIT.java | 4 +-
.../access/DataContextSharedCacheEmpiricIT.java | 2 +-
.../access/DataContextSharedCacheIT.java | 2 +-
.../cayenne/access/DataDomainQueryActionIT.java | 2 +-
.../cayenne/access/DataNodeQueriesIT.java | 2 +-
.../apache/cayenne/access/DataRowUtilsIT.java | 2 +-
.../apache/cayenne/access/DbGeneratorIT.java | 2 +-
.../org/apache/cayenne/access/DbLoaderIT.java | 4 +-
.../cayenne/access/DbLoaderPartialIT.java | 4 +-
.../apache/cayenne/access/DeleteObjectIT.java | 2 +-
.../org/apache/cayenne/access/EmbeddingIT.java | 2 +-
.../cayenne/access/FlattenedPrefetchIT.java | 2 +-
.../FlattenedRelationshipInContextIT.java | 2 +-
.../cayenne/access/IdentityColumnsIT.java | 2 +-
.../apache/cayenne/access/JointPrefetchIT.java | 2 +-
.../cayenne/access/NestedDataContextReadIT.java | 2 +-
.../access/NestedDataContextWriteIT.java | 2 +-
.../access/NestedDataContext_DeadlockIT.java | 2 +-
.../apache/cayenne/access/NumericTypesIT.java | 2 +-
.../access/ObjectStoreDiffRetainingIT.java | 2 +-
.../cayenne/access/OptimisticLockingIT.java | 2 +-
.../cayenne/access/QuotedIdentifiersIT.java | 2 +-
.../SimpleIdIncrementalFaultListDataRowsIT.java | 2 +-
.../access/SimpleIdIncrementalFaultListIT.java | 2 +-
.../SimpleIdIncrementalFaultListPrefetchIT.java | 2 +-
.../access/SingleTableInheritanceIT.java | 17 ++++-----
.../java/org/apache/cayenne/access/UUIDIT.java | 2 +-
.../access/dbsync/SchemaUpdateStrategyBase.java | 3 +-
.../access/jdbc/SQLTemplateActionIT.java | 2 +-
.../translator/select/OrderingTranslatorIT.java | 4 +-
.../select/QualifierTranslatorIT.java | 4 +-
.../translator/select/QueryAssemblerIT.java | 4 +-
.../translator/select/SelectTranslatorIT.java | 4 +-
.../cayenne/ashwood/AshwoodEntitySorterIT.java | 2 +-
.../server/ServerRuntimeBuilderIT.java | 13 +++----
.../apache/cayenne/dba/JdbcPkGeneratorIT.java | 4 +-
.../org/apache/cayenne/dba/PkGeneratorIT.java | 2 +-
.../cayenne/dba/oracle/OraclePkGeneratorIT.java | 2 +-
.../cayenne/exp/ParsedExpQualifierCompatIT.java | 2 +-
.../parser/ExpressionEvaluateInMemoryIT.java | 2 +-
.../apache/cayenne/map/DbRelationshipIT.java | 2 +-
.../apache/cayenne/map/ObjRelationshipIT.java | 2 +-
.../org/apache/cayenne/merge/MergeCase.java | 2 +-
.../org/apache/cayenne/query/EJBQLQueryIT.java | 2 +-
.../cayenne/query/EJBQLQueryNumericIT.java | 2 +-
.../org/apache/cayenne/query/SQLTemplateIT.java | 2 +-
.../org/apache/cayenne/query/SelectByIdIT.java | 2 +-
.../query/SelectQueryFetchLimitOrderingIT.java | 2 +-
.../reflect/MixedPersistenceStrategyIT.java | 2 +-
.../java/org/apache/cayenne/unit/di/DICase.java | 40 ++------------------
.../apache/cayenne/unit/di/DICaseSelfIT.java | 4 +-
.../cayenne/unit/di/server/DBCleaner.java | 3 +-
.../cayenne/unit/di/server/ServerCase.java | 5 ++-
.../unit/di/server/ServerCaseSelfIT.java | 4 +-
.../org/apache/cayenne/unit/jira/CAY_115IT.java | 2 +-
.../org/apache/cayenne/unit/jira/CAY_191IT.java | 2 +-
.../org/apache/cayenne/unit/jira/CAY_194IT.java | 2 +-
.../util/DeepMergeOperationInheritanceIT.java | 14 +++++--
.../cayenne/util/ShallowMergeOperationIT.java | 2 +-
144 files changed, 193 insertions(+), 227 deletions(-)
----------------------------------------------------------------------