Merge remote-tracking branch 'origin/master' into java8-times
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/d37f217f Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/d37f217f Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/d37f217f Branch: refs/heads/master Commit: d37f217f7af5351bf481b0f74f3914a44d9f8c93 Parents: e9e82bd 6d7bc02 Author: Savva Kolbachev <s.kolbac...@gmail.com> Authored: Mon Dec 1 11:58:09 2014 +0300 Committer: Savva Kolbachev <s.kolbac...@gmail.com> Committed: Wed May 6 16:43:40 2015 +0300 ---------------------------------------------------------------------- README.md | 18 + assembly/pom.xml | 11 +- .../resources/assemblies/assembly-generic.xml | 6 +- .../main/resources/assemblies/assembly-mac.xml | 6 +- .../main/resources/assemblies/assembly-src.xml | 5 + .../resources/assemblies/assembly-windows.xml | 6 +- 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 +- .../org/apache/cayenne/test/jdbc/SQLReader.java | 90 + .../cayenne/test/resource/ResourceUtil.java | 154 +- build-tools/pom.xml | 5 +- cayenne-client/pom.xml | 40 +- .../apache/cayenne/query/SelectByIdTest.java | 8 +- cayenne-crypto/pom.xml | 39 +- .../CryptoBatchTranslatorFactoryDecorator.java | 8 +- .../crypto/transformer/BindingsTransformer.java | 4 +- .../transformer/DefaultBindingsTransformer.java | 6 +- .../transformer/DefaultTransformerFactory.java | 6 +- .../crypto/transformer/TransformerFactory.java | 4 +- .../value/DefaultValueTransformerFactory.java | 22 +- .../cayenne/crypto/key/README-keystore.txt | 17 + cayenne-di/pom.xml | 39 +- .../apache/cayenne/di/ScopeEventListener.java | 19 +- cayenne-joda/pom.xml | 102 ++ .../org/apache/cayenne/CayenneJodaModule.java | 48 + .../cayenne/access/types/DateTimeType.java | 79 + .../cayenne/access/types/LocalDateTimeType.java | 80 + .../cayenne/access/types/LocalDateType.java | 88 + .../cayenne/access/types/LocalTimeType.java | 92 ++ .../apache/cayenne/joda/DateTimeTypeTest.java | 62 + .../org/apache/cayenne/joda/JodaTestCase.java | 40 + .../org/apache/cayenne/joda/JodaTimeIT.java | 131 ++ .../cayenne/joda/LocalDateTimeTypeTest.java | 64 + .../apache/cayenne/joda/LocalDateTypeTest.java | 76 + .../apache/cayenne/joda/LocalTimeTypeTest.java | 76 + .../cayenne/joda/db/DateTimeTestEntity.java | 9 + .../cayenne/joda/db/LocalDateTestEntity.java | 9 + .../joda/db/LocalDateTimeTestEntity.java | 9 + .../cayenne/joda/db/LocalTimeTestEntity.java | 9 + .../joda/db/auto/_DateTimeTestEntity.java | 28 + .../joda/db/auto/_LocalDateTestEntity.java | 28 + .../joda/db/auto/_LocalDateTimeTestEntity.java | 28 + .../joda/db/auto/_LocalTimeTestEntity.java | 28 + .../src/test/resources/cayenne-joda.xml | 17 + cayenne-joda/src/test/resources/joda.map.xml | 35 + cayenne-lifecycle/pom.xml | 35 +- cayenne-project/pom.xml | 36 +- .../validation/DbAttributeValidator.java | 5 +- .../validation/ProcedureParameterValidator.java | 5 +- cayenne-server/pom.xml | 90 +- .../java/org/apache/cayenne/BaseContext.java | 29 +- .../java/org/apache/cayenne/ObjectContext.java | 43 +- .../org/apache/cayenne/ResultBatchIterator.java | 79 + .../java/org/apache/cayenne/ResultIterator.java | 7 +- .../org/apache/cayenne/access/DataPort.java | 533 +++--- .../org/apache/cayenne/access/DbGenerator.java | 2 +- .../org/apache/cayenne/access/DbLoader.java | 1052 +++++------- .../cayenne/access/DbLoaderConfiguration.java | 48 - .../apache/cayenne/access/DbLoaderDelegate.java | 27 +- .../cayenne/access/DefaultDbLoaderDelegate.java | 54 - .../access/HierarchicalObjectResolver.java | 3 +- .../access/ManyToManyCandidateEntity.java | 126 -- .../cayenne/access/OperationObserver.java | 4 +- .../cayenne/access/PrefetchProcessorNode.java | 35 +- .../org/apache/cayenne/access/QueryResult.java | 267 --- .../apache/cayenne/access/jdbc/BatchAction.java | 10 +- .../cayenne/access/jdbc/ParameterBinding.java | 68 - .../access/jdbc/SQLParameterBinding.java | 62 + .../cayenne/access/jdbc/SQLStatement.java | 10 +- .../cayenne/access/jdbc/SQLTemplateAction.java | 2 +- .../cayenne/access/jdbc/SelectAction.java | 344 ++-- .../access/loader/DbAttributesBaseLoader.java | 107 ++ .../access/loader/DbAttributesLoader.java | 43 + .../loader/DbAttributesPerSchemaLoader.java | 120 ++ .../access/loader/DbLoaderConfiguration.java | 150 ++ .../cayenne/access/loader/DbTableLoader.java | 189 +++ .../access/loader/DefaultDbLoaderDelegate.java | 60 + .../access/loader/LoggingDbLoaderDelegate.java | 76 + .../loader/ManyToManyCandidateEntity.java | 142 ++ .../cayenne/access/loader/NameFilter.java | 27 + .../access/loader/NamePatternMatcher.java | 225 +++ .../access/loader/filters/CatalogFilter.java | 62 + .../access/loader/filters/FiltersConfig.java | 62 + .../loader/filters/IncludeTableFilter.java | 71 + .../loader/filters/OldFilterConfigBridge.java | 150 ++ .../access/loader/filters/PatternFilter.java | 167 ++ .../access/loader/filters/SchemaFilter.java | 49 + .../access/loader/filters/TableFilter.java | 136 ++ .../cayenne/access/loader/mapper/DbType.java | 194 +++ .../mapper/DefaultJdbc2JavaTypeMapper.java | 287 ++++ .../loader/mapper/Jdbc2JavaTypeMapper.java | 33 + .../access/translator/ParameterBinding.java | 81 + .../translator/batch/BatchParameterBinding.java | 79 - .../translator/batch/BatchTranslator.java | 5 +- .../batch/DefaultBatchTranslator.java | 11 +- .../translator/batch/DeleteBatchTranslator.java | 11 +- .../translator/batch/InsertBatchTranslator.java | 11 +- .../batch/SoftDeleteBatchTranslator.java | 13 +- .../translator/batch/UpdateBatchTranslator.java | 11 +- .../ejbql/EJBQLOrderByTranslator.java | 6 + .../select/DefaultSelectTranslator.java | 630 +++++++ .../access/translator/select/JoinStack.java | 349 ++-- .../translator/select/OrderingTranslator.java | 166 +- .../translator/select/QualifierTranslator.java | 1003 ++++++------ .../translator/select/QueryAssembler.java | 302 ++-- .../translator/select/QueryAssemblerHelper.java | 885 +++++----- .../translator/select/SelectTranslator.java | 602 +------ .../select/TrimmingQualifierTranslator.java | 113 +- .../apache/cayenne/access/types/CharType.java | 70 +- .../access/util/DoNothingOperationObserver.java | 80 + .../apache/cayenne/configuration/Constants.java | 5 + .../server/DataContextFactory.java | 1 + .../server/PropertyDataSourceFactory.java | 107 +- .../server/ServerRuntimeBuilder.java | 93 +- .../server/SyntheticNodeDataDomainProvider.java | 6 + .../server/XMLPoolingDataSourceFactory.java | 59 +- .../apache/cayenne/conn/ConnectionWrapper.java | 749 --------- .../org/apache/cayenne/conn/DataSourceInfo.java | 758 ++++----- .../apache/cayenne/conn/DriverDataSource.java | 298 ---- .../org/apache/cayenne/conn/PoolDataSource.java | 85 - .../org/apache/cayenne/conn/PoolManager.java | 649 -------- .../cayenne/conn/PooledConnectionImpl.java | 201 --- .../java/org/apache/cayenne/conn/package.html | 26 - .../datasource/BadValidationQueryException.java | 41 + .../cayenne/datasource/DataSourceBuilder.java | 136 ++ .../cayenne/datasource/DriverDataSource.java | 298 ++++ .../datasource/ManagedPoolingDataSource.java | 120 ++ .../cayenne/datasource/PoolAwareConnection.java | 593 +++++++ .../cayenne/datasource/PoolingDataSource.java | 360 ++++ .../datasource/PoolingDataSourceManager.java | 74 + .../datasource/PoolingDataSourceParameters.java | 64 + .../cayenne/datasource/StoppedDataSource.java | 88 + .../org/apache/cayenne/dba/AutoAdapter.java | 13 +- .../java/org/apache/cayenne/dba/DbAdapter.java | 18 +- .../org/apache/cayenne/dba/JdbcAdapter.java | 131 +- .../org/apache/cayenne/dba/TypesHandler.java | 2 +- .../org/apache/cayenne/dba/TypesMapping.java | 393 ++--- .../cayenne/dba/db2/DB2QualifierTranslator.java | 172 +- .../apache/cayenne/dba/derby/DerbyAdapter.java | 64 +- .../dba/derby/DerbyQualifierTranslator.java | 59 +- .../cayenne/dba/firebird/FirebirdAdapter.java | 33 +- .../firebird/FirebirdQualifierTranslator.java | 30 +- .../dba/frontbase/FrontBaseActionBuilder.java | 6 +- .../dba/frontbase/FrontBasePkGenerator.java | 191 +-- .../frontbase/FrontBaseSelectTranslator.java | 41 +- .../cayenne/dba/hsqldb/HSQLSelectAction.java | 24 +- .../dba/hsqldb/HSQLSelectTranslator.java | 60 +- .../cayenne/dba/ingres/IngresSelectAction.java | 6 +- .../dba/ingres/IngresSelectTranslator.java | 13 +- .../apache/cayenne/dba/mysql/MySQLAdapter.java | 19 + .../cayenne/dba/mysql/MySQLSelectAction.java | 24 +- .../dba/mysql/MySQLSelectTranslator.java | 61 +- .../dba/openbase/OpenBaseActionBuilder.java | 26 +- .../cayenne/dba/openbase/OpenBaseJoinStack.java | 158 +- .../openbase/OpenBaseQualifierTranslator.java | 262 ++- .../dba/openbase/OpenBaseSelectTranslator.java | 45 +- .../cayenne/dba/oracle/Oracle8JoinStack.java | 146 +- .../dba/oracle/Oracle8LOBBatchAction.java | 8 +- .../dba/oracle/Oracle8LOBBatchQueryWrapper.java | 2 +- .../dba/oracle/Oracle8LOBBatchTranslator.java | 12 +- .../dba/oracle/Oracle8QualifierTranslator.java | 38 +- .../cayenne/dba/oracle/Oracle8SelectAction.java | 16 +- .../dba/oracle/Oracle8SelectTranslator.java | 35 +- .../cayenne/dba/oracle/OracleAdapter.java | 40 +- .../dba/oracle/OracleQualifierTranslator.java | 104 +- .../cayenne/dba/oracle/OracleSelectAction.java | 24 +- .../dba/oracle/OracleSelectTranslator.java | 89 +- .../cayenne/dba/postgres/PostgresAdapter.java | 115 +- .../postgres/PostgresQualifierTranslator.java | 188 +-- .../dba/postgres/PostgresSelectAction.java | 24 +- .../dba/postgres/PostgresSelectTranslator.java | 56 +- .../cayenne/dba/sqlite/SQLiteAdapter.java | 20 + .../dba/sqlserver/SQLServerSelectAction.java | 6 +- .../sqlserver/SQLServerSelectTranslator.java | 65 +- .../SQLServerTrimmingQualifierTranslator.java | 164 +- .../java/org/apache/cayenne/exp/Expression.java | 91 +- .../cayenne/exp/LikeExpressionHelper.java | 1 - .../java/org/apache/cayenne/exp/Property.java | 4 +- .../apache/cayenne/exp/parser/Evaluator.java | 143 ++ .../cayenne/log/CommonsJdbcEventLogger.java | 819 +++++----- .../org/apache/cayenne/log/JdbcEventLogger.java | 21 +- .../apache/cayenne/log/NoopJdbcEventLogger.java | 142 +- .../java/org/apache/cayenne/map/DataMap.java | 69 +- .../org/apache/cayenne/map/DbAttribute.java | 25 + .../org/apache/cayenne/map/DbRelationship.java | 40 +- .../org/apache/cayenne/map/ObjAttribute.java | 6 + .../java/org/apache/cayenne/map/ObjEntity.java | 13 +- .../org/apache/cayenne/map/ObjRelationship.java | 2 + .../org/apache/cayenne/map/Relationship.java | 13 +- .../map/naming/DefaultUniqueNameGenerator.java | 7 +- .../apache/cayenne/map/naming/ExportedKey.java | 173 +- .../apache/cayenne/map/naming/NameCheckers.java | 6 +- .../org/apache/cayenne/merge/AddColumnToDb.java | 72 +- .../cayenne/merge/AddRelationshipToDb.java | 8 +- .../cayenne/merge/AddRelationshipToModel.java | 38 +- .../cayenne/merge/CreateTableToModel.java | 20 +- .../java/org/apache/cayenne/merge/DbMerger.java | 192 +-- .../apache/cayenne/merge/DbMergerConfig.java | 63 + .../merge/DefaultValueForNullProvider.java | 10 +- .../cayenne/merge/DropRelationshipToDb.java | 2 +- .../cayenne/merge/DropRelationshipToModel.java | 4 +- .../cayenne/merge/ProxyModelMergeDelegate.java | 108 ++ .../apache/cayenne/merge/SetColumnTypeToDb.java | 68 +- .../org/apache/cayenne/query/ObjectSelect.java | 50 +- .../org/apache/cayenne/query/SQLSelect.java | 95 +- .../org/apache/cayenne/query/SQLTemplate.java | 22 +- .../cayenne/query/SQLTemplateMetadata.java | 117 +- .../java/org/apache/cayenne/query/Select.java | 82 + .../org/apache/cayenne/query/SelectById.java | 210 ++- .../org/apache/cayenne/query/SelectQuery.java | 49 +- .../apache/cayenne/reflect/BeanAccessor.java | 182 ++- .../org/apache/cayenne/reflect/MapAccessor.java | 52 + .../apache/cayenne/reflect/PropertyUtils.java | 582 +++---- .../cayenne/remote/IncrementalSelectQuery.java | 42 +- .../apache/cayenne/util/EntityMergeSupport.java | 217 +-- .../apache/cayenne/velocity/BindDirective.java | 19 +- .../cayenne/velocity/BindEqualDirective.java | 4 +- .../cayenne/velocity/BindNotEqualDirective.java | 4 +- .../velocity/BindObjectEqualDirective.java | 6 +- .../velocity/BindObjectNotEqualDirective.java | 4 +- .../apache/cayenne/velocity/ChainDirective.java | 2 +- .../cayenne/velocity/VelocityParamSequence.java | 68 - .../velocity/VelocitySQLTemplateProcessor.java | 26 +- .../org/apache/cayenne/ejbql/EJBQLParser.jjt | 5 +- .../org/apache/cayenne/dba/db2/types.xml | 12 + .../org/apache/cayenne/dba/derby/types.xml | 12 + .../org/apache/cayenne/dba/firebird/types.xml | 6 + .../org/apache/cayenne/dba/h2/types.xml | 15 + .../org/apache/cayenne/dba/hsqldb/types.xml | 12 + .../org/apache/cayenne/dba/mysql/types.xml | 15 + .../org/apache/cayenne/dba/oracle/types.xml | 18 + .../org/apache/cayenne/dba/postgres/types.xml | 15 + .../org/apache/cayenne/dba/sqlite/types.xml | 12 + .../org/apache/cayenne/dba/sqlserver/types.xml | 14 + .../org/apache/cayenne/dba/sybase/types.xml | 15 + .../resources/org/apache/cayenne/dba/types.xml | 18 + .../CayenneDataObjectFlattenedRelIT.java | 7 + .../org/apache/cayenne/CayenneDataObjectIT.java | 260 ++- .../org/apache/cayenne/MockBaseContext.java | 11 +- .../apache/cayenne/OneWayRelationshipsIT.java | 257 +-- .../cayenne/access/DataContextBlobIT.java | 4 +- .../access/DataContextDeleteRulesIT.java | 424 +++-- ...ataContextDisjointByIdPrefetch_ExtrasIT.java | 154 +- .../apache/cayenne/access/DataContextIT.java | 1545 +++++++++--------- .../cayenne/access/DataContextOuterJoinsIT.java | 285 ++-- .../org/apache/cayenne/access/DbLoaderIT.java | 116 +- .../cayenne/access/DbLoaderPartialIT.java | 23 +- .../cayenne/access/FlattenedPrefetchIT.java | 1 - .../access/ManyToManyCandidateEntityTest.java | 113 -- .../cayenne/access/NestedDataContextReadIT.java | 14 + .../access/NestedDataContext_DeadlockIT.java | 139 +- .../cayenne/access/ReturnTypesMappingIT.java | 88 + .../cayenne/access/jdbc/SQLStatementTest.java | 2 +- ...ectActionWithUnsupportedDistinctTypesIT.java | 163 ++ .../loader/ManyToManyCandidateEntityTest.java | 113 ++ .../loader/filters/FiltersConfigTest.java | 74 + .../loader/filters/IncludeFilterTest.java | 34 + .../loader/filters/PatternFilterTest.java | 78 + .../access/loader/filters/TableFilterTest.java | 91 ++ .../access/loader/mapper/DbTypeTest.java | 87 + .../batch/DefaultBatchTranslatorIT.java | 25 +- .../select/DefaultSelectTranslatorIT.java | 787 +++++++++ .../translator/select/OrderingTranslatorIT.java | 216 ++- .../select/QualifierTranslatorIT.java | 197 ++- .../translator/select/QueryAssemblerIT.java | 62 +- .../translator/select/SelectTranslatorIT.java | 794 --------- .../translator/select/TstQueryAssembler.java | 64 +- .../cayenne/access/types/CharTypeTest.java | 17 +- .../server/ServerRuntimeBuilderIT.java | 31 +- .../cayenne/conn/DriverDataSourceTest.java | 43 - .../org/apache/cayenne/conn/PoolManagerIT.java | 128 -- .../cayenne/conn/PooledConnectionImplTest.java | 53 - .../datafactory/CombinedValueProvider.java | 25 + .../apache/cayenne/datafactory/DataFactory.java | 407 +++++ .../datafactory/DictionaryValueProvider.java | 104 ++ .../cayenne/datafactory/ValueProvider.java | 707 ++++++++ .../datasource/BasePoolingDataSourceIT.java | 77 + .../datasource/DriverDataSourceTest.java | 44 + .../ManagedPoolingDataSourceTest.java | 97 ++ .../datasource/PoolAwareConnectionTest.java | 99 ++ .../datasource/PoolDataSourceManagerTest.java | 80 + .../cayenne/datasource/PoolingDataSourceIT.java | 172 ++ .../datasource/PoolingDataSourceTest.java | 196 +++ ...lingDataSource_FailingValidationQueryIT.java | 66 + .../PoolingDataSource_StaticsTest.java | 41 + .../PoolingDataSource_ValidationQueryIT.java | 56 + .../cayenne/exp/Expression_ParamsTest.java | 6 +- .../cayenne/exp/LikeExpressionHelperTest.java | 83 + .../org/apache/cayenne/exp/PropertyTest.java | 38 +- .../cayenne/exp/parser/EvaluatorTest.java | 133 ++ .../org/apache/cayenne/map/DataMapTest.java | 6 +- .../java/org/apache/cayenne/map/DbEntityIT.java | 4 +- .../apache/cayenne/map/DbRelationshipIT.java | 4 +- .../apache/cayenne/map/ObjRelationshipIT.java | 14 +- .../apache/cayenne/map/RelationshipTest.java | 2 +- .../map/naming/LegacyNameGeneratorTest.java | 4 +- .../cayenne/merge/AddColumnToModelIT.java | 19 +- .../cayenne/merge/CreateTableToModelIT.java | 144 +- .../org/apache/cayenne/merge/DbMergerTest.java | 25 +- .../cayenne/merge/DropColumnToModelIT.java | 407 +++-- .../merge/DropRelationshipToModelIT.java | 275 ++-- .../cayenne/merge/DropTableToModelIT.java | 131 +- .../org/apache/cayenne/merge/MergeCase.java | 326 ++-- .../apache/cayenne/merge/MergerFactoryIT.java | 73 +- .../cayenne/merge/SetAllowNullToDbIT.java | 64 +- .../apache/cayenne/merge/SetNotNullToDbIT.java | 57 +- .../cayenne/merge/SetPrimaryKeyToDbIT.java | 51 +- .../apache/cayenne/merge/ValueForNullIT.java | 184 +-- .../merge/builders/DbAttributeBuilder.java | 15 +- .../cayenne/merge/builders/DbEntityBuilder.java | 6 +- .../cayenne/merge/builders/DefaultBuilder.java | 2 +- .../org/apache/cayenne/query/EJBQLQueryIT.java | 43 + .../cayenne/query/ObjectSelect_RunIT.java | 116 ++ .../org/apache/cayenne/query/SQLSelectIT.java | 284 +++- .../org/apache/cayenne/query/SQLSelectTest.java | 56 +- .../org/apache/cayenne/query/SQLTemplateIT.java | 27 +- .../org/apache/cayenne/query/SelectByIdIT.java | 201 --- .../apache/cayenne/query/SelectByIdTest.java | 78 + .../apache/cayenne/query/SelectById_RunIT.java | 227 +++ .../cayenne/query/SelectQueryBasicsTest.java | 159 -- .../org/apache/cayenne/query/SelectQueryIT.java | 1336 ++++++++------- .../apache/cayenne/query/SelectQueryTest.java | 190 +++ .../cayenne/reflect/PropertyUtilsTest.java | 649 ++++---- .../cayenne/testdo/lob/NClobTestEntity.java | 28 + .../testdo/lob/auto/_NClobTestEntity.java | 55 + .../return_types/auto/_ReturnTypesMap1.java | 21 + .../return_types/auto/_ReturnTypesMapLobs1.java | 8 + .../unsupported_distinct_types/Customer.java | 27 + .../unsupported_distinct_types/Product.java | 27 + .../UnsupportedDistinctTypes.java | 36 + .../auto/_Customer.java | 48 + .../auto/_Product.java | 79 + .../auto/_UnsupportedDistinctTypes.java | 12 + .../cayenne/unit/di/server/CayenneProjects.java | 1 + .../cayenne/unit/di/server/SchemaBuilder.java | 2 +- .../di/server/ServerCaseDataSourceFactory.java | 89 +- .../cayenne/util/EntityMergeSupportIT.java | 145 +- .../cayenne/velocity/ResultDirectiveIT.java | 107 +- .../VelocitySQLTemplateProcessorTest.java | 10 +- .../cayenne-relationships-activity.xml | 4 +- .../cayenne-unsupported-distinct-types.xml | 4 + cayenne-server/src/test/resources/lob.map.xml | 7 + .../cayenne-relationship-optimisation.xml | 4 - .../cayenne-relationship-optimisation.xml | 4 + .../loader/relationship-optimisation.map.xml | 43 + .../access/relationship-optimisation.map.xml | 43 - .../resources/relationships-activity.map.xml | 12 +- .../src/test/resources/return-types.map.xml | 8 + .../src/test/resources/things.map.xml | 8 +- .../unsupported-distinct-types.map.xml | 57 + cayenne-tools/pom.xml | 67 +- .../java/org/apache/cayenne/gen/Artifact.java | 1 + .../cayenne/gen/ClassGenerationAction.java | 32 +- .../cayenne/gen/ClientDataMapArtifact.java | 17 +- .../org/apache/cayenne/gen/DataMapArtifact.java | 13 +- .../map/naming/DefaultNameGenerator.java | 12 +- .../cayenne/tools/AntDataPortDelegate.java | 7 +- .../CayenneGeneratorEntityFilterAction.java | 20 +- .../cayenne/tools/CayenneGeneratorTask.java | 31 +- .../apache/cayenne/tools/DbGeneratorTask.java | 2 +- .../apache/cayenne/tools/DbImporterTask.java | 190 ++- .../org/apache/cayenne/tools/ExcludeTable.java | 33 + .../cayenne/tools/NamePatternMatcher.java | 294 ---- .../configuration/DriverDataSourceFactory.java | 2 +- .../cayenne/tools/dbimport/DbImportAction.java | 165 +- .../tools/dbimport/DbImportConfiguration.java | 366 ++--- .../dbimport/DbImportDbLoaderDelegate.java | 15 +- .../tools/dbimport/config/AntNestedElement.java | 42 + .../cayenne/tools/dbimport/config/Catalog.java | 110 ++ .../config/DefaultReverseEngineeringLoader.java | 230 +++ .../config/DefaultTypeMapperBuilder.java | 82 + .../tools/dbimport/config/ExcludeColumn.java | 31 + .../tools/dbimport/config/ExcludeProcedure.java | 31 + .../tools/dbimport/config/FilterContainer.java | 144 ++ .../dbimport/config/FiltersConfigBuilder.java | 367 +++++ .../tools/dbimport/config/IncludeColumn.java | 31 + .../tools/dbimport/config/IncludeProcedure.java | 31 + .../tools/dbimport/config/IncludeTable.java | 85 + .../tools/dbimport/config/PatternParam.java | 79 + .../dbimport/config/ReverseEngineering.java | 135 ++ .../config/ReverseEngineeringLoader.java | 31 + .../cayenne/tools/dbimport/config/Schema.java | 65 + .../cayenne/tools/dbimport/config/Type.java | 136 ++ .../tools/dbimport/config/TypeMapper.java | 95 ++ .../src/main/resources/reverseEngineering.xsd | 139 ++ .../templates/v1_2/client-superclass.vm | 7 +- .../templates/v1_2/embeddable-singleclass.vm | 5 +- .../templates/v1_2/embeddable-superclass.vm | 5 +- .../resources/templates/v1_2/singleclass.vm | 19 +- .../main/resources/templates/v1_2/superclass.vm | 7 +- .../cayenne/gen/ClassGenerationActionTest.java | 419 +++-- .../apache/cayenne/gen/ClassGenerationCase.java | 59 + .../gen/ClientSuperClassGenerationTest.java | 86 + .../cayenne/gen/SingleClassGenerationTest.java | 86 + .../cayenne/gen/SuperClassGenerationTest.java | 86 + .../map/naming/DefaultNameGeneratorTest.java | 6 +- .../cayenne/tools/AntDataPortDelegateTest.java | 1 + .../cayenne/tools/DbImporterTaskTest.java | 246 +++ .../cayenne/tools/NamePatternMatcherTest.java | 127 +- .../tools/dbimport/DbImportActionTest.java | 566 ++++--- .../dbimport/DbImportConfigurationTest.java | 193 --- .../dbimport/DbImportDbLoaderDelegateTest.java | 7 - .../DefaultReverseEngineeringLoaderTest.java | 241 +++ .../config/FiltersConfigBuilderTest.java | 383 +++++ .../cayenne/tools/build-catalog-and-schema.xml | 78 + .../org/apache/cayenne/tools/build-catalog.xml | 83 + .../org/apache/cayenne/tools/build-flat.xml | 75 + .../org/apache/cayenne/tools/build-mapping.xml | 44 + ...ild-reverse-engineering-in-external-file.xml | 33 + .../org/apache/cayenne/tools/build-schema.xml | 83 + .../tools/build-skip-primary-key-loading.xml | 37 + .../tools/build-skip-relationships-loading.xml | 37 + .../apache/cayenne/tools/build-table-types.xml | 40 + .../dbimport/build-include-table.map.xml-result | 37 + .../tools/dbimport/build-include-table.xml | 35 + .../tools/dbimport/build-include-table.xml.sql | 38 + .../config/reverseEngineering-ant-mapping.xml | 31 + .../reverseEngineering-catalog-and-schema.xml | 65 + .../config/reverseEngineering-catalog.xml | 68 + .../dbimport/config/reverseEngineering-flat.xml | 61 + .../config/reverseEngineering-maven-mapping.xml | 55 + .../config/reverseEngineering-mixed-mapping.xml | 43 + .../config/reverseEngineering-schema.xml | 69 + ...reverseEngineering-skipPrimaryKeyLoading.xml | 23 + ...erseEngineering-skipRelationshipsLoading.xml | 23 + .../config/reverseEngineering-tableTypes.xml | 29 + docs/doc/pom.xml | 2 +- docs/doc/src/main/resources/KEYS | 39 + docs/doc/src/main/resources/RELEASE-NOTES.txt | 43 +- docs/doc/src/main/resources/UPGRADE.txt | 23 + docs/docbook/cayenne-guide/pom.xml | 2 +- .../src/docbkx/including-cayenne-in-project.xml | 6 + .../src/docbkx/performance-tuning.xml | 10 +- docs/docbook/cayenne-guide/src/docbkx/setup.xml | 4 +- 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/docbook/upgrade-guide/src/docbkx/index.xml | 2 +- .../upgrade-guide/src/docbkx/new-features.xml | 317 ++-- docs/pom.xml | 2 +- itests/cayenne-tools-itest/pom.xml | 2 +- itests/pom.xml | 2 +- modeler/cayenne-modeler-generic-ext/pom.xml | 41 +- modeler/cayenne-modeler-generic/pom.xml | 41 +- modeler/cayenne-modeler-mac-ext/pom.xml | 40 +- modeler/cayenne-modeler-mac-legacy/pom.xml | 40 +- modeler/cayenne-modeler-mac/pom.xml | 38 +- modeler/cayenne-modeler-win/pom.xml | 23 +- modeler/cayenne-modeler/pom.xml | 44 +- .../modeler/CayenneModelerController.java | 11 +- .../cayenne/modeler/ProjectController.java | 30 +- .../apache/cayenne/modeler/ProjectTreeView.java | 59 +- .../modeler/action/CreateObjEntityAction.java | 209 ++- .../cayenne/modeler/action/MigrateAction.java | 2 - .../cayenne/modeler/action/PasteAction.java | 49 +- .../cayenne/modeler/dialog/FindDialog.java | 104 +- .../cayenne/modeler/dialog/LogConsole.java | 23 +- .../cayenne/modeler/dialog/LogConsoleView.java | 69 +- .../dialog/ResolveDbRelationshipDialog.java | 2 +- .../InferRelationshipsController.java | 2 +- .../InferRelationshipsControllerBase.java | 2 +- .../dialog/codegen/CustomModeController.java | 6 + .../modeler/dialog/codegen/CustomModePanel.java | 10 +- .../codegen/CustomPreferencesUpdater.java | 17 +- .../dialog/codegen/StandardModeController.java | 4 +- .../dialog/codegen/StandardModePanel.java | 9 + .../modeler/dialog/datadomain/FilterDialog.java | 31 +- .../dialog/datamap/PackageUpdateController.java | 20 +- .../modeler/dialog/db/DbLoaderHelper.java | 268 +-- .../modeler/dialog/db/DbLoaderMergeDialog.java | 131 -- .../dialog/db/DbLoaderOptionsDialog.java | 76 +- .../modeler/dialog/db/MergerOptions.java | 64 +- .../dialog/objentity/ClassNameUpdater.java | 31 +- .../dialog/objentity/EntitySyncController.java | 32 +- .../dialog/objentity/ObjRelationshipInfo.java | 12 +- .../dialog/pref/DataSourcePreferences.java | 2 +- .../cayenne/modeler/editor/EditorView.java | 9 +- .../ObjEntityAttributeRelationshipTab.java | 14 + .../editor/ObjRelationshipTableModel.java | 2 +- .../modeler/editor/ProcedureTabbedView.java | 14 +- .../modeler/editor/SQLTemplateScriptsTab.java | 54 +- .../DbEntityAttributeRelationshipTab.java | 14 + .../dbentity/DbRelationshipTableModel.java | 2 +- .../cayenne/modeler/pref/DBConnectionInfo.java | 2 +- .../cayenne/modeler/pref/DataMapDefaults.java | 21 +- .../modeler/pref/ProjectStatePreferences.java | 323 ++++ .../modeler/util/NameGeneratorPreferences.java | 14 +- .../modeler/util/StayOpenJCheckBoxMenuItem.java | 56 + .../util/state/AttributeDisplayEventType.java | 107 ++ .../util/state/DataMapDisplayEventType.java | 58 + .../util/state/DataNodeDisplayEventType.java | 55 + .../modeler/util/state/DisplayEventType.java | 76 + .../modeler/util/state/DisplayEventTypes.java | 198 +++ .../util/state/DomainDisplayEventType.java | 49 + .../EmbeddableAttributeDisplayEventType.java | 98 ++ .../util/state/EmbeddableDisplayEventType.java | 62 + .../util/state/EntityDisplayEventType.java | 84 + .../state/MultipleObjectsDisplayEventType.java | 166 ++ .../util/state/ProcedureDisplayEventType.java | 63 + .../ProcedureParameterDisplayEventType.java | 93 ++ .../modeler/util/state/ProjectStateUtil.java | 72 + .../util/state/QueryDisplayEventType.java | 62 + .../state/RelationshipDisplayEventType.java | 107 ++ .../apache/cayenne/modeler/images/popupmenu.gif | Bin 0 -> 285 bytes modeler/cayenne-wocompat/pom.xml | 39 +- .../cayenne/wocompat/EOModelProcessor.java | 4 +- modeler/pom.xml | 2 +- plugins/maven-cayenne-modeler-plugin/pom.xml | 40 +- plugins/maven-cayenne-plugin/pom.xml | 130 +- .../cayenne/tools/CayenneGeneratorMojo.java | 62 +- .../apache/cayenne/tools/DbGeneratorMojo.java | 24 +- .../apache/cayenne/tools/DbImporterMojo.java | 352 ++-- .../tools/DbImporterMojoConfigurationTest.java | 102 ++ .../cayenne/tools/DbImporterMojoTest.java | 367 ++++- .../org/apache/cayenne/tools/DerbyManager.java | 63 + .../org/apache/cayenne/tools/config/pom-01.xml | 99 ++ .../tools/config/pom-catalog-and-schema.xml | 82 + .../apache/cayenne/tools/config/pom-catalog.xml | 85 + .../tools/config/pom-default-package.xml | 36 + .../apache/cayenne/tools/config/pom-flat.xml | 78 + .../apache/cayenne/tools/config/pom-mapping.xml | 67 + .../cayenne/tools/config/pom-schema-2.xml | 41 + .../apache/cayenne/tools/config/pom-schema.xml | 85 + .../config/pom-skip-primary-key-loading.xml | 39 + .../config/pom-skip-relationships-loading.xml | 39 + .../cayenne/tools/config/pom-table-types.xml | 41 + .../tools/dbimport/testDefaultPackage-pom.xml | 42 + .../dbimport/testDefaultPackage.map.xml-result | 52 + .../tools/dbimport/testDefaultPackage.sql | 40 + .../dbimport/testFilteringWithSchema-pom.xml | 41 + .../testFilteringWithSchema.map.xml-result | 51 + .../tools/dbimport/testFilteringWithSchema.sql | 64 + .../dbimport/testImportAddTableAndColumn.sql | 17 + .../tools/dbimport/testImportNewDataMap.sql | 17 + .../tools/dbimport/testImportWithoutChanges.sql | 17 + .../testOldParamsSchemasAndTableExclude-pom.xml | 43 + ...dParamsSchemasAndTableExclude.map.xml-result | 37 + .../testOldParamsSchemasAndTableExclude.sql | 64 + .../cayenne/tools/dbimport/testOneToOne-pom.xml | 39 + .../tools/dbimport/testOneToOne.map.xml-result | 58 + .../cayenne/tools/dbimport/testOneToOne.sql | 41 + .../dbimport/testPreserveRelationships-pom.xml | 44 + .../dbimport/testPreserveRelationships.map.xml | 44 + .../testPreserveRelationships.map.xml-result | 34 + .../dbimport/testPreserveRelationships.sql | 28 + .../dbimport/testSchemasAndTableExclude-pom.xml | 45 + .../testSchemasAndTableExclude.map.xml-result | 38 + .../dbimport/testSchemasAndTableExclude.sql | 64 + .../tools/dbimport/testSimpleFiltering-pom.xml | 41 + .../dbimport/testSimpleFiltering.map.xml-result | 37 + .../tools/dbimport/testSimpleFiltering.sql | 37 + .../dbimport/testSkipPrimaryKeyLoading-pom.xml | 43 + .../dbimport/testSkipPrimaryKeyLoading.map.xml | 35 + .../testSkipPrimaryKeyLoading.map.xml-result | 41 + .../dbimport/testSkipPrimaryKeyLoading.sql | 30 + .../testSkipRelationshipsLoading-pom.xml | 43 + .../testSkipRelationshipsLoading.map.xml | 55 + .../testSkipRelationshipsLoading.map.xml-result | 55 + .../dbimport/testSkipRelationshipsLoading.sql | 36 + ...SupportsCatalogsOnReverseEngineering-pom.xml | 41 + ...SupportsCatalogsOnReverseEngineering.map.xml | 25 + .../tools/dbimport/testTableTypes-pom.xml | 43 + .../dbimport/testTableTypes.map.xml-result | 29 + .../cayenne/tools/dbimport/testTableTypes.sql | 25 + .../dbimport/testUnFlattensManyToMany-pom.xml | 40 + .../dbimport/testUnFlattensManyToMany.map.xml | 55 + .../testUnFlattensManyToMany.map.xml-result | 88 + .../tools/dbimport/testUnFlattensManyToMany.sql | 64 + .../tools/dbimport/testViewsExclude-pom.xml | 41 + .../dbimport/testViewsExclude.map.xml-result | 43 + .../cayenne/tools/dbimport/testViewsExclude.sql | 30 + plugins/pom.xml | 45 +- pom.xml | 355 ++-- rat.sh | 1 + tutorials/pom.xml | 5 +- tutorials/tutorial-rop-client/pom.xml | 36 +- .../tutorial/persistent/client/Main.java | 2 +- tutorials/tutorial-rop-server/pom.xml | 37 +- tutorials/tutorial/pom.xml | 21 +- .../java/org/apache/cayenne/tutorial/Main.java | 8 +- 584 files changed, 34865 insertions(+), 18457 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/d37f217f/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 6037f2d,35de260..1f38a05 --- a/pom.xml +++ b/pom.xml @@@ -61,8 -63,8 +63,9 @@@ <module>tutorials</module> <module>docs</module> <module>assembly</module> + <module>cayenne-joda</module> - </modules> + <module>cayenne-java8</module> + </modules> <issueManagement> <system>jira</system> <url>http://issues.apache.org/cayenne/</url>
