Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/asf/usergrid into release-2.1.1
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/c4f72ef1 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/c4f72ef1 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/c4f72ef1 Branch: refs/heads/usergrid-1268-akka-211 Commit: c4f72ef14b4005f7ac7316e43e84ae048054203a Parents: cb90c0b e982ba4 Author: Dave Johnson <[email protected]> Authored: Fri Jun 24 14:31:29 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Fri Jun 24 14:31:29 2016 -0400 ---------------------------------------------------------------------- deployment/pcf/LICENSE | 201 ++++++++ deployment/pcf/README.md | 44 ++ deployment/pcf/addBlobs.sh | 25 + deployment/pcf/apache-usergrid-tile-1.6.yml | 510 +++++++++++++++++++ deployment/pcf/config/blobs.yml | 19 + deployment/pcf/config/final.yml | 24 + deployment/pcf/content_migrations.yml | 53 ++ deployment/pcf/createRelease.sh | 24 + deployment/pcf/createTile.sh | 32 ++ deployment/pcf/jobs/delete-all/monit | 17 + deployment/pcf/jobs/delete-all/spec | 44 ++ .../jobs/delete-all/templates/delete-all.sh.erb | 131 +++++ deployment/pcf/jobs/deploy-all/monit | 18 + deployment/pcf/jobs/deploy-all/spec | 145 ++++++ .../jobs/deploy-all/templates/deploy-all.sh.erb | 384 ++++++++++++++ .../pcf/jobs/docker-bosh-cassandra_docker/monit | 23 + .../pcf/jobs/docker-bosh-cassandra_docker/spec | 26 + .../docker-bosh-cassandra_docker.sh.erb | 69 +++ .../jobs/docker-bosh-elasticsearch_docker/monit | 23 + .../jobs/docker-bosh-elasticsearch_docker/spec | 26 + .../docker-bosh-elasticsearch_docker.sh.erb | 69 +++ .../pcf/packages/cassandra_docker/packaging | 26 + deployment/pcf/packages/cassandra_docker/spec | 26 + deployment/pcf/packages/cf_cli/packaging | 26 + deployment/pcf/packages/cf_cli/spec | 25 + deployment/pcf/packages/common/packaging | 23 + deployment/pcf/packages/common/spec | 25 + .../pcf/packages/elasticsearch_docker/packaging | 26 + .../pcf/packages/elasticsearch_docker/spec | 26 + deployment/pcf/packages/usergrid_app/packaging | 27 + deployment/pcf/packages/usergrid_app/spec | 27 + deployment/pcf/run.sh | 25 + deployment/pcf/src/common/utils.sh | 107 ++++ deployment/pcf/src/templates/all_open.json | 6 + deployment/pcf/src/usergrid_app/manifest.yml | 22 + .../main/resources/usergrid-default.properties | 4 + .../corepersistence/CpEntityManager.java | 38 +- .../corepersistence/CpRelationManager.java | 32 +- .../corepersistence/EntityManagerFig.java | 2 +- .../asyncevents/AsyncEventService.java | 6 +- .../asyncevents/AsyncEventServiceImpl.java | 45 +- .../asyncevents/EventBuilder.java | 6 +- .../asyncevents/EventBuilderImpl.java | 46 +- .../model/DeIndexOldVersionsEvent.java | 12 +- .../corepersistence/index/IndexService.java | 23 +- .../corepersistence/index/IndexServiceImpl.java | 86 ++-- .../pipeline/cursor/CursorSerializerUtil.java | 9 - .../pipeline/cursor/RequestCursor.java | 29 +- .../usergrid/persistence/EntityManager.java | 2 +- .../persistence/entities/Notification.java | 38 +- .../collection/EntityCollectionManager.java | 13 +- .../impl/EntityCollectionManagerImpl.java | 72 ++- .../mvcc/stage/write/WriteUniqueVerify.java | 44 +- .../serialization/SerializationFig.java | 5 + .../UniqueValueSerializationStrategy.java | 3 +- .../serialization/impl/LogEntryIterator.java | 128 +++++ .../UniqueValueSerializationStrategyImpl.java | 139 ++++- .../collection/EntityCollectionManagerIT.java | 5 +- ...niqueValueSerializationStrategyImplTest.java | 218 +++++++- .../graph/impl/GraphManagerImpl.java | 4 + .../usergrid/persistence/index/EntityIndex.java | 5 +- .../usergrid/persistence/index/IndexFig.java | 2 +- .../index/impl/EsEntityIndexImpl.java | 64 +-- .../persistence/index/impl/EntityIndexTest.java | 41 -- stack/pom.xml | 2 - .../security/SecuredResourceFilterFactory.java | 72 ++- .../collection/CollectionsResourceIT.java | 87 +++- .../collection/devices/DevicesResourceIT.java | 3 +- .../usergrid/rest/management/AdminUsersIT.java | 80 +++ .../resource/endpoints/CollectionEndpoint.java | 24 +- .../cassandra/ManagementServiceImpl.java | 33 +- .../services/AbstractCollectionService.java | 49 +- .../services/AbstractConnectionsService.java | 6 +- .../services/devices/DevicesService.java | 2 + .../impl/ApplicationQueueManagerImpl.java | 52 +- .../AbstractServiceNotificationIT.java | 26 +- stack/tools/pom.xml | 1 + .../org/apache/usergrid/tools/ToolBase.java | 28 +- .../usergrid/tools/UniqueValueScanner.java | 276 ++++++++++ .../main/resources/toolsApplicationContext.xml | 7 + 80 files changed, 3835 insertions(+), 358 deletions(-) ----------------------------------------------------------------------
