usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdun...@apache.org
Subject [39/44] usergrid git commit: Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-933
Date Sat, 26 Sep 2015 01:42:44 GMT
Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-933


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

Branch: refs/heads/USERGRID-933
Commit: bd0f10b4a457bf1aff01de48f1302e3951448344
Parents: c035fb4 8281430
Author: Mike Dunker <mdunker@apache.org>
Authored: Wed Sep 23 12:44:13 2015 -0700
Committer: Mike Dunker <mdunker@apache.org>
Committed: Wed Sep 23 12:44:13 2015 -0700

----------------------------------------------------------------------
 .../creating-and-managing-notifications.md      |   2 +
 portal/bower.json                               |   2 +-
 portal/js/libs/usergrid.sdk.js                  |   8 +-
 portal/package.json                             |   2 +-
 .../usergrid/corepersistence/CoreModule.java    |  51 +++-
 .../corepersistence/CpRelationManager.java      |  34 ++-
 .../asyncevents/AmazonAsyncEventService.java    |   6 +-
 .../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 +
 .../rx/impl/AllApplicationsObservableImpl.java  |  36 +--
 .../service/ConnectionScope.java                |  53 ++++
 .../service/ConnectionService.java              |  10 +
 .../service/ConnectionServiceImpl.java          |  90 +++++-
 .../corepersistence/util/CpNamingUtils.java     |  13 +-
 .../persistence/entities/Notification.java      |  13 +-
 .../corepersistence/CpEntityMapUtilsTest.java   |  52 +++-
 .../corepersistence/TestCoreModule.java         |  34 +++
 .../DeDupConnectionDataMigrationTest.java       | 145 +++++++++
 .../migration/EntityTypeMappingMigrationIT.java | 125 --------
 .../service/ConnectionServiceImplTest.java      | 235 +++++++++++++++
 .../org/apache/usergrid/persistence/GeoIT.java  |  52 +++-
 stack/core/src/test/resources/log4j.properties  |   6 +-
 .../serialization/impl/SerializationModule.java |   4 +-
 .../migration/CollectionMigrationPlugin.java    |   8 +-
 .../migration/MvccEntityDataMigrationImpl.java  | 104 ++++---
 ...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 ++--
 stack/corepersistence/model/pom.xml             |   6 +-
 .../model/entity/MapToEntityConverter.java      |  64 ++--
 .../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 +-
 .../queue/impl/QueueManagerFactoryImpl.java     |  16 +-
 .../rest/applications/ApplicationResource.java  |  11 +-
 .../exceptions/AbstractExceptionMapper.java     |  13 +-
 .../applications/ApplicationResourceIT.java     |  12 +
 .../users/ConnectionResourceTest.java           | 302 ++++++++++++++-----
 stack/scripts/migrate_entity_data.py            |  17 ++
 .../management/AppInfoMigrationPlugin.java      | 234 +++++++-------
 .../services/AbstractConnectionsService.java    |  43 ++-
 .../notifications/apns/APNsNotification.java    |   8 +-
 .../services/notifications/gcm/GCMAdapter.java  |   9 +-
 .../services/notifications/wns/WNSAdapter.java  |  13 +-
 .../apns/NotificationsServiceIT.java            |   1 +
 .../gcm/NotificationsServiceIT.java             |   1 +
 107 files changed, 2360 insertions(+), 1489 deletions(-)
----------------------------------------------------------------------



Mime
View raw message