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/25 19:51:06 UTC
[4/7] git commit: Merge branch 'master' of
https://github.com/apache/incubator-usergrid
Merge branch 'master' of https://github.com/apache/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/314b0e56
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/314b0e56
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/314b0e56
Branch: refs/heads/master
Commit: 314b0e56903a352973b62883dea19d939aeec738
Parents: bda9087 3104739
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Aug 25 15:36:34 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Aug 25 15:36:34 2014 -0400
----------------------------------------------------------------------
.../src/main/java/CpQueryFilter.tokens | 47 +
.../index/query/tree/CpQueryFilterLexer.java | 3123 ++++++++++++++++++
.../index/query/tree/CpQueryFilterParser.java | 2501 ++++++++++++++
stack/java-sdk-old/README.txt | 4 +
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 0 -> 57 bytes
stack/java-sdk-old/doc/stylesheet.css | 29 +
stack/java-sdk-old/pom.xml | 102 +
.../java/org/usergrid/java/client/Client.java | 1261 +++++++
.../usergrid/java/client/entities/Activity.java | 626 ++++
.../usergrid/java/client/entities/Device.java | 69 +
.../usergrid/java/client/entities/Entity.java | 192 ++
.../usergrid/java/client/entities/Group.java | 80 +
.../usergrid/java/client/entities/Message.java | 149 +
.../org/usergrid/java/client/entities/User.java | 159 +
.../java/client/exception/ClientException.java | 42 +
.../java/client/response/AggregateCounter.java | 53 +
.../client/response/AggregateCounterSet.java | 112 +
.../java/client/response/ApiResponse.java | 422 +++
.../client/response/ClientCredentialsInfo.java | 59 +
.../java/client/response/QueueInfo.java | 45 +
.../usergrid/java/client/utils/JsonUtils.java | 181 +
.../usergrid/java/client/utils/MapUtils.java | 40 +
.../usergrid/java/client/utils/ObjectUtils.java | 37 +
.../usergrid/java/client/utils/UrlUtils.java | 125 +
.../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 | 28 -
.../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 | 28 -
.../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 | 29 -
stack/pom.xml | 4 +-
stack/rest/pom.xml | 40 +-
.../exceptions/JsonParseExceptionMapper.java | 35 +
147 files changed, 40848 insertions(+), 228 deletions(-)
----------------------------------------------------------------------