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/967f7c8c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/967f7c8c Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/967f7c8c Branch: refs/heads/asf-site Commit: 967f7c8ca055fcb34ef18f535d66073ce04903fc Parents: 8a26365 93b864f Author: Dave Johnson <snoopd...@apache.org> Authored: Thu Feb 18 10:51:20 2016 -0500 Committer: Dave Johnson <snoopd...@apache.org> Committed: Thu Feb 18 10:51:20 2016 -0500 ---------------------------------------------------------------------- README.md | 8 +- 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 +- docs/installation/deployment-guide.md | 2 +- sdks/swift/.gitignore | 25 + sdks/swift/LICENSE.txt | 19 + sdks/swift/Package.swift | 30 + sdks/swift/README.md | 802 ++++ .../ActivityFeed.xcodeproj/project.pbxproj | 827 ++++ .../contents.xcworkspacedata | 7 + .../contents.xcworkspacedata | 7 + .../xcshareddata/ActivityFeed.xcscmblueprint | 30 + sdks/swift/Samples/ActivityFeed/Podfile | 8 + sdks/swift/Samples/ActivityFeed/Readme.md | 29 + .../ActivityFeed/Source/ActivityEntity.swift | 60 + .../ActivityFeed/Source/AppDelegate.swift | 65 + .../AppIcon.appiconset/Contents.json | 38 + .../Source/Assets.xcassets/Contents.json | 6 + .../UsergridGuy.imageset/Contents.json | 21 + .../UsergridGuy.imageset/UsergridGuy.png | Bin 0 -> 6230 bytes .../Source/Base.lproj/LaunchScreen.storyboard | 27 + .../Source/Base.lproj/Main.storyboard | 371 ++ .../Source/FollowViewController.swift | 50 + .../ActivityFeed/Source/FormTextField.swift | 71 + .../Samples/ActivityFeed/Source/Info.plist | 43 + .../Source/LoginViewController.swift | 77 + .../Source/MessageTableViewCell.swift | 101 + .../ActivityFeed/Source/MessageTextView.swift | 39 + .../Source/MessageViewController.swift | 224 ++ .../Source/RegisterViewController.swift | 62 + .../ActivityFeed/Source/UsergridManager.swift | 78 + .../Source/ViewControllerExtensions.swift | 36 + .../Assets.xcassets/README__ignoredByTemplate__ | 1 + .../ExtensionDelegate.swift | 45 + .../WatchSample Extension/Info.plist | 45 + .../InterfaceController.swift | 81 + .../AppIcon.appiconset/Contents.json | 55 + .../WatchSample/Base.lproj/Interface.storyboard | 46 + .../Samples/ActivityFeed/WatchSample/Info.plist | 35 + .../Samples/Push/Push.xcodeproj/project.pbxproj | 473 +++ .../contents.xcworkspacedata | 7 + .../Push.xcworkspace/contents.xcworkspacedata | 7 + sdks/swift/Samples/Push/Readme.md | 21 + .../swift/Samples/Push/Source/AppDelegate.swift | 53 + .../AppIcon.appiconset/Contents.json | 38 + .../Push/Source/Assets.xcassets/Contents.json | 6 + .../UsergridGuy.imageset/Contents.json | 21 + .../UsergridGuy.imageset/UsergridGuy.png | Bin 0 -> 6230 bytes .../Source/Base.lproj/LaunchScreen.storyboard | 27 + .../Push/Source/Base.lproj/Main.storyboard | 75 + sdks/swift/Samples/Push/Source/Info.plist | 38 + .../Samples/Push/Source/UsergridManager.swift | 72 + .../Samples/Push/Source/ViewController.swift | 39 + sdks/swift/Samples/Readme.md | 27 + sdks/swift/Source/Info.plist | 26 + sdks/swift/Source/Usergrid.swift | 625 +++ sdks/swift/Source/UsergridAsset.swift | 198 + .../Source/UsergridAssetRequestWrapper.swift | 48 + sdks/swift/Source/UsergridAuth.swift | 276 ++ sdks/swift/Source/UsergridClient.swift | 904 +++++ sdks/swift/Source/UsergridClientConfig.swift | 149 + sdks/swift/Source/UsergridDevice.swift | 178 + sdks/swift/Source/UsergridEntity.swift | 611 +++ sdks/swift/Source/UsergridEnums.swift | 415 ++ sdks/swift/Source/UsergridExtensions.swift | 42 + sdks/swift/Source/UsergridFileMetaData.swift | 114 + sdks/swift/Source/UsergridKeychainHelpers.swift | 196 + sdks/swift/Source/UsergridQuery.swift | 590 +++ sdks/swift/Source/UsergridRequest.swift | 245 ++ sdks/swift/Source/UsergridRequestManager.swift | 156 + sdks/swift/Source/UsergridResponse.swift | 203 + sdks/swift/Source/UsergridResponseError.swift | 90 + sdks/swift/Source/UsergridSDK.h | 37 + sdks/swift/Source/UsergridSessionDelegate.swift | 90 + sdks/swift/Source/UsergridUser.swift | 497 +++ sdks/swift/Tests/ASSET_Tests.swift | 82 + sdks/swift/Tests/AUTH_Tests.swift | 66 + sdks/swift/Tests/CONNECTION_Tests.swift | 87 + sdks/swift/Tests/ClientCreationTests.swift | 92 + sdks/swift/Tests/Entity_Tests.swift | 173 + sdks/swift/Tests/GET_Tests.swift | 101 + sdks/swift/Tests/Info.plist | 24 + sdks/swift/Tests/PUT_Tests.swift | 146 + sdks/swift/Tests/TestAssets/logo_apigee.png | Bin 0 -> 10696 bytes sdks/swift/Tests/TestAssets/test.png | Bin 0 -> 1417937 bytes sdks/swift/Tests/User_Tests.swift | 121 + sdks/swift/UsergridSDK.podspec | 18 + .../swift/UsergridSDK.xcodeproj/project.pbxproj | 1179 ++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + .../xcschemes/UsergridSDK OSX.xcscheme | 100 + .../xcschemes/UsergridSDK iOS.xcscheme | 100 + .../xcschemes/UsergridSDK tvOS.xcscheme | 114 + .../xcschemes/UsergridSDK watchOS.xcscheme | 80 + .../xcschemes/UsergridSDK_OSX_Tests.xcscheme | 56 + .../xcschemes/UsergridSDK_TVOS_Tests.xcscheme | 56 + .../xcschemes/UsergridSDK_iOS_Tests.xcscheme | 57 + sdks/swift/docs/Classes.html | 694 ++++ sdks/swift/docs/Classes/Usergrid.html | 3704 +++++++++++++++++ sdks/swift/docs/Classes/UsergridAppAuth.html | 402 ++ sdks/swift/docs/Classes/UsergridAsset.html | 694 ++++ .../Classes/UsergridAssetUploadRequest.html | 348 ++ sdks/swift/docs/Classes/UsergridAuth.html | 550 +++ sdks/swift/docs/Classes/UsergridClient.html | 3800 ++++++++++++++++++ .../docs/Classes/UsergridClientConfig.html | 736 ++++ sdks/swift/docs/Classes/UsergridDevice.html | 644 +++ sdks/swift/docs/Classes/UsergridEntity.html | 2612 ++++++++++++ .../docs/Classes/UsergridFileMetaData.html | 524 +++ sdks/swift/docs/Classes/UsergridQuery.html | 2270 +++++++++++ .../UsergridQuery/UsergridQueryOperator.html | 272 ++ .../UsergridQuery/UsergridQuerySortOrder.html | 203 + sdks/swift/docs/Classes/UsergridRequest.html | 611 +++ sdks/swift/docs/Classes/UsergridResponse.html | 961 +++++ .../docs/Classes/UsergridResponseError.html | 465 +++ sdks/swift/docs/Classes/UsergridUser.html | 2319 +++++++++++ .../UsergridUser/UsergridUserProperties.html | 346 ++ sdks/swift/docs/Classes/UsergridUserAuth.html | 402 ++ sdks/swift/docs/Enums.html | 427 ++ sdks/swift/docs/Enums/UsergridAuthFallback.html | 248 ++ .../docs/Enums/UsergridDeviceProperties.html | 361 ++ sdks/swift/docs/Enums/UsergridDirection.html | 278 ++ .../docs/Enums/UsergridEntityProperties.html | 506 +++ sdks/swift/docs/Enums/UsergridHttpMethod.html | 333 ++ .../docs/Enums/UsergridImageContentType.html | 278 ++ .../swift/docs/Enums/UsergridQueryOperator.html | 423 ++ .../docs/Enums/UsergridQuerySortOrder.html | 330 ++ .../docs/Enums/UsergridUserProperties.html | 516 +++ sdks/swift/docs/Extensions.html | 175 + sdks/swift/docs/Extensions/UsergridAsset.html | 184 + sdks/swift/docs/Extensions/UsergridAuth.html | 260 ++ sdks/swift/docs/Extensions/UsergridClient.html | 1962 +++++++++ sdks/swift/docs/Global Variables.html | 202 + sdks/swift/docs/Protocols.html | 146 + sdks/swift/docs/Protocols/UsergridAuth.html | 260 ++ sdks/swift/docs/Typealiases.html | 403 ++ sdks/swift/docs/css/highlight.css | 200 + sdks/swift/docs/css/jazzy.css | 331 ++ .../docs/docsets/.docset/Contents/Info.plist | 20 + .../Contents/Resources/Documents/Classes.html | 573 +++ .../Resources/Documents/Classes/Usergrid.html | 3270 +++++++++++++++ .../Documents/Classes/UsergridAppAuth.html | 319 ++ .../Documents/Classes/UsergridAsset.html | 557 +++ .../Documents/Classes/UsergridAuth.html | 380 ++ .../Documents/Classes/UsergridClient.html | 3199 +++++++++++++++ .../Documents/Classes/UsergridClientConfig.html | 559 +++ .../Documents/Classes/UsergridDevice.html | 382 ++ .../Documents/Classes/UsergridEntity.html | 2388 +++++++++++ .../Documents/Classes/UsergridFileMetaData.html | 387 ++ .../Documents/Classes/UsergridQuery.html | 2010 +++++++++ .../UsergridQuery/UsergridQueryOperator.html | 272 ++ .../UsergridQuery/UsergridQuerySortOrder.html | 203 + .../Documents/Classes/UsergridResponse.html | 880 ++++ .../Documents/Classes/UsergridUser.html | 994 +++++ .../UsergridUser/UsergridUserProperties.html | 346 ++ .../Documents/Classes/UsergridUserAuth.html | 319 ++ .../Contents/Resources/Documents/Enums.html | 372 ++ .../Documents/Enums/UsergridAuthFallback.html | 221 + .../Enums/UsergridDeviceProperties.html | 334 ++ .../Documents/Enums/UsergridDirection.html | 251 ++ .../Enums/UsergridEntityProperties.html | 479 +++ .../Enums/UsergridImageContentType.html | 251 ++ .../Documents/Enums/UsergridQueryOperator.html | 396 ++ .../Documents/Enums/UsergridQuerySortOrder.html | 303 ++ .../Documents/Enums/UsergridUserProperties.html | 489 +++ .../Resources/Documents/Extensions.html | 175 + .../Documents/Extensions/UsergridAsset.html | 184 + .../Documents/Extensions/UsergridAuth.html | 260 ++ .../Documents/Extensions/UsergridClient.html | 1962 +++++++++ .../Contents/Resources/Documents/Protocols.html | 146 + .../Documents/Protocols/UsergridAuth.html | 260 ++ .../Resources/Documents/Typealiases.html | 318 ++ .../Resources/Documents/css/highlight.css | 202 + .../Contents/Resources/Documents/css/jazzy.css | 302 ++ .../Contents/Resources/Documents/img/carat.png | Bin 0 -> 274 bytes .../Contents/Resources/Documents/img/dash.png | Bin 0 -> 1338 bytes .../Contents/Resources/Documents/img/gh.png | Bin 0 -> 1571 bytes .../Contents/Resources/Documents/index.html | 234 ++ .../Contents/Resources/Documents/js/jazzy.js | 31 + .../Resources/Documents/js/jquery.min.js | 4 + .../Resources/Documents/undocumented.txt | 11 + .../.docset/Contents/Resources/docSet.dsidx | Bin 0 -> 114688 bytes sdks/swift/docs/docsets/.tgz | Bin 0 -> 111866 bytes .../UsergridSDK.docset/Contents/Info.plist | 20 + .../Contents/Resources/Documents/Classes.html | 694 ++++ .../Resources/Documents/Classes/Usergrid.html | 3704 +++++++++++++++++ .../Documents/Classes/UsergridAppAuth.html | 402 ++ .../Documents/Classes/UsergridAsset.html | 694 ++++ .../Classes/UsergridAssetUploadRequest.html | 348 ++ .../Documents/Classes/UsergridAuth.html | 550 +++ .../Documents/Classes/UsergridClient.html | 3800 ++++++++++++++++++ .../Documents/Classes/UsergridClientConfig.html | 736 ++++ .../Documents/Classes/UsergridDevice.html | 644 +++ .../Documents/Classes/UsergridEntity.html | 2612 ++++++++++++ .../Documents/Classes/UsergridFileMetaData.html | 524 +++ .../Documents/Classes/UsergridQuery.html | 2270 +++++++++++ .../UsergridQuery/UsergridQueryOperator.html | 272 ++ .../UsergridQuery/UsergridQuerySortOrder.html | 203 + .../Documents/Classes/UsergridRequest.html | 611 +++ .../Documents/Classes/UsergridResponse.html | 961 +++++ .../Classes/UsergridResponseError.html | 465 +++ .../Documents/Classes/UsergridUser.html | 2319 +++++++++++ .../UsergridUser/UsergridUserProperties.html | 346 ++ .../Documents/Classes/UsergridUserAuth.html | 402 ++ .../Contents/Resources/Documents/Enums.html | 427 ++ .../Documents/Enums/UsergridAuthFallback.html | 248 ++ .../Enums/UsergridDeviceProperties.html | 361 ++ .../Documents/Enums/UsergridDirection.html | 278 ++ .../Enums/UsergridEntityProperties.html | 506 +++ .../Documents/Enums/UsergridHttpMethod.html | 333 ++ .../Enums/UsergridImageContentType.html | 278 ++ .../Documents/Enums/UsergridQueryOperator.html | 423 ++ .../Documents/Enums/UsergridQuerySortOrder.html | 330 ++ .../Documents/Enums/UsergridUserProperties.html | 516 +++ .../Resources/Documents/Extensions.html | 175 + .../Documents/Extensions/UsergridAsset.html | 184 + .../Documents/Extensions/UsergridAuth.html | 260 ++ .../Documents/Extensions/UsergridClient.html | 1962 +++++++++ .../Resources/Documents/Global Variables.html | 202 + .../Contents/Resources/Documents/Protocols.html | 146 + .../Documents/Protocols/UsergridAuth.html | 260 ++ .../Resources/Documents/Typealiases.html | 403 ++ .../Resources/Documents/css/highlight.css | 200 + .../Contents/Resources/Documents/css/jazzy.css | 331 ++ .../Contents/Resources/Documents/img/carat.png | Bin 0 -> 274 bytes .../Contents/Resources/Documents/img/dash.png | Bin 0 -> 1338 bytes .../Contents/Resources/Documents/img/gh.png | Bin 0 -> 1571 bytes .../Contents/Resources/Documents/index.html | 919 +++++ .../Contents/Resources/Documents/js/jazzy.js | 40 + .../Resources/Documents/js/jquery.min.js | 4 + .../Resources/Documents/undocumented.txt | 0 .../Contents/Resources/docSet.dsidx | Bin 0 -> 151552 bytes sdks/swift/docs/docsets/UsergridSDK.tgz | Bin 0 -> 145485 bytes sdks/swift/docs/img/carat.png | Bin 0 -> 274 bytes sdks/swift/docs/img/dash.png | Bin 0 -> 1338 bytes sdks/swift/docs/img/gh.png | Bin 0 -> 1571 bytes sdks/swift/docs/index.html | 919 +++++ sdks/swift/docs/js/jazzy.js | 40 + sdks/swift/docs/js/jquery.min.js | 4 + sdks/swift/docs/undocumented.txt | 0 stack/README.md | 7 +- .../corepersistence/CpEntityManager.java | 27 + .../usergrid/persistence/EntityManager.java | 2 + .../services/AbstractCollectionService.java | 36 +- .../usergrid/services/CollectionServiceIT.java | 16 + website/content/releases/index.html | 11 +- 321 files changed, 99824 insertions(+), 139 deletions(-) ----------------------------------------------------------------------
