usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [50/50] git commit: Merge branch 'two-dot-o' into optimistic-tx-semantics
Date Wed, 12 Feb 2014 13:21:58 GMT
Merge branch 'two-dot-o' into optimistic-tx-semantics

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java


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

Branch: refs/heads/optimistic-tx-semantics
Commit: 7d3a9c789f97c45333aa2baf7f8d4109d4852c09
Parents: ce9e895 e578bb6
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Wed Feb 12 08:03:43 2014 -0500
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Wed Feb 12 08:03:43 2014 -0500

----------------------------------------------------------------------
 .gitignore                                      |     9 +-
 portal/.gitignore                               |     8 -
 portal/.puppet/.gitignore                       |     2 -
 portal/.puppet/Puppetfile                       |     3 -
 portal/.puppet/Puppetfile.lock                  |    12 -
 portal/.puppet/bootstrap.sh                     |    18 -
 portal/.puppet/manifests/main.pp                |    49 -
 portal/.puppet/modules/.gitignore               |     2 -
 portal/.puppet/templates/vhost-ssl.conf.erb     |    33 -
 portal/Deployment.md                            |    23 +
 portal/Gruntfile.js                             |   328 +
 portal/LICENSE                                  |   202 -
 portal/README.md                                |   273 +-
 portal/UnitTests.md                             |    24 +
 portal/Vagrantfile                              |    23 -
 portal/bower.json                               |    12 +
 portal/build.sh                                 |    28 +
 portal/coming_soon.html                         |    31 -
 portal/config.js                                |    87 +-
 portal/css/apigeeGlobalNavigation.css           |   274 +
 .../css/arsmarquette/ARSMaquettePro-Light.otf   |   Bin 0 -> 184600 bytes
 .../css/arsmarquette/ARSMaquettePro-Medium.otf  |   Bin 0 -> 188020 bytes
 .../css/arsmarquette/ARSMaquettePro-Regular.otf |   Bin 0 -> 188096 bytes
 .../ui-bg_diagonals-thick_90_eeeeee_40x40.png   |   Bin 251 -> 0 bytes
 .../images/ui-bg_flat_100_deedf7_40x100.png     |   Bin 182 -> 0 bytes
 .../images/ui-bg_flat_100_e4f1fb_40x100.png     |   Bin 213 -> 0 bytes
 .../images/ui-bg_flat_100_f2f5f7_40x100.png     |   Bin 212 -> 0 bytes
 .../images/ui-bg_flat_15_cd0a0a_40x100.png      |   Bin 181 -> 0 bytes
 .../images/ui-bg_flat_50_3baae3_40x100.png      |   Bin 182 -> 0 bytes
 .../images/ui-bg_flat_80_d7ebf9_40x100.png      |   Bin 183 -> 0 bytes
 .../ui-bg_highlight-hard_70_000000_1x100.png    |   Bin 118 -> 0 bytes
 .../ui-bg_highlight-soft_25_ffef8f_1x100.png    |   Bin 153 -> 0 bytes
 .../images/ui-icons_000000_256x240.png          |   Bin 4369 -> 0 bytes
 .../images/ui-icons_2694e8_256x240.png          |   Bin 4369 -> 0 bytes
 .../images/ui-icons_2e83ff_256x240.png          |   Bin 4369 -> 0 bytes
 .../images/ui-icons_3d80b3_256x240.png          |   Bin 4369 -> 0 bytes
 .../images/ui-icons_72a7cf_256x240.png          |   Bin 4369 -> 0 bytes
 .../images/ui-icons_ffffff_256x240.png          |   Bin 4369 -> 0 bytes
 .../css/custom-theme/jquery-ui-1.8.9.custom.css |   573 -
 portal/css/entypo/entypo.eot                    |   Bin 0 -> 35540 bytes
 portal/css/entypo/entypo.svg                    |    13 +
 portal/css/entypo/entypo.ttf                    |   Bin 0 -> 35392 bytes
 portal/css/entypo/entypo.woff                   |   Bin 0 -> 21916 bytes
 portal/css/jquery-ui-timepicker.css             |    53 -
 portal/css/jquery.ui.statusbar.css              |    25 -
 portal/css/main.css                             |  1702 +
 portal/css/prettify.css                         |    52 -
 portal/css/usergrid.css                         |  6358 ----
 portal/images/android-sdk-download.png          |   Bin 4848 -> 0 bytes
 portal/images/api-activity.gif                  |   Bin 10819 -> 0 bytes
 portal/images/apigee-logo.png                   |   Bin 3647 -> 0 bytes
 portal/images/apigeetopbar.png                  |   Bin 4658 -> 0 bytes
 portal/images/btn-copyCurl-up.png               |   Bin 2762 -> 0 bytes
 portal/images/clippy-bg.png                     |   Bin 561 -> 0 bytes
 portal/images/close.gif                         |   Bin 718 -> 0 bytes
 portal/images/dotnet-sdk-download.png           |   Bin 7149 -> 0 bytes
 portal/images/down_arrow.png                    |   Bin 1285 -> 0 bytes
 portal/images/error.png                         |   Bin 2009 -> 0 bytes
 portal/images/faviconApigee.ico                 |   Bin 1150 -> 0 bytes
 portal/images/glyphicons-halflings-white.png    |   Bin 4352 -> 0 bytes
 portal/images/glyphicons-halflings.png          |   Bin 4352 -> 0 bytes
 .../glyphicons_halflings_135_wrench-white2.pdn  |   Bin 5400 -> 0 bytes
 .../glyphicons_halflings_135_wrench-white2.png  |   Bin 296 -> 0 bytes
 .../images/glyphicons_halflings_135_wrench.png  |   Bin 228 -> 0 bytes
 .../glyphicons_halflings_135_wrench_white.png   |   Bin 251 -> 0 bytes
 .../glyphicons_halflings_wrench_white.png       |   Bin 1016 -> 0 bytes
 portal/images/grid.png                          |   Bin 166 -> 0 bytes
 portal/images/icons.png                         |   Bin 13132 -> 0 bytes
 portal/images/ios-sdk-download.png              |   Bin 4886 -> 0 bytes
 portal/images/javascript-sdk-download.png       |   Bin 4618 -> 0 bytes
 portal/images/left_arrow.png                    |   Bin 1257 -> 0 bytes
 portal/images/logo-white.png                    |   Bin 2014 -> 0 bytes
 portal/images/menuActiveTriangle.png            |   Bin 315 -> 0 bytes
 portal/images/nodejs-sdk-download.png           |   Bin 5273 -> 0 bytes
 portal/images/notice.png                        |   Bin 2112 -> 0 bytes
 portal/images/orange-arrow.png                  |   Bin 242 -> 0 bytes
 portal/images/right_arrow.png                   |   Bin 1251 -> 0 bytes
 portal/images/ruby-sdk-download.png             |   Bin 6343 -> 0 bytes
 portal/images/success.png                       |   Bin 1863 -> 0 bytes
 portal/images/swish_arrow.png                   |   Bin 220 -> 0 bytes
 portal/images/topbackground.png                 |   Bin 2890 -> 0 bytes
 portal/images/up_arrow.png                      |   Bin 1292 -> 0 bytes
 portal/images/user-photo.png                    |   Bin 3849 -> 0 bytes
 portal/images/user_profile.png                  |   Bin 3775 -> 0 bytes
 portal/images/usergrid_200.png                  |   Bin 6397 -> 0 bytes
 portal/images/usergrid_400.png                  |   Bin 8746 -> 0 bytes
 portal/images/warning.png                       |   Bin 1179 -> 0 bytes
 portal/img/appswitcher/apiPlatform_lg.png       |   Bin 0 -> 2397 bytes
 portal/img/appswitcher/appServices_lg.png       |   Bin 0 -> 2295 bytes
 portal/img/appswitcher/console_lg.png           |   Bin 0 -> 1453 bytes
 portal/img/appswitcher/home_lg.png              |   Bin 0 -> 1522 bytes
 portal/img/appswitcher/logo_color.png           |   Bin 0 -> 3459 bytes
 portal/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
 portal/img/blue-bars.png                        |   Bin 0 -> 3635 bytes
 portal/img/blue-bolt.png                        |   Bin 0 -> 3942 bytes
 portal/img/blue-carat.png                       |   Bin 0 -> 1006 bytes
 portal/img/green_dot.png                        |   Bin 0 -> 3472 bytes
 portal/img/logo.gif                             |   Bin 0 -> 2279 bytes
 portal/img/nav-device.gif                       |   Bin 0 -> 2184 bytes
 portal/img/nav-sprites.png                      |   Bin 0 -> 7953 bytes
 portal/img/no-data1.png                         |   Bin 0 -> 45300 bytes
 portal/img/phone-small.gif                      |   Bin 0 -> 1300 bytes
 portal/img/push/APNS_cert_upload.png            |   Bin 0 -> 33956 bytes
 portal/img/push/APNS_certification.png          |   Bin 0 -> 16855 bytes
 portal/img/push/android-notification.png        |   Bin 0 -> 41629 bytes
 portal/img/push/google_api_key.png              |   Bin 0 -> 98118 bytes
 portal/img/push/iphone_message.png              |   Bin 0 -> 90307 bytes
 portal/img/push/step_1.png                      |   Bin 0 -> 1953 bytes
 portal/img/push/step_2.png                      |   Bin 0 -> 2117 bytes
 portal/img/push/step_3.png                      |   Bin 0 -> 2162 bytes
 portal/img/red_dot.png                          |   Bin 0 -> 3482 bytes
 portal/img/sdk-sprites-large.png                |   Bin 0 -> 14642 bytes
 portal/img/sdk-sprites.png                      |   Bin 0 -> 5027 bytes
 portal/img/tablet-small.gif                     |   Bin 0 -> 1390 bytes
 portal/img/user-photo.png                       |   Bin 0 -> 3849 bytes
 portal/img/user_profile.png                     |   Bin 0 -> 3775 bytes
 portal/img/yellow_dot.png                       |   Bin 0 -> 3475 bytes
 portal/index-template.html                      |   131 +
 portal/index.html                               |  1412 -
 portal/js/activities/activities-controller.js   |    11 +
 portal/js/activities/activities.html            |    33 +
 .../js/app-overview/app-overview-controller.js  |    76 +
 portal/js/app-overview/app-overview.html        |    34 +
 .../js/app-overview/doc-includes/android.html   |   209 +
 .../app-overview/doc-includes/images/verify.png |   Bin 0 -> 22934 bytes
 portal/js/app-overview/doc-includes/ios.html    |   173 +
 .../app-overview/doc-includes/javascript.html   |    94 +
 portal/js/app-overview/doc-includes/net.html    |     0
 portal/js/app-overview/doc-includes/node.html   |     0
 portal/js/app-overview/doc-includes/ruby.html   |     0
 .../app-overview/getting-started-controller.js  |    90 +
 portal/js/app-overview/getting-started.html     |   108 +
 portal/js/app.js                                |   125 +
 portal/js/app/app.js                            |   118 -
 portal/js/app/console.js                        |  4536 ---
 portal/js/app/helpers.js                        |   241 -
 portal/js/app/navigation.js                     |   189 -
 portal/js/app/pages.js                          |   154 -
 portal/js/app/params.js                         |    30 -
 portal/js/app/quickLogin.js                     |    30 -
 portal/js/app/session.js                        |   172 -
 portal/js/app/sso.js                            |    89 -
 portal/js/app/status.js                         |    33 -
 portal/js/app/ui/collections.entity.js          |   320 -
 portal/js/app/ui/collections.user.js            |   120 -
 portal/js/app/ui/ui.js                          |   415 -
 portal/js/app/usergrid.appSDK.js                |  2073 --
 portal/js/app/usergrid.appSDK.orig.js           |  2070 --
 portal/js/charts/chart-controller.js            |     6 +
 portal/js/charts/chart-directives.js            |   141 +
 portal/js/charts/chart-service.js               |   494 +
 portal/js/charts/highcharts.json                |   329 +
 portal/js/charts/sparklines.js                  |     2 +
 portal/js/data/data-controller.js               |   304 +
 portal/js/data/data.html                        |   121 +
 portal/js/data/display-generic.html             |    95 +
 portal/js/data/display-groups.html              |     0
 portal/js/data/display-roles.html               |     1 +
 portal/js/data/display-users.html               |    88 +
 portal/js/data/entity-controller.js             |    69 +
 portal/js/data/entity.html                      |    31 +
 portal/js/data/shell-controller.js              |     9 +
 portal/js/data/shell.html                       |    16 +
 portal/js/dialogs/balloon-directive.js          |    25 +
 portal/js/dialogs/modal-directive.js            |    41 +
 portal/js/dialogs/modal.html                    |    16 +
 portal/js/global/alert-controller.js            |    33 +
 portal/js/global/alert-directive.js             |    40 +
 portal/js/global/app-switcher-directive.js      |    35 +
 portal/js/global/appswitcher-template.html      |    34 +
 portal/js/global/insecure-banner.html           |     7 +
 portal/js/global/insecure-banner.js             |    46 +
 portal/js/global/page-constants.js              |    11 +
 portal/js/global/page-controller.js             |   392 +
 portal/js/global/page-service.js                |   214 +
 portal/js/global/temp.json                      |    18 +
 portal/js/global/ug-service.js                  |   987 +
 portal/js/global/util-directive.js              |    24 +
 portal/js/global/utility-service.js             |    52 +
 portal/js/global/validate-directive.js          |    40 +
 .../js/groups/groups-activities-controller.js   |    27 +
 portal/js/groups/groups-activities.html         |    24 +
 portal/js/groups/groups-controller.js           |   119 +
 portal/js/groups/groups-details-controller.js   |    38 +
 portal/js/groups/groups-details.html            |    28 +
 portal/js/groups/groups-members-controller.js   |   113 +
 portal/js/groups/groups-members.html            |    60 +
 portal/js/groups/groups-roles-controller.js     |   184 +
 portal/js/groups/groups-roles.html              |   127 +
 portal/js/groups/groups-tabs.html               |    31 +
 portal/js/groups/groups.html                    |    92 +
 portal/js/lib/MD5.min.js                        |     1 -
 portal/js/lib/backbone.js                       |  1431 -
 portal/js/lib/bootstrap.min.js                  |     7 -
 portal/js/lib/date.min.js                       |     2 -
 portal/js/lib/jquery-1.7.2.min.js               |     4 -
 portal/js/lib/jquery-ui-1.8.18.min.js           |    15 -
 portal/js/lib/jquery.dataset.min.js             |     1 -
 portal/js/lib/jquery.dform-0.1.3.min.js         |    16 -
 portal/js/lib/jquery.jsonp-2.3.1.min.js         |     3 -
 portal/js/lib/jquery.tmpl.min.js                |    10 -
 portal/js/lib/jquery.ui.statusbar.min.js        |     1 -
 portal/js/lib/jquery.ui.timepicker.min.js       |     1 -
 portal/js/lib/prettify.js                       |  1477 -
 portal/js/lib/underscore-min.js                 |     5 -
 portal/js/libs/Highcharts-2.3.5/index.htm       |    79 +
 .../js/adapters/mootools-adapter.js             |    13 +
 .../js/adapters/mootools-adapter.src.js         |   328 +
 .../js/adapters/prototype-adapter.js            |    16 +
 .../js/adapters/prototype-adapter.src.js        |   385 +
 .../libs/Highcharts-2.3.5/js/highcharts-more.js |    35 +
 .../Highcharts-2.3.5/js/highcharts-more.src.js  |  1581 +
 .../js/libs/Highcharts-2.3.5/js/highcharts.js   |   250 +
 .../libs/Highcharts-2.3.5/js/highcharts.src.js  | 15281 ++++++++
 .../Highcharts-2.3.5/js/modules/canvas-tools.js |   133 +
 .../js/modules/canvas-tools.src.js              |  3113 ++
 .../js/libs/Highcharts-2.3.5/js/modules/data.js |    14 +
 .../Highcharts-2.3.5/js/modules/data.src.js     |   512 +
 .../Highcharts-2.3.5/js/modules/exporting.js    |    23 +
 .../js/modules/exporting.src.js                 |   752 +
 .../Highcharts-2.3.5/js/themes/dark-blue.js     |   263 +
 .../Highcharts-2.3.5/js/themes/dark-green.js    |   263 +
 .../js/libs/Highcharts-2.3.5/js/themes/gray.js  |   262 +
 .../js/libs/Highcharts-2.3.5/js/themes/grid.js  |    95 +
 .../js/libs/Highcharts-2.3.5/js/themes/skies.js |    89 +
 portal/js/libs/MD5.min.js                       |     1 +
 portal/js/libs/angular-1.0.5/angular-cookies.js |   183 +
 .../libs/angular-1.0.5/angular-cookies.min.js   |     7 +
 portal/js/libs/angular-1.0.5/angular-loader.js  |   276 +
 .../js/libs/angular-1.0.5/angular-loader.min.js |     7 +
 portal/js/libs/angular-1.0.5/angular-mocks.js   |  1886 +
 .../js/libs/angular-1.0.5/angular-resource.js   |   445 +
 .../libs/angular-1.0.5/angular-resource.min.js  |    10 +
 .../js/libs/angular-1.0.5/angular-sanitize.js   |   535 +
 .../libs/angular-1.0.5/angular-sanitize.min.js  |    13 +
 portal/js/libs/angular-1.0.5/angular.js         | 14733 ++++++++
 portal/js/libs/angular-1.0.5/angular.min.js     |   161 +
 portal/js/libs/angular-1.0.5/version.txt        |     1 +
 portal/js/libs/angular-1.1.5/angular-1.1.5.js   | 16876 +++++++++
 .../js/libs/angular-1.1.5/angular-merge.min.js  |     8 +
 .../angular-1.1.5/angular-resource-1.1.5.js     |   537 +
 portal/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 +
 portal/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 +
 portal/js/libs/angular-1.2.5/angular-csp.css    |    24 +
 portal/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 +
 portal/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 +
 portal/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 +++++++++++++++++
 portal/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 +
 portal/js/libs/angular-1.2.5/angular.js         | 20369 +++++++++++
 portal/js/libs/angular-1.2.5/angular.min.js     |   201 +
 portal/js/libs/angular-1.2.5/angular.min.js.map |     8 +
 portal/js/libs/angular-1.2.5/errors.json        |     1 +
 portal/js/libs/angular-1.2.5/version.json       |     1 +
 portal/js/libs/angular-1.2.5/version.txt        |     1 +
 .../angularitics-0.8.5-google-analytics.js      |     7 +
 .../js/libs/angularitics/angularitics-0.8.5.js  |     6 +
 .../libs/bootstrap/css/bootstrap-responsive.css |  1345 +
 .../bootstrap/css/bootstrap-responsive.min.css  |  1245 +
 portal/js/libs/bootstrap/css/bootstrap.css      |  6169 ++++
 portal/js/libs/bootstrap/css/bootstrap.min.css  |  5469 +++
 .../js/libs/bootstrap/custom/css/bootstrap.css  |  6315 ++++
 .../libs/bootstrap/custom/css/bootstrap.min.css |   874 +
 .../custom/img/glyphicons-halflings-white.png   |   Bin 0 -> 8777 bytes
 .../custom/img/glyphicons-halflings.png         |   Bin 0 -> 12799 bytes
 portal/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
 portal/js/libs/bootstrap/js/bootstrap.js        |  2117 ++
 portal/js/libs/bootstrap/js/bootstrap.min.js    |   644 +
 portal/js/libs/google-viz-api.js                |    49 +
 portal/js/libs/jquery/jquery-1.9.1.min.js       |     5 +
 .../js/libs/jquery/jquery-migrate-1.1.1.min.js  |     3 +
 portal/js/libs/jquery/jquery.sparkline.min.js   |     5 +
 portal/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
 portal/js/libs/jqueryui/jquery-ui-1.8.18.min.js |    15 +
 .../js/libs/jqueryui/jquery-ui-1.8.9.custom.css |   573 +
 .../js/libs/jqueryui/jquery-ui-timepicker.css   |    53 +
 .../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 +
 portal/js/libs/usergrid.sdk.js                  |  2469 ++
 portal/js/login/forgot-password-controller.js   |    12 +
 portal/js/login/forgot-password.html            |     5 +
 portal/js/login/loading.html                    |     3 +
 portal/js/login/login-controller.js             |    83 +
 portal/js/login/login.html                      |    48 +
 portal/js/login/logout-controller.js            |    10 +
 portal/js/login/logout.html                     |     1 +
 portal/js/login/register-controller.js          |    36 +
 portal/js/login/register.html                   |    80 +
 portal/js/menus/appMenu.html                    |    41 +
 portal/js/menus/menu-directives.js              |   434 +
 portal/js/menus/orgMenu.html                    |    13 +
 .../js/org-overview/org-overview-controller.js  |    86 +
 portal/js/org-overview/org-overview.html        |   121 +
 portal/js/profile/account-controller.js         |    18 +
 portal/js/profile/account.html                  |    18 +
 portal/js/profile/organizations-controller.js   |    73 +
 portal/js/profile/organizations.html            |    71 +
 portal/js/profile/profile-controller.js         |    40 +
 portal/js/profile/profile.html                  |    68 +
 portal/js/roles/roles-controller.js             |   112 +
 portal/js/roles/roles-groups-controller.js      |   113 +
 portal/js/roles/roles-groups.html               |    60 +
 portal/js/roles/roles-settings-controller.js    |    87 +
 portal/js/roles/roles-settings.html             |    80 +
 portal/js/roles/roles-tabs.html                 |    30 +
 portal/js/roles/roles-users-controller.js       |   112 +
 portal/js/roles/roles-users.html                |    59 +
 portal/js/roles/roles.html                      |    91 +
 portal/js/shell/shell-controller.js             |   216 +
 portal/js/shell/shell.html                      |    25 +
 portal/js/spec/client-tests.js                  |   159 -
 portal/js/spec/index.html                       |    20 -
 portal/js/spec/qunit-git.css                    |   238 -
 portal/js/spec/qunit-git.js                     |  1865 -
 portal/js/unit-tests/appSDK-tests.js            |   255 -
 portal/js/unit-tests/ie-jquery-tests.js         |   191 -
 portal/js/unit-tests/qunit.css                  |   231 -
 portal/js/unit-tests/qunit.js                   |  1934 -
 portal/js/users/users-activities-controller.js  |    40 +
 portal/js/users/users-activities.html           |    39 +
 portal/js/users/users-controller.js             |   115 +
 portal/js/users/users-graph-controller.js       |    67 +
 portal/js/users/users-graph.html                |    67 +
 portal/js/users/users-groups-controller.js      |   124 +
 portal/js/users/users-groups.html               |    67 +
 portal/js/users/users-profile-controller.js     |    32 +
 portal/js/users/users-profile.html              |    70 +
 portal/js/users/users-roles-controller.js       |   138 +
 portal/js/users/users-roles.html                |   129 +
 portal/js/users/users-tabs.html                 |     3 +
 portal/js/users/users.html                      |   126 +
 portal/loading.html                             |     9 -
 portal/package.json                             |    48 +
 portal/planned_outage.html                      |    48 -
 portal/sass/.gitignore                          |     1 -
 portal/sass/config.rb                           |    25 -
 portal/sass/usergrid.scss                       |  1855 -
 portal/scripts/e2e-test.bat                     |    11 +
 portal/scripts/e2e-test.sh                      |     9 +
 portal/scripts/test.bat                         |    11 +
 portal/scripts/test.sh                          |     9 +
 portal/scripts/watchr.rb                        |    19 +
 portal/scripts/web-server.js                    |   244 +
 portal/sdk/usergrid.0.10.4.js                   |  1402 +
 portal/sdk/usergrid.0.10.5.js                   |  1755 +
 portal/sdk/usergrid.0.10.7.js                   |  2265 ++
 portal/server.js                                |   244 +
 portal/service_down.html                        |    48 -
 .../apigee.ui.activities.table_rows.html        |    14 -
 .../templates/apigee.ui.admins.table_rows.html  |     8 -
 .../apigee.ui.applications.table_rows.html      |     4 -
 .../apigee.ui.collection.table_rows.html        |    65 -
 .../apigee.ui.collections.query.indexes.html    |     5 -
 .../apigee.ui.collections.table_rows.html       |     9 -
 .../apigee.ui.collections.user.header.html      |    21 -
 portal/templates/apigee.ui.curl.detail.html     |    11 -
 portal/templates/apigee.ui.feed.table_rows.html |    15 -
 .../templates/apigee.ui.groups.table_rows.html  |    14 -
 .../apigee.ui.panels.group.activities.html      |    28 -
 .../apigee.ui.panels.group.details.html         |    97 -
 .../apigee.ui.panels.group.memberships.html     |    40 -
 .../apigee.ui.panels.group.permissions.html     |    99 -
 .../apigee.ui.panels.role.permissions.html      |    58 -
 .../templates/apigee.ui.panels.role.users.html  |    38 -
 .../apigee.ui.panels.user.activities.html       |    40 -
 .../templates/apigee.ui.panels.user.graph.html  |    80 -
 .../apigee.ui.panels.user.memberships.html      |    40 -
 .../apigee.ui.panels.user.permissions.html      |   105 -
 .../apigee.ui.panels.user.profile.html          |   113 -
 .../apigee.ui.role.groups.table_rows.html       |    44 -
 .../templates/apigee.ui.roles.table_rows.html   |    15 -
 .../templates/apigee.ui.users.table_rows.html   |    18 -
 portal/templates/test/modalForm2.html           |    32 -
 portal/test/autocomplete.html                   |    25 -
 portal/test/modalForm.html                      |    32 -
 portal/tests/karma.conf.js                      |    68 +
 portal/tests/protractor/applications.spec.js    |    31 +
 portal/tests/protractor/data.spec.js            |    46 +
 portal/tests/protractor/forgotPassword.spec.js  |    33 +
 portal/tests/protractor/monitoring.spec.js      |    15 +
 portal/tests/protractor/organization.spec.js    |    40 +
 portal/tests/protractor/profile.spec.js         |    73 +
 portal/tests/protractor/push.spec.js            |    15 +
 portal/tests/protractor/users.spec.js           |    52 +
 portal/tests/protractor/util.js                 |   107 +
 portal/tests/protractorConf.js                  |    90 +
 portal/tests/selenium/chromedriver              |   Bin 0 -> 22034760 bytes
 .../selenium-server-standalone-2.37.0.jar       |   Bin 0 -> 34730734 bytes
 portal/tests/unit/sample.spec.js                |    46 +
 sdks/html5-javascript/Gruntfile.js              |    83 +
 sdks/html5-javascript/lib/Client.js             |   865 +
 sdks/html5-javascript/lib/Collection.js         |   446 +
 sdks/html5-javascript/lib/Counter.js            |   186 +
 sdks/html5-javascript/lib/Entity.js             |   646 +
 sdks/html5-javascript/lib/Group.js              |   233 +
 sdks/html5-javascript/lib/Usergrid.js           |    87 +
 sdks/html5-javascript/package.json              |    22 +
 sdks/html5-javascript/tests/mocha/index.html    |    49 +
 sdks/html5-javascript/tests/mocha/test.js       |   325 +
 .../tests/qunit/apigee_test.html                |    14 +
 sdks/html5-javascript/tests/qunit/tests.js      |     3 +
 .../resources/css/bootstrap-combined.min.css    |    18 +
 .../tests/resources/css/mocha.css               |   270 +
 .../tests/resources/css/styles.css              |    91 +
 .../tests/resources/images/apigee.png           |   Bin 0 -> 6010 bytes
 .../tests/resources/js/blanket_mocha.min.js     |     1 +
 .../tests/resources/js/json2.js                 |   486 +
 .../tests/resources/js/mocha.js                 |  5341 +++
 sdks/html5-javascript/tests/test.html           |    37 +
 sdks/html5-javascript/tests/test.js             |   910 +
 sdks/html5-javascript/usergrid.js               |  3078 +-
 sdks/html5-javascript/usergrid.min.js           |     3 +-
 sdks/nodejs/lib/usergrid.js                     |   187 +
 sdks/nodejs/test.js                             |    94 +-
 sdks/php/lib/vendor/Apigee/Usergrid/Client.php  |     7 +-
 .../persistence/cassandra/CassandraService.java |     7 +-
 .../persistence/cassandra/QueryProcessor.java   |    14 +-
 .../cassandra/RelationManagerImpl.java          |    32 +-
 .../cassandra/index/ConnectedIndexScanner.java  |    77 +-
 .../cassandra/index/IndexBucketScanner.java     |    33 +-
 .../usergrid/persistence/query/ir/OrNode.java   |    18 +-
 .../persistence/query/ir/SearchVisitor.java     |    11 +-
 .../query/ir/result/AbstractScanColumn.java     |    14 +-
 .../query/ir/result/IntersectionIterator.java   |     7 +-
 .../query/ir/result/MergeIterator.java          |    28 +-
 .../query/ir/result/SliceIterator.java          |    12 +-
 .../query/ir/result/UnionIterator.java          |   225 +-
 .../persistence/query/util/PeekingIterator.java |    64 -
 .../org/usergrid/persistence/CollectionIT.java  |     8 +-
 .../query/AllInConnectionNoTypeIT.java          |     1 +
 .../query/IntersectionUnionPagingIT.java        |    20 +-
 .../query/ir/result/AbstractScanColumnTest.java |    84 +
 .../ir/result/IntersectionIteratorTest.java     |    12 +-
 .../query/ir/result/UnionIteratorTest.java      |   242 +-
 stack/corepersistence/collection/pom.xml        |   413 +-
 .../IdColDynamicCompositeSerializer.java        |     2 +-
 .../astyanax/AstyanaxKeyspaceProvider.java      |     2 +-
 .../collection/astyanax/CassandraFig.java       |     9 +-
 .../astyanax/IdRowCompositeSerializer.java      |     2 +
 .../MultiTennantColumnFamilyDefinition.java     |    12 +-
 .../collection/cassandra/ColumnTypes.java       |    22 +
 .../collection/guice/CollectionModule.java      |    59 +-
 .../collection/hystrix/CassandraCommand.java    |    74 +
 .../collection/hystrix/CollectionCommand.java   |    46 -
 .../collection/hystrix/CommandUtils.java        |    28 +
 .../collection/hystrix/ReadCommand.java         |    50 -
 .../collection/hystrix/WriteCommand.java        |    49 -
 .../impl/EntityCollectionManagerImpl.java       |    63 +-
 .../mvcc/changelog/ChangeLogEntry.java          |     5 +-
 .../mvcc/changelog/ChangeLogGeneratorImpl.java  |    10 +-
 .../collection/mvcc/entity/MvccEntity.java      |    21 +
 .../mvcc/entity/impl/MvccEntityImpl.java        |    30 +-
 .../mvcc/stage/delete/DeleteStart.java          |     3 +-
 .../stage/write/EntityVersionSerializer.java    |     2 +-
 .../UniqueValueSerializationStrategyImpl.java   |     8 +-
 .../collection/mvcc/stage/write/WriteStart.java |     3 +-
 .../mvcc/stage/write/WriteUniqueVerify.java     |     6 +
 .../collection/rx/CassandraThreadScheduler.java |    10 +-
 .../persistence/collection/rx/Concurrent.java   |    75 +-
 .../persistence/collection/rx/RxFig.java        |     6 +-
 .../MvccEntitySerializationStrategyImpl.java    |   132 +-
 .../src/main/resources/usergrid.properties      |     1 -
 .../collection/CollectionContextImplTest.java   |     5 +-
 .../EntityCollectionManagerFactoryTest.java     |     5 +-
 .../collection/EntityCollectionManagerIT.java   |     9 +-
 .../EntityCollectionManagerSyncIT.java          |     5 +-
 .../collection/cassandra/CassandraRule.java     |     3 +-
 .../collection/guice/TestCollectionModule.java  |    25 +
 .../collection/guice/TestModule.java            |    32 +
 .../changelog/ChangeLogGeneratorImplTest.java   |    19 +-
 .../mvcc/entity/impl/MvccEntityImplTest.java    |    28 +-
 .../mvcc/stage/AbstractMvccEntityStageTest.java |    10 +-
 .../mvcc/stage/delete/DeleteCommitTest.java     |     2 +-
 .../write/EntityVersionSerializerTest.java      |     7 +-
 .../mvcc/stage/write/FieldSerializerTest.java   |    14 +-
 ...niqueValueSerializationStrategyImplTest.java |    28 +-
 .../mvcc/stage/write/WriteUniqueVerifyTest.java |    12 +-
 .../rx/CassandraThreadSchedulerTest.java        |   327 +
 .../collection/rx/ConcurrentTest.java           |    97 +-
 .../persistence/collection/rx/ParallelTest.java |   219 +
 ...MvccEntitySerializationStrategyImplTest.java |   139 +-
 .../impl/MvccLESSTransientTest.java             |     5 +-
 ...ccLogEntrySerializationStrategyImplTest.java |     5 +-
 .../collection/util/InvalidEntityGenerator.java |     5 +-
 .../collection/util/InvalidIdGenerator.java     |     5 +-
 .../util/InvalidMvccEntityGenerator.java        |     4 +-
 .../resources/cassandra-defaults.properties     |    12 -
 .../src/test/resources/cassandra.properties     |     5 -
 .../src/test/resources/log4j.properties         |     2 +-
 .../resources/serialization-defaults.properties |     4 -
 .../src/test/resources/usergrid-UNIT.properties |    15 +-
 .../src/test/resources/usergrid.properties      |     1 +
 stack/corepersistence/graph/pom.xml             |   103 +-
 .../usergrid/persistence/graph/EdgeManager.java |    16 +-
 .../usergrid/persistence/graph/GraphFig.java    |    19 +
 .../persistence/graph/SearchByEdge.java         |    70 +
 .../persistence/graph/SearchByIdType.java       |     5 -
 .../persistence/graph/SearchEdgeType.java       |     2 -
 .../persistence/graph/guice/GraphModule.java    |    11 +-
 .../persistence/graph/impl/EdgeManagerImpl.java |    99 +-
 .../persistence/graph/impl/SimpleEdge.java      |    49 +
 .../graph/impl/SimpleSearchByEdge.java          |    98 +
 .../graph/impl/SimpleSearchByIdType.java        |     1 -
 .../EdgeMetadataSerialization.java              |    24 +-
 .../graph/serialization/EdgeSerialization.java  |    37 +-
 .../impl/EdgeMetadataSerializationImpl.java     |    82 +-
 .../impl/EdgeSerializationImpl.java             |   712 +-
 .../impl/parse/ColumnNameIterator.java          |     2 -
 .../impl/parse/ObservableIterator.java          |     7 +-
 .../stage/write/EdgeWriteStage.java             |     1 -
 .../graph/serialization/util/EdgeHasher.java    |    26 +-
 .../graph/serialization/util/EdgeUtils.java     |    23 +-
 .../persistence/graph/EdgeManagerIT.java        |   258 +-
 .../graph/guice/TestGraphModule.java            |    20 +
 .../EdgeMetadataSerializationTest.java          |    84 +-
 .../EdgeSerializationChopTest.java              |   127 +
 .../serialization/EdgeSerializationTest.java    |   468 +
 .../graph/test/util/EdgeTestUtils.java          |    65 +-
 .../src/test/resources/usergrid-CHOP.properties |    12 +
 .../src/test/resources/usergrid-UNIT.properties |    14 +
 .../src/test/resources/usergrid.properties      |     1 +
 .../persistence/model/entity/SimpleId.java      |     8 +-
 .../persistence/model/util/UUIDGenerator.java   |     2 +-
 stack/corepersistence/pom.xml                   |   144 +-
 .../priamcluster/cassandra-cf.json              |    36 +-
 stack/corepersistence/priamcluster/pom.xml      |    29 +-
 .../src/main/dist/conf/Priam.properties         |    10 +-
 .../src/main/dist/init_instance/create_raid0.sh |    32 +
 .../src/main/dist/init_instance/init_cass.sh    |    73 -
 .../main/dist/init_instance/init_instance.sh    |    54 +
 .../dist/init_instance/install_cassandra.sh     |    56 +
 .../dist/init_instance/install_elasticsearch.sh |    24 +
 .../dist/init_instance/install_oraclejdk.sh     |     3 +
 .../src/main/dist/lib/priam-agent-1.2.24.jar    |   Bin 0 -> 33020 bytes
 .../dist/lib/priam-cass-extensions-1.2.24.jar   |   Bin 0 -> 5478 bytes
 .../priam-cass-extensions-2.0.0-SNAPSHOT.jar    |   Bin 5478 -> 0 bytes
 .../src/main/dist/webapps/priam-web-1.2.24.war  |   Bin 0 -> 31272443 bytes
 .../dist/webapps/priam-web-2.0.0-SNAPSHOT.war   |   Bin 31266622 -> 0 bytes
 .../src/main/groovy/configure_cassandra.groovy  |    12 +-
 .../main/groovy/configure_elasticsearch.groovy  |    47 +
 .../src/main/groovy/registry_clear.groovy       |     2 +-
 .../src/main/groovy/registry_list.groovy        |     2 +-
 .../src/main/groovy/registry_register.groovy    |     3 +-
 .../src/main/groovy/wait_for_cassandra.groovy   |    42 -
 .../src/main/groovy/wait_for_instances.groovy   |    44 +
 stack/pom.xml                                   |     2 +-
 .../rest/management/ManagementResource.java     |    16 +-
 .../users/ConnectionResourceTest.java           |     2 +-
 .../rest/management/ManagementResourceIT.java   |    13 +-
 stack/tools/pom.xml                             |     4 +
 .../java/org/usergrid/tools/EntityCleanup.java  |     4 +-
 .../org/usergrid/tools/UniqueIndexCleanup.java  |     4 +-
 .../java/org/usergrid/tools/bean/ExportOrg.java |    11 +
 590 files changed, 183323 insertions(+), 33734 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7d3a9c78/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
index 9ef4098,95bc760..aed8d22
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
@@@ -17,41 -17,37 +17,30 @@@
   */
  package org.apache.usergrid.persistence.collection.guice;
  
--import java.io.IOException;
--
--import org.safehaus.guicyfig.Env;
--import org.safehaus.guicyfig.GuicyFigModule;
--
++import com.google.inject.AbstractModule;
++import com.google.inject.assistedinject.FactoryModuleBuilder;
  import org.apache.usergrid.persistence.collection.EntityCollectionManager;
  import org.apache.usergrid.persistence.collection.EntityCollectionManagerFactory;
  import org.apache.usergrid.persistence.collection.EntityCollectionManagerSync;
  import org.apache.usergrid.persistence.collection.astyanax.CassandraFig;
  import org.apache.usergrid.persistence.collection.impl.EntityCollectionManagerImpl;
  import org.apache.usergrid.persistence.collection.impl.EntityCollectionManagerSyncImpl;
  import org.apache.usergrid.persistence.collection.migration.MigrationManagerFig;
- import org.apache.usergrid.persistence.collection.rx.CassandraThreadScheduler;
- import org.apache.usergrid.persistence.collection.rx.RxFig;
- import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
- import org.apache.usergrid.persistence.collection.serialization.impl.SerializationModule;
- import org.apache.usergrid.persistence.collection.service.impl.ServiceModule;
- 
- import com.google.inject.AbstractModule;
- import com.google.inject.Guice;
- import com.google.inject.Injector;
- import com.google.inject.assistedinject.FactoryModuleBuilder;
- import com.netflix.config.ConfigurationManager;
 +import org.apache.usergrid.persistence.collection.mvcc.MvccEntitySerializationStrategy;
 +import org.apache.usergrid.persistence.collection.mvcc.MvccLogEntrySerializationStrategy;
 +import org.apache.usergrid.persistence.collection.mvcc.stage.write.UniqueValueSerializationStrategy;
 +import org.apache.usergrid.persistence.collection.mvcc.stage.write.UniqueValueSerializationStrategyImpl;
 +import org.apache.usergrid.persistence.collection.mvcc.stage.write.WriteFig;
+ import org.apache.usergrid.persistence.collection.rx.CassandraThreadScheduler;
+ import org.apache.usergrid.persistence.collection.rx.RxFig;
+ import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
 +import org.apache.usergrid.persistence.collection.serialization.impl.MvccEntitySerializationStrategyImpl;
 +import org.apache.usergrid.persistence.collection.serialization.impl.MvccLogEntrySerializationStrategyImpl;
- 
+ import org.apache.usergrid.persistence.collection.serialization.impl.SerializationModule;
+ import org.apache.usergrid.persistence.collection.service.impl.ServiceModule;
 -
 -import com.google.inject.AbstractModule;
 -import com.google.inject.Guice;
 -import com.google.inject.Injector;
 -import com.google.inject.assistedinject.FactoryModuleBuilder;
 -import com.netflix.config.ConfigurationManager;
 -import org.apache.usergrid.persistence.collection.mvcc.stage.write.UniqueValueSerializationStrategy;
 -import org.apache.usergrid.persistence.collection.mvcc.stage.write.UniqueValueSerializationStrategyImpl;
 -import org.apache.usergrid.persistence.collection.mvcc.stage.write.WriteFig;
 -
++import org.safehaus.guicyfig.GuicyFigModule;
  import rx.Scheduler;
  
--
  /**
   * Simple module for wiring our collection api
   *
@@@ -59,42 -55,10 +48,10 @@@
   */
  public class CollectionModule extends AbstractModule {
  
-     static {
-         /*
-          * --------------------------------------------------------------------
-          * Archaius Configuration Settings
-          * --------------------------------------------------------------------
-          */
--
-         try {
-             ConfigurationManager.loadCascadedPropertiesFromResources( "usergrid" );
-         }
-         catch ( IOException e ) {
-             throw new RuntimeException( 
-                     "Cannot do much without properly loading our configuration.", e );
-         }
- 
-         Injector injector = Guice.createInjector( 
-                 new GuicyFigModule( CassandraFig.class, RxFig.class ) );
-         CassandraFig cassandraFig = injector.getInstance( CassandraFig.class );
-         RxFig rxFig = injector.getInstance( RxFig.class );
- 
-         Env env = Env.getEnvironment();
-         if ( env == Env.UNIT || env == Env.ALL ) {
-             String thriftPort = String.valueOf( AvailablePortFinder.getNextAvailable() );
-             cassandraFig.bypass( "getThriftPort", thriftPort );
-             cassandraFig.bypass( "getConnections", "20" );
-             rxFig.bypass(        "getMaxThreadCount", "20" );
-             cassandraFig.bypass( "getHosts", "localhost" );
-             cassandraFig.bypass( "getClusterName", "Usergrid" );
-             cassandraFig.bypass( "getKeyspaceName", "Usergrid_Collections" );
-         }
-     }
- 
      @Override
      protected void configure() {
 -        //noinspection unchecked
 +
 +        // noinspection unchecked
          install( new GuicyFigModule( 
                  RxFig.class, 
                  MigrationManagerFig.class,

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7d3a9c78/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
index eb998dd,5698080..f8c77f0
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
@@@ -18,16 -18,17 +18,12 @@@
   */
  package org.apache.usergrid.persistence.collection.impl;
  
--
++import com.google.common.base.Preconditions;
++import com.google.inject.Inject;
++import com.google.inject.assistedinject.Assisted;
  import java.util.UUID;
--
--import org.slf4j.Logger;
--import org.slf4j.LoggerFactory;
--
 -import org.apache.cassandra.thrift.Cassandra;
 -
  import org.apache.usergrid.persistence.collection.CollectionScope;
  import org.apache.usergrid.persistence.collection.EntityCollectionManager;
- import org.apache.usergrid.persistence.collection.hystrix.ReadCommand;
- import org.apache.usergrid.persistence.collection.hystrix.WriteCommand;
 -import org.apache.usergrid.persistence.collection.hystrix.CassandraCommand;
  import org.apache.usergrid.persistence.collection.mvcc.entity.MvccEntity;
  import org.apache.usergrid.persistence.collection.mvcc.entity.ValidationUtils;
  import org.apache.usergrid.persistence.collection.mvcc.stage.CollectionIoEvent;
@@@ -43,12 -44,14 +39,11 @@@ import org.apache.usergrid.persistence.
  import org.apache.usergrid.persistence.collection.util.EntityUtils;
  import org.apache.usergrid.persistence.model.entity.Entity;
  import org.apache.usergrid.persistence.model.entity.Id;
--
--import com.google.common.base.Preconditions;
--import com.google.inject.Inject;
--import com.google.inject.assistedinject.Assisted;
--
++import org.slf4j.Logger;
++import org.slf4j.LoggerFactory;
  import rx.Observable;
+ import rx.Scheduler;
+ import rx.util.functions.FuncN;
  
  
  /**
@@@ -142,13 -144,13 +139,12 @@@ public class EntityCollectionManagerImp
          //these 3 lines could be done in a single line, but they are on multiple lines for
clarity
  
          //create our observable and start the write
-         Observable<CollectionIoEvent<MvccEntity>> observable = WriteCommand.toObservable(
-                 new CollectionIoEvent<Entity>( collectionScope, entity ) ).map( writeStart
);
+         CollectionIoEvent<Entity> writeData = new CollectionIoEvent<Entity>(
collectionScope, entity );
  
+         Observable<CollectionIoEvent<MvccEntity>> observable =  Observable.from(
writeData ).subscribeOn( scheduler ).map( writeStart );
  
-         //execute all validation stages concurrently.  Needs refactored when this is done.
 
-         // https://github.com/Netflix/RxJava/issues/627
-         observable = Concurrent.concurrent(observable, writeVerifyUnique, writeOptimisticVerify);
 -
+         //execute all validation stages concurrently.  Needs refactored when this is done.
 https://github.com/Netflix/RxJava/issues/627
+         observable = Concurrent.concurrent(observable, scheduler, new WaitZip( ), writeVerifyUnique,
writeOptimisticVerify);
  
          //return the commit result.
          return observable.map( writeCommit );
@@@ -164,9 -166,7 +160,8 @@@
          Preconditions.checkNotNull( entityId.getType(), "Entity type is required in this
stage" );
  
  
-         return WriteCommand.toObservable( new CollectionIoEvent<Id>( collectionScope,
entityId ) )
-             .map( deleteStart )
-             .map( deleteCommit );
++
+         return Observable.from(new CollectionIoEvent<Id>( collectionScope, entityId
) ).subscribeOn( scheduler ).map( deleteStart ).map( deleteCommit );
      }
  
  

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7d3a9c78/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerifyTest.java
----------------------------------------------------------------------


Mime
View raw message