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/02/21 19:21:31 UTC

[18/21] git commit: Merge branch 'two-dot-o' of github.com:usergrid/usergrid into two-dot-o

Merge branch 'two-dot-o' of github.com:usergrid/usergrid into two-dot-o


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

Branch: refs/heads/two-dot-o
Commit: c27b2167a344c3bc4ef56fcfe71f01ddd59cae51
Parents: 9b7ec93 c0543f5
Author: Todd Nine <tn...@apigee.com>
Authored: Fri Feb 21 10:52:26 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Fri Feb 21 10:52:26 2014 -0700

----------------------------------------------------------------------
 stack/corepersistence/index/pom.xml             |   190 -
 .../index/EntityCollectionIndex.java            |    41 -
 .../index/impl/EntityCollectionIndexImpl.java   |   235 -
 .../persistence/index/impl/IndexModule.java     |    32 -
 .../index/impl/ElasticSearchTest.java           |   262 -
 .../persistence/index/impl/EntityIndexTest.java |   279 -
 .../persistence/utils/ElasticSearchRule.java    |    65 -
 .../index/src/test/resources/log4j.properties   |    15 -
 .../index/src/test/resources/sample-large.json  | 39603 -----------------
 .../index/src/test/resources/sample-small.json  |   222 -
 stack/corepersistence/query/pom.xml             |   233 +
 .../query/src/test/resources/log4j.properties   |    30 +
 stack/corepersistence/queryindex/pom.xml        |   228 +
 .../persistence/query/tree/QueryFilter.g        |   311 +
 .../queryindex/src/main/java/QueryFilter.tokens |    47 +
 .../ApplicationAlreadyExistsException.java      |    37 +
 .../DuplicateUniquePropertyExistsException.java |    52 +
 .../exceptions/EntityNotFoundException.java     |    45 +
 .../exceptions/JsonReadException.java           |    27 +
 .../exceptions/JsonWriteException.java          |    27 +
 .../exceptions/LockingException.java            |    65 +
 .../exceptions/NoFullTextIndexException.java    |    50 +
 .../exceptions/NoIndexException.java            |    50 +
 .../exceptions/NotImplementedException.java     |    58 +
 .../exceptions/PersistenceException.java        |    45 +
 .../PropertyTypeConversionException.java        |    71 +
 .../exceptions/QueryIterationException.java     |    13 +
 .../exceptions/QueryParseException.java         |    63 +
 .../exceptions/QueryTokenException.java         |    52 +
 .../persistence/exceptions/QueueException.java  |    61 +
 .../RequiredPropertyNotFoundException.java      |    41 +
 .../TransactionNotFoundException.java           |    45 +
 .../UnexpectedEntityTypeException.java          |    45 +
 .../index/EntityCollectionIndex.java            |    46 +
 .../persistence/index/EntitySearchResults.java  |    65 +
 .../index/impl/EntityCollectionIndexImpl.java   |   272 +
 .../persistence/index/impl/IndexModule.java     |    32 +
 .../persistence/query/AggregateCounter.java     |    48 +
 .../persistence/query/AggregateCounterSet.java  |   116 +
 .../persistence/query/AssociatedEntityRef.java  |    21 +
 .../persistence/query/CollectionRef.java        |    26 +
 .../persistence/query/ConnectedEntityRef.java   |    22 +
 .../persistence/query/ConnectionRef.java        |    34 +
 .../persistence/query/CounterResolution.java    |    84 +
 .../usergrid/persistence/query/EntityRef.java   |    28 +
 .../usergrid/persistence/query/Query.java       |  1099 +
 .../usergrid/persistence/query/QueryUtils.java  |    34 +
 .../usergrid/persistence/query/Results.java     |  1284 +
 .../persistence/query/SimpleEntityRef.java      |   129 +
 .../usergrid/persistence/query/ir/AllNode.java  |    45 +
 .../usergrid/persistence/query/ir/AndNode.java  |    43 +
 .../persistence/query/ir/BooleanNode.java       |    48 +
 .../query/ir/EmailIdentifierNode.java           |    28 +
 .../query/ir/NameIdentifierNode.java            |    28 +
 .../persistence/query/ir/NodeVisitor.java       |    71 +
 .../usergrid/persistence/query/ir/NotNode.java  |    62 +
 .../usergrid/persistence/query/ir/OrNode.java   |    52 +
 .../persistence/query/ir/OrderByNode.java       |    84 +
 .../persistence/query/ir/QueryNode.java         |    28 +
 .../persistence/query/ir/SearchVisitor.java     |    68 +
 .../query/ir/UuidIdentifierNode.java            |    32 +
 .../persistence/query/ir/WithinNode.java        |    87 +
 .../persistence/query/tree/AndOperand.java      |    48 +
 .../persistence/query/tree/BooleanLiteral.java  |    48 +
 .../persistence/query/tree/BooleanOperand.java  |    48 +
 .../persistence/query/tree/ContainsOperand.java |    69 +
 .../query/tree/ContainsProperty.java            |    57 +
 .../usergrid/persistence/query/tree/Equal.java  |    52 +
 .../persistence/query/tree/EqualityOperand.java |    88 +
 .../persistence/query/tree/FloatLiteral.java    |    57 +
 .../persistence/query/tree/GreaterThan.java     |    52 +
 .../query/tree/GreaterThanEqual.java            |    56 +
 .../persistence/query/tree/LessThan.java        |    52 +
 .../persistence/query/tree/LessThanEqual.java   |    54 +
 .../persistence/query/tree/Literal.java         |    38 +
 .../persistence/query/tree/LiteralFactory.java  |    58 +
 .../persistence/query/tree/LongLiteral.java     |    64 +
 .../persistence/query/tree/NotOperand.java      |    45 +
 .../persistence/query/tree/NumericLiteral.java  |    24 +
 .../persistence/query/tree/Operand.java         |    47 +
 .../persistence/query/tree/OrOperand.java       |    53 +
 .../persistence/query/tree/Property.java        |    62 +
 .../query/tree/QueryFilterLexer.java            |  2565 ++
 .../query/tree/QueryFilterParser.java           |  2186 +
 .../persistence/query/tree/QueryVisitor.java    |    90 +
 .../persistence/query/tree/StringLiteral.java   |    82 +
 .../persistence/query/tree/UUIDLiteral.java     |    49 +
 .../persistence/query/tree/WithinOperand.java   |   111 +
 .../persistence/query/tree/WithinProperty.java  |    54 +
 .../usergrid/persistence/utils/AESUtils.java    |    83 +
 .../usergrid/persistence/utils/BCrypt.java      |   627 +
 .../usergrid/persistence/utils/ClassUtils.java  |    58 +
 .../usergrid/persistence/utils/CodecUtils.java  |    45 +
 .../persistence/utils/ConversionUtils.java      |   765 +
 .../usergrid/persistence/utils/DateUtils.java   |    88 +
 .../persistence/utils/InflectionUtils.java      |    51 +
 .../usergrid/persistence/utils/Inflector.java   |   553 +
 .../usergrid/persistence/utils/JsonUtils.java   |   329 +
 .../usergrid/persistence/utils/ListUtils.java   |   230 +
 .../usergrid/persistence/utils/MapUtils.java    |   377 +
 .../usergrid/persistence/utils/NumberUtils.java |    35 +
 .../persistence/utils/PasswordUtils.java        |    28 +
 .../usergrid/persistence/utils/StringUtils.java |   172 +
 .../usergrid/persistence/utils/TimeUtils.java   |    88 +
 .../usergrid/persistence/utils/UUIDUtils.java   |   412 +
 .../usergrid/persistence/utils/Version.java     |   428 +
 .../persistence/utils/package-info.java         |    18 +
 .../index/impl/ElasticSearchTest.java           |   262 +
 .../persistence/index/impl/EntityIndexTest.java |   306 +
 .../usergrid/persistence/query/QueryTest.java   |   312 +
 .../persistence/query/tree/GrammarTreeTest.java |   608 +
 .../persistence/query/tree/LongLiteralTest.java |    62 +
 .../query/tree/StringLiteralTest.java           |    88 +
 .../persistence/utils/ElasticSearchRule.java    |    65 +
 .../src/test/resources/log4j.properties         |    15 +
 .../src/test/resources/sample-large.json        | 39603 +++++++++++++++++
 .../src/test/resources/sample-small.json        |   222 +
 117 files changed, 57851 insertions(+), 40944 deletions(-)
----------------------------------------------------------------------