You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/06/02 17:08:12 UTC
[54/54] [abbrv] usergrid git commit: Merge remote-tracking branch
'origin/master' into apm
Merge remote-tracking branch 'origin/master' into apm
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/28cad011
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/28cad011
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/28cad011
Branch: refs/heads/apm
Commit: 28cad0117254552c786717a52fe4921aef6e6ad1
Parents: 1684a64 9250a81
Author: Michael Russo <mr...@apigee.com>
Authored: Thu Jun 2 10:06:40 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Thu Jun 2 10:06:40 2016 -0700
----------------------------------------------------------------------
UsergridSDK.podspec | 18 +
content/community/index.html | 3 +-
content/docs/README.html | 8 +-
.../file-storage-configuration.html | 8 +-
content/docs/assets-and-files/folders.html | 8 +-
.../assets-and-files/legacy-asset-support.html | 8 +-
.../assets-and-files/retrieving-assets.html | 8 +-
.../docs/assets-and-files/uploading-assets.html | 8 +-
.../creating-and-incrementing-counters.html | 8 +-
.../events-and-counters.html | 8 +-
.../retrieving-counters.html | 8 +-
.../docs/data-queries/advanced-query-usage.html | 8 +-
.../docs/data-queries/operators-and-types.html | 8 +-
content/docs/data-queries/query-parameters.html | 8 +-
.../docs/data-queries/querying-your-data.html | 8 +-
content/docs/data-storage/collections.html | 8 +-
content/docs/data-storage/data-store-dbms.html | 8 +-
content/docs/data-storage/entities.html | 8 +-
.../docs/data-storage/optimizing-access.html | 8 +-
.../entity-connections/connecting-entities.html | 8 +-
.../disconnecting-entities.html | 8 +-
.../entity-connections/retrieving-entities.html | 8 +-
content/docs/genindex.html | 8 +-
content/docs/geolocation/geolocation.html | 8 +-
content/docs/index.html | 8 +-
content/docs/installation/deployment-guide.html | 8 +-
.../docs/installation/ug1-deploy-to-tomcat.html | 8 +-
.../installation/ug1-launcher-quick-start.html | 8 +-
.../docs/installation/ug2-deploy-to-tomcat.html | 8 +-
content/docs/introduction/async-vs-sync.html | 8 +-
content/docs/introduction/data-model.html | 8 +-
content/docs/introduction/overview.html | 8 +-
.../docs/introduction/usergrid-features.html | 8 +-
content/docs/jersey2skeleton/README.html | 8 +-
content/docs/objects.inv | Bin 686 -> 686 bytes
content/docs/orgs-and-apps/admin-user.html | 8 +-
content/docs/orgs-and-apps/application.html | 8 +-
content/docs/orgs-and-apps/managing.html | 8 +-
content/docs/orgs-and-apps/organization.html | 8 +-
.../push-notifications/adding-push-support.html | 8 +-
.../creating-and-managing-notifications.html | 8 +-
.../push-notifications/creating-notifiers.html | 8 +-
.../push-notifications/getting-started.html | 8 +-
.../managing-users-and-devices.html | 8 +-
content/docs/push-notifications/overview.html | 8 +-
.../docs/push-notifications/registering.html | 8 +-
content/docs/push-notifications/tbd.html | 8 +-
.../push-notifications/troubleshooting.html | 8 +-
content/docs/push-notifications/tutorial.html | 8 +-
.../docs/push-notifications/users-devices.html | 8 +-
content/docs/reference/contribute-code.html | 8 +-
content/docs/reference/presos-and-videos.html | 8 +-
content/docs/rest-endpoints/api-docs.html | 8 +-
content/docs/sdks/ios-new.html | 8 +-
content/docs/sdks/sdk-outline.html | 8 +-
content/docs/sdks/tbd.html | 8 +-
content/docs/search.html | 8 +-
.../docs/security-and-auth/app-security.html | 8 +-
.../authenticating-api-requests.html | 8 +-
...nticating-users-and-application-clients.html | 8 +-
.../changing-token-time-live-ttl.html | 8 +-
.../docs/security-and-auth/facebook-sign.html | 8 +-
.../revoking-tokens-logout.html | 8 +-
.../security-and-auth/securing-your-app.html | 8 +-
.../user-authentication-types.html | 8 +-
.../security-and-auth/using-permissions.html | 8 +-
content/docs/security-and-auth/using-roles.html | 8 +-
content/docs/user-management/activity.html | 8 +-
content/docs/user-management/group.html | 8 +-
content/docs/user-management/groups.html | 8 +-
.../docs/user-management/messagee-example.html | 8 +-
.../docs/user-management/user-connections.html | 8 +-
.../docs/user-management/user-management.html | 8 +-
.../docs/user-management/working-user-data.html | 8 +-
.../creating-a-new-application.html | 8 +-
.../docs/using-usergrid/creating-account.html | 8 +-
.../using-usergrid/using-a-sandbox-app.html | 8 +-
content/docs/using-usergrid/using-the-api.html | 8 +-
content/index.html | 3 +-
content/releases/index.html | 3 +-
docs/conf.py | 4 +-
sdks/java/README.md | 598 +++++-
sdks/java/pom.xml | 73 +-
.../org/apache/usergrid/java/client/Client.java | 1292 -------------
.../apache/usergrid/java/client/Usergrid.java | 285 +++
.../usergrid/java/client/UsergridClient.java | 427 +++++
.../java/client/UsergridClientConfig.java | 60 +
.../usergrid/java/client/UsergridEnums.java | 170 ++
.../usergrid/java/client/UsergridRequest.java | 205 +++
.../java/client/UsergridRequestManager.java | 86 +
.../java/client/auth/UsergridAppAuth.java | 55 +
.../usergrid/java/client/auth/UsergridAuth.java | 75 +
.../java/client/auth/UsergridUserAuth.java | 56 +
.../usergrid/java/client/entities/Activity.java | 625 -------
.../usergrid/java/client/entities/Device.java | 68 -
.../usergrid/java/client/entities/Entity.java | 191 --
.../usergrid/java/client/entities/Group.java | 79 -
.../usergrid/java/client/entities/Message.java | 148 --
.../usergrid/java/client/entities/User.java | 158 --
.../java/client/exception/ClientException.java | 41 -
.../client/exception/UsergridException.java | 50 +
.../java/client/model/UsergridDevice.java | 60 +
.../java/client/model/UsergridEntity.java | 487 +++++
.../java/client/model/UsergridUser.java | 198 ++
.../java/client/query/UsergridQuery.java | 434 +++++
.../java/client/response/AggregateCounter.java | 52 -
.../client/response/AggregateCounterSet.java | 111 --
.../java/client/response/ApiResponse.java | 421 -----
.../client/response/ClientCredentialsInfo.java | 58 -
.../java/client/response/QueueInfo.java | 44 -
.../java/client/response/UsergridResponse.java | 230 +++
.../client/response/UsergridResponseError.java | 98 +
.../usergrid/java/client/utils/JsonUtils.java | 262 ++-
.../usergrid/java/client/utils/MapUtils.java | 27 +-
.../usergrid/java/client/utils/ObjectUtils.java | 28 +-
.../usergrid/java/client/utils/UrlUtils.java | 124 --
.../utils/UsergridEntityDeserializer.java | 41 +
.../client/ClientAuthFallBackTestCase.java | 72 +
.../usergrid/client/ClientAuthTestCase.java | 85 +
.../client/ClientConnectionsTestCase.java | 171 ++
.../usergrid/client/ClientRestTestCase.java | 90 +
.../apache/usergrid/client/EntityTestCase.java | 676 +++++++
.../apache/usergrid/client/QueryTestCase.java | 194 ++
.../usergrid/client/SDKTestConfiguration.java | 38 +
.../apache/usergrid/client/SDKTestUtils.java | 108 ++
.../client/UsergridClientAuthTestCase.java | 73 +
.../usergrid/client/UsergridInitTestCase.java | 48 +
.../client/UsergridResponseErrorTestCase.java | 62 +
.../client/UsergridResponseTestCase.java | 85 +
.../usergrid/client/UsergridTestCase.java | 30 +
sdks/java/usergrid-java-client-2.1.0.jar | Bin 0 -> 1992232 bytes
sdks/swift/README.md | 2 +-
.../Source/Base.lproj/Main.storyboard | 26 +-
.../ActivityFeed/Source/FormTextField.swift | 2 +-
.../Source/MessageViewController.swift | 26 +-
.../Samples/Push/Source/UsergridManager.swift | 2 +-
sdks/swift/Source/Usergrid.swift | 32 +-
sdks/swift/Source/UsergridAsset.swift | 18 +-
sdks/swift/Source/UsergridAuth.swift | 6 +-
sdks/swift/Source/UsergridClient.swift | 89 +-
sdks/swift/Source/UsergridClientConfig.swift | 14 +-
sdks/swift/Source/UsergridDevice.swift | 41 +-
sdks/swift/Source/UsergridEntity.swift | 104 +-
sdks/swift/Source/UsergridEnums.swift | 22 +-
sdks/swift/Source/UsergridExtensions.swift | 82 +-
sdks/swift/Source/UsergridFileMetaData.swift | 4 +-
sdks/swift/Source/UsergridQuery.swift | 3 +-
sdks/swift/Source/UsergridRequest.swift | 2 +-
sdks/swift/Source/UsergridRequestManager.swift | 72 +-
sdks/swift/Source/UsergridResponse.swift | 6 +-
sdks/swift/Source/UsergridUser.swift | 62 +-
sdks/swift/Tests/ASSET_Tests.swift | 218 ++-
sdks/swift/Tests/AUTH_Tests.swift | 92 +-
sdks/swift/Tests/CONNECTION_Tests.swift | 42 +-
sdks/swift/Tests/ClientCreationTests.swift | 44 +-
sdks/swift/Tests/GET_Tests.swift | 38 +-
sdks/swift/Tests/PUT_Tests.swift | 38 +-
sdks/swift/Tests/TestAssets/UsergridGuy.jpg | Bin 0 -> 12981 bytes
sdks/swift/Tests/User_Tests.swift | 310 +++-
sdks/swift/UsergridSDK.podspec | 18 -
.../swift/UsergridSDK.xcodeproj/project.pbxproj | 4 +-
sdks/swift/docs/Classes.html | 16 +-
sdks/swift/docs/Classes/Usergrid.html | 290 ++-
sdks/swift/docs/Classes/UsergridAppAuth.html | 30 +-
sdks/swift/docs/Classes/UsergridAsset.html | 44 +-
.../Classes/UsergridAssetUploadRequest.html | 20 +-
sdks/swift/docs/Classes/UsergridAuth.html | 34 +-
sdks/swift/docs/Classes/UsergridClient.html | 275 ++-
.../docs/Classes/UsergridClientConfig.html | 54 +-
sdks/swift/docs/Classes/UsergridDevice.html | 205 ++-
sdks/swift/docs/Classes/UsergridEntity.html | 215 ++-
.../docs/Classes/UsergridFileMetaData.html | 30 +-
sdks/swift/docs/Classes/UsergridQuery.html | 156 +-
sdks/swift/docs/Classes/UsergridRequest.html | 36 +-
sdks/swift/docs/Classes/UsergridResponse.html | 42 +-
.../docs/Classes/UsergridResponseError.html | 24 +-
sdks/swift/docs/Classes/UsergridUser.html | 231 ++-
sdks/swift/docs/Classes/UsergridUserAuth.html | 30 +-
sdks/swift/docs/Enums.html | 28 +-
sdks/swift/docs/Enums/UsergridAuthMode.html | 283 +++
.../docs/Enums/UsergridDeviceProperties.html | 20 +-
sdks/swift/docs/Enums/UsergridDirection.html | 16 +-
.../docs/Enums/UsergridEntityProperties.html | 24 +-
sdks/swift/docs/Enums/UsergridHttpMethod.html | 16 +-
.../docs/Enums/UsergridImageContentType.html | 16 +-
.../swift/docs/Enums/UsergridQueryOperator.html | 20 +-
.../docs/Enums/UsergridQuerySortOrder.html | 20 +-
.../docs/Enums/UsergridUserProperties.html | 20 +-
sdks/swift/docs/Extensions.html | 72 +-
sdks/swift/docs/Extensions/NSDate.html | 448 +++++
sdks/swift/docs/Global Variables.html | 18 +-
sdks/swift/docs/Typealiases.html | 36 +-
.../Contents/Resources/Documents/Classes.html | 209 ++-
.../Resources/Documents/Classes/Usergrid.html | 1086 ++++++++---
.../Documents/Classes/UsergridAppAuth.html | 183 +-
.../Documents/Classes/UsergridAsset.html | 265 ++-
.../Classes/UsergridAssetUploadRequest.html | 356 ++++
.../Documents/Classes/UsergridAuth.html | 274 ++-
.../Documents/Classes/UsergridClient.html | 1310 +++++++++----
.../Documents/Classes/UsergridClientConfig.html | 345 +++-
.../Documents/Classes/UsergridDevice.html | 519 +++++-
.../Documents/Classes/UsergridEntity.html | 809 +++++---
.../Documents/Classes/UsergridFileMetaData.html | 217 ++-
.../Documents/Classes/UsergridQuery.html | 540 ++++--
.../Documents/Classes/UsergridRequest.html | 619 +++++++
.../Documents/Classes/UsergridResponse.html | 309 ++--
.../Classes/UsergridResponseError.html | 473 +++++
.../Documents/Classes/UsergridUser.html | 1734 ++++++++++++++++--
.../Documents/Classes/UsergridUserAuth.html | 169 +-
.../Contents/Resources/Documents/Enums.html | 115 +-
.../Documents/Enums/UsergridAuthFallback.html | 53 +-
.../Documents/Enums/UsergridAuthMode.html | 283 +++
.../Enums/UsergridDeviceProperties.html | 83 +-
.../Documents/Enums/UsergridDirection.html | 71 +-
.../Enums/UsergridEntityProperties.html | 101 +-
.../Documents/Enums/UsergridHttpMethod.html | 341 ++++
.../Enums/UsergridImageContentType.html | 73 +-
.../Documents/Enums/UsergridQueryOperator.html | 89 +-
.../Documents/Enums/UsergridQuerySortOrder.html | 83 +-
.../Documents/Enums/UsergridUserProperties.html | 95 +-
.../Resources/Documents/Extensions.html | 72 +-
.../Resources/Documents/Extensions/NSDate.html | 448 +++++
.../Resources/Documents/Global Variables.html | 210 +++
.../Resources/Documents/Typealiases.html | 159 +-
.../Resources/Documents/css/highlight.css | 6 +-
.../Contents/Resources/Documents/css/jazzy.css | 65 +-
.../Contents/Resources/Documents/index.html | 741 +++++++-
.../Contents/Resources/Documents/js/jazzy.js | 11 +-
.../Resources/Documents/undocumented.txt | 11 -
.../.docset/Contents/Resources/docSet.dsidx | Bin 114688 -> 147456 bytes
sdks/swift/docs/docsets/.tgz | Bin 111866 -> 148251 bytes
sdks/swift/docs/index.html | 24 +-
.../main/resources/usergrid-default.properties | 10 +-
.../corepersistence/ApplicationIdCacheImpl.java | 9 +-
.../corepersistence/CpEntityManager.java | 4 +-
.../index/IndexSchemaCacheFig.java | 2 +-
.../index/IndexSchemaCacheImpl.java | 3 +-
.../corepersistence/index/IndexServiceImpl.java | 1 +
.../org/apache/usergrid/utils/StringUtils.java | 8 +
.../main/resources/usergrid-core-context.xml | 6 +
.../shard/impl/NodeShardAllocationImpl.java | 7 +-
.../shard/impl/ShardGroupCompactionImpl.java | 18 +-
.../usergrid/persistence/queue/QueueFig.java | 4 +-
.../queue/impl/QueueManagerFactoryImpl.java | 27 +-
.../org/apache/usergrid/rest/RootResource.java | 25 +
.../rest/applications/CollectionResource.java | 8 +-
.../apache/usergrid/rest/NotificationsIT.java | 11 +
.../collection/CollectionsResourceIT.java | 147 +-
.../events/ApplicationRequestCounterIT.java | 48 +
.../cassandra/ManagementServiceImpl.java | 93 +-
.../ApplicationQueueManagerCache.java | 143 ++
.../notifications/NotificationsService.java | 11 +-
.../services/notifications/QueueListener.java | 58 +-
.../services/notifications/TaskManager.java | 117 +-
.../impl/ApplicationQueueManagerImpl.java | 151 +-
.../services/notifiers/NotifiersService.java | 6 +
.../gcm/NotificationsServiceIT.java | 77 +
website/README.md | 2 +-
website/layouts/footer.html | 3 +-
259 files changed, 20312 insertions(+), 7206 deletions(-)
----------------------------------------------------------------------