Merge branch 'master' into asf-site
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/619aff37 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/619aff37 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/619aff37 Branch: refs/heads/asf-site Commit: 619aff37417f162c93a087cfaa3a62539c828768 Parents: 6474c03 33a3e21 Author: Dave Johnson <[email protected]> Authored: Tue Feb 9 15:26:56 2016 -0500 Committer: Dave Johnson <[email protected]> Committed: Tue Feb 9 15:26:56 2016 -0500 ---------------------------------------------------------------------- CHANGELOG | 13 + README.md | 11 +- content/docs/README.html | 20 +- content/docs/_sources/index.txt | 19 +- .../_sources/installation/deployment-guide.txt | 142 +++--- content/docs/_sources/introduction/overview.txt | 32 +- .../_sources/introduction/usergrid-features.txt | 4 +- .../docs/_sources/reference/contribute-code.txt | 41 +- .../creating-a-new-application.txt | 16 + .../using-usergrid/creating-account.txt | 21 + .../using-usergrid/using-a-sandbox-app.txt | 39 ++ .../_sources/using-usergrid/using-the-api.txt | 150 ++++++ .../file-storage-configuration.html | 20 +- content/docs/assets-and-files/folders.html | 20 +- .../assets-and-files/legacy-asset-support.html | 20 +- .../assets-and-files/retrieving-assets.html | 20 +- .../docs/assets-and-files/uploading-assets.html | 20 +- .../creating-and-incrementing-counters.html | 20 +- .../events-and-counters.html | 20 +- .../retrieving-counters.html | 20 +- .../docs/data-queries/advanced-query-usage.html | 20 +- .../docs/data-queries/operators-and-types.html | 20 +- content/docs/data-queries/query-parameters.html | 20 +- .../docs/data-queries/querying-your-data.html | 20 +- content/docs/data-storage/collections.html | 20 +- content/docs/data-storage/data-store-dbms.html | 24 +- content/docs/data-storage/entities.html | 20 +- .../docs/data-storage/optimizing-access.html | 20 +- .../entity-connections/connecting-entities.html | 20 +- .../disconnecting-entities.html | 20 +- .../entity-connections/retrieving-entities.html | 20 +- content/docs/genindex.html | 20 +- content/docs/geolocation/geolocation.html | 20 +- content/docs/index.html | 119 ++--- content/docs/installation/deployment-guide.html | 226 ++++----- .../docs/installation/ug1-deploy-to-tomcat.html | 46 +- .../installation/ug1-launcher-quick-start.html | 45 +- .../docs/installation/ug2-deploy-to-tomcat.html | 20 +- content/docs/introduction/async-vs-sync.html | 24 +- content/docs/introduction/data-model.html | 20 +- content/docs/introduction/overview.html | 84 ++-- .../docs/introduction/usergrid-features.html | 34 +- content/docs/jersey2skeleton/README.html | 20 +- content/docs/objects.inv | Bin 692 -> 673 bytes content/docs/orgs-and-apps/admin-user.html | 20 +- content/docs/orgs-and-apps/application.html | 20 +- content/docs/orgs-and-apps/managing.html | 20 +- content/docs/orgs-and-apps/organization.html | 20 +- .../push-notifications/adding-push-support.html | 20 +- .../creating-and-managing-notifications.html | 20 +- .../push-notifications/creating-notifiers.html | 20 +- .../push-notifications/getting-started.html | 20 +- .../managing-users-and-devices.html | 20 +- content/docs/push-notifications/overview.html | 20 +- .../docs/push-notifications/registering.html | 20 +- content/docs/push-notifications/tbd.html | 20 +- .../push-notifications/troubleshooting.html | 20 +- content/docs/push-notifications/tutorial.html | 20 +- .../docs/push-notifications/users-devices.html | 20 +- content/docs/reference/contribute-code.html | 88 ++-- content/docs/reference/presos-and-videos.html | 24 +- content/docs/rest-endpoints/api-docs.html | 20 +- content/docs/sdks/ios-new.html | 20 +- content/docs/sdks/sdk-outline.html | 20 +- content/docs/sdks/tbd.html | 24 +- content/docs/search.html | 20 +- content/docs/searchindex.js | 2 +- .../docs/security-and-auth/app-security.html | 20 +- .../authenticating-api-requests.html | 20 +- ...nticating-users-and-application-clients.html | 20 +- .../changing-token-time-live-ttl.html | 20 +- .../docs/security-and-auth/facebook-sign.html | 20 +- .../revoking-tokens-logout.html | 20 +- .../security-and-auth/securing-your-app.html | 20 +- .../user-authentication-types.html | 20 +- .../security-and-auth/using-permissions.html | 20 +- content/docs/security-and-auth/using-roles.html | 20 +- content/docs/user-management/activity.html | 20 +- content/docs/user-management/group.html | 20 +- content/docs/user-management/groups.html | 20 +- .../docs/user-management/messagee-example.html | 20 +- .../docs/user-management/user-connections.html | 20 +- .../docs/user-management/user-management.html | 20 +- .../docs/user-management/working-user-data.html | 20 +- .../creating-a-new-application.html | 332 ++++++++++++ .../docs/using-usergrid/creating-account.html | 343 +++++++++++++ .../using-usergrid/using-a-sandbox-app.html | 368 ++++++++++++++ content/docs/using-usergrid/using-the-api.html | 502 +++++++++++++++++++ .../creating-a-new-application.md | 16 - docs/getting-started/creating-account.md | 21 - docs/getting-started/using-a-sandbox-app.md | 39 -- docs/getting-started/using-the-api.md | 150 ------ docs/index.rst | 19 +- docs/installation/deployment-guide.md | 142 +++--- docs/introduction/overview.md | 32 +- docs/introduction/usergrid-features.md | 4 +- docs/reference/contribute-code.md | 41 +- .../creating-a-new-application.md | 16 + docs/using-usergrid/creating-account.md | 21 + docs/using-usergrid/using-a-sandbox-app.md | 39 ++ docs/using-usergrid/using-the-api.md | 150 ++++++ .../push/push-send-notification-controller.js | 1 - release/README.txt | 6 +- release/binary-release.sh | 37 ++ release/pom.xml | 95 ++++ release/release-candidate.sh | 42 +- release/release.sh | 32 +- release/src/main/assembly/binary.xml | 99 ++++ sdks/html5-javascript/Release.md | 6 - stack/README.md | 32 +- .../persistence/entities/Notification.java | 2 +- .../usergrid/persistence/queue/QueueFig.java | 2 +- .../queue/impl/QueueManagerFactoryImpl.java | 51 +- .../queue/impl/SNSQueueManagerImpl.java | 1 - .../notifications/ApplicationQueueManager.java | 9 +- .../services/notifications/TaskManager.java | 68 +-- .../impl/ApplicationQueueManagerImpl.java | 389 +++++++------- .../gcm/NotificationsServiceIT.java | 114 ++--- tests/integration/lib/entities.js | 2 +- tests/integration/lib/notifications.js | 1 + tests/integration/lib/notifiers.js | 43 ++ tests/integration/test/groups/groups.js | 55 +- tests/integration/test/main.js | 5 +- .../test/notifications/notifications.js | 313 ++++++++++++ tests/integration/test/teardown.js | 18 +- 125 files changed, 3978 insertions(+), 2108 deletions(-) ----------------------------------------------------------------------
