cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject [28/30] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/247' into asf-master
Date Thu, 07 Dec 2017 10:09:57 GMT
Merge remote-tracking branch 'remotes/parent/pr/247' into asf-master

# Conflicts:
#	docs/doc/src/main/resources/RELEASE-NOTES.txt
#	docs/doc/src/main/resources/UPGRADE.txt


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

Branch: refs/heads/master
Commit: 9e768dbcb61521ee9858792b52af8d96bbf3c857
Parents: 59d9304 6b299bc
Author: Nikita Timofeev <stariy95@gmail.com>
Authored: Thu Dec 7 12:23:36 2017 +0300
Committer: Nikita Timofeev <stariy95@gmail.com>
Committed: Thu Dec 7 12:23:36 2017 +0300

----------------------------------------------------------------------
 assembly/pom.xml                                |   6 -
 .../cayenne/tools/AntDataPortDelegate.java      | 170 --------
 .../org/apache/cayenne/tools/DataPortTask.java  | 209 ----------
 .../org/apache/cayenne/tools/antlib.xml         |   1 -
 .../cayenne/tools/AntDataPortDelegateTest.java  |  53 ---
 .../invalidation/InvalidationFunction.java      |   2 +-
 .../rop/client/ClientLocalRuntime.java          |  78 ----
 .../configuration/rop/client/ClientModule.java  |  26 --
 .../configuration/rop/client/ClientRuntime.java |  49 ---
 .../rop/client/ClientRuntimeBuilder.java        |   2 +-
 .../CayenneContextWithDataContextIT.java        |   5 -
 .../access/ClientServerChannelQueryIT.java      |   7 -
 .../rop/client/ClientModuleTest.java            |  46 +--
 .../rop/client/ClientRuntimeBuilderTest.java    |  59 +++
 .../rop/client/ClientRuntimeTest.java           |  71 +---
 .../apache/cayenne/query/NamedQueryTest.java    |  43 --
 .../dbsync/filter/NamePatternMatcher.java       |  34 --
 .../dbsync/reverse/dbload/DbLoaderDelegate.java |  11 -
 .../reverse/dbload/DefaultDbLoaderDelegate.java |  11 -
 .../main/java/org/apache/cayenne/di/Binder.java |  24 --
 .../apache/cayenne/di/spi/DefaultBinder.java    |  14 -
 .../di/spi/DefaultInjectorInjectionTest.java    |  29 --
 cayenne-java8/pom.xml                           |  92 -----
 .../cayenne/java8/CayenneJava8Module.java       |  28 --
 .../org/apache/cayenne/java8/Java8Module.java   |  42 --
 .../java8/Java8ServerModuleProvider.java        |  48 ---
 ...iguration.server.CayenneServerModuleProvider |  20 -
 .../cayenne/java8/Java8ModuleProviderTest.java  |  32 --
 .../apache/cayenne/jcache/JCacheQueryCache.java |   6 -
 .../cayenne/lifecycle/audit/Auditable.java      |  47 ---
 .../lifecycle/audit/AuditableAggregator.java    |  72 ----
 .../cayenne/lifecycle/audit/AuditableChild.java |  62 ---
 .../audit/AuditableEntityDescriptor.java        |  82 ----
 .../lifecycle/audit/AuditableFilter.java        | 247 ------------
 .../lifecycle/audit/AuditableOperation.java     |  32 --
 .../lifecycle/audit/AuditableProcessor.java     |  45 ---
 .../cayenne/lifecycle/changeset/ChangeSet.java  |  47 ---
 .../lifecycle/changeset/ChangeSetFilter.java    |  74 ----
 .../lifecycle/changeset/GenericChangeSet.java   | 137 -------
 .../lifecycle/changeset/PropertyChange.java     |  54 ---
 .../cayenne/lifecycle/id/StringIdQuery.java     |  33 --
 .../cayenne/lifecycle/sort/SortWeight.java      |  49 ---
 .../sort/WeightedAshwoodEntitySorter.java       |  44 --
 .../lifecycle/audit/AuditableFilterIT.java      | 250 ------------
 .../lifecycle/audit/AuditableFilterTest.java    | 184 ---------
 .../lifecycle/audit/MockAuditableChild.java     |  26 --
 .../apache/cayenne/lifecycle/db/Auditable1.java |  29 --
 .../apache/cayenne/lifecycle/db/Auditable2.java |  29 --
 .../cayenne/lifecycle/db/AuditableChild1.java   |  27 --
 .../cayenne/lifecycle/db/AuditableChild2.java   |  25 --
 .../cayenne/lifecycle/db/AuditableChild3.java   |  27 --
 .../lifecycle/db/AuditableChildUuid.java        |  30 --
 .../apache/cayenne/lifecycle/db/SortRoot.java   |   2 -
 .../cayenne/lifecycle/db/auto/_Auditable1.java  |  43 --
 .../cayenne/lifecycle/db/auto/_Auditable2.java  |  51 ---
 .../lifecycle/db/auto/_AuditableChild1.java     |  38 --
 .../lifecycle/db/auto/_AuditableChild2.java     |  38 --
 .../lifecycle/db/auto/_AuditableChild3.java     |  46 ---
 .../lifecycle/db/auto/_AuditableChildUuid.java  |  43 --
 .../sort/WeightedAshwoodEntitySorterTest.java   |  72 ----
 .../lifecycle/unit/AuditableServerCase.java     |  83 ----
 .../src/test/resources/lifecycle-map.map.xml    |  76 ----
 .../cayenne/project/CayenneProjectModule.java   |  27 --
 .../org/apache/cayenne/access/DataDomain.java   |  12 -
 .../apache/cayenne/access/DataDomainQuery.java  |  16 -
 .../org/apache/cayenne/access/DataNode.java     |  20 -
 .../org/apache/cayenne/access/DataPort.java     | 324 ---------------
 .../apache/cayenne/access/DataPortDelegate.java |  77 ----
 .../org/apache/cayenne/access/DataRowStore.java |  49 ---
 .../access/ObjectsFromDataRowsQuery.java        |  16 -
 .../org/apache/cayenne/access/Transaction.java  |  56 ---
 .../cayenne/access/jdbc/JDBCResultIterator.java |  21 -
 .../apache/cayenne/cache/EhCacheQueryCache.java | 210 ----------
 .../apache/cayenne/cache/NestedQueryCache.java  |  11 -
 .../org/apache/cayenne/cache/OSQueryCache.java  | 401 -------------------
 .../org/apache/cayenne/cache/QueryCache.java    |  11 +-
 .../cayenne/configuration/CayenneRuntime.java   |  16 -
 .../apache/cayenne/configuration/Constants.java |  63 ---
 .../server/DataDomainProvider.java              |   1 -
 .../server/DefaultDataNodeFactory.java          |   2 -
 .../configuration/server/ServerModule.java      |  28 --
 .../configuration/server/ServerRuntime.java     |  47 ---
 .../server/ServerRuntimeBuilder.java            |  28 +-
 .../cayenne/datasource/DriverDataSource.java    | 110 -----
 .../org/apache/cayenne/dba/AutoAdapter.java     |   9 -
 .../java/org/apache/cayenne/dba/DbAdapter.java  |   7 -
 .../cayenne/dba/DefaultQuotingStrategy.java     |  15 -
 .../org/apache/cayenne/dba/JdbcAdapter.java     |  29 --
 .../org/apache/cayenne/dba/QuotingStrategy.java |  15 -
 .../java/org/apache/cayenne/exp/Expression.java |  73 ----
 .../java/org/apache/cayenne/exp/Property.java   |  13 -
 .../cayenne/exp/parser/JavaCharStream.java      |  18 -
 .../apache/cayenne/exp/parser/SimpleNode.java   |  27 --
 .../log/FormattedSlf4jJdbcEventLogger.java      |  12 -
 .../org/apache/cayenne/log/JdbcEventLogger.java |  55 ---
 .../apache/cayenne/log/NoopJdbcEventLogger.java |  40 --
 .../cayenne/log/Slf4jJdbcEventLogger.java       | 237 -----------
 .../java/org/apache/cayenne/map/DataMap.java    |  75 ----
 .../cayenne/map/EJBQLQueryDescriptor.java       |   2 -
 .../java/org/apache/cayenne/map/Embeddable.java |  19 -
 .../org/apache/cayenne/map/EntityListener.java  |  79 ----
 .../cayenne/map/EntityListenerFactory.java      |  44 --
 .../org/apache/cayenne/map/EntityResolver.java  | 114 ------
 .../java/org/apache/cayenne/map/ObjEntity.java  | 121 ------
 .../cayenne/map/ProcedureQueryDescriptor.java   |   2 -
 .../cayenne/map/SQLTemplateDescriptor.java      |   2 -
 .../cayenne/map/SelectQueryDescriptor.java      |   2 -
 .../org/apache/cayenne/query/AbstractQuery.java |  44 +-
 .../apache/cayenne/query/BaseQueryMetadata.java |  35 +-
 .../org/apache/cayenne/query/BatchQuery.java    |  43 --
 .../apache/cayenne/query/CacheableQuery.java    |  53 ---
 .../cayenne/query/DefaultQueryMetadata.java     |  17 -
 .../org/apache/cayenne/query/EJBQLQuery.java    |  31 --
 .../cayenne/query/EJBQLQueryMetadata.java       |   2 +-
 .../org/apache/cayenne/query/FluentSelect.java  |   3 +-
 .../org/apache/cayenne/query/IndirectQuery.java |  28 --
 .../org/apache/cayenne/query/NamedQuery.java    | 294 --------------
 .../cayenne/query/ProcedureQueryMetadata.java   |   2 +-
 .../java/org/apache/cayenne/query/Query.java    |  17 -
 .../org/apache/cayenne/query/QueryChain.java    |  35 --
 .../org/apache/cayenne/query/QueryMetadata.java |  20 -
 .../cayenne/query/QueryMetadataProxy.java       |  12 -
 .../cayenne/query/QueryMetadataWrapper.java     |  10 -
 .../org/apache/cayenne/query/RefreshQuery.java  |  18 -
 .../cayenne/query/SQLTemplateMetadata.java      |   2 +-
 .../org/apache/cayenne/query/SelectQuery.java   |   2 +-
 .../cayenne/query/SelectQueryMetadata.java      |   2 +-
 .../reflect/LifecycleCallbackRegistry.java      |   8 -
 .../apache/cayenne/remote/IncrementalQuery.java |  14 -
 .../cayenne/remote/IncrementalSelectQuery.java  |  31 --
 .../org/apache/cayenne/remote/RangeQuery.java   |  22 -
 .../apache/cayenne/remote/RemoteSession.java    |  32 --
 .../resource/ClassLoaderResourceLocator.java    |  22 -
 .../DataContextQueryCachingEhCacheIT.java       |  60 ---
 .../DataContextQueryCachingOSCacheIT.java       |  48 ---
 .../org/apache/cayenne/access/DataNodeIT.java   |   9 -
 .../org/apache/cayenne/access/MockDataNode.java |  10 -
 .../cayenne/cache/EhCacheQueryCacheTest.java    | 132 ------
 .../cache/EhCacheQueryCache_WithConfigTest.java |  90 -----
 .../apache/cayenne/cache/OSQueryCacheTest.java  | 138 -------
 .../server/DataDomainProviderTest.java          |   2 -
 .../configuration/server/ServerRuntimeTest.java |  40 +-
 .../exp/Expression_ParamsLegacyTest.java        |  92 -----
 .../org/apache/cayenne/exp/PropertyTest.java    |   9 -
 .../cayenne/log/Slf4jJdbcEventLoggerTest.java   |  10 -
 .../apache/cayenne/map/MockEntityResolver.java  |   6 -
 .../cayenne/map/MockMappingNamespace.java       |   4 -
 .../cayenne/map/SQLTemplateDescriptorTest.java  |   8 -
 .../cayenne/map/SelectQueryDescriptorTest.java  |   9 -
 .../apache/cayenne/query/ColumnSelectIT.java    |  13 -
 .../org/apache/cayenne/query/EJBQLQueryIT.java  |  10 -
 .../apache/cayenne/query/MockAbstractQuery.java |   4 -
 .../org/apache/cayenne/query/MockQuery.java     |  10 -
 .../apache/cayenne/query/MockQueryMetadata.java |  10 -
 .../apache/cayenne/query/NamedQueryTest.java    |  83 ----
 .../cayenne/query/ObjectSelect_CompileIT.java   |   3 -
 .../cayenne/query/ProcedureQueryCacheKeyIT.java |   2 -
 .../cayenne/query/SQLTemplateCacheKeyIT.java    |   2 -
 .../cayenne/query/SQLTemplate_LegacyTest.java   |   6 -
 .../cayenne/query/SelectQueryCacheKeyIT.java    |  28 +-
 .../apache/cayenne/query/SelectQueryTest.java   |  11 -
 .../cayenne/testdo/mt/ClientMultiTier.java      |  36 --
 .../org/apache/cayenne/testdo/mt/MultiTier.java |  36 --
 .../testdo/mt/auto/_ClientMultiTier.java        |  44 --
 .../cayenne/testdo/mt/auto/_MultiTier.java      |  44 --
 .../apache/cayenne/testdo/testmap/Tstmap.java   |  36 --
 .../cayenne/testdo/testmap/auto/_Tstmap.java    | 118 ------
 .../unit/di/server/ServerRuntimeProvider.java   |   9 +-
 .../apache/cayenne/unit/jira/CAY_743Test.java   |   9 +-
 docs/doc/src/main/resources/RELEASE-NOTES.txt   |   1 +
 docs/doc/src/main/resources/UPGRADE.txt         |   2 +
 .../apache/cayenne/tools/DbGeneratorMojo.java   |  11 -
 .../apache/cayenne/tools/DbImporterMojo.java    |  54 ---
 .../cayenne/tools/OldReverseEngineering.java    |  93 -----
 .../java/org/apache/cayenne/modeler/Main.java   |   2 +-
 .../modeler/util/state/DisplayEventType.java    |   5 +-
 .../apache/cayenne/wocompat/EOModelHelper.java  |  10 -
 .../cayenne/wocompat/EOModelProcessor.java      |  24 --
 .../org/apache/cayenne/wocompat/EOQuery.java    |  10 +-
 .../wocompat/parser/SimpleCharStream.java       |  18 -
 .../apache/cayenne/wocompat/EOQueryTest.java    |   1 -
 pom.xml                                         |   1 -
 .../apache/cayenne/tutorial/Http2Client.java    |   9 +-
 .../tutorial/persistent/client/Main.java        |   4 +-
 184 files changed, 125 insertions(+), 8018 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/9e768dbc/assembly/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cayenne/blob/9e768dbc/cayenne-server/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cayenne/blob/9e768dbc/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt
index 6b2313b,deb9ec4..e4f1ced
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@@ -13,7 -13,7 +13,8 @@@ Date
  ----------------------------------
  Changes/New Features:
  
 +CAY-2372 Extract new modules from cayenne-server
+ CAY-2377 Cleanup deprecated code.
  
  Bug Fixes:
  

http://git-wip-us.apache.org/repos/asf/cayenne/blob/9e768dbc/docs/doc/src/main/resources/UPGRADE.txt
----------------------------------------------------------------------
diff --cc docs/doc/src/main/resources/UPGRADE.txt
index 07fc3ec,877b4be..266c5ab
--- a/docs/doc/src/main/resources/UPGRADE.txt
+++ b/docs/doc/src/main/resources/UPGRADE.txt
@@@ -6,13 -6,41 +6,15 @@@ IMPORTANT: be sure to read all notes fo
  -------------------------------------------------------------------------------
  UPGRADING TO 4.1.M2
  
+ * Per CAY-2377 Cleanup deprecated code
 -      Per CAY-2377 Cleanup deprecated code
 -            - Cleanup JdbcEventLogger and implementations.
 -            - Remove getName(), setName(String name), getDataMap(), setDataMap(DataMap dataMap)
from org.apache.cayenne.query.Query and from implementations.
 -            - Cleanup org.apache.cayenne.map.*.
 -            - Remove getQuotingStrategy(boolean isQuoteStrategy) from org.apache.cayenne.dba.DbAdapter,
from org.apache.cayenne.dba.QuotingStrategy
 -            and from implementations.
 -            - Remove getCacheGroups(), getOrginatingQuery() from org.apache.cayenne.query.QueryMetadata
and from implementations.
 -            - Remove getCacheGroups(), useSharedCache(String... cacheGroups), setCacheGroups(String...
cacheGroups) from org.aapche.cayenne.query.QueryMetadata and from implementations.
 -            - Cleanup org.apache.cayenne.cache.EhCacheQueryCache and org.apache.cayenne.cache.NestedQueryCache.
 -            - Cleanup org.apache.cayenne.access.*.
 -            - Cleanup org.apache.cayenne.exp.*.
 -            - Cleanup org.apache.cayenne.wocompat.*.
 -            - Remove objEntityAdded(ObjEntity entity) and objEntityRemoved(ObjEntity entity)
from org.apache.cayenne.dbsync.reverse.DbLoaderDelegate and from implementations.
 -            - Cleanup org.apache.cayenne.tools.DbGeneratorMojo.
 -            - Remove bindList(String bindingName) and bindMap(String bindingName) from org.apache.cayenne.di.Binder
and from implementations.
 -            - Cleanup org.apache.cayenne.configuration.*.
+ 
 -            Was removed
 -            - java-8 module
 -            - org.apache.cayenne.lifecycle.audit
 -            - org.apache.cayenne.lifecycle.changeset
 -            - org.apache.cayenne.lifecycle.sort.SortWeight
 -            - org.apache.cayenne.lifecycle.sort.WeightedAshwoodEntitySorter
 -            - org.apache.cayenne.tools.OldReverseEngineering
 -            - org.apache.cayenne.tools.AntDataPortDelegate
 -            - org.apache.cayenne.tools.DataPortTask
 -            - org.apache.cayenne.access.DataPort
 -            - org.apache.cayenne.access.DataPortDelegate
 -            - org.apache.cayenne.cache.invalidation.InvalidationFunction
 -            - org.apache.cayenne.cache.OSQueryCache
 -            - org.apache.cayenne.cache.EhCacheQueryCache
 -            - org.apache.cayenne.query.NamedQuery
 -            - org.apache.cayenne.project.CayenneProjectModule
 +* Per CAY-2372 three new modules extracted from Cayenne core. No changes to the packages
or api have been made,
 +    so you should only include additional module to your project (if it where used).
  
 +    - cayenne-web module contains all logic related to bootstrapping Cayenne inside servlet
container.
 +      WebModule is autoloaded, so you shouldn't add it to runtime explicitly anymore.
 +    - cayenne-osgi module contains OSGi related functionality.
 +    - cayenne-rop-server ROP server part.
  
  UPGRADING TO 4.1.M1
  

http://git-wip-us.apache.org/repos/asf/cayenne/blob/9e768dbc/pom.xml
----------------------------------------------------------------------


Mime
View raw message