usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [49/50] usergrid git commit: Merge branch 'master' into asf-site
Date Mon, 22 Aug 2016 15:00:53 GMT
Merge branch 'master' into asf-site

Conflicts:
	website/tmp/checksums
	website/tmp/compiled_content
	website/tmp/dependencies
	website/tmp/rule_memory


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f0a2f8c1
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f0a2f8c1
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/f0a2f8c1

Branch: refs/heads/asf-site
Commit: f0a2f8c1b267550cb8e99a5d5672f26d951714c6
Parents: cbe501a 87fcf3c
Author: Dave Johnson <snoopdave@apache.org>
Authored: Fri Aug 19 16:02:55 2016 -0400
Committer: Dave Johnson <snoopdave@apache.org>
Committed: Fri Aug 19 16:02:55 2016 -0400

----------------------------------------------------------------------
 .gitignore                                      |     3 +-
 CHANGELOG                                       |    13 +
 README.md                                       |    12 +-
 UsergridSDK.podspec                             |    18 +
 content/community/index.html                    |     3 +-
 content/docs/README.html                        |    28 +-
 .../data-queries/operators-and-types.txt        |    25 +-
 content/docs/_sources/index.txt                 |    22 +-
 .../_sources/installation/deployment-guide.txt  |   468 +
 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             |    28 +-
 content/docs/assets-and-files/folders.html      |    28 +-
 .../assets-and-files/legacy-asset-support.html  |    28 +-
 .../assets-and-files/retrieving-assets.html     |    28 +-
 .../docs/assets-and-files/uploading-assets.html |    28 +-
 .../creating-and-incrementing-counters.html     |    28 +-
 .../events-and-counters.html                    |    28 +-
 .../retrieving-counters.html                    |    28 +-
 .../docs/data-queries/advanced-query-usage.html |    28 +-
 .../docs/data-queries/operators-and-types.html  |    67 +-
 content/docs/data-queries/query-parameters.html |    28 +-
 .../docs/data-queries/querying-your-data.html   |    28 +-
 content/docs/data-storage/collections.html      |    28 +-
 content/docs/data-storage/data-store-dbms.html  |    32 +-
 content/docs/data-storage/entities.html         |    28 +-
 .../docs/data-storage/optimizing-access.html    |    28 +-
 .../entity-connections/connecting-entities.html |    28 +-
 .../disconnecting-entities.html                 |    28 +-
 .../entity-connections/retrieving-entities.html |    28 +-
 content/docs/genindex.html                      |    28 +-
 content/docs/geolocation/geolocation.html       |    28 +-
 .../creating-a-new-application.html             |     2 +-
 .../docs/getting-started/creating-account.html  |     2 +-
 .../getting-started/using-a-sandbox-app.html    |     2 +-
 content/docs/getting-started/using-the-api.html |     2 +-
 content/docs/index.html                         |   127 +-
 content/docs/installation/deployment-guide.html |   834 +
 .../docs/installation/ug1-deploy-to-tomcat.html |    54 +-
 .../installation/ug1-launcher-quick-start.html  |    53 +-
 .../docs/installation/ug2-deploy-to-tomcat.html |    55 +-
 content/docs/introduction/async-vs-sync.html    |    32 +-
 content/docs/introduction/data-model.html       |    28 +-
 content/docs/introduction/overview.html         |    89 +-
 .../docs/introduction/usergrid-features.html    |    42 +-
 content/docs/jersey2skeleton/README.html        |    28 +-
 content/docs/objects.inv                        |   Bin 692 -> 686 bytes
 content/docs/orgs-and-apps/admin-user.html      |    28 +-
 content/docs/orgs-and-apps/application.html     |    28 +-
 content/docs/orgs-and-apps/managing.html        |    28 +-
 content/docs/orgs-and-apps/organization.html    |    28 +-
 .../push-notifications/adding-push-support.html |    28 +-
 .../creating-and-managing-notifications.html    |    28 +-
 .../push-notifications/creating-notifiers.html  |    28 +-
 .../push-notifications/getting-started.html     |    28 +-
 .../managing-users-and-devices.html             |    28 +-
 content/docs/push-notifications/overview.html   |    28 +-
 .../docs/push-notifications/registering.html    |    28 +-
 content/docs/push-notifications/tbd.html        |    28 +-
 .../push-notifications/troubleshooting.html     |    28 +-
 content/docs/push-notifications/tutorial.html   |    28 +-
 .../docs/push-notifications/users-devices.html  |    28 +-
 content/docs/reference/contribute-code.html     |    96 +-
 content/docs/reference/presos-and-videos.html   |    32 +-
 content/docs/rest-endpoints/api-docs.html       |    28 +-
 content/docs/sdks/ios-new.html                  |    28 +-
 content/docs/sdks/sdk-outline.html              |    28 +-
 content/docs/sdks/tbd.html                      |    32 +-
 content/docs/search.html                        |    28 +-
 content/docs/searchindex.js                     |     2 +-
 .../docs/security-and-auth/app-security.html    |    28 +-
 .../authenticating-api-requests.html            |    28 +-
 ...nticating-users-and-application-clients.html |    28 +-
 .../changing-token-time-live-ttl.html           |    28 +-
 .../docs/security-and-auth/facebook-sign.html   |    28 +-
 .../revoking-tokens-logout.html                 |    28 +-
 .../security-and-auth/securing-your-app.html    |    28 +-
 .../user-authentication-types.html              |    28 +-
 .../security-and-auth/using-permissions.html    |    28 +-
 content/docs/security-and-auth/using-roles.html |    28 +-
 content/docs/user-management/activity.html      |    28 +-
 content/docs/user-management/group.html         |    28 +-
 content/docs/user-management/groups.html        |    28 +-
 .../docs/user-management/messagee-example.html  |    28 +-
 .../docs/user-management/user-connections.html  |    28 +-
 .../docs/user-management/user-management.html   |    28 +-
 .../docs/user-management/working-user-data.html |    28 +-
 .../creating-a-new-application.html             |   336 +
 .../docs/using-usergrid/creating-account.html   |   347 +
 .../using-usergrid/using-a-sandbox-app.html     |   372 +
 content/docs/using-usergrid/using-the-api.html  |   506 +
 content/index.html                              |     3 +-
 content/releases/index.html                     |    14 +-
 deployment/aws/README.md                        |   172 +
 deployment/aws/assembly.xml                     |    74 +
 deployment/aws/aws-sample.properties            |    19 +
 deployment/aws/gatling-cluster-cf.json          |   386 +
 deployment/aws/pom.xml                          |   238 +
 deployment/aws/src/main/cql/update_locks.cql    |    23 +
 deployment/aws/src/main/cql/update_usergrid.cql |    27 +
 .../main/cql/update_usergrid_applications.cql   |    46 +
 .../src/main/dist/init_instance/create_raid0.sh |    54 +
 .../main/dist/init_instance/init_db_server.sh   |    76 +
 .../main/dist/init_instance/init_es_server.sh   |    71 +
 .../dist/init_instance/init_graphite_server.sh  |    69 +
 .../dist/init_instance/init_opscenter_server.sh |   287 +
 .../main/dist/init_instance/init_rest_server.sh |   257 +
 .../dist/init_instance/install_cassandra.sh     |    51 +
 .../main/dist/init_instance/install_collectd.sh |   350 +
 .../dist/init_instance/install_elasticsearch.sh |   123 +
 .../init_instance/install_opscenter_agent.sh    |    42 +
 .../dist/init_instance/install_oraclejdk.sh     |    55 +
 .../main/dist/init_instance/install_yourkit.sh  |    39 +
 .../main/dist/init_instance/update_keyspaces.sh |    75 +
 .../aws/src/main/dist/lib/log4j.properties      |    53 +
 deployment/aws/src/main/dist/update.sh          |    35 +
 .../aws/src/main/groovy/NodeRegistry.groovy     |   227 +
 .../src/main/groovy/configure_cassandra.groovy  |   125 +
 .../main/groovy/configure_elasticsearch.groovy  |   169 +
 .../groovy/configure_opscenter_agent.groovy     |    50 +
 .../groovy/configure_opscenter_cassandra.groovy |   120 +
 .../groovy/configure_opscenter_usergrid.groovy  |    58 +
 .../src/main/groovy/configure_portal_new.groovy |    28 +
 .../src/main/groovy/configure_usergrid.groovy   |   193 +
 .../aws/src/main/groovy/create_dashboard.groovy |    79 +
 .../src/main/groovy/get_first_instance.groovy   |    46 +
 .../src/main/groovy/registry_register.groovy    |    38 +
 .../aws/src/main/groovy/tag_instance.groovy     |    55 +
 .../src/main/groovy/wait_for_instances.groovy   |    47 +
 deployment/aws/ugcluster-cf.json                |  2062 +
 deployment/pcf/LICENSE                          |   201 +
 deployment/pcf/README.md                        |    45 +
 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 +
 docs/conf.py                                    |     4 +-
 docs/data-queries/operators-and-types.md        |    25 +-
 docs/data-storage/collections.md                |   144 +
 .../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                                  |    22 +-
 docs/installation/deployment-guide.md           |   468 +
 docs/introduction/overview.md                   |    32 +-
 docs/introduction/usergrid-features.md          |     4 +-
 docs/orgs-and-apps/application.md               |   104 +
 docs/push.tgz                                   |   Bin 1651449 -> 0 bytes
 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 +
 portal/Gruntfile.js                             |     5 +-
 portal/bower.json                               |     2 +-
 portal/getStatus.js                             |    37 +
 .../push/push-send-notification-controller.js   |     1 -
 portal/package.json                             |     2 +-
 portal/status.html                              |    35 +
 release/README.txt                              |     6 +-
 release/binary-release.sh                       |    45 +
 release/pom.xml                                 |    95 +
 release/release-candidate.sh                    |   102 +-
 release/release.sh                              |   112 +-
 release/src/main/assembly/binary.xml            |   102 +
 .../apache/usergrid/android/sdk/UGClient.java   |    12 +-
 .../Usergrid.Sdk.IntegrationTests/BaseTest.cs   |    23 +-
 .../EntityPagingTests.cs                        |     2 +-
 .../Usergrid.Sdk.IntegrationTests/GroupTests.cs |     4 +-
 .../Usergrid.Sdk.IntegrationTests/LoginTests.cs |    12 +-
 .../Usergrid.Sdk.IntegrationTests.dll.config    |     1 +
 sdks/html5-javascript/Release.md                |     6 -
 sdks/ios/README.md                              |    53 +-
 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    |   429 +
 .../java/client/UsergridClientConfig.java       |    60 +
 .../usergrid/java/client/UsergridEnums.java     |   170 +
 .../usergrid/java/client/UsergridRequest.java   |   205 +
 .../java/client/UsergridRequestManager.java     |    97 +
 .../java/client/auth/UsergridAppAuth.java       |    55 +
 .../usergrid/java/client/auth/UsergridAuth.java |    76 +
 .../java/client/auth/UsergridUserAuth.java      |    68 +
 .../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        |   431 +
 .../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/nodejs/lib/usergrid.js                     |     4 +-
 sdks/python/.gitignore                          |    57 +
 sdks/python/GUIDE.md                            |     2 +
 sdks/python/LICENSE                             |   202 +
 sdks/python/README.md                           |    16 +
 sdks/python/README.rst                          |    20 +
 sdks/python/sample_app.py                       |    77 +
 sdks/python/setup.py                            |    51 +
 sdks/python/usergrid/UsergridApplication.py     |    65 +
 sdks/python/usergrid/UsergridAuth.py            |   105 +
 sdks/python/usergrid/UsergridClient.py          |   401 +
 sdks/python/usergrid/UsergridCollection.py      |    82 +
 sdks/python/usergrid/UsergridConnection.py      |    30 +
 sdks/python/usergrid/UsergridError.py           |    21 +
 sdks/python/usergrid/UsergridOrganization.py    |    35 +
 sdks/python/usergrid/UsergridQueryIterator.py   |   157 +
 sdks/python/usergrid/__init__.py                |    37 +
 sdks/python/usergrid/app_templates.py           |    38 +
 sdks/python/usergrid/management_templates.py    |    27 +
 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                |   637 +
 sdks/swift/Source/UsergridAsset.swift           |   198 +
 .../Source/UsergridAssetRequestWrapper.swift    |    48 +
 sdks/swift/Source/UsergridAuth.swift            |   276 +
 sdks/swift/Source/UsergridClient.swift          |   931 +
 sdks/swift/Source/UsergridClientConfig.swift    |   149 +
 sdks/swift/Source/UsergridDevice.swift          |   213 +
 sdks/swift/Source/UsergridEntity.swift          |   635 +
 sdks/swift/Source/UsergridEnums.swift           |   417 +
 sdks/swift/Source/UsergridExtensions.swift      |   112 +
 sdks/swift/Source/UsergridFileMetaData.swift    |   114 +
 sdks/swift/Source/UsergridKeychainHelpers.swift |   196 +
 sdks/swift/Source/UsergridQuery.swift           |   591 +
 sdks/swift/Source/UsergridRequest.swift         |   245 +
 sdks/swift/Source/UsergridRequestManager.swift  |   176 +
 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            |   523 +
 sdks/swift/Tests/ASSET_Tests.swift              |   280 +
 sdks/swift/Tests/AUTH_Tests.swift               |   132 +
 sdks/swift/Tests/CONNECTION_Tests.swift         |   105 +
 sdks/swift/Tests/ClientCreationTests.swift      |    74 +
 sdks/swift/Tests/Entity_Tests.swift             |   173 +
 sdks/swift/Tests/GET_Tests.swift                |   113 +
 sdks/swift/Tests/Info.plist                     |    24 +
 sdks/swift/Tests/PUT_Tests.swift                |   158 +
 sdks/swift/Tests/TestAssets/UsergridGuy.jpg     |   Bin 0 -> 12981 bytes
 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               |   399 +
 .../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                    |   702 +
 sdks/swift/docs/Classes/Usergrid.html           |  3798 +
 sdks/swift/docs/Classes/UsergridAppAuth.html    |   410 +
 sdks/swift/docs/Classes/UsergridAsset.html      |   702 +
 .../Classes/UsergridAssetUploadRequest.html     |   356 +
 sdks/swift/docs/Classes/UsergridAuth.html       |   558 +
 sdks/swift/docs/Classes/UsergridClient.html     |  3873 +
 .../docs/Classes/UsergridClientConfig.html      |   744 +
 sdks/swift/docs/Classes/UsergridDevice.html     |   763 +
 sdks/swift/docs/Classes/UsergridEntity.html     |  2683 +
 .../docs/Classes/UsergridFileMetaData.html      |   532 +
 sdks/swift/docs/Classes/UsergridQuery.html      |  2278 +
 .../UsergridQuery/UsergridQueryOperator.html    |   272 +
 .../UsergridQuery/UsergridQuerySortOrder.html   |   203 +
 sdks/swift/docs/Classes/UsergridRequest.html    |   619 +
 sdks/swift/docs/Classes/UsergridResponse.html   |   969 +
 .../docs/Classes/UsergridResponseError.html     |   473 +
 sdks/swift/docs/Classes/UsergridUser.html       |  2434 +
 .../UsergridUser/UsergridUserProperties.html    |   346 +
 sdks/swift/docs/Classes/UsergridUserAuth.html   |   410 +
 sdks/swift/docs/Enums.html                      |   435 +
 sdks/swift/docs/Enums/UsergridAuthFallback.html |   248 +
 sdks/swift/docs/Enums/UsergridAuthMode.html     |   283 +
 .../docs/Enums/UsergridDeviceProperties.html    |   369 +
 sdks/swift/docs/Enums/UsergridDirection.html    |   286 +
 .../docs/Enums/UsergridEntityProperties.html    |   514 +
 sdks/swift/docs/Enums/UsergridHttpMethod.html   |   341 +
 .../docs/Enums/UsergridImageContentType.html    |   286 +
 .../swift/docs/Enums/UsergridQueryOperator.html |   431 +
 .../docs/Enums/UsergridQuerySortOrder.html      |   338 +
 .../docs/Enums/UsergridUserProperties.html      |   524 +
 sdks/swift/docs/Extensions.html                 |   203 +
 sdks/swift/docs/Extensions/NSDate.html          |   448 +
 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           |   210 +
 sdks/swift/docs/Protocols.html                  |   146 +
 sdks/swift/docs/Protocols/UsergridAuth.html     |   260 +
 sdks/swift/docs/Typealiases.html                |   411 +
 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   |   702 +
 .../Resources/Documents/Classes/Usergrid.html   |  3798 +
 .../Documents/Classes/UsergridAppAuth.html      |   410 +
 .../Documents/Classes/UsergridAsset.html        |   702 +
 .../Classes/UsergridAssetUploadRequest.html     |   356 +
 .../Documents/Classes/UsergridAuth.html         |   558 +
 .../Documents/Classes/UsergridClient.html       |  3873 +
 .../Documents/Classes/UsergridClientConfig.html |   744 +
 .../Documents/Classes/UsergridDevice.html       |   763 +
 .../Documents/Classes/UsergridEntity.html       |  2683 +
 .../Documents/Classes/UsergridFileMetaData.html |   532 +
 .../Documents/Classes/UsergridQuery.html        |  2278 +
 .../UsergridQuery/UsergridQueryOperator.html    |   272 +
 .../UsergridQuery/UsergridQuerySortOrder.html   |   203 +
 .../Documents/Classes/UsergridRequest.html      |   619 +
 .../Documents/Classes/UsergridResponse.html     |   969 +
 .../Classes/UsergridResponseError.html          |   473 +
 .../Documents/Classes/UsergridUser.html         |  2434 +
 .../UsergridUser/UsergridUserProperties.html    |   346 +
 .../Documents/Classes/UsergridUserAuth.html     |   410 +
 .../Contents/Resources/Documents/Enums.html     |   435 +
 .../Documents/Enums/UsergridAuthFallback.html   |   248 +
 .../Documents/Enums/UsergridAuthMode.html       |   283 +
 .../Enums/UsergridDeviceProperties.html         |   369 +
 .../Documents/Enums/UsergridDirection.html      |   286 +
 .../Enums/UsergridEntityProperties.html         |   514 +
 .../Documents/Enums/UsergridHttpMethod.html     |   341 +
 .../Enums/UsergridImageContentType.html         |   286 +
 .../Documents/Enums/UsergridQueryOperator.html  |   431 +
 .../Documents/Enums/UsergridQuerySortOrder.html |   338 +
 .../Documents/Enums/UsergridUserProperties.html |   524 +
 .../Resources/Documents/Extensions.html         |   203 +
 .../Resources/Documents/Extensions/NSDate.html  |   448 +
 .../Documents/Extensions/UsergridAsset.html     |   184 +
 .../Documents/Extensions/UsergridAuth.html      |   260 +
 .../Documents/Extensions/UsergridClient.html    |  1962 +
 .../Resources/Documents/Global Variables.html   |   210 +
 .../Contents/Resources/Documents/Protocols.html |   146 +
 .../Documents/Protocols/UsergridAuth.html       |   260 +
 .../Resources/Documents/Typealiases.html        |   411 +
 .../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     |   927 +
 .../Contents/Resources/Documents/js/jazzy.js    |    40 +
 .../Resources/Documents/js/jquery.min.js        |     4 +
 .../Resources/Documents/undocumented.txt        |     0
 .../.docset/Contents/Resources/docSet.dsidx     |   Bin 0 -> 147456 bytes
 sdks/swift/docs/docsets/.tgz                    |   Bin 0 -> 148251 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                      |   927 +
 sdks/swift/docs/js/jazzy.js                     |    40 +
 sdks/swift/docs/js/jquery.min.js                |     4 +
 sdks/swift/docs/undocumented.txt                |     0
 stack/Coverage.md                               |     2 +-
 stack/README.md                                 |    35 +-
 stack/awscluster/README.md                      |   163 -
 stack/awscluster/assembly.xml                   |    74 -
 stack/awscluster/aws-sample.properties          |    19 -
 stack/awscluster/gatling-cluster-cf.json        |   386 -
 stack/awscluster/pom.xml                        |   237 -
 stack/awscluster/src/main/cql/update_locks.cql  |    23 -
 .../awscluster/src/main/cql/update_usergrid.cql |    27 -
 .../main/cql/update_usergrid_applications.cql   |    46 -
 .../src/main/dist/init_instance/create_raid0.sh |    54 -
 .../main/dist/init_instance/init_db_server.sh   |    76 -
 .../main/dist/init_instance/init_es_server.sh   |    71 -
 .../dist/init_instance/init_graphite_server.sh  |    69 -
 .../dist/init_instance/init_opscenter_server.sh |   287 -
 .../main/dist/init_instance/init_rest_server.sh |   257 -
 .../dist/init_instance/install_cassandra.sh     |    51 -
 .../main/dist/init_instance/install_collectd.sh |   350 -
 .../dist/init_instance/install_elasticsearch.sh |   123 -
 .../init_instance/install_opscenter_agent.sh    |    42 -
 .../dist/init_instance/install_oraclejdk.sh     |    55 -
 .../main/dist/init_instance/install_yourkit.sh  |    39 -
 .../main/dist/init_instance/update_keyspaces.sh |    75 -
 .../src/main/dist/lib/log4j.properties          |    54 -
 stack/awscluster/src/main/dist/update.sh        |    35 -
 .../awscluster/src/main/dist/webapps/dummy.txt  |     0
 .../src/main/groovy/NodeRegistry.groovy         |   227 -
 .../src/main/groovy/configure_cassandra.groovy  |   129 -
 .../main/groovy/configure_elasticsearch.groovy  |   169 -
 .../groovy/configure_opscenter_agent.groovy     |    50 -
 .../groovy/configure_opscenter_cassandra.groovy |   120 -
 .../groovy/configure_opscenter_usergrid.groovy  |    58 -
 .../src/main/groovy/configure_portal_new.groovy |    28 -
 .../src/main/groovy/configure_usergrid.groovy   |   207 -
 .../src/main/groovy/create_dashboard.groovy     |    79 -
 .../src/main/groovy/get_first_instance.groovy   |    46 -
 .../src/main/groovy/registry_register.groovy    |    38 -
 .../src/main/groovy/tag_instance.groovy         |    55 -
 .../src/main/groovy/wait_for_instances.groovy   |    47 -
 stack/awscluster/ugcluster-cf.json              |  2062 -
 stack/build-tools/pom.xml                       |    13 +-
 stack/config/pom.xml                            |    12 +-
 .../main/resources/usergrid-default.properties  |   155 +-
 .../src/test/resources/usergrid-test.properties |    40 +-
 stack/core/pom.xml                              |   827 +-
 .../usergrid/batch/UsergridJobFactory.java      |     2 +-
 .../apache/usergrid/batch/job/OnlyOnceJob.java  |    21 +-
 .../batch/service/JobSchedulerService.java      |    57 +-
 .../batch/service/SchedulerServiceImpl.java     |    34 +-
 .../hazelcast/HazelcastLifecycleMonitor.java    |     8 +-
 .../corepersistence/ApplicationIdCache.java     |     6 +-
 .../corepersistence/ApplicationIdCacheImpl.java |    73 +-
 .../usergrid/corepersistence/CoreModule.java    |   177 +-
 .../corepersistence/CpEntityManager.java        |   740 +-
 .../corepersistence/CpEntityManagerFactory.java |   368 +-
 .../corepersistence/CpManagerCache.java         |     2 +-
 .../corepersistence/CpRelationManager.java      |   396 +-
 .../usergrid/corepersistence/CpSetup.java       |   116 +-
 .../usergrid/corepersistence/CpWalker.java      |    19 +-
 .../corepersistence/EntityManagerFig.java       |    13 +
 .../usergrid/corepersistence/GuiceFactory.java  |    18 +-
 .../usergrid/corepersistence/ManagerCache.java  |     2 +-
 .../asyncevents/AmazonAsyncEventService.java    |   811 -
 .../asyncevents/AsyncEventService.java          |    21 +-
 .../asyncevents/AsyncEventServiceImpl.java      |   931 +
 .../asyncevents/AsyncEventsSchedulerFig.java    |    76 +
 .../asyncevents/AsyncIndexProvider.java         |     6 +-
 .../asyncevents/EventBuilder.java               |    26 +-
 .../asyncevents/EventBuilderImpl.java           |   140 +-
 .../asyncevents/EventExecutionScheduler.java    |    37 +
 .../asyncevents/IndexDocNotFoundException.java  |    37 +
 .../asyncevents/model/AsyncEvent.java           |     9 +-
 .../model/DeIndexOldVersionsEvent.java          |    60 +
 .../asyncevents/model/EdgeDeleteEvent.java      |     4 +-
 .../model/ElasticsearchIndexEvent.java          |     2 +-
 .../asyncevents/model/EntityDeleteEvent.java    |     3 +
 .../model/InitializeApplicationIndexEvent.java  |     2 +-
 .../index/ApplicationIndexLocationStrategy.java |     2 +-
 .../index/CollectionSettings.java               |    47 +
 .../index/CollectionSettingsCache.java          |    59 +
 .../index/CollectionSettingsCacheFig.java       |    39 +
 .../index/CollectionSettingsFactory.java        |    73 +
 .../index/CollectionSettingsImpl.java           |    92 +
 .../index/CollectionSettingsScope.java          |    27 +
 .../index/CollectionSettingsScopeImpl.java      |    73 +
 .../index/IndexLocationStrategyFactoryImpl.java |     2 +-
 .../index/IndexProcessorFig.java                |    23 +-
 .../corepersistence/index/IndexService.java     |    23 +-
 .../corepersistence/index/IndexServiceImpl.java |   189 +-
 .../index/ManagementIndexLocationStrategy.java  |     2 +-
 .../index/ReIndexRequestBuilder.java            |     7 +
 .../index/ReIndexRequestBuilderImpl.java        |    32 +
 .../index/ReIndexServiceImpl.java               |    76 +-
 .../migration/DeDupConnectionDataMigration.java |     2 +-
 .../migration/MigrationModuleVersionPlugin.java |   137 -
 .../pipeline/PipelineModule.java                |     2 +-
 .../pipeline/PipelineOperations.java            |    30 -
 .../pipeline/builder/IdBuilder.java             |    24 +-
 .../pipeline/cursor/CursorSerializerUtil.java   |     9 -
 .../pipeline/cursor/RequestCursor.java          |    29 +-
 .../pipeline/read/FilterFactory.java            |    16 +-
 .../search/AbstractElasticSearchFilter.java     |     4 +-
 .../read/search/CandidateEntityFilter.java      |   119 +-
 .../pipeline/read/search/CandidateIdFilter.java |     6 +-
 .../read/search/SearchCollectionFilter.java     |     2 -
 .../read/search/SearchConnectionFilter.java     |     8 +-
 .../read/traverse/AbstractReadGraphFilter.java  |    49 +-
 .../AbstractReadReverseGraphFilter.java         |   291 +
 .../read/traverse/EntityLoadVerifyFilter.java   |     4 +-
 .../pipeline/read/traverse/IdFilter.java        |    52 +
 .../traverse/ReadGraphCollectionFilter.java     |     3 +-
 .../traverse/ReadGraphConnectionFilter.java     |     3 +-
 .../ReadGraphReverseConnectionFilter.java       |    53 +
 .../results/IdQueryExecutor.java                |    66 +
 .../results/ObservableQueryExecutor.java        |     9 +-
 .../rx/impl/AllApplicationsObservable.java      |     2 -
 .../corepersistence/rx/impl/AsyncRepair.java    |    38 +
 .../rx/impl/ResponseImportTasks.java            |    38 +
 .../service/ApplicationServiceImpl.java         |    46 +-
 .../service/CollectionSearch.java               |     9 +
 .../service/CollectionService.java              |     5 +
 .../service/CollectionServiceImpl.java          |    23 +
 .../service/ConnectionSearch.java               |     8 +-
 .../service/ConnectionServiceImpl.java          |    25 +-
 .../service/ServiceSchedulerFig.java            |    66 +
 .../corepersistence/util/CpNamingUtils.java     |    23 +-
 .../usergrid/count/CassandraCounterStore.java   |    13 +-
 .../usergrid/count/CassandraSubmitter.java      |     4 +-
 .../apache/usergrid/count/SimpleBatcher.java    |     2 +-
 .../usergrid/count/Slf4JBatchSubmitter.java     |     6 +-
 .../apache/usergrid/locking/LockManager.java    |     5 +
 .../locking/cassandra/AstyanaxLockImpl.java     |    92 +
 .../cassandra/AstyanaxLockManagerImpl.java      |   237 +
 .../locking/cassandra/HectorLockImpl.java       |    86 -
 .../cassandra/HectorLockManagerImpl.java        |   142 -
 .../usergrid/locking/guice/LockModule.java      |    40 +
 .../locking/noop/NoOpLockManagerImpl.java       |     5 +
 .../locking/singlenode/SingleNodeLockImpl.java  |    71 -
 .../singlenode/SingleNodeLockManagerImpl.java   |    94 -
 .../zookeeper/ZooKeeperLockManagerImpl.java     |   115 -
 .../locking/zookeeper/ZookeeperLockImpl.java    |    88 -
 .../org/apache/usergrid/mq/CounterQuery.java    |     4 -
 .../java/org/apache/usergrid/mq/Message.java    |     4 +-
 .../main/java/org/apache/usergrid/mq/Query.java |    16 +-
 .../usergrid/mq/cassandra/CassandraMQUtils.java |    12 +-
 .../mq/cassandra/QueueManagerFactoryImpl.java   |     5 +-
 .../usergrid/mq/cassandra/QueueManagerImpl.java |    24 +-
 .../apache/usergrid/mq/cassandra/QueuesCF.java  |     2 +-
 .../mq/cassandra/io/AbstractSearch.java         |     9 +-
 .../mq/cassandra/io/ConsumerTransaction.java    |    32 +-
 .../mq/cassandra/io/NoTransactionSearch.java    |     2 +-
 .../usergrid/persistence/EntityManager.java     |    32 +-
 .../persistence/EntityManagerFactory.java       |    14 +-
 .../persistence/MultiQueryIterator.java         |     2 +-
 .../persistence/NotificationGraphIterator.java  |   163 +
 .../persistence/PagingResultsIterator.java      |    25 +-
 .../apache/usergrid/persistence/PathQuery.java  |    68 +-
 .../usergrid/persistence/PersistenceModule.java |    12 +-
 .../org/apache/usergrid/persistence/Query.java  |    41 +-
 .../usergrid/persistence/RelationManager.java   |     2 +
 .../apache/usergrid/persistence/Results.java    |    20 +
 .../org/apache/usergrid/persistence/Schema.java |    26 +-
 .../persistence/cassandra/ApplicationCF.java    |     2 +-
 .../cassandra/CassandraPersistenceUtils.java    |     8 +-
 .../persistence/cassandra/CassandraService.java |    68 +-
 .../cassandra/ConnectionRefImpl.java            |     4 +-
 .../persistence/cassandra/CounterUtils.java     |    28 +-
 .../usergrid/persistence/cassandra/Setup.java   |    32 +-
 .../cassandra/util/Slf4jTraceTagReporter.java   |     4 +-
 .../cassandra/util/TraceTagAspect.java          |    11 +-
 .../cassandra/util/TraceTagManager.java         |    10 +-
 .../persistence/entities/Notification.java      |   295 +-
 .../usergrid/persistence/entities/Notifier.java |    51 +-
 .../usergrid/system/ServerEnvironmentProps.java |    27 +
 .../usergrid/system/UsergridSystemMonitor.java  |     4 +-
 .../org/apache/usergrid/utils/AESUtils.java     |     8 +-
 .../apache/usergrid/utils/ConversionUtils.java  |     6 +-
 .../org/apache/usergrid/utils/IndexUtils.java   |     4 +-
 .../org/apache/usergrid/utils/JsonUtils.java    |    22 +-
 .../org/apache/usergrid/utils/ListUtils.java    |    10 +-
 .../org/apache/usergrid/utils/MailUtils.java    |     2 +-
 .../org/apache/usergrid/utils/MapUtils.java     |     8 +-
 .../org/apache/usergrid/utils/StringUtils.java  |    12 +-
 .../org/apache/usergrid/utils/UUIDUtils.java    |    16 +-
 .../main/resources/usergrid-core-context.xml    |    47 +-
 .../org/apache/usergrid/AbstractCoreIT.java     |     6 +-
 .../org/apache/usergrid/CoreApplication.java    |    11 +-
 .../org/apache/usergrid/CoreITSetupImpl.java    |    16 +-
 .../apache/usergrid/batch/BulkTestUtils.java    |     1 -
 .../usergrid/batch/job/CountdownLatchJob.java   |     1 -
 .../usergrid/batch/job/DelayExecution.java      |     1 -
 .../usergrid/batch/job/DelayHeartbeat.java      |     1 -
 .../usergrid/batch/job/FailureJobExecution.java |     1 -
 .../usergrid/batch/job/OnlyOnceExceution.java   |   123 -
 .../usergrid/batch/job/OnlyOnceExecution.java   |   122 +
 .../job/OnlyOnceUnlockOnFailExceution.java      |   133 -
 .../job/OnlyOnceUnlockOnFailExecution.java      |   132 +
 .../usergrid/batch/job/SchedulerRuntime1IT.java |     3 +-
 .../usergrid/batch/job/SchedulerRuntime2IT.java |     3 +-
 .../usergrid/batch/job/SchedulerRuntime3IT.java |     3 +-
 .../usergrid/batch/job/SchedulerRuntime4IT.java |     3 +-
 .../usergrid/batch/job/SchedulerRuntime5IT.java |     3 +-
 .../usergrid/batch/job/SchedulerRuntime6IT.java |     5 +-
 .../usergrid/batch/job/SchedulerRuntime7IT.java |     7 +-
 .../usergrid/batch/job/SchedulerRuntime8IT.java |     3 +-
 .../batch/job/SchedulerRuntimeIntervalIT.java   |     3 +-
 .../usergrid/batch/job/TestJobListener.java     |    12 +-
 .../usergrid/batch/job/TestJobListenerTest.java |     6 +-
 .../clustering/hazelcast/HazelcastTest.java     |     5 +-
 .../corepersistence/CpEntityMapUtilsTest.java   |    28 +-
 .../corepersistence/StaleIndexCleanupTest.java  |   181 +-
 .../index/AmazonAsyncEventServiceTest.java      |   103 -
 .../index/AsyncEventServiceImplTest.java        |    96 +
 .../index/AsyncIndexServiceTest.java            |     5 +-
 .../corepersistence/index/IndexNamingTest.java  |     2 +-
 .../corepersistence/index/IndexServiceTest.java |    88 +-
 .../usergrid/corepersistence/index/RxTest.java  |   145 +-
 .../MigrationModuleVersionPluginTest.java       |   259 -
 .../count/BatchCountParallelismTest.java        |    16 +-
 .../usergrid/locking/AstyanaxLockManagerIT.java |   164 +
 .../locking/cassandra/HectorLockManagerIT.java  |   185 -
 .../SingleNodeLockTestSingleNode.java           |   170 -
 .../zookeeper/AbstractZooKeeperTest.java        |   127 -
 .../usergrid/locking/zookeeper/ZooPut.java      |   114 -
 .../zookeeper/ZookeeperLockManagerTest.java     |   186 -
 .../java/org/apache/usergrid/mq/MessagesIT.java |    70 +-
 .../org/apache/usergrid/mq/QueuePathsTest.java  |    18 +-
 .../usergrid/persistence/CollectionIT.java      |   118 +-
 .../usergrid/persistence/CoreSchemaManager.java |    34 +-
 .../apache/usergrid/persistence/CounterIT.java  |    62 +-
 .../persistence/EntityConnectionsIT.java        |   121 +-
 .../persistence/EntityDictionaryIT.java         |    24 +-
 .../usergrid/persistence/EntityManagerIT.java   |   112 +-
 .../apache/usergrid/persistence/EntityTest.java |     2 -
 .../org/apache/usergrid/persistence/GeoIT.java  |   152 +-
 .../persistence/GeoQueryBooleanTest.java        |     8 +-
 .../apache/usergrid/persistence/IndexIT.java    |   141 +-
 .../persistence/PerformanceEntityReadTest.java  |     4 +-
 .../persistence/PerformanceEntityWriteTest.java |     4 +-
 .../usergrid/persistence/RebuildIndexTest.java  |    19 +-
 .../apache/usergrid/persistence/SchemaTest.java |    18 +-
 .../cassandra/EntityManagerFactoryImplIT.java   |     8 +-
 .../query/IntersectionTransitivePagingIT.java   |     4 +-
 .../query/IntersectionUnionPagingIT.java        |    12 +-
 .../persistence/query/IteratingQueryIT.java     |   104 +-
 .../persistence/query/NotSubPropertyIT.java     |     8 +-
 .../persistence/query/ParenthesisProblemIT.java |    81 +
 .../apache/usergrid/utils/IndexUtilsTest.java   |     6 +-
 .../apache/usergrid/utils/JsonUtilsTest.java    |     4 +-
 .../apache/usergrid/utils/ListUtilsTest.java    |     6 +-
 .../org/apache/usergrid/utils/MapUtilsTest.java |     6 +-
 .../apache/usergrid/utils/TestInflector.java    |     6 +-
 .../apache/usergrid/utils/UUIDUtilsTest.java    |     4 +-
 stack/core/src/test/resources/log4j.properties  |     1 -
 .../resources/usergrid-custom-test.properties   |    16 +-
 .../test/resources/usergrid-test-context.xml    |     1 +
 stack/corepersistence/actorsystem/pom.xml       |   106 +
 .../persistence/actorsystem/ActorSystemFig.java |    83 +
 .../actorsystem/ActorSystemManager.java         |    79 +
 .../actorsystem/ActorSystemManagerImpl.java     |   447 +
 .../actorsystem/ActorSystemModule.java          |    34 +
 .../persistence/actorsystem/ClientActor.java    |   205 +
 .../actorsystem/GuiceActorProducer.java         |    46 +
 .../persistence/actorsystem/RouterProducer.java |    53 +
 .../src/main/resources/application.conf         |    50 +
 .../actorsystem/ActorServiceServiceTest.java    |    68 +
 stack/corepersistence/cache/pom.xml             |     2 +-
 .../usergrid/persistence/cache/CacheScope.java  |    24 +
 .../impl/ScopedCacheSerializationImpl.java      |   323 +-
 .../persistence/cache/ScopedCacheTest.java      |    15 +-
 stack/corepersistence/collection/pom.xml        |   120 +-
 .../collection/EntityCollectionManager.java     |    21 +-
 .../EntityCollectionManagerFactory.java         |     4 +-
 .../persistence/collection/FieldSet.java        |    12 +
 .../exception/CollectionRuntimeException.java   |    11 +
 .../exception/WriteUniqueVerifyException.java   |     2 +-
 .../collection/guice/CollectionModule.java      |    41 +
 .../guice/CollectionTaskExecutor.java           |    35 -
 .../EntityCollectionManagerFactoryImpl.java     |   174 +-
 .../impl/EntityCollectionManagerImpl.java       |   291 +-
 .../mvcc/stage/CollectionIoEvent.java           |    14 +-
 .../mvcc/stage/delete/MarkCommit.java           |    42 +-
 .../collection/mvcc/stage/delete/MarkStart.java |     4 +-
 .../mvcc/stage/delete/UniqueCleanup.java        |    33 +-
 .../mvcc/stage/delete/VersionCompact.java       |     2 +-
 .../mvcc/stage/write/RollbackAction.java        |    46 +-
 .../mvcc/stage/write/WriteCommit.java           |   116 +-
 .../mvcc/stage/write/WriteOptimisticVerify.java |     4 +-
 .../collection/mvcc/stage/write/WriteStart.java |    15 +-
 .../mvcc/stage/write/WriteUniqueVerify.java     |   207 +-
 .../scheduler/CollectionExecutorScheduler.java  |    52 +
 .../scheduler/CollectionSchedulerFig.java       |    53 +
 .../serialization/SerializationFig.java         |     4 +
 .../UniqueValueSerializationStrategy.java       |    51 +-
 .../impl/AllUniqueFieldsIterator.java           |    29 +
 .../serialization/impl/EntityVersion.java       |    12 +-
 .../serialization/impl/LogEntryIterator.java    |   128 +
 .../serialization/impl/MutableFieldSet.java     |    12 +
 .../MvccEntitySerializationStrategyImpl.java    |    33 +-
 ...vccEntitySerializationStrategyProxyImpl.java |    10 +-
 .../MvccEntitySerializationStrategyV1Impl.java  |    10 +-
 .../MvccEntitySerializationStrategyV2Impl.java  |    15 +-
 .../MvccEntitySerializationStrategyV3Impl.java  |    25 +-
 .../MvccLogEntrySerializationProxyImpl.java     |    10 +-
 .../MvccLogEntrySerializationStrategyImpl.java  |    12 +-
 ...MvccLogEntrySerializationStrategyV1Impl.java |    25 +-
 ...MvccLogEntrySerializationStrategyV2Impl.java |    25 +-
 .../serialization/impl/SettingsValidation.java  |     2 +-
 .../impl/UniqueFieldRowKeySerializer.java       |     3 +-
 .../UniqueValueSerializationStrategyImpl.java   |   638 +-
 ...iqueValueSerializationStrategyProxyImpl.java |    75 +-
 .../UniqueValueSerializationStrategyV1Impl.java |   488 +-
 .../UniqueValueSerializationStrategyV2Impl.java |   477 +-
 .../serialization/impl/UniqueValueSetImpl.java  |     6 +-
 .../migration/MvccEntityDataMigrationImpl.java  |    32 +-
 .../uniquevalues/ReservationCache.java          |    87 +
 .../uniquevalues/ReservationCacheActor.java     |    87 +
 .../uniquevalues/UniqueValueActor.java          |   282 +
 .../uniquevalues/UniqueValueException.java      |    33 +
 .../uniquevalues/UniqueValuesFig.java           |    84 +
 .../uniquevalues/UniqueValuesRouter.java        |    70 +
 .../uniquevalues/UniqueValuesService.java       |    74 +
 .../uniquevalues/UniqueValuesServiceImpl.java   |   369 +
 .../uniquevalues/UniqueValuesTable.java         |    42 +
 .../uniquevalues/UniqueValuesTableImpl.java     |   101 +
 .../collection/AbstractUniqueValueTest.java     |    46 +
 .../collection/EntityCollectionManagerIT.java   |   202 +-
 .../EntityCollectionManagerStressTest.java      |    36 +-
 .../collection/guice/TestCollectionModule.java  |     9 +-
 .../changelog/ChangeLogGeneratorImplTest.java   |     8 +-
 .../mvcc/stage/AbstractEntityStageTest.java     |     1 -
 .../mvcc/stage/delete/MarkCommitTest.java       |    23 +-
 .../mvcc/stage/delete/UniqueCleanupTest.java    |     1 -
 .../mvcc/stage/write/WriteCommitTest.java       |    21 +-
 .../stage/write/WriteOptimisticVerifyTest.java  |    21 +-
 .../mvcc/stage/write/WriteUniqueVerifyIT.java   |   125 +-
 .../mvcc/stage/write/WriteUniqueVerifyTest.java |    64 +-
 ...MvccEntitySerializationStrategyImplTest.java |     2 +-
 .../MvccEntitySerializationStrategyV2Test.java  |     2 +-
 .../impl/SerializationComparison.java           |     5 +-
 .../impl/SettingsValidationTest.java            |     2 +-
 ...niqueValueSerializationStrategyImplTest.java |   277 +-
 ...ctMvccEntityDataMigrationV1ToV3ImplTest.java |     5 +-
 .../UniqueValuesServiceDeleteTest.java          |   149 +
 .../uniquevalues/UniqueValuesServiceTest.java   |   185 +
 .../src/test/resources/dynamic-test.properties  |     4 +-
 .../src/test/resources/usergrid-CHOP.properties |    22 +-
 .../src/test/resources/usergrid-UNIT.properties |    23 +-
 .../src/test/resources/usergrid.properties      |    32 +
 stack/corepersistence/common/pom.xml            |   398 +-
 .../persistence/core/CassandraConfig.java       |    77 +
 .../persistence/core/CassandraConfigImpl.java   |   136 +
 .../usergrid/persistence/core/CassandraFig.java |   239 +
 .../core/astyanax/AstyanaxKeyspaceProvider.java |    46 +-
 .../core/astyanax/CassandraCluster.java         |    34 +
 .../core/astyanax/CassandraClusterImpl.java     |   225 +
 .../core/astyanax/CassandraConfig.java          |    58 -
 .../core/astyanax/CassandraConfigImpl.java      |   109 -
 .../persistence/core/astyanax/CassandraFig.java |   115 -
 .../persistence/core/astyanax/ColumnSearch.java |     7 +-
 .../astyanax/MultiKeyColumnNameIterator.java    |     8 +-
 .../core/astyanax/MultiRowColumnIterator.java   |    53 +-
 .../astyanax/MultiRowShardColumnIterator.java   |   462 +
 .../core/astyanax/MultiTenantColumnFamily.java  |    47 +
 .../MultiTenantColumnFamilyDefinition.java      |   138 +
 .../core/astyanax/MultiTennantColumnFamily.java |    47 -
 .../MultiTennantColumnFamilyDefinition.java     |   138 -
 .../core/consistency/TimeServiceImpl.java       |     5 +-
 .../persistence/core/datastax/CQLUtils.java     |   269 +
 .../core/datastax/DataStaxCluster.java          |    37 +
 .../core/datastax/DataStaxSessionProvider.java  |    43 +
 .../core/datastax/TableDefinition.java          |   127 +
 .../core/datastax/impl/DataStaxClusterImpl.java |   228 +
 .../core/executor/TaskExecutorFactory.java      |   112 +-
 .../persistence/core/guice/CommonModule.java    |    49 +-
 .../core/guice/SettingsValidationCluster.java   |    18 +
 .../core/metrics/MetricsFactoryImpl.java        |     6 +-
 .../migration/data/AbstractMigrationPlugin.java |     6 +-
 .../data/DataMigrationManagerImpl.java          |    11 +-
 .../data/MigrationInfoSerializationImpl.java    |    35 +-
 .../core/migration/schema/Migration.java        |     7 +-
 .../migration/schema/MigrationManagerImpl.java  |   154 +-
 .../core/migration/util/AstayanxUtils.java      |    49 -
 .../core/migration/util/AstyanaxUtils.java      |    50 +
 .../persistence/core/rx/ObservableIterator.java |     4 +-
 .../persistence/core/rx/OrderedMerge.java       |     6 +-
 .../persistence/core/rx/RxSchedulerFig.java     |    71 -
 .../core/rx/RxTaskSchedulerImpl.java            |    81 +-
 .../persistence/core/shard/SmartShard.java      |    61 +
 .../core/astyanax/ColumnNameIteratorTest.java   |    24 +-
 .../MultiKeyColumnNameIteratorTest.java         |    26 +-
 .../astyanax/MultiRowColumnIteratorTest.java    |    37 +-
 .../persistence/core/astyanax/TestUtils.java    |    14 +-
 .../persistence/core/datastax/CQLUtilsTest.java |   187 +
 .../core/datastax/DataStaxClusterTest.java      |    84 +
 .../core/datastax/TableDefinitionTest.java      |    81 +
 .../core/guice/MigrationManagerRule.java        |    18 +
 .../guice/SettingsValidationClusterTest.java    |    19 +
 .../persistence/core/rx/OrderedMergeTest.java   |    43 +-
 .../src/test/resources/usergrid-UNIT.properties |    24 +-
 .../src/test/resources/usergrid.properties      |    19 +
 stack/corepersistence/graph/pom.xml             |     3 +-
 .../usergrid/persistence/graph/GraphFig.java    |    21 +-
 .../persistence/graph/guice/GraphModule.java    |     7 -
 .../graph/impl/GraphManagerImpl.java            |    20 +-
 .../graph/impl/stage/EdgeDeleteRepairImpl.java  |    18 +-
 .../graph/impl/stage/EdgeMetaRepairImpl.java    |    46 +-
 .../impl/stage/NodeDeleteListenerImpl.java      |    20 +-
 .../EdgeMetadataSerializationProxyImpl.java     |    10 +-
 .../impl/EdgeMetadataSerializationV1Impl.java   |    46 +-
 .../impl/EdgeMetadataSerializationV2Impl.java   |    56 +-
 .../impl/EdgeSerializationImpl.java             |    63 +-
 .../serialization/impl/EdgesObservableImpl.java |    16 +-
 .../impl/NodeSerializationImpl.java             |    23 +-
 .../impl/TargetIdObservableImpl.java            |     4 +-
 .../impl/migration/EdgeDataMigrationImpl.java   |     2 +-
 .../impl/shard/DirectedEdgeMeta.java            |    12 +-
 .../impl/shard/EdgeColumnFamilies.java          |    12 +-
 .../impl/shard/EdgeShardStrategy.java           |    10 +-
 .../impl/shard/NodeShardApproximation.java      |    66 -
 .../impl/shard/NodeShardCache.java              |     7 +-
 .../graph/serialization/impl/shard/Shard.java   |    33 +-
 .../impl/shard/ShardEntryGroup.java             |    21 +-
 .../impl/shard/ShardedEdgeSerialization.java    |     2 +-
 .../serialization/impl/shard/count/Counter.java |   131 -
 .../shard/count/NodeShardApproximationImpl.java |   272 -
 .../count/NodeShardCounterSerialization.java    |    48 -
 .../NodeShardCounterSerializationImpl.java      |   186 -
 .../impl/shard/count/ShardKey.java              |    75 -
 .../impl/shard/impl/EdgeSearcher.java           |   113 +-
 .../shard/impl/EdgeShardSerializationImpl.java  |    76 +-
 .../shard/impl/NodeShardAllocationImpl.java     |    72 +-
 .../impl/shard/impl/NodeShardCacheImpl.java     |    57 +-
 .../shard/impl/ShardEntryGroupIterator.java     |    12 +
 .../shard/impl/ShardGroupColumnIterator.java    |    14 +-
 .../shard/impl/ShardGroupCompactionImpl.java    |   210 +-
 .../impl/shard/impl/ShardGroupDeletionImpl.java |    44 +-
 .../impl/ShardedEdgeSerializationImpl.java      |   142 +-
 .../impl/shard/impl/ShardsColumnIterator.java   |    79 +-
 .../shard/impl/SizebasedEdgeColumnFamilies.java |    54 +-
 .../shard/impl/SizebasedEdgeShardStrategy.java  |    13 +-
 .../shard/impl/serialize/ShardSerializer.java   |    86 +
 .../persistence/graph/GraphManagerLoadTest.java |    18 +-
 .../graph/GraphManagerShardConsistencyIT.java   |   288 +-
 .../graph/GraphManagerShardingIT.java           |   208 -
 .../graph/GraphManagerStressTest.java           |    54 +-
 .../graph/impl/NodeDeleteListenerTest.java      |     9 +-
 .../serialization/EdgeSerializationTest.java    |    11 +-
 .../graph/serialization/TestCount.java          |     4 +-
 .../impl/shard/EdgeShardSerializationTest.java  |    48 +
 .../impl/shard/NodeShardAllocationTest.java     |    76 +-
 .../impl/shard/ShardEntryGroupTest.java         |    59 +
 .../impl/shard/ShardGroupCompactionTest.java    |     4 +-
 .../serialization/impl/shard/ShardTest.java     |    65 +
 .../shard/count/NodeShardApproximationTest.java |   627 -
 .../NodeShardCounterSerializationTest.java      |   124 -
 .../shard/impl/ShardGroupDeletionImplTest.java  |     5 +
 .../graph/src/test/resources/log4j.properties   |     6 +
 .../src/test/resources/usergrid-AWS.properties  |     4 +-
 .../src/test/resources/usergrid-CHOP.properties |     4 +-
 .../src/test/resources/usergrid-UNIT.properties |     4 +-
 ...-cassandra-1.56.49-SNAPSHOT-UG-1-javadoc.jar |   Bin 619559 -> 0 bytes
 ...-cassandra-1.56.49-SNAPSHOT-UG-1-sources.jar |   Bin 161970 -> 0 bytes
 ...astyanax-cassandra-1.56.49-SNAPSHOT-UG-1.jar |   Bin 224466 -> 0 bytes
 ...astyanax-cassandra-1.56.49-SNAPSHOT-UG-1.pom |   112 -
 .../astyanax-cassandra/maven-metadata-local.xml |    12 -
 ...ax-contrib-1.56.49-SNAPSHOT-UG-1-javadoc.jar |   Bin 33178 -> 0 bytes
 ...ax-contrib-1.56.49-SNAPSHOT-UG-1-sources.jar |   Bin 2314 -> 0 bytes
 .../astyanax-contrib-1.56.49-SNAPSHOT-UG-1.jar  |   Bin 4842 -> 0 bytes
 .../astyanax-contrib-1.56.49-SNAPSHOT-UG-1.pom  |   112 -
 .../astyanax-contrib/maven-metadata-local.xml   |    12 -
 ...yanax-core-1.56.49-SNAPSHOT-UG-1-javadoc.jar |   Bin 522906 -> 0 bytes
 ...yanax-core-1.56.49-SNAPSHOT-UG-1-sources.jar |   Bin 141910 -> 0 bytes
 .../astyanax-core-1.56.49-SNAPSHOT-UG-1.jar     |   Bin 212858 -> 0 bytes
 .../astyanax-core-1.56.49-SNAPSHOT-UG-1.pom     |    88 -
 .../astyanax-core/maven-metadata-local.xml      |    12 -
 ...ity-mapper-1.56.49-SNAPSHOT-UG-1-javadoc.jar |   Bin 97513 -> 0 bytes
 ...ity-mapper-1.56.49-SNAPSHOT-UG-1-sources.jar |   Bin 30591 -> 0 bytes
 ...anax-entity-mapper-1.56.49-SNAPSHOT-UG-1.jar |   Bin 68952 -> 0 bytes
 ...anax-entity-mapper-1.56.49-SNAPSHOT-UG-1.pom |   118 -
 .../maven-metadata-local.xml                    |    12 -
 ...x-examples-1.56.49-SNAPSHOT-UG-1-javadoc.jar |   Bin 38284 -> 0 bytes
 ...x-examples-1.56.49-SNAPSHOT-UG-1-sources.jar |   Bin 4457 -> 0 bytes
 .../astyanax-examples-1.56.49-SNAPSHOT-UG-1.jar |   Bin 8506 -> 0 bytes
 .../astyanax-examples-1.56.49-SNAPSHOT-UG-1.pom |   106 -
 .../astyanax-examples/maven-metadata-local.xml  |    12 -
 ...anax-queue-1.56.49-SNAPSHOT-UG-1-javadoc.jar |   Bin 180462 -> 0 bytes
 ...anax-queue-1.56.49-SNAPSHOT-UG-1-sources.jar |   Bin 44057 -> 0 bytes
 .../astyanax-queue-1.56.49-SNAPSHOT-UG-1.jar    |   Bin 86586 -> 0 bytes
 .../astyanax-queue-1.56.49-SNAPSHOT-UG-1.pom    |   112 -
 .../astyanax-queue/maven-metadata-local.xml     |    12 -
 ...ax-recipes-1.56.49-SNAPSHOT-UG-1-javadoc.jar |   Bin 204424 -> 0 bytes
 ...ax-recipes-1.56.49-SNAPSHOT-UG-1-sources.jar |   Bin 58161 -> 0 bytes
 .../astyanax-recipes-1.56.49-SNAPSHOT-UG-1.jar  |   Bin 100246 -> 0 bytes
 .../astyanax-recipes-1.56.49-SNAPSHOT-UG-1.pom  |   106 -
 .../astyanax-recipes/maven-metadata-local.xml   |    12 -
 ...nax-thrift-1.56.49-SNAPSHOT-UG-1-javadoc.jar |   Bin 197342 -> 0 bytes
 ...nax-thrift-1.56.49-SNAPSHOT-UG-1-sources.jar |   Bin 76509 -> 0 bytes
 .../astyanax-thrift-1.56.49-SNAPSHOT-UG-1.jar   |   Bin 239007 -> 0 bytes
 .../astyanax-thrift-1.56.49-SNAPSHOT-UG-1.pom   |   112 -
 .../astyanax-thrift/maven-metadata-local.xml    |    12 -
 .../astyanax-1.56.49-SNAPSHOT-UG-1-javadoc.jar  |   Bin 261 -> 0 bytes
 .../astyanax-1.56.49-SNAPSHOT-UG-1-sources.jar  |   Bin 261 -> 0 bytes
 .../astyanax-1.56.49-SNAPSHOT-UG-1.jar          |   Bin 261 -> 0 bytes
 .../astyanax-1.56.49-SNAPSHOT-UG-1.pom          |   136 -
 .../astyanax/astyanax/maven-metadata-local.xml  |    12 -
 stack/corepersistence/map/pom.xml               |     3 +-
 .../usergrid/persistence/map/MapKeyResults.java |    42 +
 .../usergrid/persistence/map/MapManager.java    |     7 +
 .../persistence/map/impl/MapManagerImpl.java    |    15 +-
 .../persistence/map/impl/MapSerialization.java  |    11 +
 .../map/impl/MapSerializationImpl.java          |   562 +-
 .../persistence/map/MapManagerTest.java         |   193 +-
 stack/corepersistence/model/pom.xml             |    18 +-
 .../org/apache/usergrid/ExperimentalTest.java   |    22 +
 .../java/org/apache/usergrid/StressTest.java    |    22 +
 .../persistence/model/entity/EntityMap.java     |    68 +-
 .../model/entity/EntityToMapConverter.java      |     9 +-
 .../model/entity/MapToEntityConverter.java      |   255 +-
 .../persistence/model/field/ArrayField.java     |    11 +-
 .../persistence/model/field/BooleanField.java   |     4 +-
 .../persistence/model/field/ByteArrayField.java |    17 +-
 .../persistence/model/field/DistanceField.java  |    51 +
 .../model/field/EntityObjectField.java          |     9 +
 .../persistence/model/field/FieldTypeName.java  |     7 +-
 .../persistence/model/field/FloatField.java     |     4 +-
 .../persistence/model/field/IntegerField.java   |     4 +-
 .../persistence/model/field/ListField.java      |    11 +-
 .../persistence/model/field/LocationField.java  |    11 +-
 .../persistence/model/field/LongField.java      |     4 +-
 .../persistence/model/field/NullField.java      |    51 +
 .../model/field/SerializedObjectField.java      |     8 +-
 .../persistence/model/field/SetField.java       |    13 +-
 .../persistence/model/field/StringField.java    |     6 +-
 .../persistence/model/field/UUIDField.java      |     4 +-
 .../model/field/value/EntityObject.java         |    15 +-
 .../persistence/model/util/EntityUtils.java     |    18 +
 .../persistence/model/util/UUIDGenerator.java   |    18 +
 .../model/entity/MapToEntityConverterTest.java  |   179 +
 .../persistence/model/field/EntityTest.java     |    27 +-
 .../model/util/UUIDGeneratorTest.java           |    18 +
 stack/corepersistence/pom.xml                   |   197 +-
 stack/corepersistence/queryindex/pom.xml        |    25 +-
 .../usergrid/persistence/index/EntityIndex.java |     5 +-
 .../persistence/index/EntityIndexBatch.java     |    13 +-
 .../persistence/index/GeoCandidateResult.java   |    40 +
 .../usergrid/persistence/index/IndexFig.java    |     7 +-
 .../index/impl/DeIndexOperation.java            |     4 +-
 .../persistence/index/impl/EntityField.java     |    11 +
 .../index/impl/EntityMappingParser.java         |    25 +-
 .../index/impl/EntityToMapConverter.java        |    94 +-
 .../index/impl/EsEntityIndexBatchImpl.java      |    41 +-
 .../index/impl/EsEntityIndexFactoryImpl.java    |     2 +
 .../index/impl/EsEntityIndexImpl.java           |   222 +-
 .../index/impl/EsIndexProducerImpl.java         |    23 +-
 .../persistence/index/impl/EsProvider.java      |    28 +-
 .../index/impl/FailureMonitorImpl.java          |     7 +-
 .../persistence/index/impl/FieldParser.java     |     5 +-
 .../persistence/index/impl/IndexOperation.java  |     9 +-
 .../index/impl/IndexOperationMessage.java       |     6 +-
 .../persistence/index/impl/IndexingUtils.java   |    63 +-
 .../EsIndexMappingMigrationPlugin.java          |     4 +-
 .../persistence/index/query/ParsedQuery.java    |     4 +
 .../index/query/ParsedQueryBuilder.java         |     4 +-
 .../index/utils/ConversionUtils.java            |     6 +-
 .../persistence/index/utils/ListUtils.java      |    10 +-
 .../persistence/index/utils/UUIDUtils.java      |     6 +-
 .../persistence/index/impl/EntityIndexTest.java |   134 +-
 .../index/impl/EntityToMapConverterTest.java    |   193 +-
 .../persistence/index/impl/GeoPagingTest.java   |     5 +-
 .../index/impl/IndexLoadTestsIT.java            |     6 +-
 .../index/impl/IndexingUtilsTest.java           |    36 +
 .../index/impl/TestIndexIdentifier.java         |     3 +-
 .../src/test/resources/dynamic-test.properties  |     4 +-
 .../src/test/resources/usergrid-CHOP.properties |     4 +-
 .../src/test/resources/usergrid-UNIT.properties |     4 +-
 stack/corepersistence/queue/pom.xml             |   179 +-
 .../persistence/queue/LocalQueueManager.java    |    11 +-
 .../usergrid/persistence/queue/QueueFig.java    |    23 +-
 .../persistence/queue/QueueManager.java         |     6 +-
 .../persistence/queue/QueueMessage.java         |    10 +
 .../queue/impl/QueueManagerFactoryImpl.java     |    78 +-
 .../persistence/queue/impl/QueueScopeImpl.java  |     3 -
 .../queue/impl/SNSQueueManagerImpl.java         |   128 +-
 .../queue/util/AmazonNotificationUtils.java     |    22 +-
 .../persistence/queue/QueueManagerTest.java     |    10 +-
 .../usergrid/launcher/EmbeddedServerHelper.java |    10 +-
 .../resources/usergrid-standalone.properties    |    12 +-
 stack/loadtests/.gitignore                      |     1 -
 stack/loadtests/README.md                       |   207 -
 stack/loadtests/pom.xml                         |   149 -
 stack/loadtests/runAuditDeleteEntities.sh       |    65 -
 .../runAuditGetAllAppCollectionEntities.sh      |    68 -
 .../loadtests/runAuditGetCollectionEntities.sh  |    68 -
 .../runAuditVerifyCollectionEntities.sh         |    69 -
 stack/loadtests/runCollectionQueryTest.sh       |    88 -
 .../runCustomInjectRandomEntityByUuidTest.sh    |   108 -
 stack/loadtests/runDeleteEntities.sh            |    92 -
 .../loadtests/runGetEntitiesByNameSequential.sh |   101 -
 stack/loadtests/runGetEntitiesByUuid.sh         |    92 -
 stack/loadtests/runLoadEntities.sh              |    97 -
 stack/loadtests/runLoadEntitiesUnlimited.sh     |   104 -
 .../loadtests/runLoadLargeMultiFieldEntities.sh |   107 -
 stack/loadtests/runLoadNoNameEntities.sh        |    98 -
 stack/loadtests/runLoadSortableEntities.sh      |    98 -
 stack/loadtests/runOrgAppSetup.sh               |    91 -
 .../loadtests/runRandomEntityByNameQueryTest.sh |    91 -
 stack/loadtests/runRandomEntityByNameTest.sh    |    91 -
 stack/loadtests/runUpdateEntities.sh            |    91 -
 stack/loadtests/runtests_deprecated.sh          |   120 -
 .../datagenerators/EntityDataGenerator.scala    |   183 -
 .../datagenerators/FeederGenerator.scala        |   304 -
 .../datagenerators/datafiles/dist.all.last.txt  | 88799 -----------------
 .../datafiles/dist.female.first.txt             |  4275 -
 .../datafiles/dist.male.first.txt               |  1219 -
 .../usergrid/datagenerators/firstNames.txt      |  5494 -
 .../usergrid/datagenerators/lastNames.txt       | 88799 -----------------
 .../org/apache/usergrid/enums/AuthType.scala    |    31 -
 .../usergrid/enums/ConfigProperties.scala       |   181 -
 .../usergrid/enums/CsvFeedPatternType.scala     |    30 -
 .../usergrid/enums/EndConditionType.scala       |    29 -
 .../org/apache/usergrid/enums/EntityType.scala  |    30 -
 .../apache/usergrid/enums/ScenarioType.scala    |    38 -
 .../org/apache/usergrid/enums/TokenType.scala   |    29 -
 .../apache/usergrid/helpers/Extractors.scala    |   154 -
 .../org/apache/usergrid/helpers/Headers.scala   |    70 -
 .../org/apache/usergrid/helpers/Setup.scala     |   312 -
 .../org/apache/usergrid/helpers/Utils.scala     |   102 -
 .../scenarios/ApplicationScenarios.scala        |    53 -
 .../usergrid/scenarios/AuditScenarios.scala     |   342 -
 .../scenarios/ConnectionScenarios.scala         |    66 -
 .../usergrid/scenarios/DeviceScenarios.scala    |    85 -
 .../scenarios/EntityCollectionScenarios.scala   |   407 -
 .../usergrid/scenarios/EntityScenarios.scala    |    80 -
 .../usergrid/scenarios/GeoScenarios.scala       |    49 -
 .../scenarios/NotificationScenarios.scala       |    80 -
 .../usergrid/scenarios/NotifierScenarios.scala  |    70 -
 .../scenarios/OrganizationScenarios.scala       |    60 -
 .../usergrid/scenarios/TokenScenarios.scala     |    56 -
 .../usergrid/scenarios/UserScenarios.scala      |   210 -
 .../org/apache/usergrid/settings/Settings.scala |   612 -
 .../usergrid/simulations/AuditSimulation.scala  |    86 -
 .../simulations/ConfigurableSimulation.scala    |   105 -
 .../simulations/CustomInjectionSimulation.scala |   107 -
 .../simulations/deprecated/AppSimulation.scala  |    41 -
 .../deprecated/ConnectionsSimulation.scala      |    51 -
 .../deprecated/DeleteUsersSimulation.scala      |    56 -
 .../deprecated/GetEntitySimulation.scala        |    44 -
 .../deprecated/GetUserPagesSimulation.scala     |    51 -
 .../deprecated/GetUsersSimulation.scala         |    51 -
 .../deprecated/PostCustomEntitySimulation.scala |    76 -
 .../deprecated/PostUsersSimulation.scala        |    51 -
 .../PushNotificationTargetUserSimulation.scala  |    45 -
 .../deprecated/PutCustomEntitySimulation.scala  |    75 -
 .../deprecated/PutUsersSimulation.scala         |    56 -
 .../deprecated/SetupSimulation.scala            |    43 -
 stack/loadtests/src/main/scripts/gatling-mvn.sh |    31 -
 stack/loadtests/src/main/scripts/gatling-ug.sh  |    51 -
 .../src/test/resources/dummyAuditUuid.csv       |     1 -
 .../loadtests/src/test/resources/dummyUuid.csv  |     1 -
 stack/loadtests/src/test/resources/gatling.conf |   150 -
 .../src/test/resources/logback-test.xml         |    39 -
 stack/loadtests/src/test/resources/logback.xml  |    38 -
 .../loadtests/src/test/resources/recorder.conf  |    37 -
 stack/loadtests/src/test/scala/Engine.scala     |    29 -
 .../src/test/scala/IDEPathHelper.scala          |    38 -
 stack/loadtests/src/test/scala/Recorder.scala   |    28 -
 stack/loadtests/testConfig.sh                   |    67 -
 .../usergrid/mongo/AbstractMongoTest.java       |     2 +-
 .../apache/usergrid/mongo/BasicMongoTest.java   |     8 +-
 .../apache/usergrid/mongo/MongoQueryTest.java   |    18 +-
 stack/pom.xml                                   |  3052 +-
 stack/query-validator/pom.xml                   |    32 +-
 .../query/validator/ApiServerRunner.java        |   103 +-
 .../query/validator/AbstractQueryIT.java        |    26 +-
 .../usergrid/query/validator/QueryITSuite.java  |    12 +-
 .../query/validator/users/UserQueryIT.java      |    56 +-
 .../test/resources/usergrid-test-context.xml    |     5 +-
 stack/rest/pom.xml                              |    52 +-
 .../usergrid/rest/AbstractContextResource.java  |    85 +-
 .../org/apache/usergrid/rest/ApiResponse.java   |    79 +-
 .../org/apache/usergrid/rest/RootResource.java  |    65 +-
 .../rest/ServerEnvironmentProperties.java       |    22 +-
 .../apache/usergrid/rest/ShutdownListener.java  |    11 +
 .../apache/usergrid/rest/SwaggerServlet.java    |    18 +-
 .../rest/applications/ApplicationResource.java  |    63 +-
 .../rest/applications/AuthResource.java         |    30 +-
 .../rest/applications/CollectionResource.java   |   230 +
 .../rest/applications/ServiceResource.java      |   235 +-
 .../applications/assets/AssetsResource.java     |    44 +-
 .../applications/events/EventsResource.java     |     6 +-
 .../notifiers/NotifierResource.java             |    54 +-
 .../notifiers/NotifiersResource.java            |    54 +-
 .../rest/applications/queues/QueueResource.java |    50 +-
 .../queues/QueueSubscriberResource.java         |    25 +-
 .../queues/QueueSubscriptionResource.java       |    25 +-
 .../queues/QueueTransactionsResource.java       |     4 +
 .../rest/applications/users/UserResource.java   |   128 +-
 .../rest/applications/users/UsersResource.java  |    45 +-
 .../exceptions/AbstractExceptionMapper.java     |    17 +-
 ...ApplicationAlreadyExistsExceptionMapper.java |    32 +
 .../usergrid/rest/exceptions/AuthErrorInfo.java |     1 +
 .../AwsPropertiesNotFoundExceptionMapper.java   |     3 +-
 .../ElasticsearchExecutionExceptionMapper.java  |    38 +
 .../GCMInvalidRequestExceptionMapper.java       |    62 +
 .../IllegalArgumentExceptionMapper.java         |     4 +-
 .../exceptions/NotAllowedExceptionMapper.java   |    34 +
 ...rganizationApplicationNotFoundException.java |     6 +-
 .../rest/exceptions/RuntimeExceptionMapper.java |    43 +
 .../ServiceResourceNotFoundExceptionMapper.java |     9 +-
 .../UnsupportedOperationExceptionMapper.java    |    35 +
 .../UnsupportedRestOperationException.java      |    25 +
 ...UnsupportedRestOperationExceptionMapper.java |    34 +
 ...upportedServiceOperationExceptionMapper.java |    34 +
 .../rest/filters/ContentTypeFilter.java         |    20 +-
 .../rest/filters/JSONPCallbackFilter.java       |     4 +-
 .../usergrid/rest/filters/MeteringFilter.java   |     8 +-
 .../usergrid/rest/filters/TracingFilter.java    |     7 +-
 .../rest/management/ManagementResource.java     |   509 +-
 .../organizations/OrganizationResource.java     |   153 +-
 .../organizations/OrganizationsResource.java    |    70 +-
 .../applications/ApplicationResource.java       |    41 +-
 .../applications/ApplicationsResource.java      |     4 +-
 .../applications/imports/ImportsResource.java   |     6 +-
 .../organizations/users/UsersResource.java      |    63 +-
 .../rest/management/users/UserResource.java     |   165 +-
 .../rest/management/users/UsersResource.java    |    72 +-
 .../organizations/OrganizationsResource.java    |    28 +-
 .../organizations/OrganizationResource.java     |    14 +-
 .../rest/security/CrossOriginRequestFilter.java |     4 +-
 .../security/SecuredResourceFilterFactory.java  |   259 +-
 .../annotations/CheckPermissionsForPath.java    |    32 +
 .../security/shiro/RestSecurityManager.java     |     2 +-
 .../shiro/filters/BasicAuthSecurityFilter.java  |    12 +-
 .../ClientCredentialsSecurityFilter.java        |     8 +-
 .../OAuth2AccessTokenSecurityFilter.java        |    18 +-
 .../security/shiro/filters/SecurityFilter.java  |    12 +
 .../rest/system/ApplicationsResource.java       |    10 +-
 .../usergrid/rest/system/DatabaseResource.java  |     8 +-
 .../usergrid/rest/system/IndexResource.java     |    12 +-
 .../usergrid/rest/system/MigrateResource.java   |    10 +-
 .../usergrid/rest/test/PropertiesResource.java  |     3 +-
 .../rest/test/RefreshIndexResource.java         |     5 +-
 .../usergrid/rest/utils/CertificateUtils.java   |   108 +
 .../resources/usergrid-rest-deploy-context.xml  |     7 +
 .../usergrid/rest/ExceptionResourceIT.java      |    91 +
 .../java/org/apache/usergrid/rest/ITSetup.java  |    56 +-
 .../apache/usergrid/rest/IndexResourceIT.java   |     6 +-
 .../apache/usergrid/rest/NotificationsIT.java   |    11 +
 .../apache/usergrid/rest/PartialUpdateTest.java |     8 +-
 .../org/apache/usergrid/rest/TomcatRuntime.java |    12 +-
 .../org/apache/usergrid/rest/UniqueCatsIT.java  |   233 +
 .../apache/usergrid/rest/UniqueValuesIT.java    |   224 +
 .../rest/UniqueValuesPerformanceIT.java         |   165 +
 .../rest/applications/ApplicationCreateIT.java  |     3 +-
 .../rest/applications/ApplicationDeleteIT.java  |   132 +-
 .../applications/ApplicationResourceIT.java     |   120 +-
 .../usergrid/rest/applications/SecurityIT.java  |   114 +
 .../applications/assets/AssetResourceIT.java    |    90 +-
 .../applications/assets/AwsAssetResourceIT.java |    41 +-
 .../applications/assets/aws/NoAWSCredsRule.java |     4 +-
 .../collection/CollectionsResourceIT.java       |   893 +-
 .../activities/ActivityResourceIT.java          |     2 +-
 .../collection/devices/DevicesResourceIT.java   |     3 +-
 .../collection/groups/GroupResourceIT.java      |   115 +-
 .../collection/paging/PagingResourceIT.java     |    81 +-
 .../users/ConnectionResourceTest.java           |     2 +-
 .../collection/users/PermissionsResourceIT.java |   135 +-
 .../collection/users/UserResourceIT.java        |    13 +-
 .../users/extensions/TestResource.java          |     6 +-
 .../events/ApplicationRequestCounterIT.java     |    48 +
 .../applications/events/EventsResourceIT.java   |    34 +-
 .../applications/notifiers/NotifiersIT.java     |   116 +
 .../applications/queries/AndOrQueryTest.java    |     6 +-
 .../applications/queries/GeoPagingTest.java     |     7 +-
 .../applications/queries/MatrixQueryTests.java  |     2 -
 .../rest/applications/queries/OrderByTest.java  |     9 +-
 .../applications/queries/QueryTestBase.java     |     4 +-
 .../queries/SelectMappingsQueryTest.java        |   168 +
 .../rest/applications/utils/TestUtils.java      |     1 -
 .../rest/filters/ContentTypeResourceIT.java     |     4 -
 .../usergrid/rest/management/AdminUsersIT.java  |   437 +-
 .../rest/management/ExportResourceIT.java       |    22 +-
 .../rest/management/ExternalSSOEnabledIT.java   |   175 +
 .../rest/management/ImportResourceIT.java       |    15 +-
 .../rest/management/ManagementResourceIT.java   |    94 +-
 .../rest/management/OrganizationsIT.java        |    72 +-
 .../rest/management/RegistrationIT.java         |    16 +-
 .../organizations/AdminEmailEncodingIT.java     |     5 +-
 .../rest/test/resource/AbstractRestIT.java      |    11 +-
 .../rest/test/resource/ClientSetup.java         |    85 +-
 .../usergrid/rest/test/resource/DumbClient.java |    58 -
 .../resource/endpoints/CollectionEndpoint.java  |    44 +-
 .../test/resource/endpoints/NamedResource.java  |    28 +
 .../endpoints/OrganizationResource.java         |     3 +-
 .../endpoints/mgmt/ApplicationResource.java     |     8 +-
 .../resource/endpoints/mgmt/OrgResource.java    |    14 +-
 .../rest/test/resource/model/ApiResponse.java   |     3 -
 .../rest/test/resource/model/Collection.java    |     7 +-
 .../resources/corepersistence-UNIT.properties   |     2 +
 stack/rest/src/test/resources/log4j.properties  |     1 -
 .../src/test/resources/pushtest_dev_recent.p12  |   Bin 0 -> 3227 bytes
 stack/rest/src/test/resources/test.txt          |    17 +
 .../resources/usergrid-custom-test.properties   |    26 +-
 .../resources/usergrid-rest-deploy-context.xml  |    33 +-
 .../test/resources/usergrid-test-context.xml    |     2 +-
 .../resources/valid_non_apple_2036_01_07.p12    |   Bin 0 -> 2661 bytes
 stack/scripts/multitenant_migrate.py            |    48 +-
 stack/services/pom.xml                          |   920 +-
 .../management/AccountCreationProps.java        |   131 +-
 .../management/AppInfoMigrationPlugin.java      |     9 +-
 .../usergrid/management/ManagementService.java  |   389 +-
 .../usergrid/management/OrganizationConfig.java |   213 +-
 .../management/OrganizationConfigProps.java     |    73 +
 .../usergrid/management/OrganizationInfo.java   |    27 +-
 .../cassandra/AccountCreationPropsImpl.java     |     4 +-
 .../cassandra/ManagementServiceImpl.java        |   918 +-
 .../cassandra/OrganizationConfigPropsImpl.java  |   224 +
 ...alSSOProviderAdminUserNotFoundException.java |    28 +
 .../usergrid/management/export/ExportJob.java   |     7 +-
 .../management/export/ExportServiceImpl.java    |     7 +-
 .../management/export/S3ExportImpl.java         |     3 +-
 .../management/importer/FileImportJob.java      |     6 +-
 .../usergrid/management/importer/ImportJob.java |     8 +-
 .../management/importer/ImportServiceImpl.java  |   586 +-
 .../management/importer/S3ImportImpl.java       |     7 +-
 .../usergrid/security/AuthPrincipalType.java    |     4 +-
 .../security/crypto/EncryptionServiceImpl.java  |     8 +-
 .../usergrid/security/oauth/AccessInfo.java     |     2 +-
 .../security/providers/AbstractProvider.java    |    42 +-
 .../security/providers/FacebookProvider.java    |     9 +-
 .../security/providers/FoursquareProvider.java  |     6 +-
 .../providers/PingIdentityProvider.java         |    97 +-
 .../apache/usergrid/security/shiro/Realm.java   |    18 +-
 .../usergrid/security/shiro/ShiroCache.java     |   126 +-
 .../security/shiro/ShiroCacheManager.java       |    17 +-
 .../shiro/credentials/AdminUserAccessToken.java |     3 +
 .../credentials/ApplicationAccessToken.java     |     3 +
 .../ApplicationClientCredentials.java           |     5 +
 .../credentials/OrganizationAccessToken.java    |     3 +
 .../shiro/principals/AdminUserPrincipal.java    |     3 +
 .../principals/ApplicationGuestPrincipal.java   |     4 +-
 .../shiro/principals/ApplicationPrincipal.java  |     4 +-
 .../principals/ApplicationUserPrincipal.java    |    20 +-
 .../shiro/principals/OrganizationPrincipal.java |    42 +-
 .../shiro/principals/PrincipalIdentifier.java   |     8 +-
 .../security/shiro/utils/LocalShiroCache.java   |    80 +
 .../security/shiro/utils/SubjectUtils.java      |    36 +-
 .../security/sso/ApigeeSSO2Provider.java        |   220 +
 .../security/sso/ExternalSSOProvider.java       |    42 +
 .../security/sso/SSOProviderFactory.java        |    85 +
 .../security/sso/UsergridExternalProvider.java  |   291 +
 .../usergrid/security/tokens/TokenCategory.java |     4 +-
 .../usergrid/security/tokens/TokenInfo.java     |    19 +
 .../usergrid/security/tokens/TokenService.java  |    22 +-
 .../tokens/cassandra/TokenServiceImpl.java      |   277 +-
 .../services/AbstractCollectionService.java     |   219 +-
 .../services/AbstractConnectionsService.java    |    73 +-
 .../AbstractPathBasedCollectionService.java     |   153 +
 .../AbstractPathBasedColllectionService.java    |   149 -
 .../usergrid/services/AbstractService.java      |    75 +-
 .../org/apache/usergrid/services/Service.java   |     3 +
 .../apache/usergrid/services/ServiceInfo.java   |     7 +-
 .../usergrid/services/ServiceManager.java       |    28 +-
 .../services/ServiceManagerFactory.java         |    18 +-
 .../usergrid/services/ServiceParameter.java     |    44 +-
 .../usergrid/services/ServiceRequest.java       |     9 +-
 .../usergrid/services/ServiceResults.java       |     8 +-
 .../services/activities/ActivitiesService.java  |     4 +-
 .../applications/ApplicationsService.java       |    22 +-
 .../usergrid/services/assets/AssetsService.java |    16 +-
 .../services/assets/data/AssetMimeHandler.java  |     4 +-
 .../services/assets/data/AssetUtils.java        |     4 +-
 .../assets/data/AwsSdkS3BinaryStore.java        |    23 +-
 .../assets/data/LocalFileBinaryStore.java       |     4 +-
 .../services/assets/data/S3BinaryStore.java     |    36 +-
 .../services/devices/DevicesService.java        |    14 +-
 .../notifications/NotificationsService.java     |     4 +-
 .../services/devices/users/UsersService.java    |     4 +-
 .../AwsPropertiesNotFoundException.java         |     3 -
 .../usergrid/services/groups/GroupsService.java |    16 +-
 .../groups/activities/ActivitiesService.java    |     4 +-
 .../notifications/NotificationsService.java     |     4 +-
 .../services/groups/roles/RolesService.java     |     4 +-
 .../services/groups/users/UsersService.java     |     4 +-
 .../users/activities/ActivitiesService.java     |     4 +-
 .../groups/users/devices/DevicesService.java    |     4 +-
 .../notifications/NotificationsService.java     |     4 +-
 .../services/guice/ServiceModuleImpl.java       |     3 +
 .../services/messages/MessagesService.java      |     4 +-
 .../notifications/ApplicationQueueManager.java  |     9 +-
 .../ApplicationQueueManagerCache.java           |   143 +
 .../notifications/ApplicationQueueMessage.java  |     5 +-
 .../notifications/InactiveDeviceManager.java    |     8 +-
 .../services/notifications/JobScheduler.java    |    15 +-
 .../notifications/NotificationDeviceFilter.java |    45 +
 .../notifications/NotificationServiceProxy.java |     3 -
 .../notifications/NotificationsService.java     |    87 +-
 .../services/notifications/ProviderAdapter.java |     5 +-
 .../services/notifications/QueueJob.java        |    16 +-
 .../services/notifications/QueueListener.java   |   181 +-
 .../services/notifications/TaskManager.java     |   167 +-
 .../services/notifications/TestAdapter.java     |    16 +-
 .../notifications/apns/APNsAdapter.java         |    11 +-
 .../apns/RejectedAPNsListener.java              |     4 +-
 .../services/notifications/gcm/GCMAdapter.java  |   126 +-
 .../impl/ApplicationQueueManagerImpl.java       |   714 +-
 .../services/notifications/wns/WNSAdapter.java  |    15 +-
 .../services/notifiers/NotifiersService.java    |    10 +-
 .../services/queues/ImportQueueListener.java    |     4 +-
 .../services/queues/ImportQueueManager.java     |     4 +-
 .../usergrid/services/queues/QueueListener.java |    66 +-
 .../usergrid/services/roles/RolesService.java   |     6 +-
 .../services/roles/groups/GroupsService.java    |     4 +-
 .../services/roles/users/UsersService.java      |     4 +-
 .../usergrid/services/users/UsersService.java   |     8 +-
 .../users/activities/ActivitiesService.java     |     4 +-
 .../services/users/devices/DevicesService.java  |    20 +-
 .../notifications/NotificationsService.java     |     4 +-
 .../users/following/FollowingService.java       |     4 +-
 .../services/users/groups/GroupsService.java    |     4 +-
 .../notifications/NotificationsService.java     |     4 +-
 .../services/users/roles/RolesService.java      |     8 +-
 .../org/apache/usergrid/utils/PythonUtils.java  |   103 -
 .../src/main/python/pyusergrid/__init__.py      |    15 -
 .../main/python/pyusergrid/services/__init__.py |    15 -
 .../pyusergrid/services/pytest/PytestService.py |    31 -
 .../pyusergrid/services/pytest/__init__.py      |    15 -
 .../python/pyusergrid/services/pytest/test.py   |    29 -
 stack/services/src/main/python/test/__init__.py |    15 -
 stack/services/src/main/python/test/test.py     |    29 -
 .../resources/usergrid-services-context.xml     |   150 +-
 .../org/apache/usergrid/NewOrgAppAdminRule.java |     4 +-
 .../org/apache/usergrid/ServiceApplication.java |    14 +-
 .../migration/AppInfoMigrationPluginTest.java   |    18 +-
 .../apache/usergrid/management/EmailFlowIT.java |    43 +-
 .../management/OrganizationConfigIT.java        |   213 +
 .../usergrid/management/OrganizationIT.java     |     4 +-
 .../org/apache/usergrid/management/RoleIT.java  |    10 +-
 .../cassandra/ManagementServiceIT.java          |    55 +-
 .../management/export/ExportServiceIT.java      |    88 +-
 .../management/export/MockS3ExportImpl.java     |     2 +-
 .../importer/ImportConnectionsTest.java         |     2 +-
 .../management/importer/ImportServiceIT.java    |    32 +-
 .../usergrid/management/importer/S3Upload.java  |     1 -
 .../org/apache/usergrid/python/JythonTest.java  |    39 -
 .../security/providers/FacebookProviderIT.java  |     6 +-
 .../providers/PingIdentityProviderIT.java       |     6 +-
 .../security/tokens/TokenServiceIT.java         |    10 +-
 .../usergrid/services/CollectionServiceIT.java  |    16 +
 .../usergrid/services/ConnectionsServiceIT.java |    74 +-
 .../usergrid/services/ServiceInvocationIT.java  |    32 +-
 .../AbstractServiceNotificationIT.java          |    27 +-
 .../notifications/NotifiersServiceIT.java       |    11 +-
 .../apns/MockSuccessfulProviderAdapter.java     |   103 -
 .../apns/NotificationsServiceIT.java            |   320 +-
 .../gcm/MockSuccessfulProviderAdapter.java      |    89 -
 .../gcm/NotificationsServiceIT.java             |   440 +-
 .../notifications/wns/WNSAdapterTest.java       |    44 +
 .../src/test/resources/log4j.properties         |     1 -
 .../src/test/resources/pushtest_dev.p12         |   Bin 3203 -> 0 bytes
 .../src/test/resources/pushtest_prod.p12        |   Bin 3205 -> 0 bytes
 .../resources/usergrid-custom-test.properties   |     4 +-
 .../test/resources/usergrid-test-context.xml    |     1 +
 stack/test-utils/pom.xml                        |     6 +-
 .../java/org/apache/usergrid/TomcatMain.java    |    10 +-
 .../usergrid/cassandra/AvailablePortFinder.java |    18 +-
 .../usergrid/cassandra/CassandraResource.java   |     6 +-
 .../usergrid/cassandra/ClearShiroSubject.java   |     8 +-
 .../usergrid/cassandra/SchemaManager.java       |     3 -
 .../usergrid/cassandra/SpringResource.java      |    10 +-
 .../usergrid/cassandra/FakeSchemaManager.java   |    12 +-
 .../usergrid/cassandra/SpringResourceTest.java  |    10 +-
 stack/tools/pom.xml                             |    21 +-
 .../org/apache/usergrid/tools/AppAudit.java     |     2 +-
 .../java/org/apache/usergrid/tools/Cli.java     |    37 +-
 .../apache/usergrid/tools/DupAdminRepair.java   |   297 -
 .../org/apache/usergrid/tools/DupOrgRepair.java |   263 -
 .../usergrid/tools/EntityInsertBenchMark.java   |   272 -
 .../usergrid/tools/EntityReadBenchMark.java     |   353 -
 .../org/apache/usergrid/tools/EntityUpdate.java |     3 +-
 .../java/org/apache/usergrid/tools/Export.java  |    26 +-
 .../org/apache/usergrid/tools/ExportAdmins.java |    26 +-
 .../org/apache/usergrid/tools/ExportApp.java    |   136 +-
 .../usergrid/tools/ExportDataCreator.java       |    41 +-
 .../java/org/apache/usergrid/tools/Import.java  |     7 +-
 .../org/apache/usergrid/tools/ImportAdmins.java |   161 +-
 .../org/apache/usergrid/tools/IndexRebuild.java |   184 -
 .../java/org/apache/usergrid/tools/Metrics.java |     2 +-
 .../usergrid/tools/OrganizationExport.java      |     2 +-
 .../apache/usergrid/tools/PopulateSample.java   |     4 +-
 .../RepairingMismatchedApplicationMetadata.java |   119 -
 .../org/apache/usergrid/tools/ToolBase.java     |    92 +-
 .../usergrid/tools/UniqueIndexCleanup.java      |   386 -
 .../usergrid/tools/UniqueValueScanner.java      |   298 +
 .../org/apache/usergrid/tools/UserManager.java  |     3 +-
 .../apache/usergrid/tools/WarehouseExport.java  |   133 +-
 .../apache/usergrid/tools/WarehouseUpsert.java  |    30 +-
 .../apache/usergrid/tools/bean/MetricQuery.java |    11 +-
 stack/tools/src/main/resources/log4j.properties |    34 +-
 .../main/resources/toolsApplicationContext.xml  |   131 +-
 .../apache/usergrid/tools/ExportAppTest.java    |    62 +-
 .../usergrid/tools/ExportImportAdminsTest.java  |    43 +-
 .../test/resources/usergrid-test-context.xml    |    63 +
 .../websocket/WebSocketChannelHandler.java      |    16 +-
 .../test/resources/testApplicationContext.xml   |   273 +-
 tests/integration/.gitignore                    |     3 +
 tests/integration/LICENSE                       |   327 +
 tests/integration/README.md                     |     8 +
 tests/integration/config/default.js             |    28 +
 tests/integration/config/index.js               |    28 +
 tests/integration/index.js                      |    23 +
 tests/integration/lib/connections.js            |    63 +
 tests/integration/lib/devices.js                |    43 +
 tests/integration/lib/entities.js               |   126 +
 tests/integration/lib/groups.js                 |    43 +
 tests/integration/lib/notifications.js          |    35 +
 tests/integration/lib/notifiers.js              |    43 +
 tests/integration/lib/random.js                 |    39 +
 tests/integration/lib/response.js               |    23 +
 tests/integration/lib/token.js                  |    64 +
 tests/integration/lib/urls.js                   |    40 +
 tests/integration/lib/users.js                  |    48 +
 tests/integration/package.json                  |    17 +
 .../test/authentication/management.js           |    40 +
 tests/integration/test/authentication/org.js    |    39 +
 tests/integration/test/authentication/shawn     |     1 +
 tests/integration/test/authentication/user.js   |    40 +
 tests/integration/test/authorization/shawn      |     1 +
 tests/integration/test/collections/brandon      |     1 +
 tests/integration/test/connections/brandon      |     1 +
 tests/integration/test/entities/brandon         |     1 +
 tests/integration/test/entities/create.js       |    47 +
 tests/integration/test/entities/deleteAll.js    |    39 +
 tests/integration/test/entities/get.js          |    60 +
 tests/integration/test/entities/update.js       |    44 +
 tests/integration/test/groups/groups.js         |   149 +
 tests/integration/test/main.js                  |    78 +
 tests/integration/test/management/shawn         |     1 +
 tests/integration/test/mocha.opts               |     3 +
 .../test/notifications/notifications.js         |   352 +
 .../test/queries/integerComparison.js           |    82 +
 tests/integration/test/setup.js                 |   111 +
 tests/integration/test/teardown.js              |    96 +
 tests/integration/test/users/create.js          |    47 +
 tests/performance/.gitignore                    |     1 +
 tests/performance/LICENSE                       |   327 +
 tests/performance/README.md                     |   207 +
 tests/performance/pom.xml                       |   149 +
 tests/performance/runAuditDeleteEntities.sh     |    65 +
 .../runAuditGetAllAppCollectionEntities.sh      |    68 +
 .../runAuditGetCollectionEntities.sh            |    68 +
 .../runAuditVerifyCollectionEntities.sh         |    69 +
 tests/performance/runCollectionQueryTest.sh     |    88 +
 .../runCustomInjectRandomEntityByUuidTest.sh    |   108 +
 tests/performance/runDeleteEntities.sh          |    92 +
 .../runGetEntitiesByNameSequential.sh           |   101 +
 tests/performance/runGetEntitiesByUuid.sh       |    92 +
 tests/performance/runLoadEntities.sh            |    98 +
 tests/performance/runLoadEntitiesUnlimited.sh   |   103 +
 .../runLoadLargeMultiFieldEntities.sh           |   107 +
 tests/performance/runLoadNestedEntities.sh      |    98 +
 tests/performance/runLoadNoNameEntities.sh      |    98 +
 tests/performance/runLoadSortableEntities.sh    |    98 +
 tests/performance/runOrgAppSetup.sh             |    91 +
 .../runRandomEntityByNameQueryTest.sh           |    91 +
 tests/performance/runRandomEntityByNameTest.sh  |    91 +
 tests/performance/runUpdateEntities.sh          |    91 +
 tests/performance/runtests_deprecated.sh        |   120 +
 .../datagenerators/EntityDataGenerator.scala    |   223 +
 .../datagenerators/FeederGenerator.scala        |   304 +
 .../datagenerators/datafiles/dist.all.last.txt  | 88799 +++++++++++++++++
 .../datafiles/dist.female.first.txt             |  4275 +
 .../datafiles/dist.male.first.txt               |  1219 +
 .../usergrid/datagenerators/firstNames.txt      |  5494 +
 .../usergrid/datagenerators/lastNames.txt       | 88799 +++++++++++++++++
 .../org/apache/usergrid/enums/AuthType.scala    |    31 +
 .../usergrid/enums/ConfigProperties.scala       |   181 +
 .../usergrid/enums/CsvFeedPatternType.scala     |    30 +
 .../usergrid/enums/EndConditionType.scala       |    29 +
 .../org/apache/usergrid/enums/EntityType.scala  |    31 +
 .../apache/usergrid/enums/ScenarioType.scala    |    38 +
 .../org/apache/usergrid/enums/TokenType.scala   |    29 +
 .../apache/usergrid/helpers/Extractors.scala    |   154 +
 .../org/apache/usergrid/helpers/Headers.scala   |    70 +
 .../org/apache/usergrid/helpers/Setup.scala     |   312 +
 .../org/apache/usergrid/helpers/Utils.scala     |   102 +
 .../scenarios/ApplicationScenarios.scala        |    53 +
 .../usergrid/scenarios/AuditScenarios.scala     |   342 +
 .../scenarios/ConnectionScenarios.scala         |    66 +
 .../usergrid/scenarios/DeviceScenarios.scala    |    85 +
 .../scenarios/EntityCollectionScenarios.scala   |   407 +
 .../usergrid/scenarios/EntityScenarios.scala    |    80 +
 .../usergrid/scenarios/GeoScenarios.scala       |    49 +
 .../scenarios/NotificationScenarios.scala       |    80 +
 .../usergrid/scenarios/NotifierScenarios.scala  |    70 +
 .../scenarios/OrganizationScenarios.scala       |    60 +
 .../usergrid/scenarios/TokenScenarios.scala     |    56 +
 .../usergrid/scenarios/UserScenarios.scala      |   210 +
 .../org/apache/usergrid/settings/Settings.scala |   612 +
 .../usergrid/simulations/AuditSimulation.scala  |    86 +
 .../simulations/ConfigurableSimulation.scala    |   105 +
 .../simulations/CustomInjectionSimulation.scala |   107 +
 .../simulations/deprecated/AppSimulation.scala  |    41 +
 .../deprecated/ConnectionsSimulation.scala      |    51 +
 .../deprecated/DeleteUsersSimulation.scala      |    56 +
 .../deprecated/GetEntitySimulation.scala        |    44 +
 .../deprecated/GetUserPagesSimulation.scala     |    51 +
 .../deprecated/GetUsersSimulation.scala         |    51 +
 .../deprecated/PostCustomEntitySimulation.scala |    76 +
 .../deprecated/PostUsersSimulation.scala        |    51 +
 .../PushNotificationTargetUserSimulation.scala  |    45 +
 .../deprecated/PutCustomEntitySimulation.scala  |    75 +
 .../deprecated/PutUsersSimulation.scala         |    56 +
 .../deprecated/SetupSimulation.scala            |    43 +
 .../performance/src/main/scripts/gatling-mvn.sh |    31 +
 .../performance/src/main/scripts/gatling-ug.sh  |    51 +
 .../src/test/resources/dummyAuditUuid.csv       |     1 +
 .../src/test/resources/dummyUuid.csv            |     1 +
 .../performance/src/test/resources/gatling.conf |   150 +
 .../src/test/resources/logback-test.xml         |    39 +
 .../performance/src/test/resources/logback.xml  |    38 +
 .../src/test/resources/recorder.conf            |    37 +
 tests/performance/src/test/scala/Engine.scala   |    29 +
 .../src/test/scala/IDEPathHelper.scala          |    38 +
 tests/performance/src/test/scala/Recorder.scala |    28 +
 tests/performance/testConfig.sh                 |    68 +
 utils/usergrid-util-python/.gitignore           |    61 +
 utils/usergrid-util-python/LICENSE              |   202 +
 utils/usergrid-util-python/README.md            |    15 +
 .../es_tools/alias_mover.py                     |    72 +
 .../es_tools/cluster_shard_allocation.py        |   111 +
 .../es_tools/command_sender.py                  |    52 +
 .../es_tools/es_index_iterator_reindexer.py     |   128 +
 .../es_tools/es_searcher.py                     |    45 +
 .../es_tools/index_deleter.py                   |    98 +
 .../es_tools/index_prefix_checker.py            |   100 +
 .../es_tools/index_replica_setter.py            |   124 +
 .../es_tools/index_shard_allocator.py           |   149 +
 .../es_tools/mapping_deleter.py                 |    53 +
 .../es_tools/mapping_retriever.py               |    64 +
 .../es_tools/monitor_tasks.py                   |    61 +
 utils/usergrid-util-python/index_test/README.md |     1 +
 .../index_test/document_creator.py              |   276 +
 .../index_test/index_test_mixed_batch.py        |   552 +
 .../index_test/index_test_single_type_batch.py  |   555 +
 utils/usergrid-util-python/requirements.txt     |     4 +
 .../activity_streams/activity_streams.py        |   154 +
 .../samples/beacon-event-example.py             |   238 +
 .../samples/counter_test.py                     |    52 +
 utils/usergrid-util-python/setup.py             |    59 +
 .../usergrid_tools/__init__.py                  |     4 +
 .../usergrid_tools/general/__init__.py          |    21 +
 .../usergrid_tools/general/deleter.py           |   170 +
 .../general/duplicate_name_checker.py           |    47 +
 .../usergrid_tools/general/queue_monitor.py     |   138 +
 .../usergrid_tools/general/url_tester.py        |   108 +
 .../general/user_confirm_activate.py            |    51 +
 .../usergrid_tools/groups/__init__.py           |     2 +
 .../usergrid_tools/groups/big_group_creater.py  |   100 +
 .../usergrid_tools/indexing/README.md           |    22 +
 .../usergrid_tools/indexing/__init__.py         |    21 +
 .../usergrid_tools/indexing/batch_index_test.py |   362 +
 .../indexing/entity_index_test.py               |   339 +
 .../usergrid_tools/iterators/README.md          |     8 +
 .../usergrid_tools/iterators/__init__.py        |    18 +
 .../usergrid_tools/iterators/simple_iterator.py |   101 +
 .../iterators/usergrid_cross_region_iterator.py |   425 +
 .../iterators/usergrid_iterator.py              |   504 +
 .../usergrid_tools/library_check.py             |    45 +
 .../usergrid_tools/migration/README.md          |   234 +
 .../usergrid_tools/migration/__init__.py        |    24 +
 .../migration/usergrid_data_exporter.py         |   943 +
 .../migration/usergrid_data_migrator.py         |  2186 +
 .../usergrid_tools/parse_importer/README.md     |    90 +
 .../usergrid_tools/parse_importer/__init__.py   |    21 +
 .../parse_importer/parse_importer.py            |   404 +
 .../usergrid_tools/permissions/README.md        |     3 +
 .../usergrid_tools/permissions/permissions.py   |   168 +
 .../usergrid_tools/queue/README.md              |     1 +
 .../queue/dlq-iterator-checker.py               |   162 +
 .../usergrid_tools/queue/dlq_requeue.py         |   192 +
 .../queue/queue-config-sample.json              |    22 +
 .../usergrid_tools/queue/queue_cleaner.py       |   174 +
 .../usergrid_tools/redis/redis_iterator.py      |    52 +
 .../usergrid_tools/redis/redisscan.py           |    37 +
 website/README.md                               |     6 +-
 website/content/releases/index.html             |    11 +-
 website/crash.log                               |   143 -
 website/layouts/footer.html                     |     3 +-
 website/lib/default.rb                          |     4 +-
 website/nanoc.yaml                              |     2 +
 website/run.sh                                  |     3 +-
 1714 files changed, 376248 insertions(+), 229035 deletions(-)
----------------------------------------------------------------------



Mime
View raw message