You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/10/30 21:33:14 UTC

[50/50] [abbrv] usergrid git commit: Merge branch 'master' into USERGRID-872

Merge branch 'master' into USERGRID-872

Conflicts:
	stack/services/src/main/java/org/apache/usergrid/services/AbstractService.java
	stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java


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

Branch: refs/heads/USERGRID-872
Commit: 9edb31c51bdfc1191569912e0bd0570a1bea9468
Parents: b5144d0 9d3cf5b
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Oct 30 16:00:35 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Fri Oct 30 16:00:35 2015 -0400

----------------------------------------------------------------------
 DISCLAIMER                                      |     9 -
 NOTICE                                          |     2 +-
 README-Docs.md                                  |    13 +
 README.md                                       |    20 +-
 content/README.md                               |     7 +
 content/bootstrap/bootstrap.min.css             |     9 +
 content/community/index.html                    |   595 +
 content/css/bootflat-extensions.css             |   356 +
 content/css/bootflat-square.css                 |    69 +
 content/css/bootflat.css                        |  1560 +
 content/css/font-awesome.min.css                |   405 +
 content/css/usergrid-site.css                   |  1553 +
 content/docs/.gitkeep                           |     0
 content/docs/README.html                        |   389 +
 content/docs/_images/asapp.png                  |   Bin 0 -> 73593 bytes
 content/docs/_images/asemu.png                  |   Bin 0 -> 34744 bytes
 content/docs/_images/assettings.png             |   Bin 0 -> 120338 bytes
 content/docs/_images/cassandra.png              |   Bin 0 -> 47467 bytes
 content/docs/_images/gcmsetting.png             |   Bin 0 -> 101084 bytes
 content/docs/_images/googleproj0.png            |   Bin 0 -> 62311 bytes
 content/docs/_images/iOS10seeusermsg.jpg        |   Bin 0 -> 47979 bytes
 content/docs/_images/iOS1chooseapp.jpg          |   Bin 0 -> 43752 bytes
 content/docs/_images/iOS2register.jpg           |   Bin 0 -> 47339 bytes
 content/docs/_images/iOS5emptyfeed.jpg          |   Bin 0 -> 42009 bytes
 content/docs/_images/iOS6newmsg.jpg             |   Bin 0 -> 55357 bytes
 content/docs/_images/iOS7feed1msg.jpg           |   Bin 0 -> 45070 bytes
 content/docs/_images/ios-cert.png               |   Bin 0 -> 41925 bytes
 content/docs/_images/iospgapp.png               |   Bin 0 -> 29796 bytes
 content/docs/_images/iospgcert.png              |   Bin 0 -> 41925 bytes
 content/docs/_images/iospgsettings.png          |   Bin 0 -> 384425 bytes
 content/docs/_images/iospushauth.png            |   Bin 0 -> 42175 bytes
 content/docs/_images/iospushfinal.png           |   Bin 0 -> 29573 bytes
 content/docs/_images/iospushsettings.png        |   Bin 0 -> 137812 bytes
 content/docs/_images/iphonemessage.png          |   Bin 0 -> 80970 bytes
 content/docs/_images/login.png                  |   Bin 0 -> 162318 bytes
 content/docs/_images/pgaapp.png                 |   Bin 0 -> 74807 bytes
 content/docs/_images/pgasettings.png            |   Bin 0 -> 95052 bytes
 content/docs/_images/pgaspath.png               |   Bin 0 -> 34744 bytes
 content/docs/_images/portal1.png                |   Bin 0 -> 202277 bytes
 content/docs/_images/portal2.png                |   Bin 0 -> 178318 bytes
 content/docs/_images/portal3.png                |   Bin 0 -> 486403 bytes
 content/docs/_images/portal4.png                |   Bin 0 -> 166079 bytes
 content/docs/_images/portal5.png                |   Bin 0 -> 217950 bytes
 content/docs/_images/pushmiddleandroid0.png     |   Bin 0 -> 106080 bytes
 content/docs/_images/pushmiddleios0.png         |   Bin 0 -> 105175 bytes
 content/docs/_images/pushsslcertificate.png     |   Bin 0 -> 53445 bytes
 content/docs/_images/rdbms.png                  |   Bin 0 -> 40248 bytes
 content/docs/_images/reviews.png                |   Bin 0 -> 36333 bytes
 content/docs/_images/reviews2.png               |   Bin 0 -> 52726 bytes
 content/docs/_images/securitymodel0.png         |   Bin 0 -> 91321 bytes
 content/docs/_images/sendnotification.png       |   Bin 0 -> 47353 bytes
 content/docs/_sources/README.txt                |    70 +
 .../docs/_sources/asset-and-files/assets.txt    |    20 +
 .../file-storage-configuration.txt              |    39 +
 .../docs/_sources/asset-and-files/folders.txt   |    85 +
 .../asset-and-files/legacy-asset-support.txt    |     0
 .../asset-and-files/retrieving-assets.txt       |    27 +
 .../asset-and-files/uploading-assets.txt        |    86 +
 .../file-storage-configuration.txt              |    39 +
 .../docs/_sources/assets-and-files/folders.txt  |    85 +
 .../assets-and-files/legacy-asset-support.txt   |     0
 .../assets-and-files/retrieving-assets.txt      |    27 +
 .../assets-and-files/uploading-assets.txt       |    86 +
 .../creating-and-incrementing-counters.txt      |    74 +
 .../counters-and-events/events-and-counters.txt |     8 +
 .../counters-and-events/retrieving-counters.txt |   109 +
 .../data-queries/advanced-query-usage.txt       |    23 +
 .../data-queries/operators-and-types.txt        |   120 +
 .../_sources/data-queries/query-language.txt    |   427 +
 .../_sources/data-queries/query-parameters.txt  |   153 +
 .../data-queries/querying-your-data.txt         |   121 +
 .../docs/_sources/data-storage/collections.txt  |   254 +
 .../_sources/data-storage/data-store-dbms.txt   |   109 +
 content/docs/_sources/data-storage/entities.txt |   512 +
 .../_sources/data-storage/optimizing-access.txt |   185 +
 .../entity-connections/connecting-entities.txt  |    60 +
 .../disconnecting-entities.txt                  |    79 +
 .../entity-connections/relationships.txt        |    98 +
 .../entity-connections/retrieving-entities.txt  |    93 +
 .../docs/_sources/geolocation/geolocation.txt   |    72 +
 content/docs/_sources/geolocation/tbd.txt       |     1 +
 .../creating-a-new-application.txt              |    16 +
 .../getting-started/creating-account.txt        |    21 +
 .../getting-started/using-a-sandbox-app.txt     |    39 +
 .../_sources/getting-started/using-the-api.txt  |   150 +
 content/docs/_sources/index.txt                 |   178 +
 .../installation/ug1-deploy-to-tomcat.txt       |   179 +
 .../installation/ug1-launcher-quick-start.txt   |    72 +
 .../installation/ug2-deploy-to-tomcat.txt       |   179 +
 .../_sources/introduction/async-vs-sync.txt     |    25 +
 .../docs/_sources/introduction/data-model.txt   |    76 +
 content/docs/_sources/introduction/overview.txt |    17 +
 .../_sources/introduction/usergrid-features.txt |    81 +
 .../docs/_sources/jersey2skeleton/README.txt    |     9 +
 .../docs/_sources/orgs-and-apps/admin-user.txt  |   352 +
 .../docs/_sources/orgs-and-apps/application.txt |   100 +
 .../docs/_sources/orgs-and-apps/managing.txt    |    50 +
 .../_sources/orgs-and-apps/organization.txt     |   435 +
 .../push-notifications/adding-push-support.txt  |   158 +
 .../creating-and-managing-notifications.txt     |   271 +
 .../push-notifications/creating-notifiers.txt   |    69 +
 .../push-notifications/getting-started.txt      |   102 +
 .../managing-users-and-devices.txt              |   313 +
 .../_sources/push-notifications/overview.txt    |    58 +
 .../_sources/push-notifications/registering.txt |   102 +
 .../docs/_sources/push-notifications/tbd.txt    |     1 +
 .../push-notifications/troubleshooting.txt      |    93 +
 .../_sources/push-notifications/tutorial.txt    |   251 +
 .../push-notifications/users-devices.txt        |   108 +
 .../docs/_sources/reference/contribute-code.txt |    18 +
 .../_sources/reference/presos-and-videos.txt    |    31 +
 .../docs/_sources/rest-endpoints/api-docs.txt   |  3977 +
 content/docs/_sources/sdks/ios-new.txt          |   982 +
 content/docs/_sources/sdks/ios.txt              |     1 +
 content/docs/_sources/sdks/java.txt             |     1 +
 content/docs/_sources/sdks/javascript.txt       |     3 +
 content/docs/_sources/sdks/sdk-outline.txt      |   111 +
 content/docs/_sources/sdks/tbd.txt              |     1 +
 .../_sources/security-and-auth/app-security.txt |    19 +
 .../authenticating-api-requests.txt             |    38 +
 ...enticating-users-and-application-clients.txt |   128 +
 .../changing-token-time-live-ttl.txt            |    61 +
 .../security-and-auth/facebook-sign.txt         |   158 +
 .../revoking-tokens-logout.txt                  |    32 +
 .../security-and-auth/securing-your-app.txt     |    44 +
 .../user-authentication-types.txt               |    63 +
 .../security-and-auth/using-permissions.txt     |   115 +
 .../_sources/security-and-auth/using-roles.txt  |   304 +
 .../docs/_sources/user-management/activity.txt  |   439 +
 content/docs/_sources/user-management/group.txt |   363 +
 .../docs/_sources/user-management/groups.txt    |    38 +
 .../user-management/messagee-example.txt        |   137 +
 .../user-management/user-connections.txt        |    40 +
 .../user-management/user-management.txt         |    42 +
 .../user-management/working-user-data.txt       |   278 +
 content/docs/_static/ajax-loader.gif            |   Bin 0 -> 673 bytes
 content/docs/_static/basic.css                  |   599 +
 content/docs/_static/comment-bright.png         |   Bin 0 -> 3500 bytes
 content/docs/_static/comment-close.png          |   Bin 0 -> 3578 bytes
 content/docs/_static/comment.png                |   Bin 0 -> 3445 bytes
 content/docs/_static/css/badge_only.css         |     4 +
 content/docs/_static/css/badge_only.css.map     |     7 +
 content/docs/_static/css/theme.css              |  5384 +
 content/docs/_static/css/theme.css.map          |     7 +
 content/docs/_static/doctools.js                |   263 +
 content/docs/_static/down-pressed.png           |   Bin 0 -> 347 bytes
 content/docs/_static/down.png                   |   Bin 0 -> 347 bytes
 content/docs/_static/file.png                   |   Bin 0 -> 358 bytes
 content/docs/_static/fonts/FontAwesome.otf      |   Bin 0 -> 62856 bytes
 content/docs/_static/fonts/Inconsolata-Bold.ttf |   Bin 0 -> 47064 bytes
 content/docs/_static/fonts/Inconsolata.ttf      |   Bin 0 -> 63184 bytes
 content/docs/_static/fonts/Lato-Bold.ttf        |   Bin 0 -> 82368 bytes
 content/docs/_static/fonts/Lato-Regular.ttf     |   Bin 0 -> 81980 bytes
 content/docs/_static/fonts/RobotoSlab-Bold.ttf  |   Bin 0 -> 36596 bytes
 .../docs/_static/fonts/RobotoSlab-Regular.ttf   |   Bin 0 -> 36276 bytes
 .../docs/_static/fonts/fontawesome-webfont.eot  |   Bin 0 -> 38205 bytes
 .../docs/_static/fonts/fontawesome-webfont.svg  |   414 +
 .../docs/_static/fonts/fontawesome-webfont.ttf  |   Bin 0 -> 80652 bytes
 .../docs/_static/fonts/fontawesome-webfont.woff |   Bin 0 -> 44432 bytes
 content/docs/_static/jquery-1.11.1.js           | 10308 ++
 content/docs/_static/jquery.js                  |     4 +
 content/docs/_static/js/modernizr.min.js        |     4 +
 content/docs/_static/js/theme.js                |   131 +
 content/docs/_static/minus.png                  |   Bin 0 -> 173 bytes
 content/docs/_static/plus.png                   |   Bin 0 -> 173 bytes
 content/docs/_static/pygments.css               |    63 +
 content/docs/_static/searchtools.js             |   622 +
 content/docs/_static/underscore-1.3.1.js        |   999 +
 content/docs/_static/underscore.js              |    31 +
 content/docs/_static/up-pressed.png             |   Bin 0 -> 345 bytes
 content/docs/_static/up.png                     |   Bin 0 -> 345 bytes
 content/docs/_static/websupport.js              |   808 +
 content/docs/asset-and-files/assets.html        |   331 +
 .../file-storage-configuration.html             |   319 +
 content/docs/asset-and-files/folders.html       |   388 +
 .../asset-and-files/legacy-asset-support.html   |   277 +
 .../docs/asset-and-files/retrieving-assets.html |   356 +
 .../docs/asset-and-files/uploading-assets.html  |   416 +
 .../file-storage-configuration.html             |   335 +
 content/docs/assets-and-files/folders.html      |   404 +
 .../assets-and-files/legacy-asset-support.html  |   293 +
 .../assets-and-files/retrieving-assets.html     |   372 +
 .../docs/assets-and-files/uploading-assets.html |   432 +
 .../creating-and-incrementing-counters.html     |   422 +
 .../events-and-counters.html                    |   319 +
 .../retrieving-counters.html                    |   474 +
 .../docs/data-queries/advanced-query-usage.html |   337 +
 .../docs/data-queries/operators-and-types.html  |   477 +
 content/docs/data-queries/query-language.html   |   730 +
 content/docs/data-queries/query-parameters.html |   528 +
 .../docs/data-queries/querying-your-data.html   |   469 +
 content/docs/data-storage/collections.html      |   694 +
 content/docs/data-storage/data-store-dbms.html  |   439 +
 content/docs/data-storage/entities.html         |  1039 +
 .../docs/data-storage/optimizing-access.html    |   573 +
 .../entity-connections/connecting-entities.html |   394 +
 .../disconnecting-entities.html                 |   411 +
 .../docs/entity-connections/relationships.html  |   379 +
 .../entity-connections/retrieving-entities.html |   435 +
 content/docs/genindex.html                      |   298 +
 content/docs/geolocation/geolocation.html       |   429 +
 content/docs/geolocation/tbd.html               |   280 +
 .../creating-a-new-application.html             |   338 +
 .../docs/getting-started/creating-account.html  |   346 +
 .../getting-started/using-a-sandbox-app.html    |   374 +
 content/docs/getting-started/using-the-api.html |   508 +
 content/docs/index.html                         |   832 +
 .../docs/installation/ug1-deploy-to-tomcat.html |   521 +
 .../installation/ug1-launcher-quick-start.html  |   404 +
 .../docs/installation/ug2-deploy-to-tomcat.html |   533 +
 content/docs/introduction/async-vs-sync.html    |   357 +
 content/docs/introduction/data-model.html       |   465 +
 content/docs/introduction/overview.html         |   333 +
 .../docs/introduction/usergrid-features.html    |   474 +
 content/docs/jersey2skeleton/README.html        |   303 +
 content/docs/objects.inv                        |   Bin 0 -> 692 bytes
 content/docs/orgs-and-apps/admin-user.html      |   866 +
 content/docs/orgs-and-apps/application.html     |   512 +
 content/docs/orgs-and-apps/managing.html        |   356 +
 content/docs/orgs-and-apps/organization.html    |  1033 +
 .../push-notifications/adding-push-support.html |   581 +
 .../creating-and-managing-notifications.html    |   743 +
 .../push-notifications/creating-notifiers.html  |   425 +
 .../push-notifications/getting-started.html     |   497 +
 .../managing-users-and-devices.html             |   688 +
 content/docs/push-notifications/overview.html   |   393 +
 .../docs/push-notifications/registering.html    |   484 +
 content/docs/push-notifications/tbd.html        |   296 +
 .../push-notifications/troubleshooting.html     |   466 +
 content/docs/push-notifications/tutorial.html   |   666 +
 .../docs/push-notifications/users-devices.html  |   553 +
 content/docs/reference/contribute-code.html     |   331 +
 content/docs/reference/presos-and-videos.html   |   351 +
 content/docs/rest-endpoints/api-docs.html       |  4218 +
 content/docs/rest-endpoints/api-reference.html  |  5273 +
 content/docs/sdks/ios-new.html                  |  1323 +
 content/docs/sdks/ios.html                      |   280 +
 content/docs/sdks/java.html                     |   280 +
 content/docs/sdks/javascript.html               |   280 +
 content/docs/sdks/sdk-outline.html              |   516 +
 content/docs/sdks/tbd.html                      |   307 +
 content/docs/search.html                        |   309 +
 content/docs/searchindex.js                     |     1 +
 .../docs/security-and-auth/app-security.html    |   336 +
 .../authenticating-api-requests.html            |   385 +
 ...nticating-users-and-application-clients.html |   546 +
 .../changing-token-time-live-ttl.html           |   405 +
 .../docs/security-and-auth/facebook-sign.html   |   522 +
 .../revoking-tokens-logout.html                 |   358 +
 .../security-and-auth/securing-your-app.html    |   414 +
 .../user-authentication-types.html              |   420 +
 .../security-and-auth/using-permissions.html    |   526 +
 content/docs/security-and-auth/using-roles.html |   753 +
 content/docs/user-management/activity.html      |   882 +
 content/docs/user-management/group.html         |   845 +
 content/docs/user-management/groups.html        |   414 +
 .../docs/user-management/messagee-example.html  |   499 +
 .../docs/user-management/user-connections.html  |   374 +
 .../docs/user-management/user-management.html   |   388 +
 .../docs/user-management/working-user-data.html |   721 +
 content/favicon.ico                             |   Bin 0 -> 3989 bytes
 content/font/FontAwesome.otf                    |   Bin 0 -> 61896 bytes
 content/font/fontawesome-webfont-eot.eot        |   Bin 0 -> 37405 bytes
 content/font/fontawesome-webfont-svg.svg        |   399 +
 content/font/fontawesome-webfont-ttf.ttf        |   Bin 0 -> 79076 bytes
 content/font/fontawesome-webfont-woff.woff      |   Bin 0 -> 43572 bytes
 content/img/alberto.jpg                         |   Bin 0 -> 16137 bytes
 content/img/alex.png                            |   Bin 0 -> 40842 bytes
 content/img/apache_usergrid_favicon.png         |   Bin 0 -> 10735 bytes
 content/img/apache_usergrid_logo_white.png      |   Bin 0 -> 26418 bytes
 .../img/apache_usergrid_logo_white_small.png    |   Bin 0 -> 11905 bytes
 content/img/check_flat/default.png              |   Bin 0 -> 25851 bytes
 content/img/dave.jpg                            |   Bin 0 -> 14005 bytes
 content/img/ed.jpg                              |   Bin 0 -> 20460 bytes
 content/img/egg-logo.png                        |   Bin 0 -> 9938 bytes
 content/img/github.png                          |   Bin 0 -> 8936 bytes
 content/img/grey.png                            |   Bin 0 -> 37896 bytes
 content/img/intellij.png                        |   Bin 0 -> 9199 bytes
 content/img/jeff.jpg                            |   Bin 0 -> 13857 bytes
 content/img/michael_r.jpg                       |   Bin 0 -> 10244 bytes
 content/img/mike_d.JPG                          |   Bin 0 -> 36443 bytes
 content/img/nate.jpg                            |   Bin 0 -> 4291 bytes
 content/img/rod.jpg                             |   Bin 0 -> 40313 bytes
 content/img/scott.jpg                           |   Bin 0 -> 8555 bytes
 content/img/shawn.jpg                           |   Bin 0 -> 69304 bytes
 content/img/stliu.jpg                           |   Bin 0 -> 51303 bytes
 content/img/strong.jpg                          |   Bin 0 -> 7434 bytes
 content/img/structure101.png                    |   Bin 0 -> 6475 bytes
 content/img/sungju.jpg                          |   Bin 0 -> 11440 bytes
 content/img/tim.jpg                             |   Bin 0 -> 7611 bytes
 content/img/todd.jpg                            |   Bin 0 -> 18142 bytes
 content/img/usergrid-logo.pdf                   |   398 +
 content/img/usergrid.png                        |   Bin 0 -> 21994 bytes
 content/img/usergrid_160.png                    |   Bin 0 -> 2126 bytes
 content/img/usergrid_200.png                    |   Bin 0 -> 6397 bytes
 content/img/usergrid_300.png                    |   Bin 0 -> 16330 bytes
 content/img/usergrid_300_transparent.png        |   Bin 0 -> 16308 bytes
 content/img/usergrid_400.png                    |   Bin 0 -> 8746 bytes
 content/img/usergrid_800.png                    |   Bin 0 -> 14452 bytes
 content/img/usergrid_card.png                   |   Bin 0 -> 23295 bytes
 content/img/usergrid_logo.png                   |   Bin 0 -> 118086 bytes
 content/img/usergrid_logo_205_50.png            |   Bin 0 -> 7058 bytes
 content/img/usergrid_logo_260_50.png            |   Bin 0 -> 8682 bytes
 content/img/usergrid_logo_720.png               |   Bin 0 -> 27610 bytes
 content/img/usergrid_logo_720p.png              |   Bin 0 -> 27608 bytes
 content/img/usergrid_logo_900_200.png           |   Bin 0 -> 12273 bytes
 content/img/usergrid_logo_white.png             |   Bin 0 -> 16900 bytes
 content/img/usergrid_profile_128.png            |   Bin 0 -> 6689 bytes
 content/img/usergrid_profile_256.png            |   Bin 0 -> 10470 bytes
 content/img/usergrid_profile_256_white.png      |   Bin 0 -> 10724 bytes
 content/img/usergrid_profile_512_margins.png    |   Bin 0 -> 19112 bytes
 content/img/usergrid_profile_64_white.png       |   Bin 0 -> 4839 bytes
 content/img/usergrid_profile_background.png     |   Bin 0 -> 6710 bytes
 content/img/usergrid_screencast_bg.png          |   Bin 0 -> 20478 bytes
 content/img/usergrid_small_100.png              |   Bin 0 -> 6681 bytes
 content/img/usergrid_wiki.png                   |   Bin 0 -> 7135 bytes
 content/img/yourkit.jpeg                        |   Bin 0 -> 7763 bytes
 content/index.html                              |   262 +
 content/js/bootstrap.min.js                     |     8 +
 content/js/head.js                              |   708 +
 content/js/html5shiv.js                         |     8 +
 content/js/jquery-1.10.1.min.js                 |     6 +
 content/js/jquery.icheck.js                     |   397 +
 content/js/respond.min.js                       |     6 +
 content/js/usergrid-site.js                     |    50 +
 content/releases/index.html                     |   233 +
 content/static/github-btn.html                  |     2 +
 content/v101-portal-demo/config.js              |   129 +
 content/v101-portal-demo/css/entypo/entypo.eot  |   Bin 0 -> 35540 bytes
 content/v101-portal-demo/css/entypo/entypo.svg  |    13 +
 content/v101-portal-demo/css/entypo/entypo.ttf  |   Bin 0 -> 35392 bytes
 content/v101-portal-demo/css/entypo/entypo.woff |   Bin 0 -> 21916 bytes
 content/v101-portal-demo/css/main.css           |  1990 +
 content/v101-portal-demo/css/main.min.css       |     1 +
 content/v101-portal-demo/favicon.ico            |   Bin 0 -> 3989 bytes
 content/v101-portal-demo/helpJson.json          |    47 +
 .../img/appswitcher/apiPlatform_lg.png          |   Bin 0 -> 2397 bytes
 .../img/appswitcher/appServices_lg.png          |   Bin 0 -> 2295 bytes
 .../img/appswitcher/console_lg.png              |   Bin 0 -> 1453 bytes
 .../img/appswitcher/home_lg.png                 |   Bin 0 -> 1522 bytes
 .../img/appswitcher/logo_color.png              |   Bin 0 -> 3459 bytes
 .../v101-portal-demo/img/appswitcher/max_lg.png |   Bin 0 -> 1970 bytes
 .../img/appswitcher/triangleMenuItem_right.png  |   Bin 0 -> 1158 bytes
 .../triangleMenuItem_right_hover.png            |   Bin 0 -> 1169 bytes
 content/v101-portal-demo/img/blue-bars.png      |   Bin 0 -> 3635 bytes
 content/v101-portal-demo/img/blue-bolt.png      |   Bin 0 -> 3942 bytes
 content/v101-portal-demo/img/blue-carat.png     |   Bin 0 -> 1006 bytes
 content/v101-portal-demo/img/green_dot.png      |   Bin 0 -> 3472 bytes
 .../img/introjs_arrow_step_next.png             |   Bin 0 -> 219 bytes
 .../img/introjs_arrow_step_next_disabled.png    |   Bin 0 -> 220 bytes
 .../img/introjs_arrow_step_prev.png             |   Bin 0 -> 217 bytes
 .../img/introjs_arrow_step_prev_disabled.png    |   Bin 0 -> 218 bytes
 content/v101-portal-demo/img/introjs_close.png  |   Bin 0 -> 274 bytes
 content/v101-portal-demo/img/logo.png           |   Bin 0 -> 7758 bytes
 content/v101-portal-demo/img/nav-device.gif     |   Bin 0 -> 2184 bytes
 content/v101-portal-demo/img/nav-sprites.png    |   Bin 0 -> 7953 bytes
 content/v101-portal-demo/img/no-data1.png       |   Bin 0 -> 45300 bytes
 content/v101-portal-demo/img/phone-small.gif    |   Bin 0 -> 1300 bytes
 .../img/push/APNS_cert_upload.png               |   Bin 0 -> 33956 bytes
 .../img/push/APNS_certification.png             |   Bin 0 -> 16855 bytes
 .../img/push/android-notification.png           |   Bin 0 -> 41629 bytes
 .../img/push/google_api_key.png                 |   Bin 0 -> 98118 bytes
 .../img/push/iphone_message.png                 |   Bin 0 -> 90307 bytes
 content/v101-portal-demo/img/push/step_1.png    |   Bin 0 -> 1953 bytes
 content/v101-portal-demo/img/push/step_2.png    |   Bin 0 -> 2117 bytes
 content/v101-portal-demo/img/push/step_3.png    |   Bin 0 -> 2162 bytes
 content/v101-portal-demo/img/red_dot.png        |   Bin 0 -> 3482 bytes
 .../v101-portal-demo/img/sdk-sprites-large.png  |   Bin 0 -> 15115 bytes
 content/v101-portal-demo/img/sdk-sprites.png    |   Bin 0 -> 4401 bytes
 content/v101-portal-demo/img/tablet-small.gif   |   Bin 0 -> 1390 bytes
 content/v101-portal-demo/img/user-photo.png     |   Bin 0 -> 3849 bytes
 content/v101-portal-demo/img/user_profile.png   |   Bin 0 -> 3775 bytes
 content/v101-portal-demo/img/verify.png         |   Bin 0 -> 22934 bytes
 content/v101-portal-demo/img/yellow_dot.png     |   Bin 0 -> 3475 bytes
 content/v101-portal-demo/index-debug.html       |   151 +
 content/v101-portal-demo/index-template.html    |   156 +
 content/v101-portal-demo/index.html             |   151 +
 .../js/generated/usergrid-dev.js                |  4886 +
 .../js/generated/usergrid-libs.min.js           |    38 +
 .../js/generated/usergrid.min.js                |    25 +
 content/v101-portal-demo/js/libs/MD5.min.js     |     1 +
 .../js/libs/angular-1.2.5/angular-animate.js    |  1323 +
 .../libs/angular-1.2.5/angular-animate.min.js   |    23 +
 .../angular-1.2.5/angular-animate.min.js.map    |     8 +
 .../js/libs/angular-1.2.5/angular-cookies.js    |   202 +
 .../libs/angular-1.2.5/angular-cookies.min.js   |     8 +
 .../angular-1.2.5/angular-cookies.min.js.map    |     8 +
 .../js/libs/angular-1.2.5/angular-csp.css       |    24 +
 .../js/libs/angular-1.2.5/angular-loader.js     |   410 +
 .../js/libs/angular-1.2.5/angular-loader.min.js |     9 +
 .../angular-1.2.5/angular-loader.min.js.map     |     8 +
 .../js/libs/angular-1.2.5/angular-mocks.js      |  2116 +
 .../js/libs/angular-1.2.5/angular-resource.js   |   565 +
 .../libs/angular-1.2.5/angular-resource.min.js  |    13 +
 .../angular-1.2.5/angular-resource.min.js.map   |     8 +
 .../js/libs/angular-1.2.5/angular-route.js      |   911 +
 .../js/libs/angular-1.2.5/angular-route.min.js  |    14 +
 .../libs/angular-1.2.5/angular-route.min.js.map |     8 +
 .../js/libs/angular-1.2.5/angular-sanitize.js   |   622 +
 .../libs/angular-1.2.5/angular-sanitize.min.js  |    14 +
 .../angular-1.2.5/angular-sanitize.min.js.map   |     8 +
 .../js/libs/angular-1.2.5/angular-scenario.js   | 32374 ++++++
 .../js/libs/angular-1.2.5/angular-touch.js      |   563 +
 .../js/libs/angular-1.2.5/angular-touch.min.js  |    13 +
 .../libs/angular-1.2.5/angular-touch.min.js.map |     8 +
 .../js/libs/angular-1.2.5/angular.js            | 20369 ++++
 .../js/libs/angular-1.2.5/angular.min.js        |   201 +
 .../js/libs/angular-1.2.5/angular.min.js.map    |     8 +
 .../js/libs/angular-1.2.5/errors.json           |     1 +
 .../js/libs/angular-1.2.5/version.json          |     1 +
 .../js/libs/angular-1.2.5/version.txt           |     1 +
 .../libs/bootstrap/css/bootstrap-responsive.css |  1345 +
 .../bootstrap/css/bootstrap-responsive.min.css  |  1245 +
 .../js/libs/bootstrap/css/bootstrap.css         |  6169 ++
 .../js/libs/bootstrap/css/bootstrap.min.css     |  5469 +
 .../js/libs/bootstrap/custom/css/bootstrap.css  |  6316 ++
 .../libs/bootstrap/custom/css/bootstrap.min.css |     9 +
 .../custom/img/glyphicons-halflings-white.png   |   Bin 0 -> 8777 bytes
 .../custom/img/glyphicons-halflings.png         |   Bin 0 -> 12799 bytes
 .../js/libs/bootstrap/custom/js/bootstrap.js    |  2291 +
 .../libs/bootstrap/custom/js/bootstrap.min.js   |     7 +
 .../img/glyphicons-halflings-white.png          |   Bin 0 -> 8777 bytes
 .../libs/bootstrap/img/glyphicons-halflings.png |   Bin 0 -> 12799 bytes
 .../js/libs/bootstrap/js/bootstrap.js           |  2117 +
 .../js/libs/bootstrap/js/bootstrap.min.js       |   644 +
 .../v101-portal-demo/js/libs/google-viz-api.js  |    49 +
 .../js/libs/jquery/jquery-1.9.1.min.js          |     5 +
 .../js/libs/jquery/jquery-migrate-1.1.1.min.js  |     3 +
 .../js/libs/jquery/jquery.sparkline.min.js      |     5 +
 .../js/libs/jqueryui/date.min.js                |     2 +
 .../ui-bg_diagonals-thick_90_eeeeee_40x40.png   |   Bin 0 -> 251 bytes
 .../images/ui-bg_flat_100_deedf7_40x100.png     |   Bin 0 -> 182 bytes
 .../images/ui-bg_flat_100_e4f1fb_40x100.png     |   Bin 0 -> 213 bytes
 .../images/ui-bg_flat_100_f2f5f7_40x100.png     |   Bin 0 -> 212 bytes
 .../images/ui-bg_flat_15_cd0a0a_40x100.png      |   Bin 0 -> 181 bytes
 .../images/ui-bg_flat_50_3baae3_40x100.png      |   Bin 0 -> 182 bytes
 .../images/ui-bg_flat_80_d7ebf9_40x100.png      |   Bin 0 -> 183 bytes
 .../ui-bg_highlight-hard_70_000000_1x100.png    |   Bin 0 -> 118 bytes
 .../ui-bg_highlight-soft_25_ffef8f_1x100.png    |   Bin 0 -> 153 bytes
 .../jqueryui/images/ui-icons_000000_256x240.png |   Bin 0 -> 4369 bytes
 .../jqueryui/images/ui-icons_2694e8_256x240.png |   Bin 0 -> 4369 bytes
 .../jqueryui/images/ui-icons_2e83ff_256x240.png |   Bin 0 -> 4369 bytes
 .../jqueryui/images/ui-icons_3d80b3_256x240.png |   Bin 0 -> 4369 bytes
 .../jqueryui/images/ui-icons_72a7cf_256x240.png |   Bin 0 -> 4369 bytes
 .../jqueryui/images/ui-icons_ffffff_256x240.png |   Bin 0 -> 4369 bytes
 .../js/libs/jqueryui/jquery-ui-1.8.18.min.js    |    15 +
 .../js/libs/jqueryui/jquery-ui-1.8.9.custom.css |     1 +
 .../js/libs/jqueryui/jquery-ui-timepicker.css   |     1 +
 .../libs/jqueryui/jquery.ui.timepicker.min.js   |     1 +
 .../ui-bootstrap-custom-0.3.0.min.js            |     1 +
 .../ui-bootstrap-custom-tpls-0.3.0.min.js       |     1 +
 .../v101-portal-demo/js/libs/usergrid.sdk.js    |  2568 +
 docs/README                                     |    31 -
 docs/README.md                                  |    70 +
 docs/_static/css/theme.css                      |  5384 +
 docs/_theme/sphinx_rtd_theme/__init__.py        |     2 +-
 docs/_theme/sphinx_rtd_theme/breadcrumbs.html   |    16 +-
 docs/_theme/sphinx_rtd_theme/footer.html        |    25 +-
 docs/_theme/sphinx_rtd_theme/layout.html        |    57 +-
 docs/_theme/sphinx_rtd_theme/searchbox.html     |     4 +-
 .../sphinx_rtd_theme/static/css/badge_only.css  |     2 +
 .../static/css/badge_only.css.map               |     7 +
 .../sphinx_rtd_theme/static/css/theme.css       |     7 +-
 .../sphinx_rtd_theme/static/css/theme.css.map   |     7 +
 .../static/fonts/Inconsolata-Bold.ttf           |   Bin 0 -> 47064 bytes
 .../static/fonts/Inconsolata.ttf                |   Bin 0 -> 63184 bytes
 .../sphinx_rtd_theme/static/fonts/Lato-Bold.ttf |   Bin 0 -> 82368 bytes
 .../static/fonts/Lato-Regular.ttf               |   Bin 0 -> 81980 bytes
 .../static/fonts/RobotoSlab-Bold.ttf            |   Bin 0 -> 36596 bytes
 .../static/fonts/RobotoSlab-Regular.ttf         |   Bin 0 -> 36276 bytes
 .../sphinx_rtd_theme/static/js/modernizr.min.js |     4 +
 docs/_theme/sphinx_rtd_theme/static/js/theme.js |   126 +-
 docs/_theme/sphinx_rtd_theme/theme.conf         |     3 +
 .../file-storage-configuration.md               |    39 +
 docs/assets-and-files/folders.md                |    85 +
 docs/assets-and-files/legacy-asset-support.md   |     0
 docs/assets-and-files/retrieving-assets.md      |    27 +
 docs/assets-and-files/uploading-assets.md       |    86 +
 docs/concepts/activity.md                       |  1121 -
 docs/concepts/applications.md                   |    78 -
 docs/concepts/assets.md                         |    20 -
 docs/concepts/collections.md                    |    21 -
 docs/concepts/events-and-counters.md            |   268 -
 docs/concepts/groups.md                         |    38 -
 docs/concepts/query-language.md                 |   427 -
 docs/concepts/relationships.md                  |   100 -
 docs/concepts/roles-and-permissions.md          |    18 -
 docs/concepts/users-devices.md                  |   108 -
 docs/conf.py                                    |    16 +-
 docs/contribute-code.md                         |    24 -
 .../creating-and-incrementing-counters.md       |    74 +
 docs/counters-and-events/events-and-counters.md |     8 +
 docs/counters-and-events/retrieving-counters.md |   109 +
 docs/data-queries/advanced-query-usage.md       |    23 +
 docs/data-queries/operators-and-types.md        |   120 +
 docs/data-queries/query-parameters.md           |   153 +
 docs/data-queries/querying-your-data.md         |   121 +
 docs/data-storage/cassandra.png                 |   Bin 0 -> 47467 bytes
 docs/data-storage/collections.md                |   254 +
 docs/data-storage/data-store-dbms.md            |   109 +
 docs/data-storage/entities.md                   |   512 +
 docs/data-storage/optimizing-access.md          |   185 +
 docs/data-storage/rdbms.png                     |   Bin 0 -> 40248 bytes
 docs/data-storage/reviews.png                   |   Bin 0 -> 36333 bytes
 docs/data-storage/reviews2.png                  |   Bin 0 -> 52726 bytes
 docs/deploy-local.md                            |   179 -
 docs/entity-connections/connecting-entities.md  |    60 +
 .../disconnecting-entities.md                   |    79 +
 docs/entity-connections/retrieving-entities.md  |    93 +
 docs/file-storage-configuration.md              |    39 -
 docs/geolocation/geolocation.md                 |    72 +
 docs/get_2.0_running_locally.md                 |   165 -
 .../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/getting-up-and-running-locally.md          |    72 -
 docs/index.md                                   |    13 -
 docs/index.rst                                  |   178 +
 docs/installation/ug1-deploy-to-tomcat.md       |   179 +
 docs/installation/ug1-launcher-quick-start.md   |    72 +
 docs/installation/ug2-deploy-to-tomcat.md       |   179 +
 docs/introduction/async-vs-sync.md              |    25 +
 docs/introduction/data-model.md                 |    76 +
 docs/introduction/overview.md                   |    17 +
 docs/introduction/usergrid-features.md          |    81 +
 docs/jersey2skeleton/README.md                  |     9 +
 docs/jersey2skeleton/pom.xml                    |   387 +
 .../usergrid/testapp/AbstractResource.java      |    51 +
 .../apache/usergrid/testapp/ApiResponse.java    |    52 +
 .../org/apache/usergrid/testapp/Entity.java     |    55 +
 .../usergrid/testapp/ManagementResource.java    |    56 +
 .../usergrid/testapp/OrganizationResource.java  |    64 +
 .../usergrid/testapp/OrganizationsResource.java |    76 +
 .../apache/usergrid/testapp/StatusResource.java |    34 +
 .../java/org/apache/usergrid/testapp/User.java  |    28 +
 .../src/main/resources/applicationContext.xml   |    28 +
 .../main/resources/jersey2skeleton-context.xml  |    28 +
 .../src/main/webapp/WEB-INF/web.xml             |    95 +
 .../usergrid/testapp/AvailablePortFinder.java   |   208 +
 .../usergrid/testapp/OrganizationTest.java      |   127 +
 .../org/apache/usergrid/testapp/TomcatMain.java |    57 +
 .../apache/usergrid/testapp/TomcatRuntime.java  |   185 +
 .../src/test/resources/log4j.properties         |    31 +
 .../src/test/resources/logging.properties       |    26 +
 docs/jersey2skeleton/templates/markdown.hbs     |   108 +
 docs/jersey2skeleton/templates/operation.hbs    |    73 +
 docs/jersey2skeleton/templates/security.hbs     |    88 +
 .../templates/strapdown.html.hbs                |    10 +
 docs/organizations-admins.md                    |    55 -
 docs/orgs-and-apps/admin-user.md                |   352 +
 docs/orgs-and-apps/application.md               |   100 +
 docs/orgs-and-apps/managing.md                  |    50 +
 docs/orgs-and-apps/organization.md              |   435 +
 docs/presentations-and-videos.md                |     7 -
 docs/presentations-and-videos/presentations.md  |    21 -
 docs/presentations-and-videos/videos.md         |    11 -
 docs/push-notifications/adding-push-support.md  |   158 +
 docs/push-notifications/asapp.png               |   Bin 0 -> 73593 bytes
 docs/push-notifications/asemu.png               |   Bin 0 -> 34744 bytes
 docs/push-notifications/assettings.png          |   Bin 0 -> 120338 bytes
 .../creating-and-managing-notifications.md      |   271 +
 docs/push-notifications/creating-notifiers.md   |    69 +
 docs/push-notifications/gcmsetting.png          |   Bin 0 -> 101084 bytes
 docs/push-notifications/getting-started.md      |   102 +
 docs/push-notifications/googleproj0.png         |   Bin 0 -> 62311 bytes
 docs/push-notifications/ios-cert.png            |   Bin 0 -> 41925 bytes
 docs/push-notifications/iospgapp.png            |   Bin 0 -> 29796 bytes
 docs/push-notifications/iospgcert.png           |   Bin 0 -> 41925 bytes
 docs/push-notifications/iospgsettings.png       |   Bin 0 -> 384425 bytes
 docs/push-notifications/iospushauth.png         |   Bin 0 -> 42175 bytes
 docs/push-notifications/iospushfinal.png        |   Bin 0 -> 29573 bytes
 docs/push-notifications/iospushsettings.png     |   Bin 0 -> 137812 bytes
 docs/push-notifications/iphonemessage.png       |   Bin 0 -> 80970 bytes
 .../managing-users-and-devices.md               |   313 +
 docs/push-notifications/overview.md             |    58 +
 docs/push-notifications/pgaapp.png              |   Bin 0 -> 74807 bytes
 docs/push-notifications/pgasettings.png         |   Bin 0 -> 95052 bytes
 docs/push-notifications/pgaspath.png            |   Bin 0 -> 34744 bytes
 docs/push-notifications/pushmiddleandroid0.png  |   Bin 0 -> 106080 bytes
 docs/push-notifications/pushmiddleios0.png      |   Bin 0 -> 105175 bytes
 docs/push-notifications/pushsslcertificate.png  |   Bin 0 -> 53445 bytes
 docs/push-notifications/registering.md          |   102 +
 docs/push-notifications/sendnotification.png    |   Bin 0 -> 47353 bytes
 docs/push-notifications/tbd.md                  |     1 +
 docs/push-notifications/troubleshooting.md      |    93 +
 docs/push-notifications/tutorial.md             |   251 +
 docs/push-notifications/users-devices.md        |   108 +
 docs/push.tgz                                   |   Bin 0 -> 1651449 bytes
 docs/reference/contribute-code.md               |    18 +
 docs/reference/presos-and-videos.md             |    31 +
 docs/rest-endpoints/api-docs.html               |  7178 ++
 docs/rest-endpoints/api-docs.md                 |  3977 +
 docs/sdks/ios-new.md                            |   982 +
 docs/sdks/sdk-outline.md                        |   111 +
 docs/sdks/tbd.md                                |     1 +
 docs/security-and-auth/app-security.md          |    19 +
 .../authenticating-api-requests.md              |    38 +
 ...henticating-users-and-application-clients.md |   128 +
 .../changing-token-time-live-ttl.md             |    61 +
 docs/security-and-auth/facebook-sign.md         |   158 +
 .../security-and-auth/revoking-tokens-logout.md |    32 +
 docs/security-and-auth/securing-your-app.md     |    44 +
 docs/security-and-auth/securitymodel0.png       |   Bin 0 -> 91321 bytes
 .../user-authentication-types.md                |    63 +
 docs/security-and-auth/using-permissions.md     |   115 +
 docs/security-and-auth/using-roles.md           |   304 +
 .../main/groovy/usergrid/ApiDocGenerator.groovy |   422 +
 docs/src/main/resources/html/file-end.mustache  |    30 +
 .../src/main/resources/html/file-start.mustache |    54 +
 docs/src/main/resources/html/model.mustache     |    67 +
 docs/src/main/resources/html/operation.mustache |    44 +
 .../main/resources/markdown/file-start.mustache |    13 +
 docs/src/main/resources/markdown/model.mustache |    34 +
 .../main/resources/markdown/operation.mustache  |    23 +
 docs/src/main/resources/usergrid-swagger.yaml   |  2324 +
 docs/update-api-docs.sh                         |     4 +
 docs/update-website.sh                          |     6 +
 docs/upgrading.md                               |     3 -
 docs/usage.md                                   |    16 -
 docs/user-management/activity.md                |   439 +
 docs/user-management/group.md                   |   363 +
 docs/user-management/groups.md                  |    38 +
 docs/user-management/iOS10seeusermsg.jpg        |   Bin 0 -> 47979 bytes
 docs/user-management/iOS1chooseapp.jpg          |   Bin 0 -> 43752 bytes
 docs/user-management/iOS2register.jpg           |   Bin 0 -> 47339 bytes
 docs/user-management/iOS4signin.jpg             |   Bin 0 -> 46093 bytes
 docs/user-management/iOS5emptyfeed.jpg          |   Bin 0 -> 42009 bytes
 docs/user-management/iOS6newmsg.jpg             |   Bin 0 -> 55357 bytes
 docs/user-management/iOS7feed1msg.jpg           |   Bin 0 -> 45070 bytes
 docs/user-management/iOS9follow.jpg             |   Bin 0 -> 57938 bytes
 docs/user-management/login.png                  |   Bin 0 -> 162318 bytes
 docs/user-management/messagee-example.md        |   137 +
 docs/user-management/portal1.png                |   Bin 0 -> 202277 bytes
 docs/user-management/portal2.png                |   Bin 0 -> 178318 bytes
 docs/user-management/portal3.png                |   Bin 0 -> 486403 bytes
 docs/user-management/portal4.png                |   Bin 0 -> 166079 bytes
 docs/user-management/portal5.png                |   Bin 0 -> 217950 bytes
 docs/user-management/user-connections.md        |    40 +
 docs/user-management/user-management.md         |    42 +
 docs/user-management/working-user-data.md       |   278 +
 portal/README.md                                |     4 +-
 portal/bower.json                               |     2 +-
 portal/index-template.html                      |    14 +-
 portal/js/data/data-controller.js               |     1 -
 portal/js/global/page-controller.js             |     3 +-
 portal/js/global/ug-service.js                  |    19 +-
 portal/js/libs/usergrid.sdk.js                  |     8 +-
 portal/js/login/login-controller.js             |     5 +
 portal/package.json                             |     2 +-
 release/release-candidate.sh                    |    12 +-
 release/release.sh                              |    16 +-
 sdks/android/NOTICE                             |     2 +-
 sdks/android/README.md                          |     3 +-
 sdks/android/pom.xml                            |     2 +-
 sdks/dotnet/NOTICE                              |     2 +-
 sdks/dotnet/README.md                           |     4 +-
 sdks/html5-javascript/README.md                 |    12 +-
 sdks/html5-javascript/index.html                |     2 +-
 sdks/ios/README.md                              |     3 +-
 sdks/java/pom.xml                               |     6 +-
 sdks/nodejs/readme.md                           |     2 +
 sdks/perl/README.md                             |     2 +-
 sdks/perl/lib/Usergrid/Client.pm                |     2 +-
 sdks/php/README.md                              |     6 +-
 sdks/ruby-on-rails/README.md                    |     2 +-
 sdks/ruby/README.md                             |     2 +-
 stack/Coverage.md                               |    40 +
 stack/README.md                                 |     4 +-
 stack/awscluster/gatling-cluster-cf.json        |    30 +-
 .../src/main/groovy/configure_usergrid.groovy   |     5 +-
 stack/build-tools/pom.xml                       |     2 +-
 stack/config/pom.xml                            |     2 +-
 .../main/resources/usergrid-default.properties  |    79 +-
 .../src/test/resources/usergrid-test.properties |     9 +-
 stack/core/pom.xml                              |    93 +-
 .../batch/service/JobSchedulerService.java      |     2 +-
 .../corepersistence/ApplicationIdCacheFig.java  |     2 +
 .../corepersistence/ApplicationIdCacheImpl.java |    14 +-
 .../usergrid/corepersistence/CoreModule.java    |    48 +-
 .../corepersistence/CpEntityManager.java        |   255 +-
 .../corepersistence/CpEntityManagerFactory.java |    29 +-
 .../corepersistence/CpManagerCache.java         |    12 +-
 .../corepersistence/CpRelationManager.java      |    67 +-
 .../usergrid/corepersistence/CpSetup.java       |     3 +-
 .../corepersistence/EntityManagerFig.java       |     4 +-
 .../usergrid/corepersistence/ManagerCache.java  |     7 +
 .../asyncevents/AmazonAsyncEventService.java    |   604 +-
 .../asyncevents/AsyncEventService.java          |    10 +
 .../asyncevents/AsyncIndexProvider.java         |    31 +-
 .../asyncevents/EventBuilder.java               |    11 +-
 .../asyncevents/EventBuilderImpl.java           |    76 +-
 .../asyncevents/InMemoryAsyncEventService.java  |   132 -
 .../asyncevents/model/AsyncEvent.java           |   163 +-
 .../asyncevents/model/EdgeDeleteEvent.java      |    36 +-
 .../asyncevents/model/EdgeIndexEvent.java       |    44 +-
 .../model/ElasticsearchIndexEvent.java          |    51 +
 .../asyncevents/model/EntityDeleteEvent.java    |    24 +-
 .../asyncevents/model/EntityIndexEvent.java     |    32 +-
 .../model/InitializeApplicationIndexEvent.java  |    30 +-
 .../index/ApplicationIndexLocationStrategy.java |     5 +-
 .../corepersistence/index/CoreIndexFig.java     |    15 +-
 .../index/IndexProcessorFig.java                |    43 +-
 .../corepersistence/index/IndexServiceImpl.java |    16 +-
 .../index/ManagementIndexLocationStrategy.java  |     9 +-
 .../index/ReIndexServiceImpl.java               |     2 +-
 .../index/ReplicatedIndexLocationStrategy.java  |     2 +-
 .../migration/CoreMigration.java                |    45 +-
 .../migration/CoreMigrationPlugin.java          |    38 +-
 .../migration/DeDupConnectionDataMigration.java |    93 +
 .../migration/EntityTypeMappingMigration.java   |   104 -
 .../migration/MigrationModuleVersionPlugin.java |     5 -
 .../corepersistence/migration/Versions.java     |    31 -
 .../builder/PipelineBuilderFactory.java         |     3 +
 .../read/search/CandidateEntityFilter.java      |    17 +-
 .../pipeline/read/search/CandidateIdFilter.java |    15 +-
 .../results/EntityQueryExecutor.java            |     3 +-
 .../rx/impl/AllApplicationsObservableImpl.java  |    36 +-
 .../service/AggregationService.java             |    64 +
 .../service/AggregationServiceFactory.java      |    27 +
 .../service/AggregationServiceImpl.java         |   114 +
 .../service/ApplicationService.java             |    32 +
 .../service/ApplicationServiceImpl.java         |   146 +
 .../service/ConnectionScope.java                |    53 +
 .../service/ConnectionService.java              |    10 +
 .../service/ConnectionServiceImpl.java          |    90 +-
 .../corepersistence/service/StatusService.java  |    81 +
 .../service/StatusServiceImpl.java              |   110 +
 .../corepersistence/util/CpEntityMapUtils.java  |   284 +-
 .../corepersistence/util/CpNamingUtils.java     |    18 +-
 .../util/ObjectJsonSerializer.java              |    92 +
 .../apache/usergrid/count/AbstractBatcher.java  |    70 +-
 .../apache/usergrid/count/SimpleBatcher.java    |     2 +-
 .../usergrid/persistence/AbstractEntity.java    |    22 +-
 .../org/apache/usergrid/persistence/Entity.java |     9 +-
 .../usergrid/persistence/EntityManager.java     |    10 +-
 .../persistence/EntityManagerFactory.java       |    14 +-
 .../org/apache/usergrid/persistence/Query.java  |     6 +-
 .../org/apache/usergrid/persistence/Schema.java |    18 +-
 .../usergrid/persistence/cassandra/Setup.java   |    14 +-
 .../persistence/entities/Notification.java      |   134 +-
 .../main/resources/usergrid-core-context.xml    |     7 +-
 .../java/org/apache/usergrid/Application.java   |     7 +
 .../org/apache/usergrid/CoreApplication.java    |    15 +-
 .../java/org/apache/usergrid/CoreITSetup.java   |     3 +
 .../org/apache/usergrid/CoreITSetupImpl.java    |     6 +
 .../corepersistence/AggregationServiceTest.java |    79 +
 .../corepersistence/CpEntityMapUtilsTest.java   |   151 +-
 .../corepersistence/StaleIndexCleanupTest.java  |    63 +-
 .../corepersistence/TestCoreModule.java         |    34 +
 .../index/AmazonAsyncEventServiceTest.java      |    19 +-
 .../index/AsyncIndexServiceTest.java            |    16 +-
 .../index/InMemoryAsycIndexServiceTest.java     |    65 -
 .../corepersistence/index/IndexNamingTest.java  |    23 +-
 .../corepersistence/index/IndexServiceTest.java |    18 +-
 .../corepersistence/index/PublishRxTest.java    |    95 -
 .../usergrid/corepersistence/index/RxTest.java  |   108 +
 .../DeDupConnectionDataMigrationTest.java       |   145 +
 .../migration/EntityTypeMappingMigrationIT.java |   125 -
 .../service/ConnectionServiceImplTest.java      |   235 +
 .../persistence/ApplicationServiceIT.java       |   108 +
 .../usergrid/persistence/CollectionIT.java      |    10 +-
 .../usergrid/persistence/CoreSchemaManager.java |     2 +-
 .../apache/usergrid/persistence/CounterIT.java  |   119 +-
 .../usergrid/persistence/EntityManagerIT.java   |     8 +-
 .../org/apache/usergrid/persistence/GeoIT.java  |    58 +-
 .../apache/usergrid/persistence/IndexIT.java    |     6 +-
 .../PerformanceEntityRebuildIndexTest.java      |   385 -
 .../usergrid/persistence/PermissionsIT.java     |     7 +-
 .../usergrid/persistence/RebuildIndexTest.java  |   515 +
 .../usergrid/persistence/StatusServiceIT.java   |    75 +
 .../cassandra/EntityManagerFactoryImplIT.java   |     2 +-
 .../query/IntersectionTransitivePagingIT.java   |     1 +
 .../persistence/query/IteratingQueryIT.java     |     5 +-
 stack/core/src/test/resources/log4j.properties  |     6 +-
 .../resources/usergrid-custom-test.properties   |     6 +-
 .../usergrid-scheduler-test.properties          |     2 +
 stack/corepersistence/cache/pom.xml             |    69 +
 .../persistence/cache/CacheFactory.java         |    27 +
 .../usergrid/persistence/cache/CacheScope.java  |    38 +
 .../usergrid/persistence/cache/ScopedCache.java |    39 +
 .../persistence/cache/guice/CacheModule.java    |    51 +
 .../cache/impl/CacheFactoryImpl.java            |    61 +
 .../persistence/cache/impl/ScopedCacheImpl.java |    57 +
 .../cache/impl/ScopedCacheSerialization.java    |    37 +
 .../impl/ScopedCacheSerializationImpl.java      |   310 +
 .../persistence/cache/CacheTestModule.java      |    48 +
 .../persistence/cache/ScopedCacheTest.java      |   173 +
 stack/corepersistence/collection/pom.xml        |    83 +-
 .../persistence/collection/MvccEntity.java      |     8 +
 .../cache/CachedEntityCollectionManager.java    |   147 -
 .../collection/cache/EntityCacheFig.java        |     2 +
 .../EntityCollectionManagerFactoryImpl.java     |     6 -
 .../mvcc/entity/impl/MvccEntityImpl.java        |    30 +-
 .../collection/mvcc/stage/delete/MarkStart.java |     2 +-
 .../serialization/SerializationFig.java         |     2 +-
 .../MvccEntitySerializationStrategyImpl.java    |     4 +-
 .../MvccEntitySerializationStrategyV2Impl.java  |    21 +-
 .../MvccEntitySerializationStrategyV3Impl.java  |    78 +-
 .../serialization/impl/SerializationModule.java |     4 +-
 .../migration/CollectionMigrationPlugin.java    |     8 +-
 .../migration/MvccEntityDataMigrationImpl.java  |   104 +-
 ...ccEntitySerializationStrategyV3ImplTest.java |     1 -
 ...ctMvccEntityDataMigrationV1ToV3ImplTest.java |    39 +-
 .../src/test/resources/dynamic-test.properties  |     3 +
 .../src/test/resources/usergrid-CHOP.properties |     3 +
 .../src/test/resources/usergrid-UNIT.properties |     3 +
 .../src/test/resources/usergrid.properties      |     3 +-
 stack/corepersistence/common/pom.xml            |    20 +-
 .../core/astyanax/CassandraConfig.java          |     8 +-
 .../core/astyanax/CassandraConfigImpl.java      |     1 +
 .../persistence/core/astyanax/CassandraFig.java |     8 +-
 .../core/executor/TaskExecutorFactory.java      |    64 +-
 .../core/future/FutureObservable.java           |    44 -
 .../persistence/core/guice/CommonModule.java    |     2 +
 .../core/guice/SettingsValidationCluster.java   |    26 +
 .../persistence/core/guicyfig/ClusterFig.java   |    14 +-
 .../migration/data/AbstractMigrationPlugin.java |    17 +-
 .../core/migration/data/DataMigration.java      |    11 +-
 .../migration/data/DataMigrationManager.java    |    12 +-
 .../data/DataMigrationManagerImpl.java          |    19 +
 .../migration/data/MigrationDataProvider.java   |     2 +-
 .../core/migration/data/MigrationPlugin.java    |     4 +-
 .../migration/schema/MigrationManagerFig.java   |     1 +
 .../persistence/core/rx/RxSchedulerFig.java     |     2 +
 .../guice/SettingsValidationClusterTest.java    |    39 +
 .../data/DataMigrationManagerImplTest.java      |    86 +
 .../migration/data/TestProgressObserver.java    |    10 +-
 .../core/rx/ExceptionBehaviorTest.java          |   197 +
 .../persistence/core/rx/OrderedMergeTest.java   |    57 +-
 .../src/test/resources/usergrid-UNIT.properties |     3 +
 .../src/test/resources/usergrid.properties      |     3 +-
 stack/corepersistence/graph/pom.xml             |    83 +-
 .../usergrid/persistence/graph/GraphFig.java    |     2 +
 .../persistence/graph/guice/GraphModule.java    |     4 +-
 .../graph/impl/GraphManagerImpl.java            |     4 +-
 .../graph/impl/SimpleSearchEdgeType.java        |     4 +-
 .../graph/impl/SimpleSearchIdType.java          |     3 +-
 .../impl/stage/EdgeDeleteListenerImpl.java      |     4 +-
 .../graph/impl/stage/EdgeDeleteRepairImpl.java  |    61 +-
 .../impl/TargetIdObservableImpl.java            |    13 +-
 .../impl/migration/EdgeDataMigrationImpl.java   |    12 +-
 .../impl/migration/GraphMigrationPlugin.java    |     8 +-
 .../impl/shard/impl/EdgeSearcher.java           |    14 +-
 .../shard/impl/ShardGroupCompactionImpl.java    |     2 +-
 .../impl/ShardedEdgeSerializationImpl.java      |    59 +-
 .../shard/impl/serialize/EdgeSerializer.java    |    21 +-
 .../persistence/graph/GraphManagerIT.java       |    72 +-
 .../migration/EdgeDataMigrationImplTest.java    |    59 +-
 .../graph/test/util/EdgeTestUtils.java          |     2 +-
 .../src/test/resources/usergrid-AWS.properties  |     2 +
 .../src/test/resources/usergrid-CHOP.properties |     3 +
 .../test/resources/usergrid-SHARD.properties    |     3 +
 .../src/test/resources/usergrid-UNIT.properties |     3 +
 .../src/test/resources/usergrid.properties      |     3 +-
 stack/corepersistence/map/pom.xml               |    22 +-
 .../usergrid/persistence/map/MapManager.java    |    25 +-
 .../persistence/map/impl/MapManagerImpl.java    |     6 +
 .../persistence/map/impl/MapSerialization.java  |    27 +-
 .../map/impl/MapSerializationImpl.java          |   244 +-
 .../persistence/map/guice/TestMapModule.java    |    18 +
 stack/corepersistence/model/pom.xml             |    35 +-
 .../model/collection/SchemaManager.java         |    35 +
 .../persistence/model/entity/Entity.java        |     3 +
 .../model/entity/EntityToMapConverter.java      |    81 +-
 .../model/entity/MapToEntityConverter.java      |   180 +-
 .../persistence/model/field/FieldTypeName.java  |     1 +
 .../model/field/SerializedObjectField.java      |    51 +
 .../model/field/value/EntityObject.java         |    10 +
 stack/corepersistence/pom.xml                   |   110 +-
 stack/corepersistence/queryindex/pom.xml        |    59 +-
 .../persistence/index/CandidateResult.java      |    32 +-
 .../persistence/index/CandidateResults.java     |    34 +-
 .../SearchRequestBuilderStrategyV2.java         |    30 +-
 .../usergrid/persistence/index/EntityIndex.java |    74 +-
 .../persistence/index/EntityIndexBatch.java     |     8 +-
 .../usergrid/persistence/index/IndexEdge.java   |    36 +-
 .../usergrid/persistence/index/IndexFig.java    |    32 +-
 .../index/IndexLocationStrategy.java            |    34 +-
 .../persistence/index/IndexRefreshCommand.java  |    50 -
 .../usergrid/persistence/index/SearchType.java  |    30 +-
 .../usergrid/persistence/index/SearchTypes.java |    32 +-
 .../persistence/index/SelectFieldMapping.java   |    36 +-
 .../persistence/index/guice/IndexModule.java    |    13 +-
 .../index/impl/DeIndexOperation.java            |     4 +
 .../persistence/index/impl/EntityField.java     |    32 +-
 .../index/impl/EntityMappingParser.java         |    51 +-
 .../index/impl/EntityToMapConverter.java        |     5 +-
 .../index/impl/EsEntityIndexBatchImpl.java      |    21 +-
 .../index/impl/EsEntityIndexFactoryImpl.java    |    39 +-
 .../index/impl/EsEntityIndexImpl.java           |   105 +-
 .../index/impl/EsIndexBufferConsumerImpl.java   |   285 -
 .../index/impl/EsIndexCacheImpl.java            |    29 +-
 .../index/impl/EsIndexProducerImpl.java         |   235 +
 .../persistence/index/impl/EsQueryVistor.java   |    50 +-
 .../persistence/index/impl/FailureMonitor.java  |    30 +-
 .../index/impl/FailureMonitorImpl.java          |    32 +-
 .../persistence/index/impl/FieldParser.java     |    36 +-
 .../persistence/index/impl/GeoSortFields.java   |    36 +-
 .../index/impl/IndexBufferConsumer.java         |    38 -
 .../persistence/index/impl/IndexCache.java      |    30 +-
 .../persistence/index/impl/IndexEdgeImpl.java   |    36 +-
 .../index/impl/IndexIdentifierv2Impl.java       |    30 +-
 .../persistence/index/impl/IndexOperation.java  |     4 +
 .../index/impl/IndexOperationMessage.java       |    30 +-
 .../persistence/index/impl/IndexProducer.java   |    39 +
 .../index/impl/IndexRefreshCommandImpl.java     |   202 -
 .../persistence/index/impl/IndexingUtils.java   |     2 +
 .../index/impl/NoOpFilterBuilder.java           |    32 +-
 .../index/impl/NoOpQueryBuilder.java            |    32 +-
 .../impl/SearchRequestBuilderStrategy.java      |    30 +-
 .../persistence/index/impl/SortBuilder.java     |    36 +-
 .../EsIndexMappingMigrationPlugin.java          |   146 +
 .../index/migration/EsIndexMigrationPlugin.java |     8 +-
 .../index/migration/IndexDataVersions.java      |    30 +-
 .../persistence/index/query/ParsedQuery.java    |    36 +-
 .../index/query/ParsedQueryBuilder.java         |    36 +-
 .../persistence/index/query/SortPredicate.java  |    36 +-
 .../persistence/index/usergrid-mappings.json    |    13 +-
 .../persistence/index/impl/EntityIndexTest.java |   168 +-
 .../index/impl/EntityToMapConverterTest.java    |    50 +-
 .../impl/EsIndexMappingMigrationPluginTest.java |    64 +
 .../persistence/index/impl/EsRunner.java        |    32 +-
 .../persistence/index/impl/GeoPagingTest.java   |    42 +-
 .../index/impl/IndexLoadTestsIT.java            |     5 +-
 .../index/impl/TestIndexIdentifier.java         |    30 +-
 .../src/test/resources/dynamic-test.properties  |     2 +
 .../src/test/resources/usergrid-CHOP.properties |     3 +
 .../src/test/resources/usergrid-UNIT.properties |     5 +-
 .../src/test/resources/usergrid.properties      |     3 +-
 stack/corepersistence/queue/pom.xml             |    41 +-
 .../persistence/queue/DefaultQueueManager.java  |    70 -
 .../persistence/queue/LocalQueueManager.java    |   108 +
 .../usergrid/persistence/queue/QueueFig.java    |    39 +-
 .../persistence/queue/QueueManager.java         |    21 +-
 .../persistence/queue/QueueMessage.java         |    10 +
 .../usergrid/persistence/queue/QueueScope.java  |     8 +-
 .../persistence/queue/guice/QueueModule.java    |     1 -
 .../queue/impl/QueueManagerFactoryImpl.java     |    18 +-
 .../queue/impl/SNSQueueManagerImpl.java         |   642 +-
 .../queue/impl/SQSQueueManagerImpl.java         |   347 -
 .../queue/impl/UsergridAwsCredentials.java      |     7 +
 .../impl/UsergridAwsCredentialsProvider.java    |     5 +-
 .../queue/util/AmazonNotificationUtils.java     |   233 +-
 .../persistence/queue/QueueManagerTest.java     |    65 +-
 stack/jacoco-pom.xml                            |   122 +
 .../java/org/apache/usergrid/launcher/App.java  |     2 +-
 .../resources/usergrid-standalone.properties    |     5 +-
 stack/loadtests/.gitignore                      |     1 +
 stack/loadtests/README.md                       |   234 +-
 stack/loadtests/pom.xml                         |    37 +-
 .../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     |   103 +
 .../loadtests/runLoadLargeMultiFieldEntities.sh |   107 +
 stack/loadtests/runLoadNoNameEntities.sh        |    98 +
 stack/loadtests/runLoadSortableEntities.sh      |    98 +
 stack/loadtests/runOrgAppSetup.sh               |    88 +
 .../loadtests/runRandomEntityByNameQueryTest.sh |    91 +
 stack/loadtests/runRandomEntityByNameTest.sh    |    91 +
 stack/loadtests/runUpdateEntities.sh            |    91 +
 stack/loadtests/runtests.sh                     |   120 -
 stack/loadtests/runtests_deprecated.sh          |   120 +
 .../datagenerators/EntityDataGenerator.scala    |   108 +-
 .../datagenerators/FeederGenerator.scala        |   217 +-
 .../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       |   179 +
 .../usergrid/enums/CsvFeedPatternType.scala     |    30 +
 .../usergrid/enums/EndConditionType.scala       |    29 +
 .../org/apache/usergrid/enums/EntityType.scala  |    30 +
 .../apache/usergrid/enums/ScenarioType.scala    |    37 +
 .../org/apache/usergrid/enums/TokenType.scala   |    29 +
 .../apache/usergrid/helpers/Extractors.scala    |    86 +-
 .../org/apache/usergrid/helpers/Headers.scala   |    70 +
 .../org/apache/usergrid/helpers/Setup.scala     |   298 +-
 .../org/apache/usergrid/helpers/Utils.scala     |   102 +
 .../scenarios/ApplicationScenarios.scala        |    13 +-
 .../usergrid/scenarios/AuditScenarios.scala     |   261 +
 .../scenarios/ConnectionScenarios.scala         |    17 +-
 .../usergrid/scenarios/DeviceScenarios.scala    |    26 +-
 .../scenarios/EntityCollectionScenarios.scala   |   365 +
 .../usergrid/scenarios/EntityScenarios.scala    |    39 +-
 .../usergrid/scenarios/GeoScenarios.scala       |    19 +-
 .../scenarios/NotificationScenarios.scala       |    27 +-
 .../usergrid/scenarios/NotifierScenarios.scala  |    20 +-
 .../scenarios/OrganizationScenarios.scala       |    18 +-
 .../usergrid/scenarios/TokenScenarios.scala     |    19 +-
 .../usergrid/scenarios/UserScenarios.scala      |    43 +-
 .../org/apache/usergrid/settings/Headers.scala  |    47 -
 .../org/apache/usergrid/settings/Settings.scala |   586 +-
 .../org/apache/usergrid/settings/Utils.scala    |    91 -
 .../usergrid/simulations/AppSimulation.scala    |    44 -
 .../usergrid/simulations/AuditSimulation.scala  |    73 +
 .../simulations/ConfigurableSimulation.scala    |   105 +
 .../simulations/ConnectionsSimulation.scala     |    53 -
 .../simulations/CustomInjectionSimulation.scala |   107 +
 .../simulations/DeleteUsersSimulation.scala     |    56 -
 .../simulations/GetEntitySimulation.scala       |    44 -
 .../simulations/GetUserPagesSimulation.scala    |    51 -
 .../simulations/GetUsersSimulation.scala        |    51 -
 .../PostCustomEntitySimulation.scala            |    80 -
 .../simulations/PostUsersSimulation.scala       |    51 -
 .../PushNotificationTargetUserSimulation.scala  |    44 -
 .../simulations/PutCustomEntitySimulation.scala |    75 -
 .../simulations/PutUsersSimulation.scala        |    56 -
 .../usergrid/simulations/SetupSimulation.scala  |    45 -
 .../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 +
 .../src/test/resources/dummyAuditUuid.csv       |     1 +
 .../loadtests/src/test/resources/dummyUuid.csv  |     1 +
 stack/loadtests/src/test/resources/gatling.conf |     6 +-
 .../src/test/resources/logback-test.xml         |     7 +-
 stack/loadtests/src/test/resources/logback.xml  |     4 +-
 stack/loadtests/src/test/scala/Engine.scala     |     5 +-
 .../src/test/scala/IDEPathHelper.scala          |    13 +-
 stack/loadtests/src/test/scala/Recorder.scala   |     8 +-
 stack/loadtests/testConfig.sh                   |    67 +
 stack/pom.xml                                   |   288 +-
 .../resources/usergrid-custom-test.properties   |     5 +-
 stack/rest/pom.xml                              |   156 +-
 .../usergrid/rest/AbstractContextResource.java  |    45 +-
 .../org/apache/usergrid/rest/ApiResponse.java   |    14 +
 .../org/apache/usergrid/rest/IndexResource.java |    54 +-
 .../apache/usergrid/rest/MigrateResource.java   |   104 +-
 .../org/apache/usergrid/rest/RootResource.java  |    99 +-
 .../apache/usergrid/rest/SwaggerServlet.java    |     5 +-
 .../apache/usergrid/rest/SystemResource.java    |    89 +-
 .../usergrid/rest/TextToJsonSwapWriter.java     |   182 +-
 .../rest/applications/ApplicationResource.java  |    83 +-
 .../rest/applications/ServiceResource.java      |   284 +-
 .../applications/assets/AssetsResource.java     |    50 +-
 .../applications/events/EventsResource.java     |    36 +-
 .../notifiers/NotifierResource.java             |    29 +-
 .../notifiers/NotifiersResource.java            |    29 +-
 .../rest/applications/queues/QueueResource.java |    86 +-
 .../queues/QueueSubscriberResource.java         |    63 +-
 .../queues/QueueSubscriptionResource.java       |    63 +-
 .../queues/QueueTransactionsResource.java       |    40 +-
 .../rest/applications/users/UserResource.java   |   134 +-
 .../rest/applications/users/UsersResource.java  |    55 +-
 .../exceptions/AbstractExceptionMapper.java     |    13 +-
 .../AwsPropertiesNotFoundExceptionMapper.java   |    37 +
 .../exceptions/NotFoundExceptionMapper.java     |     3 +-
 .../rest/exceptions/SecurityException.java      |    31 +-
 .../exceptions/SecurityExceptionMapper.java     |     3 +-
 .../exceptions/UnsupportedMediaTypeMapper.java  |    43 +
 .../rest/filters/ContentTypeFilter.java         |    74 +-
 .../rest/filters/JSONPCallbackFilter.java       |    26 +-
 .../usergrid/rest/filters/MeteringFilter.java   |   632 +-
 .../usergrid/rest/filters/TracingFilter.java    |    37 +-
 .../rest/management/ManagementResource.java     |    53 +-
 .../management/metrics/MetricsResource.java     |     9 +-
 .../organizations/OrganizationResource.java     |   113 +-
 .../organizations/OrganizationsResource.java    |    67 +-
 .../applications/ApplicationResource.java       |   116 +-
 .../applications/ApplicationsResource.java      |    52 +-
 .../imports/FileErrorsResource.java             |    41 +-
 .../imports/FileIncludesResource.java           |    15 +-
 .../applications/imports/ImportsResource.java   |    57 +-
 .../organizations/users/UsersResource.java      |    88 +-
 .../rest/management/users/UserResource.java     |    95 +-
 .../rest/management/users/UsersResource.java    |    11 +-
 .../organizations/OrganizationsResource.java    |    76 +-
 .../organizations/OrganizationResource.java     |    28 +-
 .../rest/security/CrossOriginRequestFilter.java |    18 +-
 .../security/SecuredResourceFilterFactory.java  |   183 +-
 .../ShiroAuthenticationExceptionMapper.java     |     3 +-
 .../shiro/filters/BasicAuthSecurityFilter.java  |    38 +-
 .../ClientCredentialsSecurityFilter.java        |    25 +-
 .../OAuth2AccessTokenSecurityFilter.java        |   168 +-
 .../security/shiro/filters/SecurityFilter.java  |    33 +-
 .../session/HttpRequestSessionManager.java      |     9 +-
 .../rest/system/ApplicationsResource.java       |   178 +
 .../usergrid/rest/system/DatabaseResource.java  |   101 +
 .../rest/system/QueueSystemResource.java        |    77 +
 .../apache/usergrid/rest/utils/CORSUtils.java   |    42 +-
 .../main/resources/usergrid-rest-context.xml    |    13 +-
 .../resources/usergrid-rest-deploy-context.xml  |     2 +-
 stack/rest/src/main/webapp/WEB-INF/web.xml      |    63 +-
 .../java/org/apache/usergrid/rest/BasicIT.java  |    22 +-
 .../usergrid/rest/CollectionMetadataIT.java     |   141 +
 .../apache/usergrid/rest/IndexResourceIT.java   |    43 +-
 .../apache/usergrid/rest/NotificationsIT.java   |     6 +-
 .../apache/usergrid/rest/PartialUpdateTest.java |    16 +-
 .../apache/usergrid/rest/SystemResourceIT.java  |    78 +-
 .../org/apache/usergrid/rest/TomcatRuntime.java |    12 +-
 .../rest/applications/ApplicationCreateIT.java  |    14 +-
 .../rest/applications/ApplicationDeleteIT.java  |   206 +-
 .../applications/ApplicationResourceIT.java     |   275 +-
 .../applications/assets/AssetResourceIT.java    |    32 +-
 .../applications/assets/AwsAssetResourceIT.java |   442 +
 .../applications/assets/aws/NoAWSCredsRule.java |   124 +
 .../collection/CollectionsResourceIT.java       |    26 +-
 .../collection/DuplicateNameIT.java             |     5 +-
 .../activities/ActivityResourceIT.java          |     5 +-
 .../collection/devices/DevicesResourceIT.java   |     4 +-
 .../collection/groups/GroupResourceIT.java      |    38 +-
 .../collection/paging/PagingResourceIT.java     |    65 +-
 .../users/ConnectionResourceTest.java           |   288 +-
 .../collection/users/OwnershipResourceIT.java   |    15 +-
 .../collection/users/PermissionsResourceIT.java |   123 +-
 .../collection/users/UserResourceIT.java        |   129 +-
 .../events/ApplicationRequestCounterIT.java     |    14 +-
 .../queries/BadGrammarQueryTest.java            |    15 +-
 .../applications/queries/BasicGeoTests.java     |    45 +-
 .../rest/filters/ContentTypeResourceIT.java     |    70 +-
 .../usergrid/rest/management/AccessTokenIT.java |    42 +-
 .../usergrid/rest/management/AdminUsersIT.java  |    99 +-
 .../rest/management/ExportResourceIT.java       |   137 +-
 .../rest/management/ImportResourceIT.java       |    50 +-
 .../rest/management/ManagementResourceIT.java   |   191 +-
 .../rest/management/OrganizationsIT.java        |    60 +-
 .../rest/management/RegistrationIT.java         |    76 +-
 .../organizations/AdminEmailEncodingIT.java     |     5 +-
 .../rest/test/resource/AbstractRestIT.java      |   115 +-
 .../rest/test/resource/ClientSetup.java         |     7 +-
 .../usergrid/rest/test/resource/RestClient.java |    44 +-
 .../test/resource/TestPropertiesResource.java   |    14 +-
 .../endpoints/ApplicationsResource.java         |     8 +-
 .../resource/endpoints/BoostrapResource.java    |    49 +
 .../resource/endpoints/CollectionEndpoint.java  |   109 +-
 .../resource/endpoints/DatabaseResource.java    |     4 +
 .../test/resource/endpoints/EntityEndpoint.java |    40 +-
 .../test/resource/endpoints/NamedResource.java  |   257 +-
 .../test/resource/endpoints/RootResource.java   |     9 +-
 .../test/resource/endpoints/SetupResource.java  |    22 +-
 .../test/resource/endpoints/SubResource.java    |    37 +
 .../test/resource/endpoints/SystemResource.java |    64 +-
 .../test/resource/endpoints/TokenResource.java  |    15 +-
 .../test/resource/endpoints/UrlResource.java    |    11 +-
 .../endpoints/mgmt/ApplicationResource.java     |    27 +-
 .../endpoints/mgmt/ApplicationsResource.java    |     4 +-
 .../endpoints/mgmt/AuthorizeResource.java       |     7 +-
 .../endpoints/mgmt/ConfirmResource.java         |    12 +-
 .../endpoints/mgmt/CredentialsResource.java     |     7 +-
 .../resource/endpoints/mgmt/FeedResource.java   |     5 +-
 .../resource/endpoints/mgmt/OrgResource.java    |    68 +-
 .../endpoints/mgmt/OrganizationResource.java    |    15 +-
 .../endpoints/mgmt/PasswordResource.java        |     8 -
 .../endpoints/mgmt/ReactivateResource.java      |    10 +-
 .../resource/endpoints/mgmt/ResetResource.java  |    10 +-
 .../resource/endpoints/mgmt/TokenResource.java  |     7 +-
 .../resource/endpoints/mgmt/UserResource.java   |    20 +-
 .../resource/endpoints/mgmt/UsersResource.java  |     6 -
 .../rest/test/resource/model/Entity.java        |     2 +
 .../test/resource/model/QueryParameters.java    |     8 +
 .../resources/corepersistence-UNIT.properties   |     3 +
 stack/rest/src/test/resources/log4j.properties  |    39 +-
 .../rest/src/test/resources/logging.properties  |    13 +-
 .../resources/usergrid-custom-test.properties   |     4 +-
 .../test/resources/usergrid-test-context.xml    |     8 -
 stack/rest_integration_tests/README.md          |    19 -
 stack/rest_integration_tests/config/default.js  |    37 -
 stack/rest_integration_tests/config/index.js    |    25 -
 stack/rest_integration_tests/index.js           |    20 -
 stack/rest_integration_tests/lib/connections.js |   132 -
 stack/rest_integration_tests/lib/entities.js    |   125 -
 .../rest_integration_tests/lib/notifications.js |    48 -
 stack/rest_integration_tests/lib/random.js      |    74 -
 stack/rest_integration_tests/lib/response.js    |    30 -
 stack/rest_integration_tests/lib/token.js       |    49 -
 stack/rest_integration_tests/lib/urls.js        |    37 -
 stack/rest_integration_tests/lib/users.js       |    82 -
 stack/rest_integration_tests/package.json       |    17 -
 .../test/authentication/management.js           |    38 -
 .../test/authentication/org.js                  |    37 -
 .../test/authentication/resetPassword.js        |    78 -
 .../test/authentication/user.js                 |    40 -
 .../test/connections/create.js                  |    49 -
 .../test/connections/delete.js                  |    77 -
 .../test/connections/get.js                     |    82 -
 .../test/entities/create.js                     |    38 -
 .../test/entities/deleteAll.js                  |    37 -
 .../rest_integration_tests/test/entities/get.js |    51 -
 .../test/entities/update.js                     |    43 -
 stack/rest_integration_tests/test/main.js       |    72 -
 stack/rest_integration_tests/test/mocha.opts    |     3 -
 .../test/notifications/create.js                |    36 -
 .../test/queries/comparison.js                  |    58 -
 .../test/queries/contains.js                    |   116 -
 .../test/queries/equals.js                      |    54 -
 .../test/queries/location.js                    |    42 -
 .../test/queries/order.js                       |    82 -
 stack/rest_integration_tests/test/setup.js      |   103 -
 stack/rest_integration_tests/test/teardown.js   |    65 -
 .../rest_integration_tests/test/users/create.js |    45 -
 stack/scripts/migrate_entity_data.py            |   529 +
 stack/services/pom.xml                          |    95 +-
 .../management/AccountCreationProps.java        |    10 +-
 .../management/AppInfoMigrationPlugin.java      |   254 +-
 .../usergrid/management/ApplicationInfo.java    |     6 +-
 .../usergrid/management/ManagementService.java  |    25 +
 .../usergrid/management/OrganizationConfig.java |   170 +
 .../apache/usergrid/management/UserInfo.java    |    25 +-
 .../cassandra/ManagementServiceImpl.java        |   503 +-
 .../security/oauth/ClientCredentialsInfo.java   |     6 +-
 .../security/providers/AbstractProvider.java    |    16 +-
 .../security/providers/FacebookProvider.java    |     7 +-
 .../security/providers/FoursquareProvider.java  |    38 +-
 .../providers/PingIdentityProvider.java         |    38 +-
 .../apache/usergrid/security/shiro/Realm.java   |   420 +-
 .../usergrid/security/shiro/ShiroCache.java     |   171 +
 .../security/shiro/ShiroCacheManager.java       |   114 +
 .../shiro/UsergridAuthenticationInfo.java       |   283 +
 .../shiro/UsergridAuthorizationInfo.java        |   103 +
 .../AbstractAccessTokenCredentials.java         |     9 +-
 .../credentials/AbstractClientCredentials.java  |     5 +
 .../shiro/credentials/AdminUserAccessToken.java |     2 +
 .../credentials/ApplicationUserAccessToken.java |     3 +
 .../OrganizationClientCredentials.java          |     5 +
 .../shiro/principals/AdminUserPrincipal.java    |   143 +-
 .../principals/ApplicationGuestPrincipal.java   |    65 +-
 .../shiro/principals/ApplicationPrincipal.java  |    39 +-
 .../principals/ApplicationUserPrincipal.java    |   133 +
 .../shiro/principals/OrganizationPrincipal.java |    61 +-
 .../shiro/principals/PrincipalIdentifier.java   |    88 +
 .../shiro/principals/UserPrincipal.java         |     6 +-
 .../security/shiro/utils/SubjectUtils.java      |    13 +-
 .../services/AbstractCollectionService.java     |     8 +-
 .../services/AbstractConnectionsService.java    |    46 +-
 .../usergrid/services/AbstractService.java      |    93 +-
 .../usergrid/services/ServiceManager.java       |    14 +-
 .../usergrid/services/ServiceRequest.java       |    50 +-
 .../assets/data/AwsSdkS3BinaryStore.java        |   188 +-
 .../services/assets/data/BinaryStore.java       |     8 +-
 .../AwsPropertiesNotFoundException.java         |    40 +
 .../usergrid/services/groups/GroupsService.java |    10 +
 .../services/guice/ServiceModuleImpl.java       |    51 +-
 .../notifications/ApplicationQueueManager.java  |     2 +-
 .../notifications/NotificationsService.java     |    50 +-
 .../services/notifications/QueueListener.java   |     8 +-
 .../notifications/apns/APNsNotification.java    |     8 +-
 .../services/notifications/gcm/GCMAdapter.java  |    14 +-
 .../impl/ApplicationQueueManagerImpl.java       |     2 +-
 .../services/notifications/wns/WNSAdapter.java  |    13 +-
 .../services/queues/ImportQueueManager.java     |    24 +-
 .../usergrid/services/queues/QueueListener.java |     5 +-
 .../usergrid/services/roles/RolesService.java   |    20 +-
 .../usergrid/services/users/UsersService.java   |     7 +
 .../services/users/roles/RolesService.java      |    10 +
 .../resources/usergrid-services-context.xml     |    11 +-
 .../org/apache/usergrid/ServiceApplication.java |     2 +
 .../apache/usergrid/management/EmailFlowIT.java |    73 +-
 .../usergrid/management/OrganizationIT.java     |    18 +-
 .../org/apache/usergrid/management/RoleIT.java  |     7 +-
 .../usergrid/services/CollectionServiceIT.java  |     5 +-
 .../apns/NotificationsServiceIT.java            |     5 +-
 .../gcm/NotificationsServiceIT.java             |     3 +-
 .../resources/usergrid-custom-test.properties   |     6 +-
 .../test/resources/usergrid-test-context.xml    |     2 +-
 stack/test-utils/pom.xml                        |    89 +-
 stack/tools/pom.xml                             |     2 +-
 .../usergrid/tools/EntityInsertBenchMark.java   |   272 -
 .../usergrid/tools/EntityReadBenchMark.java     |   353 -
 .../java/org/apache/usergrid/tools/Export.java  |    26 +-
 .../org/apache/usergrid/tools/ExportAdmins.java |     1 -
 .../java/org/apache/usergrid/tools/Import.java  |    11 +-
 .../org/apache/usergrid/tools/IndexRebuild.java |   184 -
 .../RepairingMismatchedApplicationMetadata.java |   119 -
 .../org/apache/usergrid/tools/ToolBase.java     |     2 +-
 .../usergrid/tools/UniqueIndexCleanup.java      |   386 -
 stack/websocket/pom.xml                         |     2 +-
 website/README.md                               |    53 +
 website/Rules                                   |    52 +
 website/build.sh                                |     1 +
 website/content/bootstrap/bootstrap.min.css     |     9 +
 website/content/community/index.html            |   258 +
 website/content/css/bootflat-extensions.css     |   356 +
 website/content/css/bootflat-square.css         |    69 +
 website/content/css/bootflat.css                |  1560 +
 website/content/css/font-awesome.min.css        |   405 +
 website/content/css/usergrid-site.css           |  1553 +
 website/content/favicon.ico                     |   Bin 0 -> 3989 bytes
 website/content/font/FontAwesome.otf            |   Bin 0 -> 61896 bytes
 .../content/font/fontawesome-webfont-eot.eot    |   Bin 0 -> 37405 bytes
 .../content/font/fontawesome-webfont-svg.svg    |   399 +
 .../content/font/fontawesome-webfont-ttf.ttf    |   Bin 0 -> 79076 bytes
 .../content/font/fontawesome-webfont-woff.woff  |   Bin 0 -> 43572 bytes
 website/content/img/alberto.jpg                 |   Bin 0 -> 16137 bytes
 website/content/img/alex.png                    |   Bin 0 -> 40842 bytes
 website/content/img/apache_usergrid_favicon.png |   Bin 0 -> 10735 bytes
 .../content/img/apache_usergrid_logo_white.png  |   Bin 0 -> 26418 bytes
 .../img/apache_usergrid_logo_white_small.png    |   Bin 0 -> 11905 bytes
 website/content/img/check_flat/default.png      |   Bin 0 -> 25851 bytes
 website/content/img/dave.jpg                    |   Bin 0 -> 14005 bytes
 website/content/img/ed.jpg                      |   Bin 0 -> 20460 bytes
 website/content/img/egg-logo.png                |   Bin 0 -> 9938 bytes
 website/content/img/github.png                  |   Bin 0 -> 8936 bytes
 website/content/img/grey.png                    |   Bin 0 -> 37896 bytes
 website/content/img/intellij.png                |   Bin 0 -> 9199 bytes
 website/content/img/jeff.jpg                    |   Bin 0 -> 13857 bytes
 website/content/img/michael_r.jpg               |   Bin 0 -> 10244 bytes
 website/content/img/miked.jpg                   |   Bin 0 -> 36443 bytes
 website/content/img/nate.jpg                    |   Bin 0 -> 4291 bytes
 website/content/img/rod.jpg                     |   Bin 0 -> 40313 bytes
 website/content/img/scott.jpg                   |   Bin 0 -> 8555 bytes
 website/content/img/shawn.jpg                   |   Bin 0 -> 69304 bytes
 website/content/img/stliu.jpg                   |   Bin 0 -> 51303 bytes
 website/content/img/strong.jpg                  |   Bin 0 -> 7434 bytes
 website/content/img/structure101.png            |   Bin 0 -> 6475 bytes
 website/content/img/sungju.jpg                  |   Bin 0 -> 11440 bytes
 website/content/img/tim.jpg                     |   Bin 0 -> 7611 bytes
 website/content/img/todd.jpg                    |   Bin 0 -> 18142 bytes
 website/content/img/usergrid-logo.pdf           |   398 +
 website/content/img/usergrid.png                |   Bin 0 -> 21994 bytes
 website/content/img/usergrid_160.png            |   Bin 0 -> 2126 bytes
 website/content/img/usergrid_200.png            |   Bin 0 -> 6397 bytes
 website/content/img/usergrid_300.png            |   Bin 0 -> 16330 bytes
 .../content/img/usergrid_300_transparent.png    |   Bin 0 -> 16308 bytes
 website/content/img/usergrid_400.png            |   Bin 0 -> 8746 bytes
 website/content/img/usergrid_800.png            |   Bin 0 -> 14452 bytes
 website/content/img/usergrid_card.png           |   Bin 0 -> 23295 bytes
 website/content/img/usergrid_logo.png           |   Bin 0 -> 118086 bytes
 website/content/img/usergrid_logo_205_50.png    |   Bin 0 -> 7058 bytes
 website/content/img/usergrid_logo_260_50.png    |   Bin 0 -> 8682 bytes
 website/content/img/usergrid_logo_720.png       |   Bin 0 -> 27610 bytes
 website/content/img/usergrid_logo_720p.png      |   Bin 0 -> 27608 bytes
 website/content/img/usergrid_logo_900_200.png   |   Bin 0 -> 12273 bytes
 website/content/img/usergrid_logo_white.png     |   Bin 0 -> 16900 bytes
 website/content/img/usergrid_profile_128.png    |   Bin 0 -> 6689 bytes
 website/content/img/usergrid_profile_256.png    |   Bin 0 -> 10470 bytes
 .../content/img/usergrid_profile_256_white.png  |   Bin 0 -> 10724 bytes
 .../img/usergrid_profile_512_margins.png        |   Bin 0 -> 19112 bytes
 .../content/img/usergrid_profile_64_white.png   |   Bin 0 -> 4839 bytes
 .../content/img/usergrid_profile_background.png |   Bin 0 -> 6710 bytes
 website/content/img/usergrid_screencast_bg.png  |   Bin 0 -> 20478 bytes
 website/content/img/usergrid_small_100.png      |   Bin 0 -> 6681 bytes
 website/content/img/usergrid_wiki.png           |   Bin 0 -> 7135 bytes
 website/content/img/yourkit.jpeg                |   Bin 0 -> 7763 bytes
 website/content/index.html                      |    97 +
 website/content/js/bootstrap.min.js             |     8 +
 website/content/js/head.js                      |   708 +
 website/content/js/html5shiv.js                 |     8 +
 website/content/js/jquery-1.10.1.min.js         |     6 +
 website/content/js/jquery.icheck.js             |   397 +
 website/content/js/respond.min.js               |     6 +
 website/content/js/usergrid-site.js             |    50 +
 website/content/releases/index.html             |    65 +
 website/content/static/github-btn.html          |     2 +
 website/crash.log                               |   143 +
 website/layouts/community.html                  |     1 +
 website/layouts/default.html                    |    44 +
 website/layouts/docs.html                       |     1 +
 website/layouts/footer.html                     |    92 +
 website/layouts/header.html                     |   229 +
 website/lib/default.rb                          |    43 +
 website/lib/helpers_.rb                         |     0
 website/lib/pandoc.template                     |     4 +
 website/nanoc.yaml                              |    77 +
 website/run.sh                                  |     1 +
 website/tmp/checksums                           |     2 +
 website/tmp/compiled_content                    |  7076 ++
 website/tmp/dependencies                        |     6 +
 website/tmp/rule_memory                         |   Bin 0 -> 5163 bytes
 website/utilities/map-markers.rb                |    62 +
 website/utilities/markers.txt                   |   440 +
 website/utilities/snapshot-apigee.rb            |    71 +
 website/utilities/usergrid.csv                  |   290 +
 1380 files changed, 443864 insertions(+), 17211 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/9edb31c5/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/usergrid/blob/9edb31c5/stack/pom.xml
----------------------------------------------------------------------