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 2014/09/05 23:11:28 UTC
[25/33] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-push-notifications
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-push-notifications
# By Anuradha Weeraman (55) and others
# Via Dave Johnson (30) and others
* 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (212 commits)
Add some missing headers, and make some header more consistent.
Exclude all DLL files from the release, and add a README file to each directory that formerly contained DLLs to explain that.
Change to allow Launcher to compile with AppleJavaExtensions v1.4
Permissive license notices should go in license file.
Preparing for RC5 which will exclude the Portal's bower_components, node_modules and other giti-gnored files.
Adding properties file for corepersistence/common tests.
refreshIndex() fixes counting mutator test.
Test fixes for tests that seem to fail intermittently on machines with lots of cores.
Test to prove that arrays, not queries and geo queries play well together.
Get permissions right, who knows who that WAR came from.
configurable surefire arglines
Revert to launcher AppleJavaExtensions 1.4 so that at least the launcher will build.
Make it possible to deploy a UG 1 WAR.
Don't build the launcher until we have a fix for the Apple ext jar issue.
Fork count of two seems to work for me.
Portal - updated grunt to remove old task types
More JSON serialization fixes: EntityRef and CredentialsInfo should not be serialized with type info.
Fixed obscelete tests
Reverting previous change; jumped the gun on that one.
Fix JSON mapper to use same setup as we do in Collections module serializer.
...
Conflicts:
stack/core/src/main/java/org/apache/usergrid/metrics/MetricsFactory.java
stack/core/src/main/resources/usergrid-core-context.xml
stack/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1d8dd2f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1d8dd2f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1d8dd2f6
Branch: refs/heads/two-dot-o
Commit: 1d8dd2f6d970af69740e725825fd3d8db1aec5b0
Parents: 646b98c 479969f
Author: grey <gr...@apigee.com>
Authored: Wed Sep 3 14:50:06 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Wed Sep 3 14:50:06 2014 -0700
----------------------------------------------------------------------
.gitignore | 22 +-
DISCLAIMER | 9 +
LICENSE | 26 +
NOTICE | 11 +-
README.md | 20 +-
bower.json | 39 -
.../src/test/resources/install_cassandra.sh | 19 -
chop/stack/src/test/resources/install_es.sh | 19 -
.../stack/src/test/resources/setup_cassandra.sh | 19 -
chop/stack/src/test/resources/setup_es.sh | 19 -
.../src/main/resources/jettyjam.properties | 18 -
portal/Gruntfile.js | 136 +-
portal/README.md | 20 +-
portal/archive/coming_soon.html | 31 -
portal/archive/config.js | 72 -
.../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/archive/css/jquery-ui-timepicker.css | 53 -
portal/archive/css/jquery.ui.statusbar.css | 25 -
portal/archive/css/prettify.css | 52 -
portal/archive/css/usergrid-stripped.css | 5199 ----
portal/archive/css/usergrid.css | 5203 ----
portal/archive/dash/README.md | 3 -
.../archive/dash/config/testacular-e2e.conf.js | 22 -
portal/archive/dash/config/testacular.conf.js | 20 -
portal/archive/dash/test/e2e/runner.html | 10 -
portal/archive/dash/test/e2e/scenarios.js | 45 -
.../dash/test/lib/angular/angular-mocks.js | 1764 --
.../dash/test/lib/angular/angular-scenario.js | 26195 -----------------
.../archive/dash/test/lib/angular/version.txt | 1 -
.../archive/dash/test/unit/controllersSpec.js | 31 -
portal/archive/dash/test/unit/directivesSpec.js | 19 -
portal/archive/dash/test/unit/filtersSpec.js | 19 -
portal/archive/dash/test/unit/servicesSpec.js | 14 -
portal/archive/images/APNS_cert_upload.png | Bin 33956 -> 0 bytes
portal/archive/images/APNS_certification.png | Bin 16855 -> 0 bytes
portal/archive/images/android-notification.png | Bin 41629 -> 0 bytes
portal/archive/images/android-sdk-download.png | Bin 4848 -> 0 bytes
portal/archive/images/api-activity.gif | Bin 10819 -> 0 bytes
portal/archive/images/apigee-logo.png | Bin 3647 -> 0 bytes
portal/archive/images/apigeetopbar.png | Bin 4658 -> 0 bytes
portal/archive/images/background_one_col.png | Bin 3126 -> 0 bytes
portal/archive/images/btn-copyCurl-up.png | Bin 2762 -> 0 bytes
portal/archive/images/clippy-bg.png | Bin 561 -> 0 bytes
portal/archive/images/close.gif | Bin 718 -> 0 bytes
portal/archive/images/dotnet-sdk-download.png | Bin 7149 -> 0 bytes
portal/archive/images/down_arrow.png | Bin 1285 -> 0 bytes
portal/archive/images/error.png | Bin 2009 -> 0 bytes
portal/archive/images/faviconApigee.ico | Bin 1150 -> 0 bytes
.../images/glyphicons-halflings-white.png | Bin 4352 -> 0 bytes
portal/archive/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/archive/images/google_api_key.png | Bin 98118 -> 0 bytes
portal/archive/images/green_dot.png | Bin 3472 -> 0 bytes
portal/archive/images/grid.png | Bin 166 -> 0 bytes
portal/archive/images/icons.png | Bin 13132 -> 0 bytes
portal/archive/images/ios-sdk-download.png | Bin 4886 -> 0 bytes
portal/archive/images/iphone_message.png | Bin 90307 -> 0 bytes
.../archive/images/javascript-sdk-download.png | Bin 4618 -> 0 bytes
portal/archive/images/left_arrow.png | Bin 1257 -> 0 bytes
portal/archive/images/logo-white.png | Bin 2014 -> 0 bytes
portal/archive/images/menuActiveTriangle.png | Bin 315 -> 0 bytes
portal/archive/images/nodejs-sdk-download.png | Bin 5273 -> 0 bytes
portal/archive/images/notice.png | Bin 2112 -> 0 bytes
portal/archive/images/orange-arrow.png | Bin 242 -> 0 bytes
.../archive/images/push_notifications_icon.png | Bin 338 -> 0 bytes
portal/archive/images/red_dot.png | Bin 3482 -> 0 bytes
portal/archive/images/right_arrow.png | Bin 1251 -> 0 bytes
portal/archive/images/ruby-sdk-download.png | Bin 6343 -> 0 bytes
portal/archive/images/step_1.png | Bin 1953 -> 0 bytes
portal/archive/images/step_2.png | Bin 2117 -> 0 bytes
portal/archive/images/step_3.png | Bin 2162 -> 0 bytes
portal/archive/images/success.png | Bin 1863 -> 0 bytes
portal/archive/images/swish_arrow.png | Bin 220 -> 0 bytes
portal/archive/images/topbackground.png | Bin 2890 -> 0 bytes
portal/archive/images/up_arrow.png | Bin 1292 -> 0 bytes
portal/archive/images/user-photo.png | Bin 3849 -> 0 bytes
portal/archive/images/user_profile.png | Bin 3775 -> 0 bytes
portal/archive/images/usergrid_200.png | Bin 6397 -> 0 bytes
portal/archive/images/usergrid_400.png | Bin 8746 -> 0 bytes
portal/archive/images/warning.png | Bin 1179 -> 0 bytes
portal/archive/images/yellow_dot.png | Bin 3475 -> 0 bytes
portal/archive/index-stripped2.html | 1795 --
portal/archive/index.html | 1932 --
portal/archive/js/app/app.js | 131 -
portal/archive/js/app/console.js | 5397 ----
portal/archive/js/app/helpers.js | 241 -
portal/archive/js/app/navigation.js | 251 -
portal/archive/js/app/pages.js | 161 -
portal/archive/js/app/params.js | 30 -
portal/archive/js/app/quickLogin.js | 30 -
portal/archive/js/app/session.js | 176 -
portal/archive/js/app/sso.js | 135 -
portal/archive/js/app/status.js | 37 -
portal/archive/js/app/ui/collections.entity.js | 320 -
portal/archive/js/app/ui/collections.user.js | 120 -
portal/archive/js/app/ui/ui.js | 415 -
portal/archive/js/app/usergrid.appSDK.js | 2097 --
portal/archive/js/app/usergrid.appSDK.orig.js | 2070 --
portal/archive/js/lib/MD5.min.js | 1 -
portal/archive/js/lib/backbone.js | 1431 -
portal/archive/js/lib/bootstrap.min.js | 7 -
portal/archive/js/lib/date.min.js | 2 -
portal/archive/js/lib/jquery-1.7.2.min.js | 4 -
portal/archive/js/lib/jquery-ui-1.8.18.min.js | 15 -
portal/archive/js/lib/jquery.dataset.min.js | 1 -
portal/archive/js/lib/jquery.dform-0.1.3.min.js | 16 -
portal/archive/js/lib/jquery.jsonp-2.3.1.min.js | 3 -
portal/archive/js/lib/jquery.tmpl.min.js | 10 -
.../archive/js/lib/jquery.ui.statusbar.min.js | 1 -
.../archive/js/lib/jquery.ui.timepicker.min.js | 1 -
portal/archive/js/lib/prettify.js | 1477 -
portal/archive/js/lib/underscore-min.js | 5 -
portal/archive/js/spec/client-tests.js | 159 -
portal/archive/js/spec/index.html | 20 -
portal/archive/js/spec/qunit-git.css | 238 -
portal/archive/js/spec/qunit-git.js | 1865 --
portal/archive/js/unit-tests/appSDK-tests.js | 255 -
portal/archive/js/unit-tests/ie-jquery-tests.js | 191 -
portal/archive/js/unit-tests/qunit.css | 231 -
portal/archive/js/unit-tests/qunit.js | 1934 --
portal/archive/loading.html | 9 -
portal/archive/max/index.html | 0
portal/archive/planned_outage.html | 48 -
portal/archive/push/index.html | 34 -
portal/archive/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 | 67 -
.../apigee.ui.collections.query.indexes.html | 5 -
.../apigee.ui.collections.table_rows.html | 9 -
.../apigee.ui.collections.user.header.html | 21 -
.../templates/apigee.ui.curl.detail.html | 11 -
.../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 -
...pigee.ui.panels.notifications.configure.html | 14 -
.../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/archive/templates/test/modalForm2.html | 32 -
portal/archive/test/autocomplete.html | 25 -
portal/archive/test/modalForm.html | 32 -
portal/bower.json | 6 +-
portal/build.sh | 24 +-
portal/config.js | 49 +-
portal/css/apigeeGlobalNavigation.css | 291 -
portal/css/dash.min.css | 1 -
portal/css/main.css | 94 +-
portal/css/main.min.css | 1 +
portal/favicon.ico | Bin 1150 -> 3989 bytes
portal/helpJson.json | 47 +
portal/img/green_dot.png | Bin 3472 -> 0 bytes
portal/img/logo.gif | Bin 2279 -> 0 bytes
portal/img/logo.png | Bin 0 -> 7758 bytes
portal/img/push/APNS_cert_upload.png | Bin 33956 -> 0 bytes
portal/img/push/APNS_certification.png | Bin 16855 -> 0 bytes
portal/img/push/android-notification.png | Bin 41629 -> 0 bytes
portal/img/push/google_api_key.png | Bin 98118 -> 0 bytes
portal/img/push/iphone_message.png | Bin 90307 -> 0 bytes
portal/img/push/step_1.png | Bin 1953 -> 0 bytes
portal/img/push/step_2.png | Bin 2117 -> 0 bytes
portal/img/push/step_3.png | Bin 2162 -> 0 bytes
portal/img/red_dot.png | Bin 3482 -> 0 bytes
portal/img/yellow_dot.png | Bin 3475 -> 0 bytes
portal/index-template.html | 44 +-
portal/js/activities/activities.html | 56 +-
.../js/app-overview/app-overview-controller.js | 61 +-
portal/js/app-overview/app-overview.html | 60 +-
.../js/app-overview/doc-includes/android.html | 401 +-
portal/js/app-overview/doc-includes/ios.html | 364 +-
.../app-overview/doc-includes/javascript.html | 216 +-
portal/js/app-overview/doc-includes/net.html | 16 +
portal/js/app-overview/doc-includes/node.html | 16 +
portal/js/app-overview/doc-includes/ruby.html | 16 +
.../app-overview/getting-started-controller.js | 107 -
portal/js/app-overview/getting-started.html | 119 -
portal/js/app.js | 21 +-
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.html | 261 +-
portal/js/data/display-generic.html | 168 +-
portal/js/data/display-groups.html | 16 +
portal/js/data/display-roles.html | 18 +-
portal/js/data/display-users.html | 257 +-
portal/js/data/entity.html | 31 +-
portal/js/dialogs/modal.html | 49 +-
portal/js/global/app-switcher-directive.js | 53 -
portal/js/global/appswitcher-template.html | 34 -
portal/js/global/help-service.js | 22 +-
portal/js/global/insecure-banner.html | 30 +-
portal/js/global/page-controller.js | 17 +-
portal/js/global/page-title.html | 44 +-
portal/js/global/ug-service.js | 45 +-
portal/js/groups/groups-activities.html | 44 +-
portal/js/groups/groups-details.html | 83 +-
portal/js/groups/groups-members.html | 101 +-
portal/js/groups/groups-roles.html | 247 +-
portal/js/groups/groups-tabs.html | 45 +-
portal/js/groups/groups.html | 196 +-
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/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 -
.../angularitics-0.8.5-google-analytics.js | 7 -
.../js/libs/angularitics/angularitics-0.8.5.js | 6 -
portal/js/login/forgot-password.html | 27 +-
portal/js/login/loading.html | 20 +-
portal/js/login/login.html | 114 +-
portal/js/login/logout.html | 18 +-
portal/js/login/register.html | 80 +-
portal/js/menu.html | 32 +-
portal/js/menus/appMenu.html | 88 +-
portal/js/menus/orgMenu.html | 39 +-
portal/js/org-overview/org-overview.html | 269 +-
portal/js/profile/account.html | 31 +-
portal/js/profile/organizations.html | 136 +-
portal/js/profile/profile.html | 105 +-
portal/js/roles/roles-groups.html | 99 +-
portal/js/roles/roles-settings.html | 173 +-
portal/js/roles/roles-tabs.html | 48 +-
portal/js/roles/roles-users.html | 100 +-
portal/js/roles/roles.html | 184 +-
portal/js/shell/shell.html | 37 +-
portal/js/users/users-activities.html | 75 +-
portal/js/users/users-feed.html | 63 +-
portal/js/users/users-graph.html | 125 +-
portal/js/users/users-groups.html | 116 +-
portal/js/users/users-profile.html | 154 +-
portal/js/users/users-roles.html | 258 +-
portal/js/users/users-tabs.html | 17 +-
portal/js/users/users.html | 272 +-
portal/package.json | 7 +-
portal/scripts/e2e-test.bat | 15 +
portal/scripts/e2e-test.sh | 15 +
portal/scripts/test.bat | 15 +
portal/scripts/test.sh | 15 +
portal/scripts/watchr.rb | 15 +
portal/scripts/web-server.js | 19 +
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 | 19 +
portal/tests/karma.conf.js | 23 +-
portal/tests/protractor-ignore/profile.spec.js | 97 +
portal/tests/protractor/applications.spec.js | 20 +
portal/tests/protractor/data.spec.js | 20 +
portal/tests/protractor/forgotPassword.spec.js | 20 +
portal/tests/protractor/login.spec.js | 20 +
portal/tests/protractor/organization.spec.js | 20 +
portal/tests/protractor/profile.spec.js | 77 -
portal/tests/protractor/roles.spec.js | 20 +
portal/tests/protractor/shell.spec.js | 20 +
portal/tests/protractor/users.spec.js | 20 +
portal/tests/protractor/util.js | 24 +-
portal/tests/protractorConf.js | 24 +-
portal/tests/selenium/chromedriver | Bin 22034760 -> 0 bytes
.../selenium-server-standalone-2.37.0.jar | Bin 34730734 -> 0 bytes
portal/tests/unit/sample.spec.js | 19 +
release/pom.xml | 65 +
release/sign-release.sh | 30 +
release/src/main/assembly/source.xml | 57 +
sdks/android/.gitignore | 20 -
sdks/android/README.txt | 2 +
sdks/android/dist/jackson-core-asl-1.9.1.jar | Bin 228286 -> 0 bytes
sdks/android/dist/jackson-mapper-asl-1.9.1.jar | Bin 764465 -> 0 bytes
.../dist/spring-android-core-1.0.0.M4.jar | Bin 83065 -> 0 bytes
.../spring-android-rest-template-1.0.0.M4.jar | Bin 137368 -> 0 bytes
sdks/android/doc/allclasses-frame.html | 27 -
sdks/android/doc/allclasses-noframe.html | 27 -
sdks/android/doc/constant-values.html | 153 -
sdks/android/doc/deprecated-list.html | 117 -
sdks/android/doc/help-doc.html | 222 -
sdks/android/doc/index-all.html | 371 -
sdks/android/doc/index.html | 68 -
.../apache/usergrid/android/client/Client.html | 989 -
.../client/callbacks/ApiResponseCallback.html | 224 -
.../client/callbacks/ClientAsyncTask.html | 338 -
.../client/callbacks/ClientCallback.html | 227 -
.../callbacks/DeviceRegistrationCallback.html | 220 -
.../callbacks/GroupsRetrievedCallback.html | 220 -
.../client/callbacks/QueryResultsCallback.html | 220 -
.../class-use/ApiResponseCallback.html | 282 -
.../callbacks/class-use/ClientAsyncTask.html | 117 -
.../callbacks/class-use/ClientCallback.html | 180 -
.../class-use/DeviceRegistrationCallback.html | 171 -
.../class-use/GroupsRetrievedCallback.html | 160 -
.../class-use/QueryResultsCallback.html | 219 -
.../android/client/callbacks/package-frame.html | 28 -
.../client/callbacks/package-summary.html | 166 -
.../android/client/callbacks/package-tree.html | 145 -
.../android/client/callbacks/package-use.html | 178 -
.../android/client/class-use/Client.html | 117 -
.../usergrid/android/client/package-frame.html | 20 -
.../android/client/package-summary.html | 137 -
.../usergrid/android/client/package-tree.html | 134 -
.../usergrid/android/client/package-use.html | 117 -
.../android/client/utils/DeviceUuidFactory.html | 352 -
.../android/client/utils/ObjectUtils.html | 258 -
.../utils/class-use/DeviceUuidFactory.html | 117 -
.../client/utils/class-use/ObjectUtils.html | 117 -
.../android/client/utils/package-frame.html | 21 -
.../android/client/utils/package-summary.html | 142 -
.../android/client/utils/package-tree.html | 131 -
.../android/client/utils/package-use.html | 117 -
sdks/android/doc/overview-frame.html | 23 -
sdks/android/doc/overview-summary.html | 139 -
sdks/android/doc/overview-tree.html | 154 -
sdks/android/doc/package-list | 3 -
sdks/android/doc/resources/background.gif | Bin 2313 -> 0 bytes
sdks/android/doc/resources/tab.gif | Bin 291 -> 0 bytes
sdks/android/doc/resources/titlebar.gif | Bin 10701 -> 0 bytes
sdks/android/doc/resources/titlebar_end.gif | Bin 849 -> 0 bytes
sdks/android/doc/stylesheet.css | 474 -
.../0.0.6/usergrid-java-client-0.0.6.jar | Bin 46389 -> 0 bytes
.../0.0.6/usergrid-java-client-0.0.6.jar.sha1 | 1 -
.../0.0.6/usergrid-java-client-0.0.6.pom | 95 -
.../0.0.6/usergrid-java-client-0.0.6.pom.sha1 | 1 -
.../maven-metadata-local.xml | 12 -
sdks/android/pom.xml | 43 +-
.../apache/usergrid/android/client/Client.java | 185 +-
.../client/callbacks/ApiResponseCallback.java | 16 +
.../client/callbacks/ClientAsyncTask.java | 16 +
.../client/callbacks/ClientCallback.java | 16 +
.../callbacks/DeviceRegistrationCallback.java | 16 +
.../callbacks/GroupsRetrievedCallback.java | 16 +
.../client/callbacks/QueryResultsCallback.java | 16 +
.../android/client/utils/DeviceUuidFactory.java | 16 +
.../android/client/utils/ObjectUtils.java | 16 +
.../NSubstitute.1.6.0.0/BreakingChanges.txt | 131 -
.../packages/NSubstitute.1.6.0.0/CHANGELOG.txt | 103 -
.../packages/NSubstitute.1.6.0.0/README.txt | 119 -
sdks/dotnet/packages/NUnit.2.6.2/README.txt | 3 +
.../packages/Newtonsoft.Json.4.5.11/README.txt | 3 +
sdks/dotnet/packages/RestSharp.104.1/readme.txt | 19 -
.../LocationDotNetSample/Form1.cs | 18 +-
.../packages/Geocoder.0.1.0.0/README.txt | 3 +
sdks/html5-javascript/README.md | 76 +-
.../examples/all-calls/all-calls.html | 18 +-
sdks/html5-javascript/examples/all-calls/app.js | 19 +-
sdks/html5-javascript/examples/dogs/app.js | 17 +
sdks/html5-javascript/examples/dogs/dogs.html | 19 +-
sdks/html5-javascript/examples/facebook/app.js | 17 +
.../examples/facebook/facebook.html | 19 +-
.../examples/facebook/guide.html | 17 +
.../examples/persistence/test.html | 19 +-
.../examples/persistence/test.js | 17 +
sdks/html5-javascript/examples/test/test.html | 19 +-
.../extensions/usergrid.validation.js | 30 +-
sdks/html5-javascript/index.html | 17 +
sdks/html5-javascript/lib/Module.js | 19 +-
sdks/html5-javascript/lib/Usergrid.js | 36 +-
sdks/html5-javascript/lib/modules/Asset.js | 168 +-
sdks/html5-javascript/lib/modules/Client.js | 8 +-
sdks/html5-javascript/lib/modules/Entity.js | 179 +-
sdks/html5-javascript/lib/modules/Group.js | 2 +-
sdks/html5-javascript/tests/mocha/index.html | 25 +-
sdks/html5-javascript/tests/mocha/test.js | 17 +
.../tests/qunit/apigee_test.html | 17 +
sdks/html5-javascript/tests/qunit/tests.js | 17 +
sdks/html5-javascript/tests/test.html | 17 +
sdks/html5-javascript/tests/test.js | 17 +
sdks/html5-javascript/usergrid.js | 268 +-
sdks/html5-javascript/usergrid.min.js | 35 +-
sdks/ios/Nukefile | 17 +
sdks/ios/UGAPI/v2/UGConnection.h | 16 +
sdks/ios/UGAPI/v2/UGConnection.m | 18 +-
sdks/ios/UGAPI/v2/UGHTTPClient.h | 16 +
sdks/ios/UGAPI/v2/UGHTTPClient.m | 16 +
sdks/ios/UGAPI/v2/UGHTTPHelpers.h | 19 +-
sdks/ios/UGAPI/v2/UGHTTPHelpers.m | 17 +-
sdks/ios/UGAPI/v2/UGHTTPResult.h | 16 +
sdks/ios/UGAPI/v2/UGHTTPResult.m | 16 +
.../samples/Books/books/AddBookViewController.h | 31 +
.../samples/Books/books/AddBookViewController.m | 17 +
sdks/ios/samples/Books/books/AppDelegate.h | 31 +
sdks/ios/samples/Books/books/AppDelegate.m | 17 +
.../samples/Books/books/BooksViewController.h | 31 +
.../samples/Books/books/BooksViewController.m | 17 +
.../Books/books/UGSignInViewController.h | 14 +
.../Books/books/UGSignInViewController.m | 17 +
sdks/ios/samples/Books/books/books-Info.plist | 18 +
sdks/ios/samples/Books/books/books-Prefix.pch | 17 +
.../Books/books/en.lproj/InfoPlist.strings | 19 +
sdks/ios/samples/Books/books/main.m | 17 +
.../ios/samples/Browser/browser/UGAppDelegate.h | 14 +
.../ios/samples/Browser/browser/UGAppDelegate.m | 17 +
.../Browser/browser/UGAppViewController.h | 14 +
.../Browser/browser/UGAppViewController.m | 17 +
.../browser/UGCollectionViewController.h | 14 +
.../browser/UGCollectionViewController.m | 17 +
.../Browser/browser/UGEntityViewController.h | 14 +
.../Browser/browser/UGEntityViewController.m | 17 +
.../Browser/browser/UGSignInViewController.h | 14 +
.../Browser/browser/UGSignInViewController.m | 17 +
.../Browser/browser/UGTextViewController.h | 14 +
.../Browser/browser/UGTextViewController.m | 17 +
.../samples/Browser/browser/browser-Info.plist | 18 +
sdks/ios/samples/Browser/browser/main.m | 17 +
sdks/ios/samples/parties/parties/AppDelegate.h | 14 +-
sdks/ios/samples/parties/parties/AppDelegate.m | 17 +
.../parties/parties/PartiesViewController.h | 14 +-
.../parties/parties/PartiesViewController.m | 17 +
.../parties/parties/PartyViewController.h | 14 +-
.../parties/parties/PartyViewController.m | 17 +
sdks/ios/samples/parties/parties/main.m | 17 +
.../samples/parties/parties/parties-Info.plist | 18 +
sdks/ios/test/test_client.nu | 17 +
sdks/ios/test/test_connection.nu | 17 +
sdks/java/.gitignore | 20 -
sdks/java/dist/jackson-core-asl-1.9.1.jar | Bin 228286 -> 0 bytes
sdks/java/dist/jackson-mapper-asl-1.9.1.jar | Bin 764465 -> 0 bytes
sdks/java/dist/spring-android-core-1.0.0.M4.jar | Bin 83065 -> 0 bytes
.../spring-android-rest-template-1.0.0.M4.jar | Bin 137368 -> 0 bytes
.../usergrid-android-client-0.0.1-SNAPSHOT.jar | Bin 66123 -> 0 bytes
sdks/java/doc/allclasses-frame.html | 40 -
sdks/java/doc/allclasses-noframe.html | 40 -
sdks/java/doc/constant-values.html | 731 -
sdks/java/doc/deprecated-list.html | 117 -
sdks/java/doc/help-doc.html | 222 -
sdks/java/doc/index-all.html | 1299 -
sdks/java/doc/index.html | 68 -
.../usergrid/java/client/Client.Query.html | 238 -
.../java/client/Client.QueuePosition.html | 381 -
.../org/apache/usergrid/java/client/Client.html | 1652 --
.../java/client/class-use/Client.Query.html | 246 -
.../client/class-use/Client.QueuePosition.html | 192 -
.../usergrid/java/client/class-use/Client.html | 175 -
.../entities/Activity.ActivityCollection.html | 408 -
.../entities/Activity.ActivityObject.html | 720 -
.../client/entities/Activity.MediaLink.html | 434 -
.../usergrid/java/client/entities/Activity.html | 1449 -
.../usergrid/java/client/entities/Device.html | 387 -
.../usergrid/java/client/entities/Entity.html | 599 -
.../usergrid/java/client/entities/Group.html | 427 -
.../usergrid/java/client/entities/Message.html | 641 -
.../usergrid/java/client/entities/User.html | 707 -
.../class-use/Activity.ActivityCollection.html | 117 -
.../class-use/Activity.ActivityObject.html | 231 -
.../entities/class-use/Activity.MediaLink.html | 191 -
.../client/entities/class-use/Activity.html | 203 -
.../java/client/entities/class-use/Device.html | 169 -
.../java/client/entities/class-use/Entity.html | 415 -
.../java/client/entities/class-use/Group.html | 159 -
.../java/client/entities/class-use/Message.html | 183 -
.../java/client/entities/class-use/User.html | 248 -
.../java/client/entities/package-frame.html | 28 -
.../java/client/entities/package-summary.html | 169 -
.../java/client/entities/package-tree.html | 141 -
.../java/client/entities/package-use.html | 219 -
.../java/client/exception/ClientException.html | 263 -
.../exception/class-use/ClientException.html | 117 -
.../java/client/exception/package-frame.html | 20 -
.../java/client/exception/package-summary.html | 137 -
.../java/client/exception/package-tree.html | 142 -
.../java/client/exception/package-use.html | 117 -
.../usergrid/java/client/package-frame.html | 28 -
.../usergrid/java/client/package-summary.html | 167 -
.../usergrid/java/client/package-tree.html | 146 -
.../usergrid/java/client/package-use.html | 158 -
.../java/client/response/AggregateCounter.html | 316 -
.../client/response/AggregateCounterSet.html | 444 -
.../java/client/response/ApiResponse.html | 1148 -
.../client/response/ClientCredentialsInfo.html | 316 -
.../java/client/response/QueueInfo.html | 297 -
.../response/class-use/AggregateCounter.html | 191 -
.../response/class-use/AggregateCounterSet.html | 170 -
.../client/response/class-use/ApiResponse.html | 365 -
.../class-use/ClientCredentialsInfo.html | 170 -
.../client/response/class-use/QueueInfo.html | 187 -
.../java/client/response/package-frame.html | 24 -
.../java/client/response/package-summary.html | 151 -
.../java/client/response/package-tree.html | 134 -
.../java/client/response/package-use.html | 178 -
.../usergrid/java/client/utils/JsonUtils.html | 480 -
.../usergrid/java/client/utils/MapUtils.html | 260 -
.../usergrid/java/client/utils/ObjectUtils.html | 258 -
.../usergrid/java/client/utils/UrlUtils.html | 314 -
.../java/client/utils/class-use/JsonUtils.html | 117 -
.../java/client/utils/class-use/MapUtils.html | 117 -
.../client/utils/class-use/ObjectUtils.html | 117 -
.../java/client/utils/class-use/UrlUtils.html | 117 -
.../java/client/utils/package-frame.html | 23 -
.../java/client/utils/package-summary.html | 147 -
.../java/client/utils/package-tree.html | 133 -
.../usergrid/java/client/utils/package-use.html | 117 -
sdks/java/doc/overview-frame.html | 25 -
sdks/java/doc/overview-summary.html | 147 -
sdks/java/doc/overview-tree.html | 184 -
sdks/java/doc/package-list | 5 -
sdks/java/doc/resources/background.gif | Bin 2313 -> 0 bytes
sdks/java/doc/resources/tab.gif | Bin 291 -> 0 bytes
sdks/java/doc/resources/titlebar.gif | Bin 10701 -> 0 bytes
sdks/java/doc/resources/titlebar_end.gif | Bin 849 -> 0 bytes
sdks/java/doc/serialized-form.html | 134 -
sdks/java/doc/stylesheet.css | 474 -
sdks/java/pom.xml | 21 +-
sdks/nodejs/.gitignore | 2 -
sdks/nodejs/.npmignore | 1 -
sdks/nodejs/lib/usergrid.js | 195 +-
sdks/nodejs/test.js | 17 +
sdks/nodejs/test/client.js | 18 +
sdks/nodejs/test/collection.js | 17 +
sdks/nodejs/test/entity.js | 17 +
sdks/perl/Build.PL | 46 +
sdks/perl/LICENSE | 202 +
sdks/perl/MANIFEST | 23 +
sdks/perl/Makefile.PL | 41 +
sdks/perl/README.md | 341 +
sdks/perl/examples/books.pl | 48 +
sdks/perl/lib/Usergrid/Client.pm | 492 +
sdks/perl/lib/Usergrid/Collection.pm | 212 +
sdks/perl/lib/Usergrid/Entity.pm | 92 +
sdks/perl/lib/Usergrid/Request.pm | 249 +
sdks/perl/t/01_init.t | 27 +
sdks/perl/t/02_login.t | 64 +
sdks/perl/t/03_update.t | 102 +
sdks/perl/t/04_collection.t | 104 +
sdks/perl/t/05_query.t | 108 +
sdks/perl/t/06_batch_update.t | 107 +
sdks/perl/t/07_batch_delete.t | 87 +
sdks/perl/t/08_connections.t | 94 +
sdks/perl/t/09_paging.t | 140 +
sdks/perl/t/10_auto_paging.t | 94 +
sdks/php/kessel/config.ini | 18 -
sdks/php/kessel/kessel.rb | 188 -
sdks/ruby-on-rails/.gitignore | 18 -
sdks/ruby-on-rails/.rspec | 1 -
sdks/ruby-on-rails/.rvmrc | 2 -
sdks/usergrid-java-sdk-0.0.6/README.txt | 5 +
sdks/usergrid-java-sdk-0.0.6/pom.xml | 114 +
.../java/org/usergrid/java/client/Client.java | 1292 +
.../usergrid/java/client/entities/Activity.java | 626 +
.../usergrid/java/client/entities/Device.java | 68 +
.../usergrid/java/client/entities/Entity.java | 191 +
.../usergrid/java/client/entities/Group.java | 79 +
.../usergrid/java/client/entities/Message.java | 148 +
.../org/usergrid/java/client/entities/User.java | 158 +
.../java/client/exception/ClientException.java | 42 +
.../java/client/response/AggregateCounter.java | 52 +
.../client/response/AggregateCounterSet.java | 111 +
.../java/client/response/ApiResponse.java | 421 +
.../client/response/ClientCredentialsInfo.java | 58 +
.../java/client/response/QueueInfo.java | 44 +
.../usergrid/java/client/utils/JsonUtils.java | 182 +
.../usergrid/java/client/utils/MapUtils.java | 39 +
.../usergrid/java/client/utils/ObjectUtils.java | 36 +
.../usergrid/java/client/utils/UrlUtils.java | 124 +
stack/README.md | 14 +-
stack/awscluster/aws-sample.properties | 17 +
stack/awscluster/src/main/cql/create_locks.cql | 17 +
.../awscluster/src/main/cql/create_usergrid.cql | 17 +
.../main/cql/create_usergrid_applications.cql | 17 +
.../main/dist/init_instance/init_rest_server.sh | 13 +-
stack/cloudbees.xml | 18 +
.../main/resources/usergrid-default.properties | 29 +-
stack/config/src/test/resources/cassandra.yaml | 25 +-
.../src/test/resources/usergrid-test.properties | 14 +
stack/core/pom.xml | 44 +-
.../java/org/apache/usergrid/batch/Job.java | 12 +-
.../org/apache/usergrid/batch/JobFactory.java | 2 +-
.../usergrid/batch/UsergridJobFactory.java | 6 +-
.../batch/service/JobSchedulerService.java | 302 +-
.../corepersistence/CpEntityManager.java | 54 +-
.../corepersistence/CpEntityMapUtils.java | 2 +-
.../corepersistence/CpRelationManager.java | 63 +-
.../apache/usergrid/metrics/MetricsFactory.java | 8 -
.../java/org/apache/usergrid/mq/Message.java | 10 +-
.../usergrid/mq/cassandra/QueueManagerImpl.java | 38 +-
.../mq/cassandra/io/AbstractSearch.java | 5 +-
.../mq/cassandra/io/ConsumerTransaction.java | 12 +-
.../usergrid/persistence/CredentialsInfo.java | 13 +-
.../apache/usergrid/persistence/EntityRef.java | 1 -
.../persistence/ObservableIterator.java | 82 +
.../apache/usergrid/persistence/PathQuery.java | 8 +-
.../usergrid/persistence/SimpleEntityRef.java | 36 +-
.../cassandra/CassandraPersistenceUtils.java | 9 +-
.../persistence/cassandra/CassandraService.java | 137 +-
.../cassandra/EntityManagerFactoryImpl.java | 5 +-
.../cassandra/EntityManagerImpl.java | 58 +-
.../persistence/cassandra/GeoIndexManager.java | 21 +-
.../persistence/cassandra/QueryProcessor.java | 3 +-
.../cassandra/RelationManagerImpl.java | 55 +-
.../persistence/cassandra/Serializers.java | 14 +-
.../persistence/hector/CountingMutator.java | 344 +
.../usergrid/persistence/query/ir/AllNode.java | 12 +
.../persistence/query/ir/BooleanNode.java | 16 +
.../query/ir/EmailIdentifierNode.java | 12 +
.../query/ir/NameIdentifierNode.java | 12 +
.../usergrid/persistence/query/ir/NotNode.java | 12 +
.../persistence/query/ir/OrderByNode.java | 16 +-
.../persistence/query/ir/QueryNode.java | 12 +
.../persistence/query/ir/SliceNode.java | 12 +
.../query/ir/UuidIdentifierNode.java | 12 +
.../persistence/query/ir/WithinNode.java | 12 +
.../query/ir/result/SubtractionIterator.java | 8 +-
.../org/apache/usergrid/utils/JsonUtils.java | 8 +-
.../org/apache/usergrid/utils/UUIDUtils.java | 11 +
.../main/resources/usergrid-core-context.xml | 2 +-
.../apache/usergrid/batch/BulkTestUtils.java | 10 +-
.../usergrid/batch/UsergridJobFactoryTest.java | 3 +-
.../usergrid/batch/job/CountdownLatchJob.java | 6 +
.../usergrid/batch/job/DelayExecution.java | 6 +
.../usergrid/batch/job/DelayHeartbeat.java | 6 +
.../batch/job/FailureJobExceuction.java | 74 -
.../usergrid/batch/job/FailureJobExecution.java | 87 +
.../usergrid/batch/job/OnlyOnceExceution.java | 6 +
.../job/OnlyOnceUnlockOnFailExceution.java | 6 +
.../usergrid/batch/job/SchedulerRuntime1IT.java | 5 +-
.../usergrid/batch/job/SchedulerRuntime2IT.java | 61 +-
.../usergrid/batch/job/SchedulerRuntime3IT.java | 39 +-
.../usergrid/batch/job/SchedulerRuntime4IT.java | 11 +-
.../usergrid/batch/job/SchedulerRuntime5IT.java | 4 +-
.../usergrid/batch/job/SchedulerRuntime6IT.java | 14 +-
.../usergrid/batch/job/SchedulerRuntime7IT.java | 14 +-
.../usergrid/batch/job/SchedulerRuntime8IT.java | 4 +-
.../batch/job/SchedulerRuntimeIntervalIT.java | 115 +
.../usergrid/batch/job/TestJobListener.java | 67 +-
.../usergrid/batch/job/TestJobListenerTest.java | 7 +-
.../corepersistence/CpEntityMapUtilsTest.java | 119 +
.../usergrid/persistence/CollectionIT.java | 66 +
.../usergrid/persistence/CountingMutatorIT.java | 119 +
.../org/apache/usergrid/persistence/GeoIT.java | 95 +-
.../persistence/GeoQueryBooleanTest.java | 190 +
.../apache/usergrid/persistence/IndexIT.java | 21 +-
.../usergrid/persistence/PathQueryIT.java | 4 +-
.../cassandra/QueryProcessorTest.java | 93 +-
.../query/IntersectionTransitivePagingIT.java | 163 +
.../query/IntersectionUnionPagingIT.java | 4 +-
.../persistence/query/NotSubPropertyIT.java | 177 +
stack/core/src/test/resources/cassandra.yaml | 17 +
.../core/src/test/resources/project.properties | 24 +-
.../resources/usergrid-properties-context.xml | 17 +
.../usergrid-scheduler-test.properties | 20 +-
.../test/resources/usergrid-test-context.xml | 16 +
.../exception/CollectionRuntimeException.java | 1 -
.../exception/WriteUniqueVerifyException.java | 18 -
.../mvcc/entity/impl/MvccLogEntryImpl.java | 3 +-
.../UniqueValueSerializationStrategyImpl.java | 2 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 7 +-
.../MvccEntitySerializationStrategyImpl.java | 25 +-
.../collection/guice/TestModule.java | 2 +
.../mvcc/stage/delete/MarkStartTest.java | 3 +
.../collection/mvcc/stage/load/LoadTest.java | 7 +
...MvccEntitySerializationStrategyImplTest.java | 13 +-
.../collection/util/InvalidIdGenerator.java | 14 -
.../src/test/resources/usergrid-UNIT.properties | 1 +
.../core/astyanax/ColumnNameIterator.java | 27 +-
.../persistence/core/astyanax/ColumnSearch.java | 46 +
.../persistence/core/astyanax/ColumnTypes.java | 3 +
.../astyanax/MultiKeyColumnNameIterator.java | 235 +
.../core/astyanax/MultiRowColumnIterator.java | 253 +
.../core/astyanax/MultiTennantColumnFamily.java | 13 +-
.../core/hystrix/HystrixCassandra.java | 73 +-
.../persistence/core/rx/ObservableIterator.java | 2 +-
.../persistence/core/rx/OrderedMerge.java | 194 +-
.../core/scope/ApplicationScopeImpl.java | 3 +-
.../persistence/core/util/ValidationUtils.java | 2 +-
.../core/astyanax/ColumnNameIteratorTest.java | 205 +
.../MultiKeyColumnNameIteratorTest.java | 330 +
.../astyanax/MultiRowColumnIteratorTest.java | 502 +
.../persistence/core/astyanax/TestUtils.java | 76 +
.../core/cassandra/CassandraRule.java | 24 +-
.../persistence/core/rx/OrderedMergeTest.java | 146 +-
.../common/src/test/resources/log4j.properties | 39 +
.../src/test/resources/usergrid-UNIT.properties | 14 +
.../src/test/resources/usergrid.properties | 1 +
stack/corepersistence/graph/pom.xml | 7 +
.../apache/usergrid/persistence/graph/Edge.java | 1 -
.../usergrid/persistence/graph/GraphFig.java | 90 +-
.../persistence/graph/SearchByEdge.java | 8 +-
.../persistence/graph/SearchByEdgeType.java | 18 +-
.../persistence/graph/guice/GraphModule.java | 51 +-
.../persistence/graph/guice/MergedProxy.java | 34 -
.../graph/guice/StorageEdgeSerialization.java | 34 -
.../graph/impl/CollectionIndexObserver.java | 2 +-
.../graph/impl/GraphManagerImpl.java | 54 +-
.../persistence/graph/impl/SimpleEdge.java | 7 +-
.../graph/impl/SimpleMarkedEdge.java | 4 +-
.../graph/impl/SimpleSearchByEdge.java | 20 +-
.../graph/impl/SimpleSearchByEdgeType.java | 22 +-
.../graph/impl/SimpleSearchByIdType.java | 6 +-
.../impl/stage/EdgeDeleteListenerImpl.java | 3 -
.../graph/impl/stage/EdgeDeleteRepairImpl.java | 16 +-
.../graph/impl/stage/EdgeMetaRepair.java | 2 -
.../graph/impl/stage/EdgeMetaRepairImpl.java | 67 +-
.../impl/stage/NodeDeleteListenerImpl.java | 26 +-
.../EdgeMetadataSerialization.java | 3 +-
.../graph/serialization/EdgeSerialization.java | 3 +-
.../graph/serialization/NodeSerialization.java | 3 +-
.../impl/EdgeMetadataSerializationImpl.java | 8 +-
.../impl/EdgeSerializationImpl.java | 1037 +-
.../impl/NodeSerializationImpl.java | 86 +-
.../serialization/impl/shard/DirectedEdge.java | 41 +
.../impl/shard/DirectedEdgeMeta.java | 575 +
.../impl/shard/EdgeColumnFamilies.java | 60 +
.../serialization/impl/shard/EdgeRowKey.java | 44 +
.../impl/shard/EdgeShardSerialization.java | 24 +-
.../impl/shard/EdgeShardStrategy.java | 45 +-
.../impl/shard/NodeShardAllocation.java | 21 +-
.../impl/shard/NodeShardApproximation.java | 31 +-
.../impl/shard/NodeShardCache.java | 21 +-
.../serialization/impl/shard/NodeType.java | 66 +
.../graph/serialization/impl/shard/RowKey.java | 55 +
.../serialization/impl/shard/RowKeyType.java | 66 +
.../graph/serialization/impl/shard/Shard.java | 143 +
.../impl/shard/ShardEntryGroup.java | 324 +
.../impl/shard/ShardGroupCompaction.java | 71 +
.../impl/shard/ShardedEdgeSerialization.java | 186 +
.../serialization/impl/shard/count/Counter.java | 8 +-
.../shard/count/NodeShardApproximationImpl.java | 177 +-
.../count/NodeShardCounterSerialization.java | 2 +-
.../NodeShardCounterSerializationImpl.java | 98 +-
.../impl/shard/count/ShardKey.java | 53 +-
.../impl/shard/impl/EdgeRowKey.java | 46 -
.../impl/shard/impl/EdgeRowKeySerializer.java | 58 -
.../impl/shard/impl/EdgeSearcher.java | 162 +
.../shard/impl/EdgeShardSerializationImpl.java | 90 +-
.../shard/impl/NodeShardAllocationImpl.java | 288 +-
.../impl/shard/impl/NodeShardCacheImpl.java | 254 +-
.../shard/impl/ShardEntryGroupIterator.java | 123 +
.../shard/impl/ShardGroupColumnIterator.java | 130 +
.../shard/impl/ShardGroupCompactionImpl.java | 618 +
.../impl/ShardedEdgeSerializationImpl.java | 1006 +
.../impl/shard/impl/ShardsColumnIterator.java | 127 +
.../shard/impl/SizebasedEdgeColumnFamilies.java | 154 +
.../shard/impl/SizebasedEdgeShardStrategy.java | 51 +-
.../impl/shard/impl/SourceEdgeSearcher.java | 22 +
.../DescendingTimestampComparator.java | 43 +
.../DirectedEdgeDescendingComparator.java | 69 +
.../impl/comparators/OrderedComparator.java | 52 +
.../SourceDirectedEdgeDescendingComparator.java | 42 +
.../TargetDirectedEdgeDescendingComparator.java | 42 +
.../impl/serialize/EdgeRowKeySerializer.java | 63 +
.../shard/impl/serialize/EdgeSerializer.java | 77 +
.../serialize/EdgeShardRowKeySerializer.java | 103 +
.../shard/impl/serialize/RowSerializer.java | 63 +
.../shard/impl/serialize/RowTypeSerializer.java | 62 +
.../graph/serialization/util/EdgeHasher.java | 86 -
.../graph/serialization/util/EdgeUtils.java | 132 -
.../serialization/util/GraphValidation.java | 189 +
.../graph/ComittedGraphManagerIT.java | 138 -
.../graph/CommittedGraphManagerIT.java | 135 +
.../persistence/graph/GraphManagerIT.java | 3 -
.../persistence/graph/GraphManagerLoadTest.java | 7 +-
.../graph/GraphManagerShardConsistencyIT.java | 563 +
.../graph/GraphManagerShardingIT.java | 48 +-
.../graph/GraphManagerStressTest.java | 9 +-
.../usergrid/persistence/graph/SimpleTest.java | 18 +-
.../graph/StorageGraphManagerIT.java | 2 +-
.../graph/impl/EdgeDeleteListenerTest.java | 4 +-
.../graph/impl/NodeDeleteListenerTest.java | 2 -
.../graph/impl/stage/EdgeDeleteRepairTest.java | 7 +-
.../graph/impl/stage/EdgeMetaRepairTest.java | 2 -
.../EdgeMetadataSerializationTest.java | 2 +-
.../EdgeSerializationChopTest.java | 7 +-
.../serialization/NodeSerializationTest.java | 3 +-
.../PermanentSerializationTest.java | 3 -
.../graph/serialization/TestCount.java | 1 -
.../impl/shard/EdgeShardSerializationTest.java | 108 +-
.../impl/shard/NodeShardAllocationTest.java | 620 +-
.../impl/shard/NodeShardCacheTest.java | 235 +-
.../impl/shard/ShardEntryGroupTest.java | 409 +
.../impl/shard/ShardGroupCompactionTest.java | 226 +
.../shard/count/NodeShardApproximationTest.java | 130 +-
.../NodeShardCounterSerializationTest.java | 8 +-
.../shard/impl/ShardEntryGroupIteratorTest.java | 276 +
...rceDirectedEdgeDescendingComparatorTest.java | 136 +
...getDirectedEdgeDescendingComparatorTest.java | 136 +
.../serialization/util/EdgeHasherTest.java | 501 -
.../graph/test/util/EdgeTestUtils.java | 12 +-
.../graph/src/test/resources/log4j.properties | 1 +
.../test/resources/usergrid-SHARD.properties | 23 +
.../src/test/resources/usergrid-UNIT.properties | 3 +
.../persistence/model/entity/Entity.java | 2 +-
.../persistence/model/field/AbstractField.java | 2 +-
.../persistence/model/field/ArrayField.java | 4 +
.../usergrid/persistence/model/field/Field.java | 2 +-
.../persistence/model/field/SetField.java | 1 +
.../model/field/value/EntityObject.java | 12 +-
.../persistence/model/entity/SimpleIdTest.java | 73 +
.../model/src/test/resources/log4j.properties | 29 +
stack/corepersistence/pom.xml | 4 +-
.../src/main/java/CpQueryFilter.tokens | 47 +
.../usergrid/persistence/index/query/Query.java | 19 +-
.../persistence/index/utils/JsonUtils.java | 329 -
.../persistence/index/impl/EntityIndexTest.java | 19 +
.../src/test/resources/log4j.properties | 6 +-
.../apache/usergrid/launcher/AppleUtils.java | 21 +-
.../launcher/src/main/resources/cassandra.yaml | 25 +-
.../1.5.4/AppleJavaExtensions-1.5.4.jar | Bin 23531 -> 0 bytes
.../1.5.4/AppleJavaExtensions-1.5.4.pom | 9 -
.../maven-metadata-local.xml | 12 -
.../recaptcha4j/0.0.8/recaptcha4j-0.0.8.jar | Bin 10344 -> 0 bytes
.../recaptcha4j/0.0.8/recaptcha4j-0.0.8.pom | 9 -
.../recaptcha4j/maven-metadata-local.xml | 12 -
.../0.0.3/usergrid-java-client-0.0.3.jar | Bin 45750 -> 0 bytes
.../usergrid-java-client-0.0.3.jar.lastUpdated | 5 -
.../0.0.3/usergrid-java-client-0.0.3.jar.sha1 | 1 -
.../0.0.3/usergrid-java-client-0.0.3.pom | 87 -
.../usergrid-java-client-0.0.3.pom.lastUpdated | 5 -
.../0.0.3/usergrid-java-client-0.0.3.pom.sha1 | 1 -
.../maven-metadata-local.xml | 13 -
stack/mongo-emulator/pom.xml | 2 +-
.../test/resources/usergrid-test-context.xml | 78 +-
stack/pom.xml | 69 +-
stack/query-validator/pom.xml | 2 +-
.../test/resources/usergrid-test-context.xml | 3 +-
stack/rest/pom.xml | 29 +-
.../exceptions/JsonParseExceptionMapper.java | 35 +
.../apache/usergrid/rest/AbstractRestIT.java | 11 +
.../applications/users/MatrixQueryTests.java | 202 +
.../users/PermissionsResourceIT.java | 1 +
.../rest/applications/utils/UserRepo.java | 9 +
.../rest/management/ExportResourceIT.java | 131 +-
.../rest/test/resource/MatrixResource.java | 64 +
.../rest/test/resource/NamedResource.java | 5 +
.../rest/test/resource/SetResource.java | 12 +
.../rest/test/resource/ValueResource.java | 18 +-
.../resources/usergrid-properties-context.xml | 17 +
.../resources/usergrid-rest-deploy-context.xml | 16 +
.../test/resources/usergrid-test-context.xml | 16 +
stack/services/pom.xml | 10 +-
.../management/AccountCreationProps.java | 6 +-
.../cassandra/ManagementServiceImpl.java | 8 +-
.../usergrid/management/export/ExportJob.java | 6 +
.../management/export/ExportServiceImpl.java | 5 +
.../usergrid/services/ServiceRequest.java | 11 +-
.../apache/usergrid/management/EmailFlowIT.java | 17 +-
.../usergrid/management/OrganizationIT.java | 2 +
.../resources/usergrid-properties-context.xml | 17 +
stack/test-utils/pom.xml | 2 +-
.../src/main/resources/cassandra.yaml | 25 +-
.../src/test/resources/project.properties | 21 +-
.../resources/usergrid-custom-test.properties | 16 +
.../resources/usergrid-properties-context.xml | 17 +
stack/tools/pom.xml | 2 +-
.../org/apache/usergrid/tools/AppNameFix.java | 59 +-
.../RepairingMismatchedApplicationMetadata.java | 92 +-
.../src/main/resources/apidoc/applications.yaml | 21 +-
.../src/main/resources/apidoc/management.yaml | 21 +-
stack/tools/src/main/resources/log4j.properties | 45 +
stack/websocket/pom.xml | 2 +-
ugc/features/step_definitions/ugc_steps.rb | 23 +-
ugc/features/support/env.rb | 23 +-
ugc/lib/ugc.rb | 23 +-
ugc/lib/ugc/application.rb | 23 +-
ugc/lib/ugc/commands/delete.rb | 23 +-
ugc/lib/ugc/commands/get.rb | 23 +-
ugc/lib/ugc/commands/logout.rb | 16 +
ugc/lib/ugc/commands/post.rb | 23 +-
ugc/lib/ugc/commands/profile.rb | 23 +-
ugc/lib/ugc/commands/put.rb | 23 +-
ugc/lib/ugc/commands/query.rb | 23 +-
ugc/lib/ugc/commands/target.rb | 23 +-
ugc/lib/ugc/helpers/curl.rb | 23 +-
ugc/lib/ugc/helpers/format.rb | 23 +-
ugc/lib/ugc/helpers/history.rb | 23 +-
ugc/lib/ugc/helpers/parse.rb | 23 +-
ugc/lib/ugc/helpers/rest.rb | 23 +-
ugc/lib/ugc/management.rb | 23 +-
ugc/lib/ugc/settings.rb | 23 +-
ugc/lib/ugc/version.rb | 23 +-
ugc/test/default_test.rb | 23 +-
ugc/test/test_helper.rb | 23 +-
928 files changed, 28111 insertions(+), 168084 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d8dd2f6/stack/core/pom.xml
----------------------------------------------------------------------
diff --cc stack/core/pom.xml
index 899d30e,709d9aa..33a0ca4
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@@ -545,22 -545,43 +544,53 @@@
<version>2.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.usergrid.chop</groupId>
+ <artifactId>chop-stack</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ -->
+
<dependency>
- <groupId>org.apache.usergrid.chop</groupId>
- <artifactId>chop-stack</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>-->
+ <groupId>com.codahale.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <version>${metrics.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.codahale.metrics</groupId>
+ <artifactId>metrics-graphite</artifactId>
+ <version>${metrics.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.netflix.rxjava</groupId>
+ <artifactId>rxjava-core</artifactId>
+ <version>${rx.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.netflix.rxjava</groupId>
+ <artifactId>rxjava-math</artifactId>
+ <version>${rx.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.clearspring.analytics</groupId>
+ <artifactId>stream</artifactId>
+ <version>2.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.codahale.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <version>${metrics.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.codahale.metrics</groupId>
+ <artifactId>metrics-graphite</artifactId>
+ <version>${metrics.version}</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d8dd2f6/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index 4640fba,7e1f199..b27a61d
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@@ -410,13 -411,13 +411,13 @@@ public class CpEntityManager implement
EntityCollectionManager ecm = managerCache.getEntityCollectionManager( collectionScope );
- if ( !UUIDUtils.isTimeBased( id.getUuid() ) ) {
- throw new IllegalArgumentException(
- "Entity Id " + id.getType() + ":"+ id.getUuid() +" uuid not time based");
- }
+ // if ( !UUIDUtils.isTimeBased( id.getUuid() ) ) {
+ // throw new IllegalArgumentException(
+ // "Entity Id " + id.getType() + ":"+ id.getUuid() +" uuid not time based");
+ // }
org.apache.usergrid.persistence.model.entity.Entity cpEntity =
- ecm.load( id ).toBlockingObservable().last();
+ ecm.load( id ).toBlocking().last();
if ( cpEntity == null ) {
if ( logger.isDebugEnabled() ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d8dd2f6/stack/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d8dd2f6/stack/services/pom.xml
----------------------------------------------------------------------