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/08/26 20:02:47 UTC
[59/61] [abbrv] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5e938f7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5e938f7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5e938f7f
Branch: refs/heads/two-dot-o
Commit: 5e938f7f457e887ad47369c8e43ad8789e641b97
Parents: 314b0e5 13bd549
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Aug 26 13:49:32 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Aug 26 13:49:32 2014 -0400
----------------------------------------------------------------------
.gitignore | 4 +-
DISCLAIMER | 9 +
portal/Gruntfile.js | 32 +-
portal/build.sh | 1 +
portal/config.js | 20 +
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 +
portal/js/data/display-groups.html | 16 +
portal/js/users/users-tabs.html | 17 +-
portal/package.json | 2 +-
portal/scripts/e2e-test.bat | 15 +
portal/scripts/e2e-test.sh | 1 +
portal/scripts/test.bat | 15 +
portal/scripts/test.sh | 1 +
portal/scripts/watchr.rb | 15 +
portal/scripts/web-server.js | 19 +
portal/server.js | 19 +
portal/tests/karma.conf.js | 19 +
portal/tests/protractor-ignore/profile.spec.js | 20 +
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/roles.spec.js | 20 +
portal/tests/protractor/shell.spec.js | 20 +
portal/tests/protractor/users.spec.js | 20 +
portal/tests/protractor/util.js | 20 +
portal/tests/protractorConf.js | 20 +-
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 | 6 +-
release/sign-release.sh | 30 +-
release/src/main/assembly/source.xml | 3 +-
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 | 85 -
.../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 | 28 -
sdks/android/pom.xml | 18 +
.../LocationDotNetSample/Form1.cs | 18 +-
sdks/html5-javascript/examples/all-calls/app.js | 19 +-
sdks/html5-javascript/examples/dogs/app.js | 17 +
sdks/html5-javascript/examples/facebook/app.js | 17 +
.../examples/persistence/test.js | 17 +
.../extensions/usergrid.validation.js | 34 +-
sdks/html5-javascript/tests/mocha/test.js | 17 +
sdks/html5-javascript/tests/qunit/tests.js | 17 +
sdks/html5-javascript/tests/test.js | 17 +
sdks/ios/Nukefile | 17 +
.../samples/Books/books/AddBookViewController.h | 17 +
.../samples/Books/books/AddBookViewController.m | 17 +
sdks/ios/samples/Books/books/AppDelegate.h | 17 +
sdks/ios/samples/Books/books/AppDelegate.m | 17 +
.../samples/Books/books/BooksViewController.h | 17 +
.../samples/Books/books/BooksViewController.m | 17 +
.../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.m | 17 +
.../Browser/browser/UGAppViewController.m | 17 +
.../browser/UGCollectionViewController.m | 17 +
.../Browser/browser/UGEntityViewController.m | 17 +
.../Browser/browser/UGSignInViewController.m | 17 +
.../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.m | 17 +
.../parties/parties/PartiesViewController.m | 17 +
.../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 | 85 -
.../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/nodejs/.gitignore | 2 -
sdks/nodejs/.npmignore | 1 -
sdks/nodejs/lib/usergrid.js | 37 +-
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/.travis.yml | 1 -
sdks/perl/Build.PL | 16 +
sdks/perl/Makefile.PL | 16 +
sdks/perl/examples/books.pl | 16 +
sdks/perl/t/01_init.t | 16 +
sdks/perl/t/02_login.t | 16 +
sdks/perl/t/03_update.t | 16 +
sdks/perl/t/04_collection.t | 16 +
sdks/perl/t/05_query.t | 16 +
sdks/perl/t/06_batch_update.t | 16 +
sdks/perl/t/07_batch_delete.t | 16 +
sdks/perl/t/08_connections.t | 16 +
sdks/perl/t/09_paging.t | 16 +
sdks/perl/t/10_auto_paging.t | 16 +
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 | 12 +-
.../main/resources/usergrid-default.properties | 22 +-
stack/config/src/test/resources/cassandra.yaml | 25 +-
.../src/test/resources/usergrid-test.properties | 21 +-
stack/core/pom.xml | 1 +
.../usergrid/persistence/query/tree/.gitignore | 2 -
.../usergrid/batch/job/SchedulerRuntime3IT.java | 1 -
stack/core/src/test/resources/cassandra.yaml | 16 +-
.../core/src/test/resources/project.properties | 14 +
.../usergrid-scheduler-test.properties | 15 +
stack/java-sdk-old/doc/allclasses-frame.html | 85 -
stack/java-sdk-old/doc/allclasses-noframe.html | 85 -
stack/java-sdk-old/doc/constant-values.html | 732 ------
stack/java-sdk-old/doc/deprecated-list.html | 146 --
stack/java-sdk-old/doc/help-doc.html | 223 --
stack/java-sdk-old/doc/index-files/index-1.html | 209 --
.../java-sdk-old/doc/index-files/index-10.html | 151 --
.../java-sdk-old/doc/index-files/index-11.html | 154 --
.../java-sdk-old/doc/index-files/index-12.html | 151 --
.../java-sdk-old/doc/index-files/index-13.html | 217 --
.../java-sdk-old/doc/index-files/index-14.html | 268 --
.../java-sdk-old/doc/index-files/index-15.html | 204 --
.../java-sdk-old/doc/index-files/index-16.html | 151 --
.../java-sdk-old/doc/index-files/index-17.html | 466 ----
.../java-sdk-old/doc/index-files/index-18.html | 184 --
.../java-sdk-old/doc/index-files/index-19.html | 157 --
stack/java-sdk-old/doc/index-files/index-2.html | 193 --
.../java-sdk-old/doc/index-files/index-20.html | 239 --
.../java-sdk-old/doc/index-files/index-21.html | 154 --
stack/java-sdk-old/doc/index-files/index-3.html | 161 --
stack/java-sdk-old/doc/index-files/index-4.html | 166 --
stack/java-sdk-old/doc/index-files/index-5.html | 151 --
stack/java-sdk-old/doc/index-files/index-6.html | 547 ----
stack/java-sdk-old/doc/index-files/index-7.html | 145 --
stack/java-sdk-old/doc/index-files/index-8.html | 160 --
stack/java-sdk-old/doc/index-files/index-9.html | 145 --
stack/java-sdk-old/doc/index.html | 39 -
.../usergrid/android/client/Client.Query.html | 247 --
.../android/client/Client.QueuePosition.html | 398 ---
.../doc/org/usergrid/android/client/Client.html | 2389 ------------------
.../client/callbacks/ApiResponseCallback.html | 221 --
.../client/callbacks/ClientAsyncTask.html | 281 --
.../client/callbacks/ClientCallback.html | 228 --
.../callbacks/DeviceRegistrationCallback.html | 221 --
.../callbacks/GroupsRetrievedCallback.html | 221 --
.../client/callbacks/QueryResultsCallback.html | 221 --
.../class-use/ApiResponseCallback.html | 328 ---
.../callbacks/class-use/ClientAsyncTask.html | 144 --
.../callbacks/class-use/ClientCallback.html | 218 --
.../class-use/DeviceRegistrationCallback.html | 182 --
.../class-use/GroupsRetrievedCallback.html | 181 --
.../class-use/QueryResultsCallback.html | 266 --
.../android/client/callbacks/package-frame.html | 51 -
.../client/callbacks/package-summary.html | 187 --
.../android/client/callbacks/package-tree.html | 162 --
.../android/client/callbacks/package-use.html | 207 --
.../android/client/class-use/Client.Query.html | 306 ---
.../client/class-use/Client.QueuePosition.html | 222 --
.../android/client/class-use/Client.html | 204 --
.../entities/Activity.ActivityCollection.html | 412 ---
.../entities/Activity.ActivityObject.html | 868 -------
.../client/entities/Activity.MediaLink.html | 450 ----
.../android/client/entities/Activity.html | 1790 -------------
.../android/client/entities/Device.html | 402 ---
.../android/client/entities/Entity.html | 586 -----
.../usergrid/android/client/entities/Group.html | 458 ----
.../android/client/entities/Message.html | 756 ------
.../usergrid/android/client/entities/User.html | 850 -------
.../class-use/Activity.ActivityCollection.html | 144 --
.../class-use/Activity.ActivityObject.html | 276 --
.../entities/class-use/Activity.MediaLink.html | 212 --
.../client/entities/class-use/Activity.html | 227 --
.../client/entities/class-use/Device.html | 210 --
.../client/entities/class-use/Entity.html | 635 -----
.../client/entities/class-use/Group.html | 209 --
.../client/entities/class-use/Message.html | 212 --
.../android/client/entities/class-use/User.html | 344 ---
.../android/client/entities/package-frame.html | 48 -
.../client/entities/package-summary.html | 189 --
.../android/client/entities/package-tree.html | 155 --
.../android/client/entities/package-use.html | 293 ---
.../usergrid/android/client/package-frame.html | 54 -
.../android/client/package-summary.html | 185 --
.../usergrid/android/client/package-tree.html | 168 --
.../usergrid/android/client/package-use.html | 201 --
.../client/response/AggregateCounter.html | 333 ---
.../client/response/AggregateCounterSet.html | 511 ----
.../android/client/response/ApiResponse.html | 1576 ------------
.../client/response/ClientCredentialsInfo.html | 333 ---
.../android/client/response/QueueInfo.html | 309 ---
.../response/class-use/AggregateCounter.html | 223 --
.../response/class-use/AggregateCounterSet.html | 196 --
.../client/response/class-use/ApiResponse.html | 434 ----
.../class-use/ClientCredentialsInfo.html | 196 --
.../client/response/class-use/QueueInfo.html | 220 --
.../android/client/response/package-frame.html | 40 -
.../client/response/package-summary.html | 173 --
.../android/client/response/package-tree.html | 153 --
.../android/client/response/package-use.html | 226 --
.../android/client/utils/DeviceUuidFactory.html | 285 ---
.../android/client/utils/JsonUtils.html | 556 ----
.../usergrid/android/client/utils/MapUtils.html | 261 --
.../android/client/utils/ObjectUtils.html | 252 --
.../usergrid/android/client/utils/UrlUtils.html | 332 ---
.../utils/class-use/DeviceUuidFactory.html | 144 --
.../client/utils/class-use/JsonUtils.html | 144 --
.../client/utils/class-use/MapUtils.html | 144 --
.../client/utils/class-use/ObjectUtils.html | 144 --
.../client/utils/class-use/UrlUtils.html | 144 --
.../android/client/utils/package-frame.html | 40 -
.../android/client/utils/package-summary.html | 174 --
.../android/client/utils/package-tree.html | 153 --
.../android/client/utils/package-use.html | 144 --
stack/java-sdk-old/doc/overview-frame.html | 50 -
stack/java-sdk-old/doc/overview-summary.html | 167 --
stack/java-sdk-old/doc/overview-tree.html | 173 --
stack/java-sdk-old/doc/package-list | 5 -
stack/java-sdk-old/doc/resources/inherit.gif | Bin 57 -> 0 bytes
stack/java-sdk-old/doc/stylesheet.css | 29 -
stack/java-sdk-old/pom.xml | 2 +-
.../launcher/src/main/resources/cassandra.yaml | 25 +-
stack/pom.xml | 1 +
.../src/main/resources/cassandra.yaml | 25 +-
.../src/test/resources/project.properties | 21 +-
.../src/main/resources/apidoc/applications.yaml | 21 +-
.../src/main/resources/apidoc/management.yaml | 21 +-
386 files changed, 5377 insertions(+), 61593 deletions(-)
----------------------------------------------------------------------