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/03/27 22:22:03 UTC
[49/50] [abbrv] git commit: Merge branch 'two-dot-o' of
https://github.com/usergrid/usergrid into binary_serialization
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization
# By Todd Nine (30) and others
# Via Todd Nine (10) and others
* 'two-dot-o' of https://github.com/usergrid/usergrid: (80 commits)
Use 2.0.0-SNAPSHOT version in Core Persistence too.
Updated tests. Need to figure a work around for Mockito
Updated Cassandra to Resolve issue
Put queryindex classes all under one top-level "index" package to eliminate conflict with old persistence classes.
Put queryindex classes all under one top-level "index" package to eliminate conflict with old persistence classes.
Merge with hystrix. Added debug logging
Merged hystrix into asyncqueue
Change version to 2.0.0-SNAPSHOT so modules do not conflict with old Usergrid modules in the repo.
Add license headers to awscluster files.
Fixing invalid JSON, comments not allowed (see http://rfc7159.net/rfc7159).
Removed logging because it was really verbose
Fixed reset counter
Updated wait script. Count was incorrect.
Added token calculation on startup
Update README.md
Update README.md
Added @Ignore tag to all integration tests.
Removed scheduler to instead use the default RX scheduler.
Added Counters section to readme
tweaking formatting in readme
...
Conflicts:
stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/JsonUtils.java
stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/CorePerformanceIT.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/5a1bcb97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5a1bcb97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5a1bcb97
Branch: refs/pull/77/merge
Commit: 5a1bcb977d1cbd5cfdb7baab556dd4af116020a3
Parents: 269100c 9caf38b
Author: grey <gr...@apigee.com>
Authored: Thu Mar 27 14:18:13 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Thu Mar 27 14:18:13 2014 -0700
----------------------------------------------------------------------
LICENSE | 65 +-
NOTICE | 11 +
README.md | 64 +-
portal/config.js | 11 +-
portal/index-debug.html | 18 +-
portal/index-template.html | 2 +-
portal/index.html | 18 +-
portal/js/app.js | 7 +-
portal/js/global/page-controller.js | 58 +-
portal/js/global/page-title.html | 2 +-
portal/js/global/ug-service.js | 74 +-
portal/js/libs/usergrid-libs.min.js | 22 +-
portal/js/libs/usergrid.sdk.js | 5 +
portal/js/login/forgot-password-controller.js | 1 -
portal/js/login/login-controller.js | 8 +-
portal/js/login/login.html | 6 +
portal/js/menus/appMenu.html | 7 +-
portal/js/menus/menu-directives.js | 1 -
portal/js/org-overview/org-overview.html | 4 +-
portal/js/templates.js | 57 +-
portal/js/usergrid-dev.min.js | 171 +-
portal/js/usergrid.min.js | 12 +-
portal/js/users/users-feed-controller.js | 29 +
portal/js/users/users-feed.html | 27 +
portal/js/users/users.html | 1 +
portal/package.json | 5 +-
portal/phantomjsdriver.log | 3869 ------------------
portal/seleniumLog.txt | 0
portal/tests/unit/sample.spec.js | 3 +-
sdks/html5-javascript/README.md | 206 +-
sdks/html5-javascript/changelog.md | 10 +-
sdks/html5-javascript/lib/Usergrid.js | 13 +-
sdks/html5-javascript/lib/modules/Asset.js | 4 +-
sdks/html5-javascript/lib/modules/Client.js | 74 +-
sdks/html5-javascript/lib/modules/Folder.js | 4 +-
sdks/html5-javascript/package.json | 2 +-
sdks/html5-javascript/tests/mocha/test.js | 25 +
sdks/html5-javascript/usergrid.js | 36 +-
sdks/html5-javascript/usergrid.min.js | 6 +-
sdks/ios/UGAPI/UGActivity.h | 17 +
sdks/ios/UGAPI/UGActivity.m | 17 +
sdks/ios/UGAPI/UGClient.h | 17 +
sdks/ios/UGAPI/UGClient.m | 17 +
sdks/ios/UGAPI/UGClientDelegate.h | 17 +
sdks/ios/UGAPI/UGClientResponse.h | 17 +
sdks/ios/UGAPI/UGClientResponse.m | 17 +
sdks/ios/UGAPI/UGHTTPManager.h | 17 +
sdks/ios/UGAPI/UGHTTPManager.m | 17 +
sdks/ios/UGAPI/UGMultiStepAction.h | 17 +
sdks/ios/UGAPI/UGMultiStepAction.m | 17 +
sdks/ios/UGAPI/UGQuery.h | 17 +
sdks/ios/UGAPI/UGQuery.m | 17 +
sdks/ios/UGAPI/UGUser.h | 17 +
sdks/ios/UGAPI/UGUser.m | 23 +-
sdks/ios/UGAPIApp/UGAPIApp-Prefix.pch | 17 +
sdks/ios/UGAPIApp/UGAppAppDelegate.h | 23 +-
sdks/ios/UGAPIApp/UGAppAppDelegate.m | 23 +-
sdks/ios/UGAPIApp/UGAppViewController.h | 23 +-
sdks/ios/UGAPIApp/UGAppViewController.m | 23 +-
sdks/ios/UGAPIApp/main.m | 23 +-
sdks/ios/UGAPIAppTests/UGAPIAppTests.h | 23 +-
sdks/ios/UGAPIAppTests/UGAPIAppTests.m | 23 +-
.../lib/usergrid_ironhorse/query.rb | 30 +-
.../lib/usergrid_ironhorse/version.rb | 2 +-
.../spec/usergrid_ironhorse/base_spec.rb | 8 +-
sdks/ruby-on-rails/usergrid_ironhorse.gemspec | 4 +-
stack/awscluster/assembly.xml | 70 +-
stack/awscluster/pom.xml | 16 +
.../src/main/dist/init_instance/create_raid0.sh | 18 +
.../main/dist/init_instance/init_db_server.sh | 19 +
.../main/dist/init_instance/init_rest_server.sh | 19 +
.../dist/init_instance/install_cassandra.sh | 19 +
.../dist/init_instance/install_elasticsearch.sh | 19 +
.../dist/init_instance/install_oraclejdk.sh | 19 +
stack/awscluster/src/main/dist/update.sh | 18 +
.../src/main/groovy/configure_cassandra.groovy | 71 +-
.../main/groovy/configure_elasticsearch.groovy | 19 +
.../src/main/groovy/configure_portal_new.groovy | 19 +
.../src/main/groovy/configure_priam.groovy | 19 +
.../src/main/groovy/configure_usergrid.groovy | 19 +
.../src/main/groovy/registry_clear.groovy | 19 +
.../src/main/groovy/registry_list.groovy | 19 +
.../src/main/groovy/registry_register.groovy | 19 +
.../src/main/groovy/tag_instance.groovy | 19 +
.../src/main/groovy/wait_for_instances.groovy | 40 +-
stack/build-tools/pom.xml | 2 +-
stack/config/pom.xml | 2 +-
stack/core/pom.xml | 2 +-
stack/corepersistence/collection/pom.xml | 48 +-
.../collection/EntityCollectionManager.java | 3 +
.../collection/guice/CollectionModule.java | 8 +-
.../collection/hystrix/CassandraCommand.java | 74 -
.../collection/hystrix/CommandUtils.java | 28 -
.../impl/EntityCollectionManagerImpl.java | 25 +-
.../mvcc/stage/delete/MarkCommit.java | 2 +-
.../collection/mvcc/stage/delete/MarkStart.java | 2 +-
.../collection/mvcc/stage/load/Load.java | 2 +-
.../mvcc/stage/write/WriteCommit.java | 2 +-
.../mvcc/stage/write/WriteOptimisticVerify.java | 2 +-
.../collection/mvcc/stage/write/WriteStart.java | 2 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 19 +-
.../collection/rx/CassandraThreadScheduler.java | 107 -
.../persistence/collection/rx/RxFig.java | 42 -
.../stage/write/WriteUniqueVerifyStageTest.java | 3 +-
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 6 +-
.../rx/CassandraThreadSchedulerTest.java | 327 --
.../persistence/collection/rx/ParallelTest.java | 71 +-
.../src/test/resources/log4j.properties | 1 +
stack/corepersistence/graph/pom.xml | 3 +-
.../usergrid/persistence/graph/EdgeManager.java | 163 -
.../persistence/graph/EdgeManagerFactory.java | 40 -
.../usergrid/persistence/graph/GraphFig.java | 47 +-
.../persistence/graph/GraphManager.java | 169 +
.../persistence/graph/GraphManagerFactory.java | 40 +
.../graph/consistency/AsyncProcessor.java | 55 +-
.../graph/consistency/AsyncProcessorImpl.java | 118 +-
.../graph/consistency/AsynchronousMessage.java | 18 +
.../graph/consistency/CompleteListener.java | 14 +
.../graph/consistency/ErrorListener.java | 15 +
.../graph/consistency/LocalTimeoutQueue.java | 102 +
.../graph/consistency/MessageListener.java | 24 +
.../consistency/SimpleAsynchronousMessage.java | 31 +
.../graph/consistency/SimpleTimeoutEvent.java | 30 -
.../graph/consistency/TimeoutEvent.java | 18 -
.../graph/consistency/TimeoutQueue.java | 15 +-
.../graph/consistency/TimeoutTask.java | 61 +
.../persistence/graph/guice/EdgeDelete.java | 37 +
.../persistence/graph/guice/GraphModule.java | 51 +-
.../persistence/graph/guice/NodeDelete.java | 37 +
.../graph/hystrix/HystrixGraphObservable.java | 71 +
.../graph/impl/CollectionIndexObserver.java | 14 +-
.../graph/impl/EdgeDeleteListener.java | 201 +
.../persistence/graph/impl/EdgeEvent.java | 42 +
.../persistence/graph/impl/EdgeManagerImpl.java | 371 --
.../graph/impl/GraphManagerImpl.java | 384 ++
.../graph/impl/NodeDeleteListener.java | 332 ++
.../graph/impl/SimpleSearchByEdgeType.java | 38 +
.../graph/impl/stage/AbstractEdgeRepair.java | 147 +
.../graph/impl/stage/EdgeDeleteRepair.java | 45 +
.../graph/impl/stage/EdgeDeleteRepairImpl.java | 76 +
.../graph/impl/stage/EdgeMetaRepair.java | 62 +
.../graph/impl/stage/EdgeMetaRepairImpl.java | 337 ++
.../EdgeMetadataSerialization.java | 78 +-
.../graph/serialization/EdgeSerialization.java | 16 +-
.../graph/serialization/NodeSerialization.java | 2 +-
.../impl/EdgeMetadataSerializationImpl.java | 80 +-
.../impl/EdgeSerializationImpl.java | 262 +-
.../impl/parse/ColumnNameIterator.java | 64 +-
.../impl/parse/ObservableIterator.java | 42 +-
.../persistence/graph/EdgeManagerIT.java | 1468 -------
.../persistence/graph/GraphManagerIT.java | 1497 +++++++
.../graph/GraphManagerStressTest.java | 317 ++
.../graph/GraphManagerTimeoutIT.java | 230 ++
.../graph/consistency/AsyncProcessorTest.java | 182 +-
.../consistency/LocalTimeoutQueueTest.java | 164 +
.../graph/guice/TestGraphModule.java | 4 +-
.../graph/impl/NodeDeleteListenerTest.java | 425 ++
.../graph/impl/stage/EdgeDeleteRepairTest.java | 217 +
.../graph/impl/stage/EdgeMetaRepairTest.java | 446 ++
.../EdgeSerializationChopTest.java | 35 +-
.../serialization/EdgeSerializationTest.java | 223 +-
.../serialization/NodeSerializationTest.java | 13 +-
.../graph/serialization/TestCount.java | 125 +
.../serialization/util/EdgeHasherTest.java | 14 +-
.../graph/test/util/EdgeTestUtils.java | 7 +-
.../graph/src/test/resources/log4j.properties | 36 +
...-cassandra-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 619559 bytes
...-cassandra-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 161970 bytes
...astyanax-cassandra-1.56.49-SNAPSHOT-UG-1.jar | Bin 0 -> 224466 bytes
...astyanax-cassandra-1.56.49-SNAPSHOT-UG-1.pom | 112 +
.../1.56.49-SNAPSHOT/_maven.repositories | 4 -
...yanax-cassandra-1.56.49-SNAPSHOT-javadoc.jar | Bin 629128 -> 0 bytes
...x-cassandra-1.56.49-SNAPSHOT-sources.sources | Bin 161845 -> 0 bytes
.../astyanax-cassandra-1.56.49-SNAPSHOT.jar | Bin 224329 -> 0 bytes
.../astyanax-cassandra-1.56.49-SNAPSHOT.pom | 112 -
.../1.56.49-SNAPSHOT/maven-metadata-local.xml | 12 -
.../1.56.49-SNAPSHOT/resolver-status.properties | 4 -
.../astyanax-cassandra/maven-metadata-local.xml | 6 +-
...ax-contrib-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 33178 bytes
...ax-contrib-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 2314 bytes
.../astyanax-contrib-1.56.49-SNAPSHOT-UG-1.jar | Bin 0 -> 4842 bytes
.../astyanax-contrib-1.56.49-SNAPSHOT-UG-1.pom | 112 +
...styanax-contrib-1.56.49-SNAPSHOT-javadoc.jar | Bin 32792 -> 0 bytes
...nax-contrib-1.56.49-SNAPSHOT-sources.sources | Bin 2314 -> 0 bytes
.../astyanax-contrib-1.56.49-SNAPSHOT.jar | Bin 4842 -> 0 bytes
.../astyanax-contrib-1.56.49-SNAPSHOT.pom | 112 -
.../1.56.49-SNAPSHOT/maven-metadata-local.xml | 12 -
.../astyanax-contrib/maven-metadata-local.xml | 6 +-
...yanax-core-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 522906 bytes
...yanax-core-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 141910 bytes
.../astyanax-core-1.56.49-SNAPSHOT-UG-1.jar | Bin 0 -> 212858 bytes
.../astyanax-core-1.56.49-SNAPSHOT-UG-1.pom | 88 +
.../1.56.49-SNAPSHOT/_maven.repositories | 4 -
.../astyanax-core-1.56.49-SNAPSHOT-javadoc.jar | Bin 532409 -> 0 bytes
...tyanax-core-1.56.49-SNAPSHOT-sources.sources | Bin 141819 -> 0 bytes
.../astyanax-core-1.56.49-SNAPSHOT.jar | Bin 212622 -> 0 bytes
.../astyanax-core-1.56.49-SNAPSHOT.pom | 88 -
.../1.56.49-SNAPSHOT/maven-metadata-local.xml | 12 -
.../1.56.49-SNAPSHOT/resolver-status.properties | 4 -
.../astyanax-core/maven-metadata-local.xml | 6 +-
...ity-mapper-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 97513 bytes
...ity-mapper-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 30591 bytes
...anax-entity-mapper-1.56.49-SNAPSHOT-UG-1.jar | Bin 0 -> 68952 bytes
...anax-entity-mapper-1.56.49-SNAPSHOT-UG-1.pom | 118 +
...x-entity-mapper-1.56.49-SNAPSHOT-javadoc.jar | Bin 97504 -> 0 bytes
...tity-mapper-1.56.49-SNAPSHOT-sources.sources | Bin 30591 -> 0 bytes
.../astyanax-entity-mapper-1.56.49-SNAPSHOT.jar | Bin 68862 -> 0 bytes
.../astyanax-entity-mapper-1.56.49-SNAPSHOT.pom | 118 -
.../1.56.49-SNAPSHOT/maven-metadata-local.xml | 12 -
.../maven-metadata-local.xml | 6 +-
...x-examples-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 38284 bytes
...x-examples-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 4457 bytes
.../astyanax-examples-1.56.49-SNAPSHOT-UG-1.jar | Bin 0 -> 8506 bytes
.../astyanax-examples-1.56.49-SNAPSHOT-UG-1.pom | 106 +
...tyanax-examples-1.56.49-SNAPSHOT-javadoc.jar | Bin 37847 -> 0 bytes
...ax-examples-1.56.49-SNAPSHOT-sources.sources | Bin 4457 -> 0 bytes
.../astyanax-examples-1.56.49-SNAPSHOT.jar | Bin 8506 -> 0 bytes
.../astyanax-examples-1.56.49-SNAPSHOT.pom | 106 -
.../1.56.49-SNAPSHOT/maven-metadata-local.xml | 12 -
.../astyanax-examples/maven-metadata-local.xml | 6 +-
...anax-queue-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 180462 bytes
...anax-queue-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 44057 bytes
.../astyanax-queue-1.56.49-SNAPSHOT-UG-1.jar | Bin 0 -> 86586 bytes
.../astyanax-queue-1.56.49-SNAPSHOT-UG-1.pom | 112 +
.../astyanax-queue-1.56.49-SNAPSHOT-javadoc.jar | Bin 182179 -> 0 bytes
...yanax-queue-1.56.49-SNAPSHOT-sources.sources | Bin 44057 -> 0 bytes
.../astyanax-queue-1.56.49-SNAPSHOT.jar | Bin 86544 -> 0 bytes
.../astyanax-queue-1.56.49-SNAPSHOT.pom | 112 -
.../1.56.49-SNAPSHOT/maven-metadata-local.xml | 12 -
.../astyanax-queue/maven-metadata-local.xml | 6 +-
...ax-recipes-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 204424 bytes
...ax-recipes-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 58161 bytes
.../astyanax-recipes-1.56.49-SNAPSHOT-UG-1.jar | Bin 0 -> 100246 bytes
.../astyanax-recipes-1.56.49-SNAPSHOT-UG-1.pom | 106 +
...styanax-recipes-1.56.49-SNAPSHOT-javadoc.jar | Bin 207654 -> 0 bytes
...nax-recipes-1.56.49-SNAPSHOT-sources.sources | Bin 58161 -> 0 bytes
.../astyanax-recipes-1.56.49-SNAPSHOT.jar | Bin 100070 -> 0 bytes
.../astyanax-recipes-1.56.49-SNAPSHOT.pom | 106 -
.../1.56.49-SNAPSHOT/maven-metadata-local.xml | 12 -
.../astyanax-recipes/maven-metadata-local.xml | 6 +-
...nax-thrift-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 197342 bytes
...nax-thrift-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 76509 bytes
.../astyanax-thrift-1.56.49-SNAPSHOT-UG-1.jar | Bin 0 -> 239007 bytes
.../astyanax-thrift-1.56.49-SNAPSHOT-UG-1.pom | 112 +
.../1.56.49-SNAPSHOT/_maven.repositories | 4 -
...astyanax-thrift-1.56.49-SNAPSHOT-javadoc.jar | Bin 199736 -> 0 bytes
...anax-thrift-1.56.49-SNAPSHOT-sources.sources | Bin 75715 -> 0 bytes
.../astyanax-thrift-1.56.49-SNAPSHOT.jar | Bin 235822 -> 0 bytes
.../astyanax-thrift-1.56.49-SNAPSHOT.pom | 112 -
.../1.56.49-SNAPSHOT/maven-metadata-local.xml | 12 -
.../1.56.49-SNAPSHOT/resolver-status.properties | 4 -
.../astyanax-thrift/maven-metadata-local.xml | 6 +-
.../astyanax-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 261 bytes
.../astyanax-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 261 bytes
.../astyanax-1.56.49-SNAPSHOT-UG-1.jar | Bin 0 -> 261 bytes
.../astyanax-1.56.49-SNAPSHOT-UG-1.pom | 136 +
.../astyanax-1.56.49-SNAPSHOT-javadoc.jar | Bin 261 -> 0 bytes
.../astyanax-1.56.49-SNAPSHOT-sources.sources | Bin 261 -> 0 bytes
.../astyanax-1.56.49-SNAPSHOT.jar | Bin 261 -> 0 bytes
.../astyanax-1.56.49-SNAPSHOT.pom | 136 -
.../1.56.49-SNAPSHOT/maven-metadata-local.xml | 12 -
.../astyanax/astyanax/maven-metadata-local.xml | 6 +-
.../netflix/astyanax/maven-metadata-local.xml | 12 -
stack/corepersistence/model/pom.xml | 2 +-
stack/corepersistence/perftest1/pom.xml | 8 +-
stack/corepersistence/perftest2/pom.xml | 4 +-
stack/corepersistence/pom.xml | 8 +-
stack/corepersistence/queryindex/pom.xml | 2 +-
.../persistence/index/query/tree/QueryFilter.g | 311 ++
.../persistence/query/tree/QueryFilter.g | 311 --
.../persistence/exceptions/IndexException.java | 41 -
.../exceptions/JsonReadException.java | 29 -
.../exceptions/JsonWriteException.java | 29 -
.../exceptions/NoFullTextIndexException.java | 52 -
.../exceptions/NoIndexException.java | 50 -
.../exceptions/PersistenceException.java | 47 -
.../persistence/exceptions/QueryException.java | 41 -
.../exceptions/QueryParseException.java | 65 -
.../exceptions/QueryTokenException.java | 54 -
.../index/EntityCollectionIndex.java | 4 +-
.../index/exceptions/IndexException.java | 41 +
.../index/exceptions/JsonReadException.java | 29 +
.../index/exceptions/JsonWriteException.java | 29 +
.../exceptions/NoFullTextIndexException.java | 52 +
.../index/exceptions/NoIndexException.java | 50 +
.../index/exceptions/PersistenceException.java | 47 +
.../index/exceptions/QueryException.java | 41 +
.../index/exceptions/QueryParseException.java | 65 +
.../index/exceptions/QueryTokenException.java | 54 +
.../index/impl/EsEntityCollectionIndex.java | 52 +-
.../persistence/index/impl/EsQueryVistor.java | 28 +-
.../index/legacy/EntityManagerFacade.java | 8 +-
.../persistence/index/query/EntityRef.java | 30 +
.../usergrid/persistence/index/query/Query.java | 1015 +++++
.../persistence/index/query/Results.java | 126 +
.../index/query/SimpleEntityRef.java | 131 +
.../index/query/tree/AndOperand.java | 50 +
.../index/query/tree/BooleanLiteral.java | 50 +
.../index/query/tree/BooleanOperand.java | 50 +
.../index/query/tree/ContainsOperand.java | 71 +
.../index/query/tree/ContainsProperty.java | 59 +
.../persistence/index/query/tree/Equal.java | 54 +
.../index/query/tree/EqualityOperand.java | 90 +
.../index/query/tree/FloatLiteral.java | 59 +
.../index/query/tree/GreaterThan.java | 55 +
.../index/query/tree/GreaterThanEqual.java | 59 +
.../persistence/index/query/tree/LessThan.java | 55 +
.../index/query/tree/LessThanEqual.java | 57 +
.../persistence/index/query/tree/Literal.java | 41 +
.../index/query/tree/LiteralFactory.java | 61 +
.../index/query/tree/LongLiteral.java | 67 +
.../index/query/tree/NotOperand.java | 45 +
.../index/query/tree/NumericLiteral.java | 27 +
.../persistence/index/query/tree/Operand.java | 50 +
.../persistence/index/query/tree/OrOperand.java | 56 +
.../persistence/index/query/tree/Property.java | 65 +
.../index/query/tree/QueryVisitor.java | 102 +
.../index/query/tree/StringLiteral.java | 85 +
.../index/query/tree/UUIDLiteral.java | 52 +
.../index/query/tree/WithinOperand.java | 111 +
.../index/query/tree/WithinProperty.java | 57 +
.../persistence/index/utils/ClassUtils.java | 58 +
.../index/utils/ConversionUtils.java | 765 ++++
.../persistence/index/utils/EntityBuilder.java | 177 +
.../persistence/index/utils/JsonUtils.java | 329 ++
.../persistence/index/utils/ListUtils.java | 232 ++
.../persistence/index/utils/MapUtils.java | 377 ++
.../persistence/index/utils/StringUtils.java | 172 +
.../persistence/index/utils/UUIDUtils.java | 412 ++
.../usergrid/persistence/query/EntityRef.java | 30 -
.../usergrid/persistence/query/Query.java | 1015 -----
.../usergrid/persistence/query/Results.java | 126 -
.../persistence/query/SimpleEntityRef.java | 131 -
.../persistence/query/tree/AndOperand.java | 50 -
.../persistence/query/tree/BooleanLiteral.java | 50 -
.../persistence/query/tree/BooleanOperand.java | 50 -
.../persistence/query/tree/ContainsOperand.java | 71 -
.../query/tree/ContainsProperty.java | 59 -
.../usergrid/persistence/query/tree/Equal.java | 54 -
.../persistence/query/tree/EqualityOperand.java | 90 -
.../persistence/query/tree/FloatLiteral.java | 59 -
.../persistence/query/tree/GreaterThan.java | 55 -
.../query/tree/GreaterThanEqual.java | 59 -
.../persistence/query/tree/LessThan.java | 55 -
.../persistence/query/tree/LessThanEqual.java | 57 -
.../persistence/query/tree/Literal.java | 41 -
.../persistence/query/tree/LiteralFactory.java | 61 -
.../persistence/query/tree/LongLiteral.java | 67 -
.../persistence/query/tree/NotOperand.java | 45 -
.../persistence/query/tree/NumericLiteral.java | 27 -
.../persistence/query/tree/Operand.java | 50 -
.../persistence/query/tree/OrOperand.java | 56 -
.../persistence/query/tree/Property.java | 65 -
.../persistence/query/tree/QueryVisitor.java | 102 -
.../persistence/query/tree/StringLiteral.java | 85 -
.../persistence/query/tree/UUIDLiteral.java | 52 -
.../persistence/query/tree/WithinOperand.java | 111 -
.../persistence/query/tree/WithinProperty.java | 57 -
.../org/apache/usergrid/utils/ClassUtils.java | 58 -
.../apache/usergrid/utils/ConversionUtils.java | 765 ----
.../apache/usergrid/utils/EntityBuilder.java | 177 -
.../org/apache/usergrid/utils/JsonUtils.java | 315 --
.../org/apache/usergrid/utils/ListUtils.java | 232 --
.../org/apache/usergrid/utils/MapUtils.java | 377 --
.../org/apache/usergrid/utils/StringUtils.java | 172 -
.../org/apache/usergrid/utils/UUIDUtils.java | 412 --
.../persistence/index/impl/CollectionIT.java | 10 +-
.../index/impl/CorePerformanceIT.java | 22 +-
.../impl/EntityCollectionIndexStressTest.java | 4 +-
.../index/impl/EntityCollectionIndexTest.java | 6 +-
.../usergrid/persistence/index/impl/GeoIT.java | 10 +-
.../persistence/index/impl/IndexIT.java | 6 +-
.../persistence/index/legacy/Application.java | 4 +-
.../index/legacy/CoreApplication.java | 4 +-
.../index/legacy/CoreITSetupImpl.java | 2 +-
.../query/AbstractIteratingQueryIT.java | 2 +
.../query/AllInConnectionNoTypeIT.java | 2 +
.../query/IntersectionUnionPagingIT.java | 2 +
.../usergrid/persistence/query/QueryTest.java | 31 +-
.../persistence/query/tree/GrammarTreeTest.java | 20 +-
.../persistence/query/tree/LongLiteralTest.java | 1 +
.../query/tree/StringLiteralTest.java | 2 +-
stack/launcher/pom.xml | 2 +-
.../1.5.4/AppleJavaExtensions-1.5.4.jar | Bin 0 -> 23531 bytes
.../1.5.4/AppleJavaExtensions-1.5.4.pom | 9 +
.../maven-metadata-local.xml | 12 +
stack/mongo-emulator/pom.xml | 2 +-
stack/pom.xml | 14 +-
stack/query-validator/pom.xml | 2 +-
stack/rest/pom.xml | 4 +-
.../applications/ApplicationResource.java | 1 -
.../main/resources/swagger/applications.json | 16 -
.../src/main/resources/swagger/management.json | 16 -
.../src/main/resources/swagger/resources.json | 16 -
stack/services/pom.xml | 8 +-
.../management/export/ExportServiceImpl.java | 59 +-
.../management/export/S3ExportImpl.java | 10 +-
.../cassandra/ManagementServiceIT.java | 290 +-
.../management/cassandra/MockS3ExportImpl.java | 1 -
stack/test-utils/pom.xml | 2 +-
stack/tools/pom.xml | 4 +-
stack/websocket/pom.xml | 2 +-
402 files changed, 15915 insertions(+), 14965 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5a1bcb97/stack/corepersistence/model/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5a1bcb97/stack/pom.xml
----------------------------------------------------------------------