You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/09/19 00:50:29 UTC
[24/24] usergrid git commit: Merge branch 'two-dot-o-dev' into
usergrid-103-upgrade-jersey
Merge branch 'two-dot-o-dev' into usergrid-103-upgrade-jersey
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a2389e6d
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a2389e6d
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a2389e6d
Branch: refs/heads/usergrid-103-upgrade-jersey
Commit: a2389e6dc20aefeeae6eb335f36bd6f450597cac
Parents: 6ea6685 327ccc6
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Sep 18 18:49:09 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Fri Sep 18 18:49:09 2015 -0400
----------------------------------------------------------------------
.../usergrid/corepersistence/CoreModule.java | 51 +++-
.../corepersistence/CpRelationManager.java | 23 +-
.../asyncevents/AsyncEventService.java | 2 +
.../migration/CoreMigration.java | 45 +---
.../migration/CoreMigrationPlugin.java | 38 ++-
.../migration/DeDupConnectionDataMigration.java | 93 ++++++++
.../migration/EntityTypeMappingMigration.java | 104 --------
.../migration/MigrationModuleVersionPlugin.java | 5 -
.../corepersistence/migration/Versions.java | 31 ---
.../builder/PipelineBuilderFactory.java | 3 +
.../service/ConnectionScope.java | 53 +++++
.../service/ConnectionService.java | 10 +
.../service/ConnectionServiceImpl.java | 89 ++++++-
.../corepersistence/util/CpNamingUtils.java | 13 +-
.../corepersistence/TestCoreModule.java | 34 +++
.../DeDupConnectionDataMigrationTest.java | 145 ++++++++++++
.../migration/EntityTypeMappingMigrationIT.java | 125 ----------
.../service/ConnectionServiceImplTest.java | 235 +++++++++++++++++++
stack/core/src/test/resources/log4j.properties | 6 +-
.../serialization/impl/SerializationModule.java | 4 +-
.../migration/CollectionMigrationPlugin.java | 8 +-
.../migration/MvccEntityDataMigrationImpl.java | 10 +-
...ctMvccEntityDataMigrationV1ToV3ImplTest.java | 39 +--
.../migration/data/AbstractMigrationPlugin.java | 17 +-
.../core/migration/data/DataMigration.java | 11 +-
.../migration/data/MigrationDataProvider.java | 2 +-
.../core/migration/data/MigrationPlugin.java | 4 +-
.../migration/schema/MigrationManagerFig.java | 1 +
.../migration/data/TestProgressObserver.java | 10 +-
.../persistence/graph/guice/GraphModule.java | 4 +-
.../graph/impl/GraphManagerImpl.java | 4 +-
.../impl/stage/EdgeDeleteListenerImpl.java | 4 +-
.../graph/impl/stage/EdgeDeleteRepairImpl.java | 61 ++---
.../impl/TargetIdObservableImpl.java | 13 +-
.../impl/migration/EdgeDataMigrationImpl.java | 12 +-
.../impl/migration/GraphMigrationPlugin.java | 8 +-
.../impl/shard/impl/EdgeSearcher.java | 14 +-
.../impl/ShardedEdgeSerializationImpl.java | 59 +++--
.../shard/impl/serialize/EdgeSerializer.java | 21 +-
.../persistence/graph/GraphManagerIT.java | 73 +++++-
.../migration/EdgeDataMigrationImplTest.java | 59 +++--
.../persistence/index/CandidateResult.java | 32 ++-
.../persistence/index/CandidateResults.java | 34 ++-
.../SearchRequestBuilderStrategyV2.java | 30 +--
.../usergrid/persistence/index/IndexEdge.java | 36 +--
.../index/IndexLocationStrategy.java | 30 +--
.../persistence/index/IndexRefreshCommand.java | 30 +--
.../usergrid/persistence/index/SearchType.java | 30 +--
.../usergrid/persistence/index/SearchTypes.java | 32 +--
.../persistence/index/SelectFieldMapping.java | 36 +--
.../persistence/index/guice/IndexModule.java | 4 +-
.../persistence/index/impl/EntityField.java | 32 ++-
.../index/impl/EntityMappingParser.java | 37 ++-
.../index/impl/EsEntityIndexFactoryImpl.java | 29 ++-
.../index/impl/EsIndexBufferConsumerImpl.java | 28 +--
.../index/impl/EsIndexCacheImpl.java | 29 ++-
.../persistence/index/impl/EsQueryVistor.java | 50 ++--
.../persistence/index/impl/FailureMonitor.java | 30 ++-
.../index/impl/FailureMonitorImpl.java | 32 +--
.../persistence/index/impl/FieldParser.java | 36 +--
.../persistence/index/impl/GeoSortFields.java | 36 +--
.../index/impl/IndexBufferConsumer.java | 28 +--
.../persistence/index/impl/IndexCache.java | 30 +--
.../persistence/index/impl/IndexEdgeImpl.java | 36 +--
.../index/impl/IndexIdentifierv2Impl.java | 30 +--
.../index/impl/IndexRefreshCommandImpl.java | 30 +--
.../index/impl/NoOpFilterBuilder.java | 32 ++-
.../index/impl/NoOpQueryBuilder.java | 32 ++-
.../impl/SearchRequestBuilderStrategy.java | 30 +--
.../persistence/index/impl/SortBuilder.java | 36 +--
.../EsIndexMappingMigrationPlugin.java | 30 ++-
.../index/migration/EsIndexMigrationPlugin.java | 8 +-
.../index/migration/IndexDataVersions.java | 30 +--
.../persistence/index/query/ParsedQuery.java | 36 +--
.../index/query/ParsedQueryBuilder.java | 36 +--
.../persistence/index/query/SortPredicate.java | 36 +--
.../persistence/index/usergrid-mappings.json | 5 -
.../persistence/index/impl/EntityIndexTest.java | 13 +-
.../index/impl/EntityToMapConverterTest.java | 38 +--
.../impl/EsIndexMappingMigrationPluginTest.java | 30 +--
.../persistence/index/impl/EsRunner.java | 32 +--
.../persistence/index/impl/GeoPagingTest.java | 36 +--
.../index/impl/TestIndexIdentifier.java | 30 +--
.../management/AppInfoMigrationPlugin.java | 234 +++++++++---------
.../org/apache/usergrid/tools/ExportAdmins.java | 17 +-
85 files changed, 1773 insertions(+), 1298 deletions(-)
----------------------------------------------------------------------