Merge branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6e211688 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6e211688 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6e211688 Branch: refs/heads/master Commit: 6e2116880534865da3b4e068454006dbee87be06 Parents: 2376ec1 e0931be Author: Robert Walsh <rjwalsh1...@gmail.com> Authored: Wed Apr 13 16:52:36 2016 -0500 Committer: Robert Walsh <rjwalsh1...@gmail.com> Committed: Wed Apr 13 16:52:36 2016 -0500 ---------------------------------------------------------------------- content/docs/README.html | 2 +- .../_sources/installation/deployment-guide.txt | 2 +- .../file-storage-configuration.html | 2 +- content/docs/assets-and-files/folders.html | 2 +- .../assets-and-files/legacy-asset-support.html | 2 +- .../assets-and-files/retrieving-assets.html | 2 +- .../docs/assets-and-files/uploading-assets.html | 2 +- .../creating-and-incrementing-counters.html | 2 +- .../events-and-counters.html | 2 +- .../retrieving-counters.html | 2 +- .../docs/data-queries/advanced-query-usage.html | 2 +- .../docs/data-queries/operators-and-types.html | 2 +- content/docs/data-queries/query-parameters.html | 2 +- .../docs/data-queries/querying-your-data.html | 2 +- content/docs/data-storage/collections.html | 2 +- content/docs/data-storage/data-store-dbms.html | 2 +- content/docs/data-storage/entities.html | 2 +- .../docs/data-storage/optimizing-access.html | 2 +- .../entity-connections/connecting-entities.html | 2 +- .../disconnecting-entities.html | 2 +- .../entity-connections/retrieving-entities.html | 2 +- content/docs/genindex.html | 2 +- content/docs/geolocation/geolocation.html | 2 +- content/docs/index.html | 4 +- content/docs/installation/deployment-guide.html | 10 +- .../docs/installation/ug1-deploy-to-tomcat.html | 2 +- .../installation/ug1-launcher-quick-start.html | 2 +- .../docs/installation/ug2-deploy-to-tomcat.html | 2 +- content/docs/introduction/async-vs-sync.html | 2 +- content/docs/introduction/data-model.html | 2 +- content/docs/introduction/overview.html | 2 +- .../docs/introduction/usergrid-features.html | 2 +- content/docs/jersey2skeleton/README.html | 2 +- content/docs/orgs-and-apps/admin-user.html | 2 +- content/docs/orgs-and-apps/application.html | 2 +- content/docs/orgs-and-apps/managing.html | 2 +- content/docs/orgs-and-apps/organization.html | 2 +- .../push-notifications/adding-push-support.html | 2 +- .../creating-and-managing-notifications.html | 2 +- .../push-notifications/creating-notifiers.html | 2 +- .../push-notifications/getting-started.html | 2 +- .../managing-users-and-devices.html | 2 +- content/docs/push-notifications/overview.html | 2 +- .../docs/push-notifications/registering.html | 2 +- content/docs/push-notifications/tbd.html | 2 +- .../push-notifications/troubleshooting.html | 2 +- content/docs/push-notifications/tutorial.html | 2 +- .../docs/push-notifications/users-devices.html | 2 +- content/docs/reference/contribute-code.html | 2 +- content/docs/reference/presos-and-videos.html | 6 +- content/docs/rest-endpoints/api-docs.html | 2 +- content/docs/sdks/ios-new.html | 2 +- content/docs/sdks/sdk-outline.html | 2 +- content/docs/sdks/tbd.html | 6 +- content/docs/search.html | 2 +- content/docs/searchindex.js | 2 +- .../docs/security-and-auth/app-security.html | 2 +- .../authenticating-api-requests.html | 2 +- ...nticating-users-and-application-clients.html | 2 +- .../changing-token-time-live-ttl.html | 2 +- .../docs/security-and-auth/facebook-sign.html | 2 +- .../revoking-tokens-logout.html | 2 +- .../security-and-auth/securing-your-app.html | 2 +- .../user-authentication-types.html | 2 +- .../security-and-auth/using-permissions.html | 2 +- content/docs/security-and-auth/using-roles.html | 2 +- content/docs/user-management/activity.html | 2 +- content/docs/user-management/group.html | 2 +- content/docs/user-management/groups.html | 2 +- .../docs/user-management/messagee-example.html | 2 +- .../docs/user-management/user-connections.html | 2 +- .../docs/user-management/user-management.html | 2 +- .../docs/user-management/working-user-data.html | 2 +- .../creating-a-new-application.html | 2 +- .../docs/using-usergrid/creating-account.html | 2 +- .../using-usergrid/using-a-sandbox-app.html | 2 +- content/docs/using-usergrid/using-the-api.html | 2 +- content/releases/index.html | 11 +- deployment/pcf/README.md | 2 + docs/installation/deployment-guide.md | 2 +- release/binary-release.sh | 10 +- release/pom.xml | 2 +- release/release-candidate.sh | 62 +- release/release.sh | 84 +- release/src/main/assembly/binary.xml | 27 +- stack/build-tools/pom.xml | 2 +- stack/config/pom.xml | 2 +- .../main/resources/usergrid-default.properties | 3 - stack/core/pom.xml | 16 +- .../usergrid/corepersistence/CoreModule.java | 2 - .../corepersistence/CpEntityManager.java | 47 +- .../usergrid/corepersistence/GuiceFactory.java | 1 + .../asyncevents/AmazonAsyncEventService.java | 844 ------------------- .../asyncevents/AsyncEventService.java | 12 +- .../asyncevents/AsyncEventServiceImpl.java | 835 ++++++++++++++++++ .../asyncevents/AsyncIndexProvider.java | 4 +- .../asyncevents/EventBuilder.java | 12 +- .../asyncevents/EventBuilderImpl.java | 15 +- .../asyncevents/IndexDocNotFoundException.java | 37 + .../asyncevents/model/AsyncEvent.java | 2 - .../asyncevents/model/EdgeIndexEvent.java | 70 -- .../asyncevents/model/EntityIndexEvent.java | 54 -- .../index/IndexProcessorFig.java | 8 - .../corepersistence/index/IndexServiceImpl.java | 4 +- .../migration/MigrationModuleVersionPlugin.java | 137 --- .../read/search/CandidateEntityFilter.java | 10 +- .../usergrid/persistence/EntityManager.java | 2 + .../main/resources/usergrid-core-context.xml | 5 +- .../index/AmazonAsyncEventServiceTest.java | 103 --- .../index/AsyncEventServiceImplTest.java | 103 +++ .../index/AsyncIndexServiceTest.java | 3 +- .../MigrationModuleVersionPluginTest.java | 259 ------ stack/corepersistence/cache/pom.xml | 2 +- stack/corepersistence/collection/pom.xml | 2 +- .../impl/EntityCollectionManagerImpl.java | 8 +- stack/corepersistence/common/pom.xml | 2 +- .../core/astyanax/CassandraClusterImpl.java | 34 +- .../persistence/core/astyanax/CassandraFig.java | 8 + stack/corepersistence/graph/pom.xml | 2 +- stack/corepersistence/map/pom.xml | 2 +- stack/corepersistence/model/pom.xml | 2 +- .../model/entity/MapToEntityConverter.java | 18 +- stack/corepersistence/pom.xml | 2 +- stack/corepersistence/queryindex/pom.xml | 2 +- .../usergrid/persistence/index/IndexFig.java | 3 + .../index/impl/EsIndexProducerImpl.java | 5 +- .../persistence/index/impl/EsProvider.java | 20 +- stack/corepersistence/queue/pom.xml | 2 +- .../persistence/queue/LocalQueueManager.java | 6 +- .../usergrid/persistence/queue/QueueFig.java | 17 + .../persistence/queue/QueueManager.java | 6 +- .../persistence/queue/QueueMessage.java | 10 + .../queue/impl/SNSQueueManagerImpl.java | 48 +- .../persistence/queue/QueueManagerTest.java | 10 +- stack/pom.xml | 2 +- stack/rest/pom.xml | 2 +- .../org/apache/usergrid/rest/RootResource.java | 31 +- .../rest/management/ManagementResource.java | 308 ------- .../applications/ApplicationResource.java | 34 +- .../rest/management/users/UserResource.java | 2 +- .../security/SecuredResourceFilterFactory.java | 2 +- .../resources/usergrid-rest-deploy-context.xml | 7 + .../rest/applications/ApplicationDeleteIT.java | 17 +- .../collection/CollectionsResourceIT.java | 56 ++ .../usergrid/rest/management/AdminUsersIT.java | 102 ++- .../rest/management/ManagementResourceIT.java | 58 +- stack/services/pom.xml | 19 +- .../usergrid/management/ManagementService.java | 7 +- .../cassandra/ManagementServiceImpl.java | 22 +- .../credentials/ApplicationAccessToken.java | 3 + .../credentials/OrganizationAccessToken.java | 3 + .../tokens/cassandra/TokenServiceImpl.java | 332 +++++++- .../services/AbstractCollectionService.java | 36 +- .../usergrid/services/ServiceManager.java | 5 +- .../services/notifications/QueueListener.java | 2 +- .../services/notifications/TaskManager.java | 8 +- .../impl/ApplicationQueueManagerImpl.java | 2 +- .../services/queues/ImportQueueManager.java | 4 +- .../usergrid/services/queues/QueueListener.java | 2 +- .../usergrid/services/CollectionServiceIT.java | 16 + stack/test-utils/pom.xml | 2 +- stack/tools/pom.xml | 4 +- tests/integration/test/main.js | 18 +- .../test/notifications/notifications.js | 78 +- .../test/queries/integerComparison.js | 31 +- tests/integration/test/setup.js | 4 +- website/content/releases/index.html | 11 +- 167 files changed, 2150 insertions(+), 2255 deletions(-) ----------------------------------------------------------------------
