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/04/07 22:21:52 UTC

[01/28] git commit: Merge branch 'two-dot-o' of https://github.com/GERey/usergrid-1 into two-dot-o

Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o a371f92cf -> 77902384f
  refs/pull/77/merge [deleted] 7bfe637d3


Merge branch 'two-dot-o' of https://github.com/GERey/usergrid-1 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/6eacac3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6eacac3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6eacac3d

Branch: refs/heads/two-dot-o
Commit: 6eacac3daa836b75f9a7e6652c45d5bb41958f00
Parents: 304cd69 6671849
Author: GERey <gr...@apigee.com>
Authored: Wed Jan 29 14:16:43 2014 -0800
Committer: GERey <gr...@apigee.com>
Committed: Wed Jan 29 14:16:43 2014 -0800

----------------------------------------------------------------------
 .gitignore                                      |   3 +-
 stack/corepersistence/.gitignore                |   7 +
 stack/corepersistence/README.md                 |  73 ++
 stack/corepersistence/collection/pom.xml        | 194 +++++
 .../persistence/collection/CollectionScope.java |  26 +
 .../collection/EntityCollectionManager.java     |  35 +
 .../EntityCollectionManagerFactory.java         |  35 +
 .../collection/EntityCollectionManagerSync.java |  33 +
 .../collection/OrganizationScope.java           |  16 +
 .../astyanax/AstyanaxKeyspaceProvider.java      |  68 ++
 .../collection/astyanax/CassandraFig.java       |  41 +
 .../astyanax/CompositeFieldSerializer.java      |  26 +
 .../astyanax/IdRowCompositeSerializer.java      |  51 ++
 .../astyanax/MultiTennantColumnFamily.java      |  28 +
 .../MultiTennantColumnFamilyDefinition.java     |  62 ++
 .../collection/astyanax/ScopedRowKey.java       |  92 +++
 .../exception/CollectionRuntimeException.java   |  31 +
 .../collection/guice/CollectionModule.java      |  49 ++
 .../collection/guice/PropertyUtils.java         |  98 +++
 .../collection/hystrix/CollectionCommand.java   |  46 ++
 .../collection/hystrix/ReadCommand.java         |  50 ++
 .../collection/hystrix/WriteCommand.java        |  49 ++
 .../collection/impl/CollectionScopeImpl.java    |  81 ++
 .../impl/EntityCollectionManagerImpl.java       | 158 ++++
 .../impl/EntityCollectionManagerSyncImpl.java   |  53 ++
 .../collection/impl/OrganizationScopeImpl.java  |  77 ++
 .../collection/migration/Migration.java         |  18 +
 .../migration/MigrationException.java           |  19 +
 .../collection/migration/MigrationManager.java  |  16 +
 .../migration/MigrationManagerFig.java          |  25 +
 .../migration/MigrationManagerImpl.java         | 194 +++++
 .../mvcc/MvccEntitySerializationStrategy.java   |  71 ++
 .../mvcc/MvccLogEntrySerializationStrategy.java |  62 ++
 .../mvcc/changelog/ChangeLogEntry.java          | 101 +++
 .../mvcc/changelog/ChangeLogGenerator.java      |  48 ++
 .../mvcc/changelog/ChangeLogGeneratorImpl.java  | 107 +++
 .../collection/mvcc/entity/MvccEntity.java      |  35 +
 .../collection/mvcc/entity/MvccLogEntry.java    |  29 +
 .../collection/mvcc/entity/Stage.java           |  67 ++
 .../collection/mvcc/entity/ValidationUtils.java | 134 +++
 .../mvcc/entity/impl/MvccEntityImpl.java        |  97 +++
 .../mvcc/entity/impl/MvccLogEntryImpl.java      |  99 +++
 .../mvcc/event/PostProcessObserver.java         |  24 +
 .../mvcc/stage/CollectionIoEvent.java           |  31 +
 .../mvcc/stage/delete/DeleteCommit.java         |  95 +++
 .../mvcc/stage/delete/DeleteStart.java          |  92 +++
 .../collection/mvcc/stage/load/Load.java        |  83 ++
 .../mvcc/stage/write/WriteCommit.java           |  92 +++
 .../mvcc/stage/write/WriteOptimisticVerify.java |  32 +
 .../collection/mvcc/stage/write/WriteStart.java |  86 ++
 .../mvcc/stage/write/WriteUniqueVerify.java     |  32 +
 .../collection/rx/CassandraThreadScheduler.java |  93 +++
 .../persistence/collection/rx/Concurrent.java   |  69 ++
 .../persistence/collection/rx/RxFig.java        |  22 +
 .../serialization/OptimisticUpdate.java         |  23 +
 .../serialization/SerializationFig.java         |  18 +
 .../collection/serialization/UniqueUpdate.java  |  28 +
 .../impl/CollectionScopedRowKeySerializer.java  |  76 ++
 .../MvccEntitySerializationStrategyImpl.java    | 274 +++++++
 .../MvccLogEntrySerializationStrategyImpl.java  | 269 ++++++
 .../serialization/impl/SerializationModule.java |  39 +
 .../collection/service/UUIDService.java         |  16 +
 .../collection/service/impl/ServiceModule.java  |  20 +
 .../service/impl/UUIDServiceImpl.java           |  19 +
 .../collection/util/EntityUtils.java            |  49 ++
 .../collection/CollectionContextImplTest.java   |  60 ++
 .../EntityCollectionManagerFactoryTest.java     |  62 ++
 .../collection/EntityCollectionManagerIT.java   | 213 +++++
 .../EntityCollectionManagerSyncIT.java          | 200 +++++
 .../cassandra/AvailablePortFinder.java          | 187 +++++
 .../collection/cassandra/CassandraRule.java     | 105 +++
 .../collection/guice/MigrationManagerRule.java  |  38 +
 .../changelog/ChangeLogGeneratorImplTest.java   | 222 +++++
 .../mvcc/entity/impl/MvccEntityImplTest.java    | 107 +++
 .../mvcc/entity/impl/MvccLogEntryImplTest.java  |  84 ++
 .../collection/mvcc/entity/impl/StageTest.java  |  84 ++
 .../mvcc/stage/AbstractEntityStageTest.java     |  61 ++
 .../mvcc/stage/AbstractIdStageTest.java         |  60 ++
 .../mvcc/stage/AbstractMvccEntityStageTest.java |  72 ++
 .../mvcc/stage/InvalidMvccEntityGenerator.java  | 118 +++
 .../mvcc/stage/TestEntityGenerator.java         |  74 ++
 .../mvcc/stage/delete/DeleteCommitTest.java     | 122 +++
 .../mvcc/stage/delete/DeleteStartTest.java      |  97 +++
 .../collection/mvcc/stage/load/LoadTest.java    | 115 +++
 .../mvcc/stage/write/WriteCommitTest.java       | 117 +++
 .../mvcc/stage/write/WriteStartTest.java        |  84 ++
 .../mvcc/stage/write/WriteUniqueVerifyTest.java |  72 ++
 .../collection/rx/ConcurrentTest.java           | 112 +++
 .../serialization/impl/IdRowSerializerTest.java |  43 +
 ...MvccEntitySerializationStrategyImplTest.java | 482 +++++++++++
 .../impl/MvccLESSTransientTest.java             |  99 +++
 ...ccLogEntrySerializationStrategyImplTest.java | 254 ++++++
 .../impl/ScopedRowKeySerializerTest.java        |  46 ++
 .../impl/SerializationComparison.java           | 180 ++++
 .../collection/util/InvalidEntityGenerator.java |  80 ++
 .../collection/util/InvalidIdGenerator.java     | 130 +++
 .../resources/cassandra-defaults.properties     |  12 +
 .../src/test/resources/cassandra.properties     |   5 +
 .../src/test/resources/dynamic-test.properties  |  12 +
 .../src/test/resources/log4j.properties         |  10 +
 .../resources/serialization-defaults.properties |   4 +
 stack/corepersistence/graph/pom.xml             |  58 ++
 .../apache/usergrid/persistence/graph/Edge.java |  55 ++
 .../usergrid/persistence/graph/EdgeManager.java | 151 ++++
 .../persistence/graph/EdgeManagerFactory.java   |  40 +
 .../persistence/graph/SearchByEdgeType.java     |  64 ++
 .../persistence/graph/SearchByIdType.java       |  42 +
 .../persistence/graph/SearchEdgeType.java       |  53 ++
 .../persistence/graph/SearchIdType.java         |  38 +
 .../DynamicCompositeFieldSerializer.java        |  53 ++
 .../IdColDynamicCompositeSerializer.java        |  93 +++
 .../persistence/graph/guice/GraphModule.java    |  75 ++
 .../graph/impl/CollectionIndexObserver.java     |  78 ++
 .../persistence/graph/impl/EdgeManagerImpl.java | 166 ++++
 .../persistence/graph/impl/SimpleEdge.java      |  76 ++
 .../graph/impl/SimpleSearchByEdgeType.java      |  87 ++
 .../graph/impl/SimpleSearchByIdType.java        |  62 ++
 .../graph/impl/SimpleSearchEdgeType.java        |  38 +
 .../graph/impl/SimpleSearchIdType.java          |  30 +
 .../EdgeMetadataSerialization.java              | 126 +++
 .../graph/serialization/EdgeSerialization.java  |  91 +++
 .../graph/serialization/impl/CassUtils.java     |  51 ++
 .../impl/EdgeMetadataSerializationImpl.java     | 407 +++++++++
 .../impl/EdgeSerializationImpl.java             | 531 ++++++++++++
 .../OrganizationScopedRowKeySerializer.java     |  88 ++
 .../impl/parse/ColumnNameIterator.java          |  60 ++
 .../serialization/impl/parse/ColumnParser.java  |  37 +
 .../impl/parse/ObservableIterator.java          |  50 ++
 .../impl/parse/StringColumnParser.java          |  46 ++
 .../graph/serialization/stage/GraphIoEvent.java |  32 +
 .../stage/write/EdgeWriteStage.java             |  60 ++
 .../graph/serialization/util/EdgeHasher.java    |  77 ++
 .../graph/serialization/util/EdgeUtils.java     | 103 +++
 .../persistence/graph/EdgeManagerIT.java        | 816 +++++++++++++++++++
 .../EdgeMetadataSerializationTest.java          | 460 +++++++++++
 .../serialization/util/EdgeHasherTest.java      | 501 ++++++++++++
 .../graph/test/util/EdgeTestUtils.java          | 140 ++++
 .../astyanax-cassandra-1.56.46-UG-javadoc.jar   | Bin 0 -> 616253 bytes
 ...styanax-cassandra-1.56.46-UG-sources.sources | Bin 0 -> 161740 bytes
 .../astyanax-cassandra-1.56.46-UG.jar           | Bin 0 -> 224404 bytes
 .../astyanax-cassandra-1.56.46-UG.pom           | 112 +++
 .../astyanax-cassandra/maven-metadata-local.xml |  12 +
 .../astyanax-contrib-1.56.46-UG-javadoc.jar     | Bin 0 -> 33029 bytes
 .../astyanax-contrib-1.56.46-UG-sources.sources | Bin 0 -> 2314 bytes
 .../1.56.46-UG/astyanax-contrib-1.56.46-UG.jar  | Bin 0 -> 4842 bytes
 .../1.56.46-UG/astyanax-contrib-1.56.46-UG.pom  | 112 +++
 .../astyanax-contrib/maven-metadata-local.xml   |  12 +
 .../astyanax-core-1.56.46-UG-javadoc.jar        | Bin 0 -> 519966 bytes
 .../astyanax-core-1.56.46-UG-sources.sources    | Bin 0 -> 141783 bytes
 .../1.56.46-UG/astyanax-core-1.56.46-UG.jar     | Bin 0 -> 5510008 bytes
 .../1.56.46-UG/astyanax-core-1.56.46-UG.pom     |  88 ++
 .../astyanax-core/maven-metadata-local.xml      |  12 +
 ...styanax-entity-mapper-1.56.46-UG-javadoc.jar | Bin 0 -> 91123 bytes
 ...nax-entity-mapper-1.56.46-UG-sources.sources | Bin 0 -> 30392 bytes
 .../astyanax-entity-mapper-1.56.46-UG.jar       | Bin 0 -> 68615 bytes
 .../astyanax-entity-mapper-1.56.46-UG.pom       | 118 +++
 .../maven-metadata-local.xml                    |  12 +
 .../astyanax-examples-1.56.46-UG-javadoc.jar    | Bin 0 -> 38106 bytes
 ...astyanax-examples-1.56.46-UG-sources.sources | Bin 0 -> 4457 bytes
 .../1.56.46-UG/astyanax-examples-1.56.46-UG.jar | Bin 0 -> 8506 bytes
 .../1.56.46-UG/astyanax-examples-1.56.46-UG.pom | 106 +++
 .../astyanax-examples/maven-metadata-local.xml  |  12 +
 .../astyanax-queue-1.56.46-UG-javadoc.jar       | Bin 0 -> 179575 bytes
 .../astyanax-queue-1.56.46-UG-sources.sources   | Bin 0 -> 44057 bytes
 .../1.56.46-UG/astyanax-queue-1.56.46-UG.jar    | Bin 0 -> 86618 bytes
 .../1.56.46-UG/astyanax-queue-1.56.46-UG.pom    | 112 +++
 .../astyanax-queue/maven-metadata-local.xml     |  12 +
 .../astyanax-recipes-1.56.46-UG-javadoc.jar     | Bin 0 -> 203394 bytes
 .../astyanax-recipes-1.56.46-UG-sources.sources | Bin 0 -> 58144 bytes
 .../1.56.46-UG/astyanax-recipes-1.56.46-UG.jar  | Bin 0 -> 100221 bytes
 .../1.56.46-UG/astyanax-recipes-1.56.46-UG.pom  | 106 +++
 .../astyanax-recipes/maven-metadata-local.xml   |  12 +
 .../astyanax-thrift-1.56.46-UG-javadoc.jar      | Bin 0 -> 196141 bytes
 .../astyanax-thrift-1.56.46-UG-sources.sources  | Bin 0 -> 75715 bytes
 .../1.56.46-UG/astyanax-thrift-1.56.46-UG.jar   | Bin 0 -> 235965 bytes
 .../1.56.46-UG/astyanax-thrift-1.56.46-UG.pom   | 112 +++
 .../astyanax-thrift/maven-metadata-local.xml    |  12 +
 .../netflix/astyanax/maven-metadata-local.xml   |  12 +
 .../1.4-UG/_maven.repositories                  |   4 +
 .../1.4-UG/jukito-build-tools-1.4-UG.jar        | Bin 0 -> 4603 bytes
 .../1.4-UG/jukito-build-tools-1.4-UG.pom        |  13 +
 .../jukito-build-tools/maven-metadata-local.xml |  12 +
 .../jukito-parent/1.4-UG/_maven.repositories    |   3 +
 .../1.4-UG/jukito-parent-1.4-UG.pom             | 313 +++++++
 .../jukito-parent/maven-metadata-local.xml      |  12 +
 .../jukito-samples/1.4-UG/_maven.repositories   |   4 +
 .../1.4-UG/jukito-samples-1.4-UG.jar            | Bin 0 -> 5103 bytes
 .../1.4-UG/jukito-samples-1.4-UG.pom            |  33 +
 .../jukito-samples/maven-metadata-local.xml     |  12 +
 .../jukito/jukito/1.4-UG/_maven.repositories    |   5 +
 .../jukito/1.4-UG/jukito-1.4-UG-sources.jar     | Bin 0 -> 30660 bytes
 .../org/jukito/jukito/1.4-UG/jukito-1.4-UG.jar  | Bin 0 -> 42832 bytes
 .../org/jukito/jukito/1.4-UG/jukito-1.4-UG.pom  |  93 +++
 .../org/jukito/jukito/maven-metadata-local.xml  |  12 +
 stack/corepersistence/model/pom.xml             |  46 ++
 .../model/builder/EntitySerializer.java         |  30 +
 .../model/builder/EntitySerializerFactory.java  |  22 +
 .../persistence/model/entity/Entity.java        | 112 +++
 .../usergrid/persistence/model/entity/Id.java   |  31 +
 .../persistence/model/entity/SimpleId.java      |  89 ++
 .../persistence/model/field/AbstractField.java  |  67 ++
 .../persistence/model/field/ArrayField.java     |  27 +
 .../persistence/model/field/BooleanField.java   |  19 +
 .../model/field/ByteBufferField.java            |  29 +
 .../persistence/model/field/DoubleField.java    |  20 +
 .../model/field/EntityObjectField.java          |  20 +
 .../usergrid/persistence/model/field/Field.java |  27 +
 .../persistence/model/field/IntegerField.java   |  20 +
 .../persistence/model/field/ListField.java      |  28 +
 .../persistence/model/field/LocationField.java  |  20 +
 .../persistence/model/field/LongField.java      |  23 +
 .../persistence/model/field/SetField.java       |  28 +
 .../persistence/model/field/StringField.java    |  17 +
 .../persistence/model/field/UUIDField.java      |  20 +
 .../model/field/value/EntityObject.java         |  40 +
 .../persistence/model/field/value/Location.java |  32 +
 .../persistence/model/util/UUIDGenerator.java   |  93 +++
 .../usergrid/persistence/model/util/Verify.java |  37 +
 .../persistence/model/field/EntityTest.java     | 115 +++
 .../model/util/UUIDGeneratorTest.java           | 119 +++
 stack/corepersistence/pom.xml                   |  51 ++
 stack/corepersistence/priamcluster/README.md    |  83 ++
 stack/corepersistence/priamcluster/assembly.xml |  29 +
 .../priamcluster/aws-sample.properties          |   2 +
 .../priamcluster/cassandra-cf.json              | 325 ++++++++
 stack/corepersistence/priamcluster/pom.xml      | 116 +++
 .../src/main/dist/conf/Priam.properties         |  21 +
 .../src/main/dist/init_instance/init_cass.sh    |  73 ++
 .../dist/init_instance/install_oraclejdk.sh     |  28 +
 .../priam-cass-extensions-2.0.0-SNAPSHOT.jar    | Bin 0 -> 5478 bytes
 .../dist/webapps/priam-web-2.0.0-SNAPSHOT.war   | Bin 0 -> 31266622 bytes
 .../src/main/groovy/configure_cassandra.groovy  | 113 +++
 .../src/main/groovy/configure_priam.groovy      |  41 +
 .../src/main/groovy/registry_clear.groovy       |  20 +
 .../src/main/groovy/registry_list.groovy        |  24 +
 .../src/main/groovy/registry_register.groovy    |  39 +
 .../src/main/groovy/tag_instance.groovy         |  28 +
 .../src/main/groovy/wait_for_cassandra.groovy   |  42 +
 238 files changed, 16599 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[27/28] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Todd Nine
# Via Todd Nine
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Fixed backticks on query
  Added opscenter


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

Branch: refs/heads/two-dot-o
Commit: b1c1219b8911944a2f914c4ec58c3f820605864f
Parents: bea9b03 ae9bdf6
Author: grey <gr...@apigee.com>
Authored: Fri Apr 4 08:12:23 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Fri Apr 4 08:12:23 2014 -0700

----------------------------------------------------------------------
 .../src/main/dist/init_instance/install_cassandra.sh     | 11 +++++++++++
 .../src/main/groovy/configure_elasticsearch.groovy       |  2 +-
 .../awscluster/src/main/groovy/configure_usergrid.groovy |  4 ++--
 stack/awscluster/src/main/groovy/registry_list.groovy    |  2 +-
 stack/awscluster/ugcluster-cf.json                       |  2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------



[23/28] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Todd Nine (3) and Dave Johnson (1)
# Via Todd Nine (4) and Dave Johnson (1)
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Fixed typo in readme
  Dependency and other cleanup.
  Fixes bug in query for wait script
  Initial commit of async processing framework.  Need to evaluate it a bit more on the async processing.


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

Branch: refs/heads/two-dot-o
Commit: 269100c3b9ea7481a6263f121f2cb983ce471736
Parents: fe2bb3b fc10597
Author: grey <gr...@apigee.com>
Authored: Mon Mar 24 09:56:00 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Mar 24 09:56:00 2014 -0700

----------------------------------------------------------------------
 stack/awscluster/README.md                      |   2 +-
 .../src/main/groovy/wait_for_instances.groovy   |   2 +-
 .../graph/consistency/AsyncProcessor.java       |  14 +-
 .../graph/consistency/AsyncProcessorImpl.java   |  94 ++++++-
 .../graph/consistency/TimeService.java          |  33 +++
 .../persistence/graph/guice/GraphModule.java    |   7 +-
 .../graph/consistency/AsyncProcessorTest.java   | 273 +++++++++++++++++++
 stack/corepersistence/perftest1/pom.xml         |   9 +-
 .../persistence/Usergrid1PerformanceTest.java   |  36 +--
 9 files changed, 432 insertions(+), 38 deletions(-)
----------------------------------------------------------------------



[20/28] git commit: Removed the swallowing of exceptions, now throwing the proper exception. Removed some more codehaus jackson imports that were lying around.

Posted by sn...@apache.org.
Removed the swallowing of exceptions, now throwing the proper exception.
Removed some more codehaus jackson imports that were lying around.


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

Branch: refs/heads/two-dot-o
Commit: a175c57c852889f66aa2d237d3c9107504f3d18f
Parents: a16e6e4
Author: grey <gr...@apigee.com>
Authored: Thu Mar 20 12:06:18 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Thu Mar 20 12:06:18 2014 -0700

----------------------------------------------------------------------
 .../MvccEntitySerializationStrategyImpl.java     | 19 +++++--------------
 .../org/apache/usergrid/utils/JsonUtils.java     |  9 ---------
 2 files changed, 5 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a175c57c/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
index 4acc3ee..e06b5a8 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
@@ -18,7 +18,6 @@
 package org.apache.usergrid.persistence.collection.serialization.impl;
 
 
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -44,8 +43,6 @@ import org.apache.usergrid.persistence.collection.util.EntityUtils;
 import org.apache.usergrid.persistence.model.entity.Entity;
 import org.apache.usergrid.persistence.model.entity.Id;
 
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.google.common.base.Optional;
@@ -293,7 +290,6 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
         //the marker for when we're passed a "null" value
         private static final byte[] EMPTY = new byte[] { 0x0 };
 
-//TODO:Make sure your exceptions provide descriptive error messages.
         @Override
         public ByteBuffer toByteBuffer( final EntityWrapper wrapper ) {
             if ( wrapper == null ) {
@@ -324,14 +320,8 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
             try {
                 builder.addBytes( mapper.writeValueAsBytes( wrapper.entity.get() ) );
             }
-            catch ( JsonMappingException e ) {
-                e.printStackTrace();
-            }
-            catch ( JsonGenerationException e ) {
-                e.printStackTrace();
-            }
-            catch ( IOException e ) {
-                e.printStackTrace();
+            catch ( Exception e ) {
+                throw new CollectionRuntimeException(e.getMessage());
             }
 
             return builder.build();
@@ -365,10 +355,11 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
                 byte[] array = jsonBytes.array();
                 int start = jsonBytes.arrayOffset();
                 int length = jsonBytes.remaining();
+
                 storedEntity = mapper.readValue( array,start,length,Entity.class);
             }
-            catch ( IOException e ) {
-                e.printStackTrace();
+            catch ( Exception e ) {
+                throw new CollectionRuntimeException(e.getMessage());
             }
 
             final Optional<Entity> entity = Optional.of( storedEntity );

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a175c57c/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java
index 5b5e2a5..491ca50 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java
@@ -35,15 +35,6 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
-//import org.apache.usergrid.persistence.Entity;
-//import org.codehaus.jackson.JsonNode;
-//import org.codehaus.jackson.io.JsonStringEncoder;
-//import org.codehaus.jackson.map.ObjectMapper;
-//import org.codehaus.jackson.map.SerializationConfig.Feature;
-//import org.codehaus.jackson.smile.SmileFactory;
-//import com.fasterxml.jackson.
-
-
 public class JsonUtils {
 
     private static final Logger LOG = LoggerFactory.getLogger( JsonUtils.class );


[08/28] git commit: Pushing relevant code to github so Dave can see issue on line 386

Posted by sn...@apache.org.
Pushing relevant code to github so Dave can see issue on line 386


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

Branch: refs/heads/two-dot-o
Commit: 596147a5ee95c0b97e0e025026951da6a4bbda1e
Parents: 0d544e3
Author: grey <gr...@apigee.com>
Authored: Mon Mar 17 11:11:40 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Mar 17 11:11:40 2014 -0700

----------------------------------------------------------------------
 .../impl/MvccEntitySerializationStrategyImpl.java             | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/596147a5/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
index 1db0ac0..d68b1aa 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
@@ -23,6 +23,7 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.UUID;
 
@@ -377,12 +378,12 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
                 return new EntityWrapper( MvccEntity.Status.COMPLETE, Optional.<Entity>absent() );
             }
 
-            Object storedObject = null;
+            LinkedHashMap storedObject = null;
             Entity storedEntity = null;
             String derper = null;
-            byteBuffer.position( 9 );
+            byteBuffer.position( 0 );
             try {
-                storedObject = mapper.readValue( helper,Object.class);
+                storedEntity = mapper.readValue( helper,Entity.class);
             }
             catch ( IOException e ) {
                 e.printStackTrace();


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

Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Exclude core persistence from RAT (for now).


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

Branch: refs/heads/two-dot-o
Commit: e04bc7723a910f9ef039ea1936ef736d1a937101
Parents: a175c57 e2f6fbf
Author: grey <gr...@apigee.com>
Authored: Thu Mar 20 12:07:50 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Thu Mar 20 12:07:50 2014 -0700

----------------------------------------------------------------------
 stack/pom.xml | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e04bc772/stack/pom.xml
----------------------------------------------------------------------


[26/28] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Todd Nine
# Via Todd Nine
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Fixed client->cass firewall rules


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

Branch: refs/heads/two-dot-o
Commit: bea9b0368552e3d9f0988cf45096e9e13f2a8f53
Parents: b341b04 d340680
Author: grey <gr...@apigee.com>
Authored: Fri Mar 28 10:11:10 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Fri Mar 28 10:11:10 2014 -0700

----------------------------------------------------------------------
 stack/awscluster/ugcluster-cf.json | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------



[12/28] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Dave Johnson
# Via Dave Johnson (1) and Todd Nine (1)
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Fixing merge error: duplicate module in POM.


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

Branch: refs/heads/two-dot-o
Commit: 96ca52ed10738c879b9f6939f75b6a89d75385cd
Parents: 4111f15 070f15b
Author: grey <gr...@apigee.com>
Authored: Tue Mar 18 09:23:42 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Tue Mar 18 09:23:42 2014 -0700

----------------------------------------------------------------------
 stack/pom.xml | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/96ca52ed/stack/pom.xml
----------------------------------------------------------------------


[24/28] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

Posted by sn...@apache.org.
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/heads/two-dot-o
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
----------------------------------------------------------------------


[17/28] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Fixes to CorePersistenceIT and index impl.

Conflicts:
	stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.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/50347dd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/50347dd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/50347dd1

Branch: refs/heads/two-dot-o
Commit: 50347dd13a45b5da64248e384780d93613f48a66
Parents: fc2bf68 6b7ffbe
Author: grey <gr...@apigee.com>
Authored: Thu Mar 20 10:29:37 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Thu Mar 20 10:29:37 2014 -0700

----------------------------------------------------------------------
 .../index/impl/EsEntityCollectionIndex.java     | 12 ++++---
 .../index/impl/CorePerformanceIT.java           | 38 +++++++++++---------
 2 files changed, 29 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/50347dd1/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/50347dd1/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/CorePerformanceIT.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/CorePerformanceIT.java
index b368b92,0008304..59bde56
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/CorePerformanceIT.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/CorePerformanceIT.java
@@@ -17,9 -17,9 +17,6 @@@
   */
  package org.apache.usergrid.persistence.index.impl;
  
--import com.google.inject.Guice;
--import com.google.inject.Injector;
--import com.netflix.config.ConfigurationManager;
  import java.io.BufferedReader;
  import java.io.FileNotFoundException;
  import java.io.FileReader;
@@@ -27,7 -27,7 +24,14 @@@ import java.io.IOException
  import java.util.ArrayList;
  import java.util.Date;
  import java.util.List;
++
++import org.junit.Ignore;
++import org.junit.Test;
++import org.slf4j.Logger;
++import org.slf4j.LoggerFactory;
++
  import org.apache.commons.lang3.math.NumberUtils;
++
  import org.apache.usergrid.persistence.collection.CollectionScope;
  import org.apache.usergrid.persistence.collection.EntityCollectionManager;
  import org.apache.usergrid.persistence.collection.EntityCollectionManagerFactory;
@@@ -44,10 -44,10 +48,10 @@@ import org.apache.usergrid.persistence.
  import org.apache.usergrid.persistence.model.util.UUIDGenerator;
  import org.apache.usergrid.persistence.query.Query;
  import org.apache.usergrid.persistence.query.Results;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.slf4j.Logger;
--import org.slf4j.LoggerFactory;
++
++import com.google.inject.Guice;
++import com.google.inject.Injector;
++import com.netflix.config.ConfigurationManager;
  
  
  /**


[10/28] git commit: Added working smile binary serialization. Added working annotation to the corepersistance teir for the serialization of setters and getters. Ignoring the Id when doing serialization. Added test to prove it is working as intended.

Posted by sn...@apache.org.
Added working smile binary serialization.
Added working annotation to the corepersistance teir for the serialization of setters and getters.
Ignoring the Id when doing serialization.
Added test to prove it is working as intended.


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

Branch: refs/heads/two-dot-o
Commit: b4b5564bfd16f7aa1204d1af1df8e8249dfa55b4
Parents: ccdf99a
Author: grey <gr...@apigee.com>
Authored: Mon Mar 17 18:03:17 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Mar 17 18:03:17 2014 -0700

----------------------------------------------------------------------
 .../MvccEntitySerializationStrategyImpl.java    | 146 +++----------------
 ...MvccEntitySerializationStrategyImplTest.java |   2 +-
 stack/corepersistence/model/pom.xml             |   5 -
 .../persistence/model/entity/Entity.java        |   5 +-
 .../model/field/value/EntityObject.java         |  24 +++
 5 files changed, 47 insertions(+), 135 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b4b5564b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
index d68b1aa..5d95fa5 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
@@ -23,13 +23,13 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.UUID;
 
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.smile.SmileFactory;
 
 import org.apache.cassandra.db.marshal.BytesType;
 import org.apache.cassandra.db.marshal.ReversedType;
@@ -64,8 +64,8 @@ import com.netflix.astyanax.model.CompositeBuilder;
 import com.netflix.astyanax.model.CompositeParser;
 import com.netflix.astyanax.model.Composites;
 import com.netflix.astyanax.serializers.AbstractSerializer;
+import com.netflix.astyanax.serializers.ByteBufferSerializer;
 import com.netflix.astyanax.serializers.BytesArraySerializer;
-import com.netflix.astyanax.serializers.ObjectSerializer;
 import com.netflix.astyanax.serializers.UUIDSerializer;
 
 
@@ -80,6 +80,11 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
 
     private static final IdRowCompositeSerializer ID_SER = IdRowCompositeSerializer.get();
 
+    private static final ByteBufferSerializer BUFFER_SERIALIZER = ByteBufferSerializer.get();
+
+    private static final BytesArraySerializer BYTES_ARRAY_SERIALIZER = BytesArraySerializer.get();
+
+
     private static final CollectionScopedRowKeySerializer<Id> ROW_KEY_SER =
             new CollectionScopedRowKeySerializer<Id>( ID_SER );
 
@@ -276,11 +281,9 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
 
     public static class EntitySerializer extends AbstractSerializer<EntityWrapper> {
 
-        //public static final SmileFactory f = new SmileFactory(  );
+        public static final SmileFactory f = new SmileFactory(  );
 
         public static ObjectMapper mapper = new ObjectMapper(  );
-        private static final BytesArraySerializer BYTES_ARRAY_SERIALIZER = BytesArraySerializer.get();
-
 
         private static byte[] STATE_COMPLETE = new byte[] { 0 };
         private static byte[] STATE_DELETED = new byte[] { 1 };
@@ -293,7 +296,7 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
         private static final byte[] EMPTY = new byte[] { 0x0 };
         String helper;
 
-//TODO:Make sure your exceptions provide descriptive error messages. And to make sure you even needs the descriptions
+//TODO:Make sure your exceptions provide descriptive error messages.
         @Override
         public ByteBuffer toByteBuffer( final EntityWrapper wrapper ) {
             if ( wrapper == null ) {
@@ -302,11 +305,7 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
 
             CompositeBuilder builder = Composites.newCompositeBuilder();
 
-
             builder.addBytes( VERSION );
-           // f.disable( SmileParser.Feature.REQUIRE_HEADER );
-
-           // mapper = new ObjectMapper( f );
 
             //mark this version as empty
             if ( !wrapper.entity.isPresent() ) {
@@ -328,7 +327,6 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
 
             try {
                 builder.addBytes( mapper.writeValueAsBytes( wrapper.entity.get() ) );
-                helper = mapper.writeValueAsString( wrapper.entity.get() );
             }
             catch ( JsonMappingException e ) {
                 e.printStackTrace();
@@ -345,31 +343,15 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
 
         @Override
         public EntityWrapper fromByteBuffer( final ByteBuffer byteBuffer ) {
-            CompositeParser parser = Composites.newCompositeParser( byteBuffer );
-            byte[] b = new byte[byteBuffer.remaining()];
-
-            //byteBuffer.get( b, 0, b.length );
-            //return mapper.readValue(b, Entity.class);
+           CompositeParser parser = Composites.newCompositeParser( byteBuffer );
 
             byte[] version = parser.read( BYTES_ARRAY_SERIALIZER );
-//            try {
-//                version = mapper.readValue( byteBuffer.array(),0,1, byte[].class);
-//            }
-//            catch ( IOException e ) {
-//                e.printStackTrace();
-//            }
 
             if ( !Arrays.equals( VERSION, version ) ) {
                 throw new UnsupportedOperationException( "A version of type " + version + " is unsupported" );
             }
 
             byte[] state = parser.read( BYTES_ARRAY_SERIALIZER );
-//            try {
-//                state = mapper.readValue( byteBuffer.array(),1,2, new TypeReference<Byte>() {});
-//            }
-//            catch ( IOException e ) {
-//                e.printStackTrace();
-//            }
 
             /**
              * It's been deleted, remove it
@@ -378,113 +360,22 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
                 return new EntityWrapper( MvccEntity.Status.COMPLETE, Optional.<Entity>absent() );
             }
 
-            LinkedHashMap storedObject = null;
             Entity storedEntity = null;
-            String derper = null;
-            byteBuffer.position( 0 );
-            try {
-                storedEntity = mapper.readValue( helper,Entity.class);
-            }
-            catch ( IOException e ) {
-                e.printStackTrace();
-            }
-            storedEntity = convertToEntity(storedObject);
 
-            final Optional<Entity> entity = Optional.of( storedEntity );
-
-            if ( Arrays.equals( STATE_COMPLETE, state ) ) {
-                return new EntityWrapper( MvccEntity.Status.COMPLETE, entity );
-            }
-
-            //it's partial by default
-            return new EntityWrapper( MvccEntity.Status.PARTIAL, entity );
-        }
-
-        private Entity convertToEntity( final Object storedObject ) {
-            Entity storedEntity = null;
-            return null;
-        }
-    }
-
-    /**
-     * TODO: Serializer for the entity. This just uses object serialization, change this to use SMILE before production!
-     * We want to retain the Optional wrapper.  It helps us easily mark something as cleaned without removing the column
-     * and makes it obvious that the entity could be missing in the api
-     */
-    private static class ObjSerializer extends AbstractSerializer<EntityWrapper> {
-
-        private static final BytesArraySerializer BYTES_ARRAY_SERIALIZER = BytesArraySerializer.get();
-        private static final ObjectSerializer SER = ObjectSerializer.get();
-
-        private static byte[] STATE_COMPLETE = new byte[] { 0 };
-        private static byte[] STATE_DELETED = new byte[] { 1 };
-        private static byte[] STATE_PARTIAL = new byte[] { 2 };
-
-        private static byte[] VERSION = new byte[] { 0 };
-
-
-        //the marker for when we're passed a "null" value
-        private static final byte[] EMPTY = new byte[] { 0x0 };
-
-
-        @Override
-        public ByteBuffer toByteBuffer( final EntityWrapper wrapper ) {
-
-
-            CompositeBuilder builder = Composites.newCompositeBuilder();
-
-
-            builder.addBytes( VERSION );
-
-
-            //mark this version as empty
-            if ( !wrapper.entity.isPresent() ) {
-                //we're empty
-                builder.addBytes( STATE_DELETED );
-
-                return builder.build();
-            }
-
-            //we have an entity
-
-            if ( wrapper.status == MvccEntity.Status.COMPLETE ) {
-                builder.addBytes( STATE_COMPLETE );
-            }
-
-            else {
-                builder.addBytes( STATE_PARTIAL );
-            }
-
-            builder.addBytes( SER.toByteBuffer( wrapper.entity.get() ));
-
-            return builder.build();
-        }
-
-
-        @Override
-        public EntityWrapper fromByteBuffer( final ByteBuffer byteBuffer ) {
-
-            CompositeParser parser = Composites.newCompositeParser( byteBuffer );
+            ByteBuffer jsonBytes = parser.read(  BUFFER_SERIALIZER );
 
+            try {
 
-            final byte[] version = parser.read( BYTES_ARRAY_SERIALIZER );
+                byte[] array = jsonBytes.array();
+                int start = jsonBytes.arrayOffset();
+                int length = jsonBytes.remaining();
 
-            if ( !Arrays.equals( VERSION, version ) ) {
-                throw new UnsupportedOperationException( "A version of type " + version + " is unsupported" );
+                storedEntity = mapper.readValue( array,start,length,Entity.class);
             }
-
-
-            final byte[] state = parser.read( BYTES_ARRAY_SERIALIZER );
-
-            /**
-             * It's been deleted, remove it
-             */
-            if ( Arrays.equals( STATE_DELETED, state ) ) {
-                return new EntityWrapper( MvccEntity.Status.COMPLETE, Optional.<Entity>absent() );
+            catch ( IOException e ) {
+                e.printStackTrace();
             }
 
-            final Entity storedEntity = ( Entity ) parser.read( SER );
-
             final Optional<Entity> entity = Optional.of( storedEntity );
 
             if ( Arrays.equals( STATE_COMPLETE, state ) ) {
@@ -492,7 +383,6 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
             }
 
             //it's partial by default
-
             return new EntityWrapper( MvccEntity.Status.PARTIAL, entity );
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b4b5564b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
index bc4485d..ea4cb7b 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
@@ -322,7 +322,7 @@ public class MvccEntitySerializationStrategyImplTest {
         //YES THIS SHOULD BE DOING WHA TI THOUGHT< BUT ITSN:T
         Field<Boolean> boolFieldReturned = returned.getEntity().get().getField( boolField.getName() );
 
-        assertSame( boolField, boolFieldReturned );
+        assertEquals( boolField, boolFieldReturned );
 
         Set<Field> results = new HashSet<Field>();
         results.addAll( entity.getFields() );

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b4b5564b/stack/corepersistence/model/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/pom.xml b/stack/corepersistence/model/pom.xml
index 418ae53..8a7af5b 100644
--- a/stack/corepersistence/model/pom.xml
+++ b/stack/corepersistence/model/pom.xml
@@ -40,11 +40,6 @@
             <version>${commons.lang.version}</version>
             <scope>test</scope>
         </dependency>
-      <dependency>
-        <groupId>com.facebook.giraph.hive</groupId>
-        <artifactId>hive-io-exp-cmdline</artifactId>
-        <version>0.8-SNAPSHOT</version>
-      </dependency>
 
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b4b5564b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
index ee6e656..1444961 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
@@ -20,9 +20,11 @@ package org.apache.usergrid.persistence.model.entity;
 
 
 import java.util.UUID;
+
+import org.codehaus.jackson.annotate.JsonIgnore;
+
 import org.apache.usergrid.persistence.model.field.value.EntityObject;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.base.Preconditions;
 
 
@@ -73,6 +75,7 @@ public class Entity extends EntityObject {
     }
 
 
+    @JsonIgnore
     public Id getId() {
         return id;
     }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b4b5564b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
index e898392..331516e 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
@@ -19,10 +19,16 @@
 package org.apache.usergrid.persistence.model.field.value;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.codehaus.jackson.annotate.JsonAnyGetter;
+import org.codehaus.jackson.annotate.JsonAnySetter;
+import org.codehaus.jackson.annotate.JsonIgnore;
+import org.codehaus.jackson.annotate.JsonTypeInfo;
+
 import org.apache.usergrid.persistence.model.field.Field;
 
 /**
@@ -33,11 +39,13 @@ public class EntityObject implements Serializable {
     /**
      * Fields the users can set
      */
+    @JsonTypeInfo( use= JsonTypeInfo.Id.CLASS,include= JsonTypeInfo.As.WRAPPER_OBJECT,property="@class" )
     private final Map<String, Field> fields = new HashMap<String, Field>();
 
     /**
      * Add the field, return the old one if it existed
      */
+    @JsonIgnore
     public <T extends java.lang.Object> Field<T> setField( Field<T> value ) {
         return fields.put( value.getName(), value );
     }
@@ -45,10 +53,26 @@ public class EntityObject implements Serializable {
     /**
      * Get the field by name the user has set into the entity
      */
+    @JsonIgnore
     public <T extends java.lang.Object> Field<T> getField( String name ) {
         return fields.get( name );
     }
 
+    @JsonAnySetter
+    public void setFields(ArrayList al) {
+        if(al.size() == 0)
+            return;
+
+        for(int i = 0; i < al.size(); i++) {
+            Field fd = ( Field ) al.get( i );
+            fields.put( fd.getName(), fd);
+        }
+    }
+
+    @JsonAnyGetter
+    public void getFields( String name) {
+        fields.get( name );
+    }
     /**
      * Get all fields in the entity
      */


[06/28] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By grey (34) and others
# Via Dave Johnson (7) and others
* 'two-dot-o' of https://github.com/usergrid/usergrid: (93 commits)
  Update to reflect current state of Query-Index module.
  Use validation utils to validate entity and scope.
  Strip down the Results class to bare essentials.
  99 of 100 tests passing in query-index module, one skipped because no connection support yet.
  Adding 43 more legacy tests for query-index for total of 100 (7 are still failing).
  Ignore two-dot-o's ignored files.
  Better stress test for EntityManagerFacade.
  61 tests passing, 3 tests skipped.
  Renamed PR to match org.apache
  Ignored file creation tests as they are not always deleted for unknown reasons.
  Added license file headers to all new files.
  Removed ExportInfo and all mentions of it in the code.
  Fixed bug where timestamp was only instantiated only once.
  Added error checking to rest endpoint, with test cases for each exception thrown. Renamed returned entity from export job “Export Entity”
  Fixed collections bug, fixed all tests to prepare for removal of ExportInfo.
  Fixed s3 cloud exporting functionality. Fixed and retested integration test to make sure.
  Made blanket changes to remove ExportInfo to support serialization of export information.
  Fixed all tests, and code. Tomcat issue still persists.
  Added test to avoid collisions in management service, but didn’t seem to work for a certain test. Currently ignored. Made errors clearer in for rest endpoints. Added map code to try to fix Tomcat runtime error, but didn’t fix the issue. Added exportJob as a beanie.
  Removed OAuthResponse to simplify code. Created test for new error checking in ExportInfo.
  ...


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

Branch: refs/heads/two-dot-o
Commit: fe4d388c7c2d175e4963a14a513f945b4cb755a4
Parents: 3af1805 5f6ca31
Author: grey <gr...@apigee.com>
Authored: Mon Mar 10 14:28:33 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Mar 10 14:28:33 2014 -0700

----------------------------------------------------------------------
 .gitignore                                      |    13 +-
 portal/Gruntfile.js                             |    74 +-
 portal/archive/coming_soon.html                 |    31 +
 .../ui-bg_diagonals-thick_90_eeeeee_40x40.png   |   Bin 0 -> 251 bytes
 .../images/ui-bg_flat_100_deedf7_40x100.png     |   Bin 0 -> 182 bytes
 .../images/ui-bg_flat_100_e4f1fb_40x100.png     |   Bin 0 -> 213 bytes
 .../images/ui-bg_flat_100_f2f5f7_40x100.png     |   Bin 0 -> 212 bytes
 .../images/ui-bg_flat_15_cd0a0a_40x100.png      |   Bin 0 -> 181 bytes
 .../images/ui-bg_flat_50_3baae3_40x100.png      |   Bin 0 -> 182 bytes
 .../images/ui-bg_flat_80_d7ebf9_40x100.png      |   Bin 0 -> 183 bytes
 .../ui-bg_highlight-hard_70_000000_1x100.png    |   Bin 0 -> 118 bytes
 .../ui-bg_highlight-soft_25_ffef8f_1x100.png    |   Bin 0 -> 153 bytes
 .../images/ui-icons_000000_256x240.png          |   Bin 0 -> 4369 bytes
 .../images/ui-icons_2694e8_256x240.png          |   Bin 0 -> 4369 bytes
 .../images/ui-icons_2e83ff_256x240.png          |   Bin 0 -> 4369 bytes
 .../images/ui-icons_3d80b3_256x240.png          |   Bin 0 -> 4369 bytes
 .../images/ui-icons_72a7cf_256x240.png          |   Bin 0 -> 4369 bytes
 .../images/ui-icons_ffffff_256x240.png          |   Bin 0 -> 4369 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 0 -> 33956 bytes
 portal/archive/images/APNS_certification.png    |   Bin 0 -> 16855 bytes
 portal/archive/images/android-notification.png  |   Bin 0 -> 41629 bytes
 portal/archive/images/android-sdk-download.png  |   Bin 0 -> 4848 bytes
 portal/archive/images/api-activity.gif          |   Bin 0 -> 10819 bytes
 portal/archive/images/apigee-logo.png           |   Bin 0 -> 3647 bytes
 portal/archive/images/apigeetopbar.png          |   Bin 0 -> 4658 bytes
 portal/archive/images/background_one_col.png    |   Bin 0 -> 3126 bytes
 portal/archive/images/btn-copyCurl-up.png       |   Bin 0 -> 2762 bytes
 portal/archive/images/clippy-bg.png             |   Bin 0 -> 561 bytes
 portal/archive/images/close.gif                 |   Bin 0 -> 718 bytes
 portal/archive/images/dotnet-sdk-download.png   |   Bin 0 -> 7149 bytes
 portal/archive/images/down_arrow.png            |   Bin 0 -> 1285 bytes
 portal/archive/images/error.png                 |   Bin 0 -> 2009 bytes
 portal/archive/images/faviconApigee.ico         |   Bin 0 -> 1150 bytes
 .../images/glyphicons-halflings-white.png       |   Bin 0 -> 4352 bytes
 portal/archive/images/glyphicons-halflings.png  |   Bin 0 -> 4352 bytes
 .../glyphicons_halflings_135_wrench-white2.pdn  |   Bin 0 -> 5400 bytes
 .../glyphicons_halflings_135_wrench-white2.png  |   Bin 0 -> 296 bytes
 .../images/glyphicons_halflings_135_wrench.png  |   Bin 0 -> 228 bytes
 .../glyphicons_halflings_135_wrench_white.png   |   Bin 0 -> 251 bytes
 .../glyphicons_halflings_wrench_white.png       |   Bin 0 -> 1016 bytes
 portal/archive/images/google_api_key.png        |   Bin 0 -> 98118 bytes
 portal/archive/images/green_dot.png             |   Bin 0 -> 3472 bytes
 portal/archive/images/grid.png                  |   Bin 0 -> 166 bytes
 portal/archive/images/icons.png                 |   Bin 0 -> 13132 bytes
 portal/archive/images/ios-sdk-download.png      |   Bin 0 -> 4886 bytes
 portal/archive/images/iphone_message.png        |   Bin 0 -> 90307 bytes
 .../archive/images/javascript-sdk-download.png  |   Bin 0 -> 4618 bytes
 portal/archive/images/left_arrow.png            |   Bin 0 -> 1257 bytes
 portal/archive/images/logo-white.png            |   Bin 0 -> 2014 bytes
 portal/archive/images/menuActiveTriangle.png    |   Bin 0 -> 315 bytes
 portal/archive/images/nodejs-sdk-download.png   |   Bin 0 -> 5273 bytes
 portal/archive/images/notice.png                |   Bin 0 -> 2112 bytes
 portal/archive/images/orange-arrow.png          |   Bin 0 -> 242 bytes
 .../archive/images/push_notifications_icon.png  |   Bin 0 -> 338 bytes
 portal/archive/images/red_dot.png               |   Bin 0 -> 3482 bytes
 portal/archive/images/right_arrow.png           |   Bin 0 -> 1251 bytes
 portal/archive/images/ruby-sdk-download.png     |   Bin 0 -> 6343 bytes
 portal/archive/images/step_1.png                |   Bin 0 -> 1953 bytes
 portal/archive/images/step_2.png                |   Bin 0 -> 2117 bytes
 portal/archive/images/step_3.png                |   Bin 0 -> 2162 bytes
 portal/archive/images/success.png               |   Bin 0 -> 1863 bytes
 portal/archive/images/swish_arrow.png           |   Bin 0 -> 220 bytes
 portal/archive/images/topbackground.png         |   Bin 0 -> 2890 bytes
 portal/archive/images/up_arrow.png              |   Bin 0 -> 1292 bytes
 portal/archive/images/user-photo.png            |   Bin 0 -> 3849 bytes
 portal/archive/images/user_profile.png          |   Bin 0 -> 3775 bytes
 portal/archive/images/usergrid_200.png          |   Bin 0 -> 6397 bytes
 portal/archive/images/usergrid_400.png          |   Bin 0 -> 8746 bytes
 portal/archive/images/warning.png               |   Bin 0 -> 1179 bytes
 portal/archive/images/yellow_dot.png            |   Bin 0 -> 3475 bytes
 portal/archive/index-stripped2.html             |  1795 ++
 portal/archive/index.html                       |  1910 ++
 portal/archive/js/app/app.js                    |   131 +
 portal/archive/js/app/console.js                |  5393 ++++
 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                               |     3 +-
 portal/build.sh                                 |    14 +-
 portal/config.js                                |    19 +-
 portal/css/dash.min.css                         |     1 +
 portal/css/main.css                             |  1391 +-
 portal/img/verify.png                           |   Bin 0 -> 22934 bytes
 portal/index-debug.html                         |   128 +
 portal/index-template.html                      |    26 +-
 portal/index.html                               |   128 +
 .../js/app-overview/app-overview-controller.js  |     5 +-
 portal/js/app-overview/app-overview.html        |     8 +-
 .../js/app-overview/doc-includes/android.html   |     2 +-
 .../app-overview/doc-includes/images/verify.png |   Bin 22934 -> 0 bytes
 portal/js/app-overview/doc-includes/ios.html    |     2 +-
 .../app-overview/doc-includes/javascript.html   |     2 +-
 .../app-overview/getting-started-controller.js  |     5 +-
 portal/js/app-overview/getting-started.html     |    39 +-
 portal/js/app.js                                |   106 +-
 portal/js/charts/chart-controller.js            |     2 +-
 portal/js/data/data.html                        |     9 +-
 portal/js/global/page-controller.js             |    36 +-
 portal/js/global/page-service.js                |   214 -
 portal/js/global/page-title.html                |    17 +
 portal/js/global/page-title.js                  |    31 +
 portal/js/global/ug-service.js                  |   208 +-
 portal/js/global/utility-service.js             |     4 +-
 portal/js/groups/groups-details-controller.js   |     2 +-
 portal/js/groups/groups.html                    |    13 +-
 .../libs/bootstrap/custom/css/bootstrap.min.css |   867 +-
 .../js/libs/jqueryui/jquery-ui-1.8.9.custom.css |   574 +-
 .../js/libs/jqueryui/jquery-ui-timepicker.css   |    54 +-
 portal/js/libs/usergrid-libs.min.js             |    22 +
 portal/js/libs/usergrid.sdk.js                  |     8 +-
 portal/js/login/forgot-password-controller.js   |     7 +-
 portal/js/login/login.html                      |     2 +-
 portal/js/org-overview/org-overview.html        |    12 +-
 portal/js/profile/account.html                  |     9 +-
 portal/js/roles/roles-controller.js             |     2 +-
 portal/js/roles/roles.html                      |    10 +-
 portal/js/shell/shell.html                      |     9 +-
 portal/js/templates.js                          |  2963 ++
 portal/js/usergrid-dev.min.js                   |  4770 +++
 portal/js/usergrid.min.js                       |     6 +
 portal/js/users/users-controller.js             |     4 +-
 portal/js/users/users-profile-controller.js     |     2 +-
 portal/js/users/users.html                      |    15 +-
 portal/package.json                             |     8 +-
 portal/phantomjsdriver.log                      |  3869 +++
 portal/seleniumLog.txt                          |     0
 portal/tests/karma.conf.js                      |     2 +-
 portal/tests/protractor/data.spec.js            |     9 +-
 portal/tests/protractor/monitoring.spec.js      |    15 -
 portal/tests/protractor/profile.spec.js         |     4 +
 portal/tests/protractor/push.spec.js            |    15 -
 portal/tests/protractor/users.spec.js           |    21 +-
 portal/tests/protractor/util.js                 |    17 +-
 portal/tests/protractorConf.js                  |    15 +-
 portal/tests/unit/sample.spec.js                |    12 +-
 sdks/html5-javascript/Release.md                |     6 +
 sdks/html5-javascript/lib/Usergrid.js           |     3 +-
 sdks/html5-javascript/lib/modules/Client.js     |    16 +-
 sdks/html5-javascript/lib/modules/Collection.js |    14 +-
 sdks/html5-javascript/lib/modules/Counter.js    |    16 +-
 sdks/html5-javascript/lib/modules/Entity.js     |    55 +-
 sdks/html5-javascript/lib/modules/Group.js      |    28 +-
 sdks/html5-javascript/tests/mocha/test.js       |  1588 +-
 sdks/html5-javascript/usergrid.js               |   138 +-
 sdks/html5-javascript/usergrid.min.js           |     6 +-
 .../lib/vendor/Apigee/Usergrid/Collection.php   |     4 +-
 stack/build-tools/pom.xml                       |    16 +
 .../src/main/resources/usergrid/checkstyle.xml  |    16 +
 stack/config/pom.xml                            |    16 +
 stack/config/src/main/resources/log4j.xml       |    16 +
 .../main/resources/usergrid-default.properties  |    12 +
 stack/config/src/test/resources/cassandra.yaml  |    14 +-
 stack/config/src/test/resources/hazelcast.xml   |    16 +
 stack/config/src/test/resources/log4j.xml       |    16 +
 stack/core/pom.xml                              |    16 +
 .../persistence/query/tree/QueryFilter.g        |    34 +
 .../java/org/apache/usergrid/batch/AppArgs.java |    16 +
 .../java/org/apache/usergrid/batch/Job.java     |    16 +
 .../org/apache/usergrid/batch/JobExecution.java |    17 +-
 .../apache/usergrid/batch/JobExecutionImpl.java |    18 +-
 .../org/apache/usergrid/batch/JobFactory.java   |    16 +
 .../usergrid/batch/JobNotFoundException.java    |    16 +
 .../org/apache/usergrid/batch/JobRuntime.java   |    17 +-
 .../usergrid/batch/JobRuntimeException.java     |    16 +
 .../usergrid/batch/UsergridJobFactory.java      |    16 +
 .../apache/usergrid/batch/job/OnlyOnceJob.java  |    17 +-
 .../apache/usergrid/batch/job/package-info.java |     1 -
 .../usergrid/batch/repository/JobAccessor.java  |     1 -
 .../batch/repository/JobDescriptor.java         |    16 +
 .../usergrid/batch/repository/package-info.java |     1 -
 .../org/apache/usergrid/batch/service/App.java  |    16 +
 .../usergrid/batch/service/JobListener.java     |     1 -
 .../batch/service/JobSchedulerService.java      |     1 -
 .../usergrid/batch/service/package-info.java    |     1 -
 .../hazelcast/HazelcastLifecycleMonitor.java    |    17 +-
 .../apache/usergrid/count/AbstractBatcher.java  |    17 +-
 .../apache/usergrid/count/BatchSubmitter.java   |    17 +-
 .../java/org/apache/usergrid/count/Batcher.java |    17 +-
 .../usergrid/count/CassandraCounterStore.java   |    17 +-
 .../usergrid/count/CassandraSubmitter.java      |    17 +-
 .../apache/usergrid/count/CountProducer.java    |    17 +-
 .../CounterProcessingUnavailableException.java  |    17 +-
 .../org/apache/usergrid/count/CounterStore.java |    17 +-
 .../apache/usergrid/count/SimpleBatcher.java    |    17 +-
 .../usergrid/count/Slf4JBatchSubmitter.java     |    17 +-
 .../org/apache/usergrid/count/common/Count.java |    17 +-
 .../usergrid/count/common/CountSerDeUtils.java  |    17 +-
 .../common/CountTransportSerDeException.java    |    17 +-
 .../org/apache/usergrid/count/package-info.java |    16 +
 .../usergrid/exception/JsonReadException.java   |    18 +-
 .../usergrid/exception/JsonWriteException.java  |    18 +-
 .../exception/NotImplementedException.java      |    17 +-
 .../java/org/apache/usergrid/locking/Lock.java  |    17 +-
 .../org/apache/usergrid/locking/LockHelper.java |    17 +-
 .../apache/usergrid/locking/LockManager.java    |    17 +-
 .../usergrid/locking/LockPathBuilder.java       |    17 +-
 .../locking/cassandra/HectorLockImpl.java       |    17 +-
 .../cassandra/HectorLockManagerImpl.java        |    17 +-
 .../locking/exception/UGLockException.java      |    17 +-
 .../usergrid/locking/noop/NoOpLockImpl.java     |    17 +-
 .../locking/noop/NoOpLockManagerImpl.java       |    17 +-
 .../locking/singlenode/SingleNodeLockImpl.java  |    17 +-
 .../singlenode/SingleNodeLockManagerImpl.java   |    17 +-
 .../zookeeper/ZooKeeperLockManagerImpl.java     |    17 +-
 .../locking/zookeeper/ZookeeperLockImpl.java    |    17 +-
 .../org/apache/usergrid/mq/CounterQuery.java    |    17 +-
 .../java/org/apache/usergrid/mq/Message.java    |    17 +-
 .../main/java/org/apache/usergrid/mq/Query.java |    17 +-
 .../apache/usergrid/mq/QueryFilterLexer.java    |    16 +
 .../apache/usergrid/mq/QueryFilterParser.java   |    16 +
 .../org/apache/usergrid/mq/QueryProcessor.java  |    16 +
 .../main/java/org/apache/usergrid/mq/Queue.java |    17 +-
 .../org/apache/usergrid/mq/QueueManager.java    |    17 +-
 .../apache/usergrid/mq/QueueManagerFactory.java |    17 +-
 .../org/apache/usergrid/mq/QueuePosition.java   |    17 +-
 .../java/org/apache/usergrid/mq/QueueQuery.java |    17 +-
 .../org/apache/usergrid/mq/QueueResults.java    |    17 +-
 .../java/org/apache/usergrid/mq/QueueSet.java   |    17 +-
 .../usergrid/mq/cassandra/CassandraMQUtils.java |    17 +-
 .../mq/cassandra/MessageIndexUpdate.java        |    17 +-
 .../usergrid/mq/cassandra/QueueIndexUpdate.java |    17 +-
 .../mq/cassandra/QueueManagerFactoryImpl.java   |    17 +-
 .../usergrid/mq/cassandra/QueueManagerImpl.java |    17 +-
 .../apache/usergrid/mq/cassandra/QueuesCF.java  |    17 +-
 .../mq/cassandra/io/AbstractSearch.java         |    17 +-
 .../mq/cassandra/io/ConsumerTransaction.java    |    17 +-
 .../usergrid/mq/cassandra/io/EndSearch.java     |    17 +-
 .../usergrid/mq/cassandra/io/FilterSearch.java  |    17 +-
 .../mq/cassandra/io/NoTransactionSearch.java    |    17 +-
 .../usergrid/mq/cassandra/io/QueueBounds.java   |    16 +
 .../usergrid/mq/cassandra/io/QueueSearch.java   |    17 +-
 .../usergrid/mq/cassandra/io/StartSearch.java   |    17 +-
 .../usergrid/persistence/AbstractEntity.java    |    17 +-
 .../usergrid/persistence/AggregateCounter.java  |    17 +-
 .../persistence/AggregateCounterSet.java        |    17 +-
 .../persistence/AssociatedEntityRef.java        |    17 +-
 .../usergrid/persistence/CollectionRef.java     |    17 +-
 .../persistence/ConnectedEntityRef.java         |    17 +-
 .../usergrid/persistence/ConnectionRef.java     |    17 +-
 .../usergrid/persistence/CounterQuery.java      |    17 +-
 .../usergrid/persistence/CounterResolution.java |    17 +-
 .../usergrid/persistence/CredentialsInfo.java   |    17 +-
 .../usergrid/persistence/DynamicEntity.java     |    17 +-
 .../org/apache/usergrid/persistence/Entity.java |    17 +-
 .../usergrid/persistence/EntityFactory.java     |    17 +-
 .../usergrid/persistence/EntityManager.java     |    17 +-
 .../persistence/EntityManagerFactory.java       |    17 +-
 .../persistence/EntityPropertyComparator.java   |    17 +-
 .../apache/usergrid/persistence/EntityRef.java  |    17 +-
 .../usergrid/persistence/EntityUtils.java       |    17 +-
 .../apache/usergrid/persistence/Identifier.java |    17 +-
 .../persistence/IndexBucketLocator.java         |    17 +-
 .../persistence/MultiQueryIterator.java         |    16 +
 .../persistence/PagingResultsIterator.java      |    16 +
 .../apache/usergrid/persistence/PathQuery.java  |    16 +
 .../org/apache/usergrid/persistence/Query.java  |    22 +-
 .../apache/usergrid/persistence/QueryUtils.java |    16 +
 .../usergrid/persistence/RelationManager.java   |    17 +-
 .../apache/usergrid/persistence/Results.java    |    17 +-
 .../apache/usergrid/persistence/RoleRef.java    |    17 +-
 .../org/apache/usergrid/persistence/Schema.java |    17 +-
 .../persistence/SimpleCollectionRef.java        |    17 +-
 .../usergrid/persistence/SimpleEntityRef.java   |    17 +-
 .../usergrid/persistence/SimpleRoleRef.java     |    17 +-
 .../usergrid/persistence/TypedEntity.java       |    17 +-
 .../org/apache/usergrid/persistence/Update.java |    17 +-
 .../annotations/EntityCollection.java           |    17 +-
 .../annotations/EntityDictionary.java           |    17 +-
 .../persistence/annotations/EntityProperty.java |    17 +-
 .../persistence/cassandra/ApplicationCF.java    |    17 +-
 .../usergrid/persistence/cassandra/CFEnum.java  |    17 +-
 .../cassandra/CassandraPersistenceUtils.java    |    17 +-
 .../persistence/cassandra/CassandraService.java |    17 +-
 .../cassandra/ConnectedEntityRefImpl.java       |    17 +-
 .../cassandra/ConnectionRefImpl.java            |    17 +-
 .../persistence/cassandra/CounterUtils.java     |    17 +-
 .../persistence/cassandra/CursorCache.java      |    16 +
 .../cassandra/EntityManagerFactoryImpl.java     |    17 +-
 .../cassandra/EntityManagerImpl.java            |    17 +-
 .../cassandra/EntityValueSerializer.java        |    17 +-
 .../persistence/cassandra/GeoIndexManager.java  |    17 +-
 .../persistence/cassandra/IndexUpdate.java      |    17 +-
 .../persistence/cassandra/QueryProcessor.java   |    17 +-
 .../cassandra/RelationManagerImpl.java          |    17 +-
 .../usergrid/persistence/cassandra/Setup.java   |    17 +-
 .../cassandra/SimpleIndexBucketLocatorImpl.java |    17 +-
 .../cassandra/index/ConnectedIndexScanner.java  |    17 +-
 .../cassandra/index/IndexBucketScanner.java     |    17 +-
 .../index/IndexMultiBucketSetLoader.java        |    17 +-
 .../cassandra/index/IndexScanner.java           |    17 +-
 .../cassandra/index/NoOpIndexScanner.java       |    17 +-
 .../cassandra/util/Slf4jTraceTagReporter.java   |    16 +
 .../cassandra/util/TaggedOpTimer.java           |    16 +
 .../persistence/cassandra/util/TimedOpTag.java  |    16 +
 .../cassandra/util/TraceParticipant.java        |    16 +
 .../persistence/cassandra/util/TraceTag.java    |    16 +
 .../cassandra/util/TraceTagAspect.java          |    16 +
 .../cassandra/util/TraceTagManager.java         |    16 +
 .../cassandra/util/TraceTagReporter.java        |    16 +
 .../usergrid/persistence/entities/Activity.java |    17 +-
 .../persistence/entities/Application.java       |    17 +-
 .../usergrid/persistence/entities/Asset.java    |    17 +-
 .../usergrid/persistence/entities/Device.java   |    17 +-
 .../usergrid/persistence/entities/Event.java    |    17 +-
 .../usergrid/persistence/entities/Export.java   |   158 +
 .../usergrid/persistence/entities/Folder.java   |    17 +-
 .../usergrid/persistence/entities/Group.java    |    17 +-
 .../usergrid/persistence/entities/JobData.java  |    17 +-
 .../usergrid/persistence/entities/JobStat.java  |    17 +-
 .../usergrid/persistence/entities/Message.java  |    17 +-
 .../usergrid/persistence/entities/Role.java     |    17 +-
 .../usergrid/persistence/entities/User.java     |    17 +-
 .../ApplicationAlreadyExistsException.java      |    17 +-
 .../DuplicateUniquePropertyExistsException.java |    17 +-
 .../exceptions/EntityNotFoundException.java     |    17 +-
 .../exceptions/LockingException.java            |    18 +-
 .../exceptions/NoFullTextIndexException.java    |    17 +-
 .../exceptions/NoIndexException.java            |    17 +-
 .../exceptions/PersistenceException.java        |    17 +-
 .../PropertyTypeConversionException.java        |    17 +-
 .../exceptions/QueryIterationException.java     |    16 +
 .../exceptions/QueryParseException.java         |    17 +-
 .../exceptions/QueryTokenException.java         |    17 +-
 .../persistence/exceptions/QueueException.java  |    18 +-
 .../RequiredPropertyNotFoundException.java      |    17 +-
 .../TransactionNotFoundException.java           |    17 +-
 .../UnexpectedEntityTypeException.java          |    17 +-
 .../persistence/geo/CollectionGeoSearch.java    |    16 +
 .../persistence/geo/ConnectionGeoSearch.java    |    16 +
 .../persistence/geo/EntityLocationRef.java      |    16 +
 .../EntityLocationRefDistanceComparator.java    |    17 +-
 .../persistence/geo/GeoIndexSearcher.java       |    16 +
 .../persistence/geo/GeocellManager.java         |    16 +
 .../usergrid/persistence/geo/GeocellUtils.java  |    24 +-
 .../geo/comparator/DoubleTupleComparator.java   |    16 +
 .../persistence/geo/model/BoundingBox.java      |    27 +-
 .../persistence/geo/model/CostFunction.java     |    27 +-
 .../geo/model/DefaultCostFunction.java          |    27 +-
 .../usergrid/persistence/geo/model/Point.java   |    27 +-
 .../usergrid/persistence/geo/model/Tuple.java   |    16 +
 .../usergrid/persistence/query/ir/AllNode.java  |    16 +
 .../usergrid/persistence/query/ir/AndNode.java  |    17 +-
 .../persistence/query/ir/BooleanNode.java       |    17 +-
 .../query/ir/EmailIdentifierNode.java           |    16 +
 .../query/ir/NameIdentifierNode.java            |    16 +
 .../persistence/query/ir/NodeVisitor.java       |    17 +-
 .../usergrid/persistence/query/ir/NotNode.java  |    17 +-
 .../usergrid/persistence/query/ir/OrNode.java   |    17 +-
 .../persistence/query/ir/OrderByNode.java       |    17 +-
 .../persistence/query/ir/QueryNode.java         |    17 +-
 .../persistence/query/ir/QuerySlice.java        |    17 +-
 .../persistence/query/ir/SearchVisitor.java     |    16 +
 .../persistence/query/ir/SliceNode.java         |    17 +-
 .../query/ir/UuidIdentifierNode.java            |    16 +
 .../persistence/query/ir/WithinNode.java        |    17 +-
 .../query/ir/result/AbstractScanColumn.java     |    16 +
 .../result/CollectionResultsLoaderFactory.java  |    16 +
 .../ir/result/ConnectionIndexSliceParser.java   |    17 +-
 .../query/ir/result/ConnectionRefLoader.java    |    16 +
 .../result/ConnectionResultsLoaderFactory.java  |    16 +
 .../ir/result/ConnectionTypesIterator.java      |    16 +
 .../query/ir/result/EmptyIterator.java          |    16 +
 .../query/ir/result/EntityRefLoader.java        |    17 +-
 .../query/ir/result/EntityResultsLoader.java    |    17 +-
 .../query/ir/result/GeoIterator.java            |    17 +-
 .../persistence/query/ir/result/IDLoader.java   |    16 +
 .../query/ir/result/IntersectionIterator.java   |    17 +-
 .../query/ir/result/MergeIterator.java          |    17 +-
 .../query/ir/result/MultiIterator.java          |    17 +-
 .../query/ir/result/OrderByIterator.java        |    17 +-
 .../query/ir/result/ResultIterator.java         |    17 +-
 .../query/ir/result/ResultsLoader.java          |    17 +-
 .../query/ir/result/ResultsLoaderFactory.java   |    16 +
 .../persistence/query/ir/result/ScanColumn.java |    16 +
 .../query/ir/result/ScanColumnTransformer.java  |    16 +
 .../ir/result/SecondaryIndexSliceParser.java    |    17 +-
 .../query/ir/result/SliceIterator.java          |    17 +-
 .../query/ir/result/SliceParser.java            |    17 +-
 .../query/ir/result/StaticIdIterator.java       |    16 +
 .../query/ir/result/SubtractionIterator.java    |    17 +-
 .../query/ir/result/UUIDIndexSliceParser.java   |    17 +-
 .../query/ir/result/UnionIterator.java          |    17 +-
 .../persistence/query/tree/AndOperand.java      |    17 +-
 .../persistence/query/tree/BooleanLiteral.java  |    17 +-
 .../persistence/query/tree/BooleanOperand.java  |    17 +-
 .../persistence/query/tree/ContainsOperand.java |    17 +-
 .../query/tree/ContainsProperty.java            |    17 +-
 .../usergrid/persistence/query/tree/Equal.java  |    17 +-
 .../persistence/query/tree/EqualityOperand.java |    17 +-
 .../persistence/query/tree/FloatLiteral.java    |    17 +-
 .../persistence/query/tree/GreaterThan.java     |    17 +-
 .../query/tree/GreaterThanEqual.java            |    17 +-
 .../persistence/query/tree/LessThan.java        |    17 +-
 .../persistence/query/tree/LessThanEqual.java   |    17 +-
 .../persistence/query/tree/Literal.java         |    17 +-
 .../persistence/query/tree/LiteralFactory.java  |    17 +-
 .../persistence/query/tree/LongLiteral.java     |    17 +-
 .../persistence/query/tree/NotOperand.java      |    17 +-
 .../persistence/query/tree/NumericLiteral.java  |    17 +-
 .../persistence/query/tree/Operand.java         |    17 +-
 .../persistence/query/tree/OrOperand.java       |    17 +-
 .../persistence/query/tree/Property.java        |    17 +-
 .../persistence/query/tree/QueryVisitor.java    |    17 +-
 .../persistence/query/tree/StringLiteral.java   |    17 +-
 .../persistence/query/tree/UUIDLiteral.java     |    17 +-
 .../persistence/query/tree/WithinOperand.java   |    17 +-
 .../persistence/query/tree/WithinProperty.java  |    17 +-
 .../persistence/schema/CollectionInfo.java      |    17 +-
 .../persistence/schema/DictionaryInfo.java      |    17 +-
 .../usergrid/persistence/schema/EntityInfo.java |    17 +-
 .../persistence/schema/PropertyInfo.java        |    17 +-
 .../usergrid/system/UsergridSystemMonitor.java  |    16 +
 .../org/apache/usergrid/utils/AESUtils.java     |     1 -
 .../org/apache/usergrid/utils/DateUtils.java    |    15 -
 .../org/apache/usergrid/utils/Inflector.java    |    25 -
 .../org/apache/usergrid/utils/package-info.java |     1 -
 .../main/resources/usergrid-core-context.xml    |    16 +
 .../resources/usergrid-scheduler-context.xml    |    17 +
 stack/core/src/site/apt/format.apt              |    17 +-
 stack/core/src/site/apt/index.apt               |    16 +
 stack/core/src/site/fml/faq.fml                 |    17 +
 stack/core/src/site/site.xml                    |    16 +
 stack/core/src/site/xdoc/xdoc.xml               |    18 +-
 stack/core/src/test/java/io/baas/Simple.java    |    19 -
 .../org/apache/usergrid/AbstractCoreIT.java     |    17 +-
 .../java/org/apache/usergrid/Application.java   |    16 +
 .../apache/usergrid/ConcurrentCoreITSuite.java  |    17 +-
 .../usergrid/ConcurrentCoreIteratorITSuite.java |    16 +
 .../usergrid/ConcurrentCoreTestSuite.java       |    16 +
 .../org/apache/usergrid/CoreApplication.java    |    17 +-
 .../java/org/apache/usergrid/CoreITSetup.java   |    17 +-
 .../org/apache/usergrid/CoreITSetupImpl.java    |    16 +
 .../java/org/apache/usergrid/CoreITSuite.java   |    16 +
 .../java/org/apache/usergrid/CoreTestSuite.java |    17 +-
 .../org/apache/usergrid/batch/AppArgsTest.java  |    16 +
 .../batch/BulkJobExecutionUnitTest.java         |    16 +
 .../apache/usergrid/batch/BulkTestUtils.java    |    16 +
 .../batch/ConcurrentSchedulerITSuite.java       |    16 +
 .../batch/ConcurrentSchedulerTestSuite.java     |    16 +
 .../apache/usergrid/batch/SchedulerITSuite.java |    16 +
 .../usergrid/batch/SchedulerTestSuite.java      |    16 +
 .../usergrid/batch/UsergridJobFactoryTest.java  |    16 +
 .../usergrid/batch/job/TestJobListener.java     |     1 -
 .../usergrid/batch/job/TestJobListenerTest.java |     1 -
 .../apache/usergrid/batch/job/package-info.java |     1 -
 .../clustering/hazelcast/HazelcastTest.java     |    17 +-
 .../count/BatchCountParallelismTest.java        |    16 +
 .../usergrid/count/SimpleBatcherTest.java       |    17 +-
 .../count/common/CountSerDeUtilsTest.java       |    17 +-
 .../apache/usergrid/count/common/CountTest.java |    17 +-
 .../locking/cassandra/HectorLockManagerIT.java  |    17 +-
 .../SingleNodeLockTestSingleNode.java           |    17 +-
 .../zookeeper/AbstractZooKeeperTest.java        |    17 +-
 .../usergrid/locking/zookeeper/ZooPut.java      |    17 +-
 .../zookeeper/ZookeeperLockManagerTest.java     |    17 +-
 .../java/org/apache/usergrid/mq/MessagesIT.java |    17 +-
 .../org/apache/usergrid/mq/QueuePathsTest.java  |    17 +-
 .../usergrid/persistence/CollectionIT.java      |    17 +-
 .../usergrid/persistence/CoreSchemaManager.java |    16 +
 .../apache/usergrid/persistence/CounterIT.java  |    17 +-
 .../persistence/EntityConnectionsIT.java        |    17 +-
 .../persistence/EntityDictionaryIT.java         |    17 +-
 .../usergrid/persistence/EntityManagerIT.java   |    17 +-
 .../EntityPropertyComparatorTest.java           |    16 +
 .../apache/usergrid/persistence/EntityTest.java |    17 +-
 .../org/apache/usergrid/persistence/GeoIT.java  |    17 +-
 .../apache/usergrid/persistence/IndexIT.java    |    17 +-
 .../usergrid/persistence/PathQueryIT.java       |    16 +
 .../usergrid/persistence/PermissionsIT.java     |    17 +-
 .../apache/usergrid/persistence/QueryTest.java  |    17 +-
 .../usergrid/persistence/QueryUtilsTest.java    |    16 +
 .../apache/usergrid/persistence/SchemaTest.java |    21 +-
 .../apache/usergrid/persistence/UtilsTest.java  |    17 +-
 .../cassandra/EntityManagerFactoryImplIT.java   |    17 +-
 .../cassandra/QueryProcessorTest.java           |    17 +-
 .../SimpleIndexBucketLocatorImplTest.java       |    17 +-
 .../cassandra/util/TraceTagUnitTest.java        |    16 +
 .../persistence/entities/SampleEntity.java      |    17 +-
 ...EntityLocationRefDistanceComparatorTest.java |    17 +-
 .../query/AbstractIteratingQueryIT.java         |    17 +-
 .../persistence/query/AllInCollectionIT.java    |    17 +-
 .../persistence/query/AllInConnectionIT.java    |    17 +-
 .../query/AllInConnectionNoTypeIT.java          |    17 +-
 .../query/IntersectionUnionPagingIT.java        |    17 +-
 .../query/MultiOrderByCollectionIT.java         |    17 +-
 .../MultiOrderByComplexUnionCollectionIT.java   |    17 +-
 .../MultiOrderByComplexUnionConnectionIT.java   |    17 +-
 .../query/MultiOrderByConnectionIT.java         |    17 +-
 .../query/NotOrderByCollectionIT.java           |    17 +-
 .../query/NotOrderByConnectionIT.java           |    17 +-
 ...gleOrderByBoundRangeScanAscCollectionIT.java |    17 +-
 ...gleOrderByBoundRangeScanAscConnectionIT.java |    17 +-
 ...leOrderByBoundRangeScanDescCollectionIT.java |    17 +-
 ...leOrderByBoundRangeScanDescConnectionIT.java |    17 +-
 ...eOrderByComplexIntersectionCollectionIT.java |    17 +-
 ...eOrderByComplexIntersectionConnectionIT.java |    17 +-
 .../SingleOrderByComplexUnionCollectionIT.java  |    17 +-
 .../SingleOrderByComplexUnionConnectionIT.java  |    17 +-
 .../SingleOrderByIntersectionCollectionIT.java  |    17 +-
 .../SingleOrderByIntersectionConnectionIT.java  |    17 +-
 .../SingleOrderByLessThanLimitCollectionIT.java |    17 +-
 .../SingleOrderByLessThanLimitConnectionIT.java |    17 +-
 .../SingleOrderByMaxLimitCollectionIT.java      |    17 +-
 .../SingleOrderByMaxLimitConnectionIT.java      |    17 +-
 ...SingleOrderByNoIntersectionCollectionIT.java |    17 +-
 ...SingleOrderByNoIntersectionConnectionIT.java |    17 +-
 .../query/SingleOrderByNotCollectionIT.java     |    17 +-
 .../query/SingleOrderByNotConnectionIT.java     |    17 +-
 ...OrderBySameRangeScanGreaterCollectionIT.java |    17 +-
 ...OrderBySameRangeScanGreaterConnectionIT.java |    17 +-
 ...meRangeScanGreaterThanEqualCollectionIT.java |    17 +-
 ...gleOrderBySameRangeScanLessCollectionIT.java |    17 +-
 ...gleOrderBySameRangeScanLessConnectionIT.java |    17 +-
 ...ySameRangeScanLessThanEqualCollectionIT.java |    17 +-
 ...ySameRangeScanLessThanEqualConnectionIT.java |    17 +-
 .../query/ir/result/AbstractScanColumnTest.java |    16 +
 .../query/ir/result/InOrderIterator.java        |    16 +
 .../ir/result/IntersectionIteratorTest.java     |    17 +-
 .../query/ir/result/IteratorHelper.java         |    16 +
 .../ir/result/SubtractionIteratorTest.java      |    17 +-
 .../query/ir/result/UnionIteratorTest.java      |    17 +-
 .../persistence/query/tree/GrammarTreeTest.java |    17 +-
 .../persistence/query/tree/LongLiteralTest.java |    17 +-
 .../query/tree/StringLiteralTest.java           |    17 +-
 .../system/UsergridSystemMonitorIT.java         |    16 +
 .../apache/usergrid/utils/TimeUtilsTest.java    |     1 -
 .../org/apache/usergrid/utils/package-info.java |     1 -
 .../core/src/test/java/org/usergrid/Simple.java |    36 +
 .../collection/rx/CassandraThreadScheduler.java |     2 +-
 .../collection/EntityCollectionManagerST.java   |    89 -
 .../EntityCollectionManagerStressTest.java      |   104 +
 stack/corepersistence/queryindex/README.md      |    41 +-
 .../index/EntityCollectionIndex.java            |     5 +
 .../index/impl/EsEntityCollectionIndex.java     |   106 +-
 .../persistence/index/impl/EsProvider.java      |    62 +-
 .../usergrid/persistence/query/Query.java       |    54 +-
 .../usergrid/persistence/query/Results.java     |   875 +-
 .../persistence/index/impl/CollectionIT.java    |    23 +-
 .../impl/EntityCollectionIndexStressTest.java   |    77 +-
 .../index/impl/EntityCollectionIndexTest.java   |    21 +-
 .../usergrid/persistence/index/impl/GeoIT.java  |    60 +-
 .../persistence/index/impl/IndexIT.java         |    36 +-
 .../index/legacy/EntityManagerFacade.java       |    53 +-
 .../query/AbstractIteratingQueryIT.java         |  1385 +
 .../persistence/query/AllInCollectionIT.java    |    33 +
 .../persistence/query/AllInConnectionIT.java    |    32 +
 .../query/AllInConnectionNoTypeIT.java          |    55 +
 .../query/IntersectionUnionPagingIT.java        |   170 +
 .../query/MultiOrderByCollectionIT.java         |    33 +
 .../MultiOrderByComplexUnionCollectionIT.java   |    33 +
 .../MultiOrderByComplexUnionConnectionIT.java   |    33 +
 .../query/MultiOrderByConnectionIT.java         |    34 +
 .../query/NotOrderByCollectionIT.java           |    33 +
 .../query/NotOrderByConnectionIT.java           |    33 +
 ...gleOrderByBoundRangeScanAscCollectionIT.java |    33 +
 ...gleOrderByBoundRangeScanAscConnectionIT.java |    33 +
 ...leOrderByBoundRangeScanDescCollectionIT.java |    33 +
 ...leOrderByBoundRangeScanDescConnectionIT.java |    33 +
 ...eOrderByComplexIntersectionCollectionIT.java |    33 +
 ...eOrderByComplexIntersectionConnectionIT.java |    34 +
 .../SingleOrderByComplexUnionCollectionIT.java  |    33 +
 .../SingleOrderByComplexUnionConnectionIT.java  |    33 +
 .../SingleOrderByIntersectionCollectionIT.java  |    33 +
 .../SingleOrderByIntersectionConnectionIT.java  |    33 +
 .../SingleOrderByLessThanLimitCollectionIT.java |    33 +
 .../SingleOrderByLessThanLimitConnectionIT.java |    33 +
 .../SingleOrderByMaxLimitCollectionIT.java      |    34 +
 .../SingleOrderByMaxLimitConnectionIT.java      |    34 +
 ...SingleOrderByNoIntersectionCollectionIT.java |    33 +
 ...SingleOrderByNoIntersectionConnectionIT.java |    33 +
 .../query/SingleOrderByNotCollectionIT.java     |    33 +
 .../query/SingleOrderByNotConnectionIT.java     |    33 +
 ...OrderBySameRangeScanGreaterCollectionIT.java |    33 +
 ...OrderBySameRangeScanGreaterConnectionIT.java |    33 +
 ...meRangeScanGreaterThanEqualCollectionIT.java |    33 +
 ...gleOrderBySameRangeScanLessCollectionIT.java |    33 +
 ...gleOrderBySameRangeScanLessConnectionIT.java |    33 +
 ...ySameRangeScanLessThanEqualCollectionIT.java |    33 +
 ...ySameRangeScanLessThanEqualConnectionIT.java |    33 +
 .../src/test/resources/usergrid-UNIT.properties |     1 -
 stack/launcher/launch                           |    18 +-
 stack/launcher/pom.xml                          |    16 +
 .../java/org/apache/usergrid/launcher/App.java  |    17 +-
 .../apache/usergrid/launcher/AppleUtils.java    |    17 +-
 .../org/apache/usergrid/launcher/JarMain.java   |     1 -
 .../apache/usergrid/launcher/LauncherFrame.java |    17 +-
 .../usergrid/launcher/LogViewerFrame.java       |    17 +-
 .../apache/usergrid/launcher/package-info.java  |     1 -
 .../launcher/src/main/resources/cassandra.yaml  |    14 +-
 .../resources/usergrid-standalone-context.xml   |    16 +
 .../resources/usergrid-standalone.properties    |    23 +
 stack/mongo-emulator/pom.xml                    |    16 +
 .../usergrid/mongo/MongoChannelHandler.java     |    17 +-
 .../usergrid/mongo/MongoMessageDecoder.java     |    17 +-
 .../usergrid/mongo/MongoMessageEncoder.java     |    17 +-
 .../org/apache/usergrid/mongo/MongoQuery.java   |    17 +-
 .../org/apache/usergrid/mongo/MongoServer.java  |    17 +-
 .../mongo/MongoServerPipelineFactory.java       |    17 +-
 .../usergrid/mongo/commands/Buildinfo.java      |    17 +-
 .../usergrid/mongo/commands/Collstats.java      |    17 +-
 .../apache/usergrid/mongo/commands/Count.java   |    17 +-
 .../apache/usergrid/mongo/commands/Dbstats.java |    17 +-
 .../usergrid/mongo/commands/Getlasterror.java   |    17 +-
 .../usergrid/mongo/commands/ListDatabases.java  |    17 +-
 .../usergrid/mongo/commands/MongoCommand.java   |    17 +-
 .../mongo/commands/ReplSetGetStatus.java        |    17 +-
 .../usergrid/mongo/commands/ServerStatus.java   |    17 +-
 .../usergrid/mongo/commands/Whatsmyuri.java     |    17 +-
 .../apache/usergrid/mongo/protocol/Message.java |    17 +-
 .../apache/usergrid/mongo/protocol/OpCrud.java  |    17 +-
 .../usergrid/mongo/protocol/OpDelete.java       |    17 +-
 .../usergrid/mongo/protocol/OpGetMore.java      |    17 +-
 .../usergrid/mongo/protocol/OpInsert.java       |    17 +-
 .../usergrid/mongo/protocol/OpKillCursors.java  |    17 +-
 .../apache/usergrid/mongo/protocol/OpMsg.java   |    17 +-
 .../apache/usergrid/mongo/protocol/OpQuery.java |    17 +-
 .../apache/usergrid/mongo/protocol/OpReply.java |    17 +-
 .../usergrid/mongo/protocol/OpUpdate.java       |    17 +-
 .../usergrid/mongo/query/MongoQueryParser.java  |    17 +-
 .../mongo/testproxy/MongoMessageFrame.java      |    17 +-
 .../testproxy/MongoProxyInboundHandler.java     |    17 +-
 .../testproxy/MongoProxyPipelineFactory.java    |    17 +-
 .../mongo/testproxy/MongoProxyServer.java       |    17 +-
 .../testproxy/MongoProxyServerHandler.java      |    17 +-
 .../apache/usergrid/mongo/utils/BSONUtils.java  |    17 +-
 .../usergrid/mongo/AbstractMongoTest.java       |    17 +-
 .../apache/usergrid/mongo/BasicMongoTest.java   |    16 +
 .../usergrid/mongo/DatabaseInitializer.java     |    17 +-
 .../apache/usergrid/mongo/MongoQueryTest.java   |    16 +
 stack/pom.xml                                   |    71 +
 stack/query-validator/pom.xml                   |    18 +-
 .../query/validator/ApiServerRunner.java        |    17 +-
 .../validator/DefaultQueryResultsMatcher.java   |    17 +-
 .../usergrid/query/validator/QueryEntity.java   |    17 +-
 .../usergrid/query/validator/QueryRequest.java  |    17 +-
 .../usergrid/query/validator/QueryResponse.java |    17 +-
 .../query/validator/QueryResultsMatcher.java    |    17 +-
 .../usergrid/query/validator/QueryRunner.java   |    19 +-
 .../validator/QueryValidationConfiguration.java |    17 +-
 .../query/validator/QueryValidator.java         |    17 +-
 .../usergrid/query/validator/SqliteRunner.java  |    17 +-
 .../usergrid-query-validator-context.xml        |    16 +
 .../query/validator/AbstractQueryIT.java        |    17 +-
 .../usergrid/query/validator/QueryITSuite.java  |    19 +-
 .../query/validator/users/UserQueryIT.java      |    19 +-
 .../src/test/resources/project.properties       |    16 +
 .../resources/usergrid-custom-test.properties   |    16 +
 .../test/resources/usergrid-test-context.xml    |    16 +
 stack/rest/pom.xml                              |    17 +
 .../usergrid/rest/AbstractContextResource.java  |    17 +-
 .../org/apache/usergrid/rest/ApiResponse.java   |    17 +-
 .../rest/JacksonCustomMapperProvider.java       |    17 +-
 .../org/apache/usergrid/rest/RootResource.java  |    17 +-
 .../rest/ServerEnvironmentProperties.java       |    16 +
 .../apache/usergrid/rest/SwaggerServlet.java    |    17 +-
 .../apache/usergrid/rest/SystemResource.java    |    17 +-
 .../usergrid/rest/TextToJsonSwapWriter.java     |    16 +
 .../rest/applications/ApplicationResource.java  |    17 +-
 .../rest/applications/AuthResource.java         |    17 +-
 .../rest/applications/ServiceResource.java      |    17 +-
 .../applications/assets/AssetsResource.java     |    16 +
 .../applications/events/EventsResource.java     |    17 +-
 .../rest/applications/queues/QueueResource.java |    17 +-
 .../queues/QueueSubscriberResource.java         |    17 +-
 .../queues/QueueSubscriptionResource.java       |    17 +-
 .../queues/QueueTransactionsResource.java       |    17 +-
 .../users/AbstractUserExtensionResource.java    |    17 +-
 .../rest/applications/users/UserResource.java   |    17 +-
 .../rest/applications/users/UsersResource.java  |    17 +-
 .../exceptions/AbstractExceptionMapper.java     |    17 +-
 .../usergrid/rest/exceptions/AuthErrorInfo.java |    17 +-
 .../AuthorizationExceptionMapper.java           |    17 +-
 ...cateUniquePropertyExistsExceptionMapper.java |    17 +-
 .../EntityNotFoundExceptionMapper.java          |    17 +-
 ...orbiddenServiceOperationExceptionMapper.java |    17 +-
 .../IllegalArgumentExceptionMapper.java         |    17 +-
 .../exceptions/JsonReadExceptionMapper.java     |    12 +-
 .../exceptions/JsonWriteExceptionMapper.java    |    12 +-
 .../exceptions/ManagementExceptionMapper.java   |    17 +-
 .../usergrid/rest/exceptions/NoOpException.java |    17 +-
 .../rest/exceptions/NoOpExceptionMapper.java    |    17 +-
 .../NotImplementedExceptionMapper.java          |    17 +-
 .../exceptions/OAuthProblemExceptionMapper.java |    17 +-
 ...rganizationApplicationNotFoundException.java |    16 +
 ...ationApplicationNotFoundExceptionMapper.java |    16 +
 .../exceptions/PersistenceExceptionMapper.java  |    17 +-
 .../exceptions/QueryParseExceptionMapper.java   |    17 +-
 .../exceptions/QueryTokenExceptionMapper.java   |    17 +-
 .../RecentlyUsedPasswordExceptionMapper.java    |    16 +
 .../rest/exceptions/RedirectionException.java   |    16 +
 .../exceptions/RedirectionExceptionMapper.java  |    17 +-
 ...RequiredPropertyNotFoundExceptionMapper.java |    17 +-
 .../rest/exceptions/SecurityException.java      |    17 +-
 .../exceptions/SecurityExceptionMapper.java     |    17 +-
 .../rest/exceptions/ServiceExceptionMapper.java |    17 +-
 .../ServiceResourceNotFoundExceptionMapper.java |    17 +-
 .../rest/exceptions/ThrowableMapper.java        |    17 +-
 .../TransactionNotFoundExceptionMapper.java     |    17 +-
 .../rest/filters/ContentTypeFilter.java         |    17 +-
 .../rest/filters/JSONPCallbackFilter.java       |    17 +-
 .../usergrid/rest/filters/MeteringFilter.java   |    17 +-
 .../usergrid/rest/filters/TracingFilter.java    |    16 +
 .../rest/management/ManagementResource.java     |    32 +-
 .../management/metrics/MetricsResource.java     |    16 +
 .../organizations/OrganizationResource.java     |    17 +-
 .../organizations/OrganizationsResource.java    |    17 +-
 .../applications/ApplicationResource.java       |   198 +-
 .../applications/ApplicationsResource.java      |    17 +-
 .../organizations/users/UsersResource.java      |    17 +-
 .../rest/management/users/UserResource.java     |    17 +-
 .../rest/management/users/UsersResource.java    |    17 +-
 .../organizations/OrganizationsResource.java    |    17 +-
 .../organizations/OrganizationResource.java     |    16 +
 .../rest/security/CrossOriginRequestFilter.java |    17 +-
 .../security/SecuredResourceFilterFactory.java  |    17 +-
 .../annotations/RequireAdminUserAccess.java     |    17 +-
 .../annotations/RequireApplicationAccess.java   |    17 +-
 .../annotations/RequireOrganizationAccess.java  |    17 +-
 .../annotations/RequireSystemAccess.java        |    17 +-
 .../security/shiro/RestSecurityManager.java     |    17 +-
 .../ShiroAuthenticationExceptionMapper.java     |    17 +-
 .../shiro/filters/BasicAuthSecurityFilter.java  |    17 +-
 .../ClientCredentialsSecurityFilter.java        |    17 +-
 .../OAuth2AccessTokenSecurityFilter.java        |    17 +-
 .../security/shiro/filters/SecurityFilter.java  |    17 +-
 .../session/HttpRequestSessionManager.java      |    17 +-
 .../session/HttpServletRequestSession.java      |    17 +-
 .../usergrid/rest/test/PropertiesResource.java  |    11 +-
 .../apache/usergrid/rest/utils/CORSUtils.java   |    17 +-
 .../apache/usergrid/rest/utils/JSONPUtils.java  |    17 +-
 .../usergrid/rest/utils/PathingUtils.java       |    16 +
 .../main/resources/swagger/applications.json    |    16 +
 .../src/main/resources/swagger/management.json  |    16 +
 .../src/main/resources/swagger/resources.json   |    16 +
 .../main/resources/usergrid-rest-context.xml    |    16 +
 .../resources/usergrid-rest-deploy-context.xml  |    16 +
 stack/rest/src/main/webapp/WEB-INF/c.tld        |    17 +-
 .../apache/usergrid/rest/TestResource/error.jsp |    16 +
 .../apache/usergrid/rest/TestResource/test.jsp  |    16 +
 .../ApplicationResource/authorize_form.jsp      |    16 +
 .../applications/ApplicationResource/error.jsp  |    16 +
 .../users/UserResource/activate.jsp             |    16 +
 .../applications/users/UserResource/confirm.jsp |    16 +
 .../applications/users/UserResource/error.jsp   |    16 +
 .../users/UserResource/resetpw_email_form.jsp   |    16 +
 .../UserResource/resetpw_email_success.jsp      |    16 +
 .../users/UserResource/resetpw_set_form.jsp     |    16 +
 .../users/UserResource/resetpw_set_success.jsp  |    16 +
 .../applications/users/UsersResource/error.jsp  |    16 +
 .../users/UsersResource/resetpw_email_form.jsp  |    16 +
 .../UsersResource/resetpw_email_success.jsp     |    16 +
 .../ManagementResource/authorize_form.jsp       |    16 +
 .../management/ManagementResource/error.jsp     |    16 +
 .../OrganizationResource/activate.jsp           |    16 +
 .../OrganizationResource/confirm.jsp            |    16 +
 .../OrganizationResource/error.jsp              |    16 +
 .../management/users/UserResource/activate.jsp  |    16 +
 .../management/users/UserResource/confirm.jsp   |    16 +
 .../management/users/UserResource/error.jsp     |    16 +
 .../users/UserResource/resetpw_email_form.jsp   |    16 +
 .../UserResource/resetpw_email_success.jsp      |    16 +
 .../users/UserResource/resetpw_set_form.jsp     |    16 +
 .../users/UserResource/resetpw_set_success.jsp  |    16 +
 .../management/users/UsersResource/error.jsp    |    16 +
 .../users/UsersResource/resetpw_email_form.jsp  |    16 +
 .../UsersResource/resetpw_email_success.jsp     |    16 +
 stack/rest/src/main/webapp/WEB-INF/web.xml      |    16 +
 stack/rest/src/main/webapp/css/styles.css       |    17 +-
 .../apache/usergrid/rest/AbstractRestIT.java    |    17 +-
 .../java/org/apache/usergrid/rest/BasicIT.java  |    17 +-
 .../usergrid/rest/ConcurrentRestITSuite.java    |    16 +
 .../usergrid/rest/DatabaseInitializer.java      |    17 +-
 .../java/org/apache/usergrid/rest/ITSetup.java  |    26 +-
 .../org/apache/usergrid/rest/RestITSuite.java   |    26 +-
 .../apache/usergrid/rest/TestContextSetup.java  |    16 +
 .../apache/usergrid/rest/TomcatResource.java    |    16 +
 .../ApplicationRequestCounterIT.java            |    24 +-
 .../applications/ApplicationResourceIT.java     |    16 +-
 .../rest/applications/DevicesResourceIT.java    |    16 +
 .../applications/assets/AssetResourceIT.java    |    16 +
 .../collection/BadGrammarQueryTest.java         |    16 +
 .../collection/BrowserCompatibilityTest.java    |    17 +-
 .../collection/PagingResourceIT.java            |    17 +-
 .../collection/activities/AndOrQueryTest.java   |    16 +
 .../collection/activities/OrderByTest.java      |    16 +
 .../activities/PagingEntitiesTest.java          |    16 +
 .../collection/activities/PutTest.java          |    16 +
 .../collection/groups/GeoPagingTest.java        |    26 +-
 .../collection/groups/UpdateGroupIT.java        |    26 +-
 .../applications/events/EventsResourceIT.java   |    16 +
 .../queues/AbstractQueueResourceIT.java         |    16 +
 .../queues/QueueResourceLong1IT.java            |    16 +
 .../queues/QueueResourceLong2IT.java            |    16 +
 .../queues/QueueResourceLong3IT.java            |    16 +
 .../queues/QueueResourceShortIT.java            |    16 +
 .../applications/users/ActivityResourceIT.java  |    17 +-
 .../users/CollectionsResourceIT.java            |    17 +-
 .../users/ConnectionResourceTest.java           |    16 +
 .../applications/users/GroupResourceIT.java     |    17 +-
 .../applications/users/OwnershipResourceIT.java |    17 +-
 .../users/PermissionsResourceIT.java            |    17 +-
 .../applications/users/RetrieveUsersTest.java   |    16 +
 .../rest/applications/users/UserResourceIT.java |    17 +-
 .../users/extensions/TestResource.java          |    17 +-
 .../rest/applications/utils/TestUtils.java      |    17 +-
 .../rest/applications/utils/UserRepo.java       |    16 +
 .../rest/filters/ContentTypeResourceIT.java     |    17 +-
 .../rest/management/ManagementResourceIT.java   |   598 +-
 .../rest/management/RegistrationIT.java         |    25 +-
 .../organizations/AdminEmailEncodingIT.java     |    16 +
 .../organizations/OrganizationResourceIT.java   |    16 +
 .../organizations/OrganizationsResourceIT.java  |    16 +
 .../applications/ApplicationsIT.java            |    84 +
 .../rest/management/users/MUUserResourceIT.java |    25 +-
 .../UsersOrganizationsResourceIT.java           |    16 +
 .../rest/test/PropertiesResourceIT.java         |    12 +-
 .../rest/test/resource/CollectionResource.java  |    17 +-
 .../usergrid/rest/test/resource/Connection.java |    17 +-
 .../rest/test/resource/CustomCollection.java    |    17 +-
 .../rest/test/resource/EntityResource.java      |    17 +-
 .../apache/usergrid/rest/test/resource/Me.java  |    17 +-
 .../rest/test/resource/NamedResource.java       |    17 +-
 .../rest/test/resource/ResultsParser.java       |    17 +-
 .../rest/test/resource/RootResource.java        |    17 +-
 .../rest/test/resource/SetResource.java         |    17 +-
 .../rest/test/resource/TestContext.java         |    26 +-
 .../rest/test/resource/ValueResource.java       |    17 +-
 .../rest/test/resource/app/Application.java     |    17 +-
 .../usergrid/rest/test/resource/app/Device.java |    17 +-
 .../usergrid/rest/test/resource/app/User.java   |    17 +-
 .../rest/test/resource/app/UsersCollection.java |    17 +-
 .../resource/app/queue/DevicesCollection.java   |    17 +-
 .../rest/test/resource/app/queue/Queue.java     |    17 +-
 .../resource/app/queue/QueuesCollection.java    |    17 +-
 .../app/queue/SubscribersCollection.java        |    17 +-
 .../test/resource/app/queue/Transaction.java    |    17 +-
 .../app/queue/TransactionsCollection.java       |    17 +-
 .../rest/test/resource/mgmt/Application.java    |    17 +-
 .../resource/mgmt/ApplicationsCollection.java   |    17 +-
 .../rest/test/resource/mgmt/Management.java     |    17 +-
 .../rest/test/resource/mgmt/Organization.java   |    17 +-
 .../resource/mgmt/OrganizationsCollection.java  |    17 +-
 .../rest/test/security/TestAdminUser.java       |    17 +-
 .../rest/test/security/TestAppUser.java         |    17 +-
 .../usergrid/rest/test/security/TestUser.java   |    17 +-
 stack/services/pom.xml                          |    16 +
 .../management/AccountCreationProps.java        |    17 +-
 .../usergrid/management/ActivationState.java    |    16 +
 .../usergrid/management/ApplicationCreator.java |    16 +
 .../usergrid/management/ApplicationInfo.java    |    17 +-
 .../usergrid/management/ManagementService.java  |    17 +-
 .../usergrid/management/OrganizationInfo.java   |    17 +-
 .../management/OrganizationOwnerInfo.java       |    17 +-
 .../management/OrganizationProfile.java         |    17 +-
 .../apache/usergrid/management/UserInfo.java    |    17 +-
 .../cassandra/AccountCreationPropsImpl.java     |    17 +-
 .../cassandra/ApplicationCreatorImpl.java       |    16 +
 .../cassandra/ManagementServiceImpl.java        |    45 +-
 .../ApplicationCreationException.java           |    16 +
 .../exceptions/DisabledAdminUserException.java  |    17 +-
 .../exceptions/DisabledAppUserException.java    |    17 +-
 .../exceptions/IncorrectPasswordException.java  |    17 +-
 .../exceptions/ManagementException.java         |    17 +-
 .../RecentlyUsedPasswordException.java          |    16 +
 .../UnableToLeaveOrganizationException.java     |    17 +-
 .../UnactivatedAdminUserException.java          |    17 +-
 .../exceptions/UnactivatedAppUserException.java |    17 +-
 .../UnactivatedOrganizationException.java       |    17 +-
 .../UnconfirmedAdminUserException.java          |    17 +-
 .../usergrid/management/export/ExportJob.java   |    81 +
 .../management/export/ExportService.java        |    48 +
 .../management/export/ExportServiceImpl.java    |   608 +
 .../usergrid/management/export/S3Export.java    |    35 +
 .../management/export/S3ExportImpl.java         |   109 +
 .../usergrid/management/utils/AccountUtils.java |    17 +-
 .../usergrid/security/AuthPrincipalInfo.java    |    17 +-
 .../usergrid/security/AuthPrincipalType.java    |    17 +-
 .../security/crypto/EncryptionService.java      |    17 +-
 .../security/crypto/EncryptionServiceImpl.java  |    17 +-
 .../security/crypto/command/BcryptCommand.java  |    17 +-
 .../crypto/command/EncryptionCommand.java       |    17 +-
 .../security/crypto/command/Md5HashCommand.java |    17 +-
 .../crypto/command/PlainTextCommand.java        |    17 +-
 .../crypto/command/SaltedHasherCommand.java     |    17 +-
 .../crypto/command/Sha1HashCommand.java         |    17 +-
 .../usergrid/security/oauth/AccessInfo.java     |    17 +-
 .../security/oauth/ClientCredentialsInfo.java   |    17 +-
 .../usergrid/security/oauth/OAuthProxy.java     |    17 +-
 .../security/oauth/OAuthProxyFactory.java       |    17 +-
 .../security/providers/AbstractProvider.java    |    16 +
 .../security/providers/FacebookProvider.java    |    16 +
 .../security/providers/FoursquareProvider.java  |    16 +
 .../providers/PingIdentityProvider.java         |    16 +
 .../security/providers/SignInAsProvider.java    |    16 +
 .../providers/SignInProviderFactory.java        |    16 +
 .../security/salt/NoOpSaltProvider.java         |    17 +-
 .../security/salt/PropertiesSaltProvider.java   |    17 +-
 .../usergrid/security/salt/SaltProvider.java    |    17 +-
 .../security/shiro/CustomPermission.java        |    17 +-
 .../shiro/CustomPermissionResolver.java         |    17 +-
 .../shiro/PrincipalCredentialsToken.java        |    17 +-
 .../apache/usergrid/security/shiro/Realm.java   |    17 +-
 .../AbstractAccessTokenCredentials.java         |    17 +-
 .../credentials/AbstractClientCredentials.java  |    17 +-
 .../AbstractPasswordCredentials.java            |    17 +-
 .../credentials/AccessTokenCredentials.java     |    17 +-
 .../shiro/credentials/AdminUserAccessToken.java |    17 +-
 .../shiro/credentials/AdminUserCredentials.java |    17 +-
 .../shiro/credentials/AdminUserPassword.java    |    17 +-
 .../credentials/ApplicationAccessToken.java     |    17 +-
 .../ApplicationClientCredentials.java           |    17 +-
 .../credentials/ApplicationCredentials.java     |    17 +-
 .../shiro/credentials/ApplicationGuest.java     |    17 +-
 .../credentials/ApplicationUserAccessToken.java |    17 +-
 .../credentials/ApplicationUserCredentials.java |    17 +-
 .../credentials/ApplicationUserPassword.java    |    17 +-
 .../shiro/credentials/ClientCredentials.java    |    17 +-
 .../credentials/OrganizationAccessToken.java    |    17 +-
 .../OrganizationClientCredentials.java          |    17 +-
 .../credentials/OrganizationCredentials.java    |    17 +-
 .../shiro/credentials/PasswordCredentials.java  |    17 +-
 .../shiro/credentials/PrincipalCredentials.java |    17 +-
 .../shiro/principals/AdminUserPrincipal.java    |    17 +-
 .../principals/ApplicationGuestPrincipal.java   |    17 +-
 .../shiro/principals/ApplicationPrincipal.java  |    17 +-
 .../principals/ApplicationUserPrincipal.java    |    17 +-
 .../shiro/principals/OrganizationPrincipal.java |    17 +-
 .../shiro/principals/PrincipalIdentifier.java   |    17 +-
 .../shiro/principals/UserPrincipal.java         |    17 +-
 .../security/shiro/utils/SubjectUtils.java      |    17 +-
 .../usergrid/security/tokens/TokenCategory.java |    17 +-
 .../usergrid/security/tokens/TokenInfo.java     |    16 +
 .../usergrid/security/tokens/TokenService.java  |    16 +
 .../tokens/cassandra/TokenServiceImpl.java      |    18 +-
 .../tokens/exceptions/BadTokenException.java    |    17 +-
 .../exceptions/ExpiredTokenException.java       |    17 +-
 .../exceptions/InvalidTokenException.java       |    17 +-
 .../tokens/exceptions/TokenException.java       |    17 +-
 .../services/AbstractCollectionService.java     |    20 +-
 .../services/AbstractConnectionsService.java    |    17 +-
 .../AbstractPathBasedColllectionService.java    |    17 +-
 .../usergrid/services/AbstractService.java      |    17 +-
 .../org/apache/usergrid/services/Service.java   |    17 +-
 .../apache/usergrid/services/ServiceAction.java |    17 +-
 .../ServiceCollectionEventListener.java         |    17 +-
 .../usergrid/services/ServiceContext.java       |    17 +-
 .../services/ServiceExecutionEvent.java         |    17 +-
 .../services/ServiceExecutionEventListener.java |    17 +-
 .../apache/usergrid/services/ServiceInfo.java   |    17 +-
 .../usergrid/services/ServiceManager.java       |    17 +-
 .../services/ServiceManagerFactory.java         |    17 +-
 .../usergrid/services/ServiceParameter.java     |    17 +-
 .../usergrid/services/ServicePayload.java       |    17 +-
 .../usergrid/services/ServiceRequest.java       |    17 +-
 .../usergrid/services/ServiceResults.java       |    17 +-
 .../apache/usergrid/services/ServiceUtils.java  |    17 +-
 .../services/activities/ActivitiesService.java  |    17 +-
 .../applications/ApplicationsService.java       |    17 +-
 .../usergrid/services/assets/AssetsService.java |    17 +-
 .../services/assets/data/AssetMimeHandler.java  |    16 +
 .../services/assets/data/AssetUtils.java        |    16 +
 .../services/assets/data/BinaryStore.java       |    16 +
 .../assets/data/LocalFileBinaryStore.java       |    16 +
 .../services/assets/data/S3BinaryStore.java     |    16 +
 .../services/devices/DevicesService.java        |    17 +-
 .../services/devices/users/UsersService.java    |    17 +-
 .../ForbiddenServiceOperationException.java     |    17 +-
 .../services/exceptions/ServiceException.java   |    17 +-
 .../exceptions/ServiceInvocationException.java  |    17 +-
 .../ServiceResourceNotFoundException.java       |    17 +-
 .../UndefinedServiceEntityTypeException.java    |    17 +-
 .../UnsupportedServiceOperationException.java   |    17 +-
 .../generic/GenericCollectionService.java       |    17 +-
 .../generic/GenericConnectionsService.java      |    17 +-
 .../services/generic/RootCollectionService.java |    17 +-
 .../usergrid/services/groups/GroupsService.java |    17 +-
 .../groups/activities/ActivitiesService.java    |    17 +-
 .../services/groups/roles/RolesService.java     |    17 +-
 .../services/groups/users/UsersService.java     |    17 +-
 .../users/activities/ActivitiesService.java     |    17 +-
 .../groups/users/devices/DevicesService.java    |    17 +-
 .../services/messages/MessagesService.java      |    17 +-
 .../usergrid/services/roles/RolesService.java   |    17 +-
 .../services/roles/groups/GroupsService.java    |    17 +-
 .../services/roles/users/UsersService.java      |    17 +-
 .../usergrid/services/users/UsersService.java   |    17 +-
 .../users/activities/ActivitiesService.java     |    53 +-
 .../services/users/devices/DevicesService.java  |    17 +-
 .../users/following/FollowingService.java       |    16 +
 .../services/users/groups/GroupsService.java    |    17 +-
 .../services/users/roles/RolesService.java      |    17 +-
 .../org/apache/usergrid/utils/PythonUtils.java  |    17 +-
 .../src/main/python/pyusergrid/__init__.py      |    15 +
 .../main/python/pyusergrid/services/__init__.py |    15 +
 .../pyusergrid/services/pytest/PytestService.py |    16 +
 .../pyusergrid/services/pytest/__init__.py      |    15 +
 .../python/pyusergrid/services/pytest/test.py   |    16 +
 stack/services/src/main/python/test/__init__.py |    15 +
 stack/services/src/main/python/test/test.py     |    16 +
 .../resources/usergrid-services-context.xml     |    26 +
 .../test/java/baas/io/simple/SimpleService.java |    18 -
 .../usergrid/ConcurrentServiceITSuite.java      |    16 +
 .../org/apache/usergrid/ServiceApplication.java |    16 +
 .../org/apache/usergrid/ServiceITSetup.java     |    19 +
 .../org/apache/usergrid/ServiceITSetupImpl.java |    22 +
 .../org/apache/usergrid/ServiceITSuite.java     |    16 +
 .../apache/usergrid/management/EmailFlowIT.java |    17 +-
 .../management/ManagementTestHelper.java        |    17 +-
 .../usergrid/management/MockImapClient.java     |    16 +
 .../usergrid/management/OrganizationIT.java     |    25 +-
 .../org/apache/usergrid/management/RoleIT.java  |    17 +-
 .../cassandra/ApplicationCreatorIT.java         |    16 +
 .../cassandra/ManagementServiceIT.java          |   723 +-
 .../cassandra/ManagementTestHelperImpl.java     |    17 +-
 .../management/cassandra/MockS3ExportImpl.java  |    72 +
 .../org/apache/usergrid/python/JythonTest.java  |    17 +-
 .../usergrid/security/CustomResolverTest.java   |    17 +-
 .../crypto/EncryptionServiceImplTest.java       |    17 +-
 .../crypto/command/BcryptCommandTest.java       |    17 +-
 .../crypto/command/Md5HashCommandTest.java      |    17 +-
 .../crypto/command/Sha1HashCommandTest.java     |    17 +-
 .../security/providers/FacebookProviderIT.java  |    16 +
 .../providers/PingIdentityProviderIT.java       |    16 +
 .../security/tokens/TokenServiceIT.java         |    16 +
 .../usergrid/services/AbstractServiceIT.java    |    17 +-
 .../usergrid/services/ActivitiesServiceIT.java  |    17 +-
 .../services/ApplicationsServiceIT.java         |    17 +-
 .../usergrid/services/CollectionServiceIT.java  |    17 +-
 .../usergrid/services/ConnectionsServiceIT.java |    17 +-
 .../usergrid/services/GroupServiceIT.java       |    17 +-
 .../usergrid/services/RolesServiceIT.java       |    17 +-
 .../usergrid/services/ServiceFactoryIT.java     |    19 +-
 .../usergrid/services/ServiceInfoTest.java      |    17 +-
 .../usergrid/services/ServiceInvocationIT.java  |    17 +-
 .../usergrid/services/ServiceRequestIT.java     |    17 +-
 .../usergrid/services/UsersServiceIT.java       |    17 +-
 .../services/assets/data/AssetUtilsTest.java    |    16 +
 .../usergrid/services/simple/SimpleService.java |    33 +
 .../src/test/resources/project.properties       |    16 +
 .../test/resources/usergrid-test-context.xml    |    16 +
 stack/test-utils/pom.xml                        |    16 +
 .../apache/usergrid/NoExitSecurityManager.java  |    16 +
 .../usergrid/cassandra/AvailablePortFinder.java |    27 +-
 .../usergrid/cassandra/CassandraResource.java   |    16 +
 .../usergrid/cassandra/ClearShiroSubject.java   |    16 +
 .../apache/usergrid/cassandra/Concurrent.java   |    16 +
 .../cassandra/ConcurrentJunitRunner.java        |    16 +
 .../usergrid/cassandra/ConcurrentSuite.java     |    16 +
 .../apache/usergrid/cassandra/DataControl.java  |    16 +
 .../apache/usergrid/cassandra/DataLoader.java   |    16 +
 .../usergrid/cassandra/SchemaManager.java       |    16 +
 .../src/main/resources/cassandra.yaml           |    12 +
 .../src/main/resources/log4j.properties         |    12 +
 .../cassandra/AnotherCassandraResourceIT.java   |    16 +
 .../cassandra/CassandraResourceITSuite.java     |    16 +
 .../cassandra/CassandraResourceTest.java        |    16 +
 .../usergrid/cassandra/FakeSchemaManager.java   |    16 +
 .../usergrid/cassandra/OkThisIsTheLastIT.java   |    16 +
 .../YetAnotherCassandraResourceIT.java          |    16 +
 .../src/test/resources/project.properties       |    12 +
 .../test/resources/usergrid-test-context.xml    |    16 +
 stack/tools/impoexpo.sh                         |    16 +
 stack/tools/pom.xml                             |    16 +
 stack/tools/src/main/assembly/release.xml       |    16 +
 .../main/dist/usergrid-custom-tools.properties  |    16 +
 stack/tools/src/main/dist/usergrid-export.sh    |    16 +
 .../java/org/apache/usergrid/tools/ApiDoc.java  |    17 +-
 .../org/apache/usergrid/tools/AppAudit.java     |    17 +-
 .../org/apache/usergrid/tools/AppNameFix.java   |    17 +-
 .../java/org/apache/usergrid/tools/Cli.java     |    17 +-
 .../java/org/apache/usergrid/tools/Command.java |    17 +-
 .../org/apache/usergrid/tools/CredExport.java   |    17 +-
 .../apache/usergrid/tools/DupAdminRepair.java   |    17 +-
 .../org/apache/usergrid/tools/DupOrgRepair.java |    17 +-
 .../apache/usergrid/tools/EntityCleanup.java    |    17 +-
 .../usergrid/tools/EntityInsertBenchMark.java   |    17 +-
 .../usergrid/tools/EntityReadBenchMark.java     |    17 +-
 .../org/apache/usergrid/tools/EntityUpdate.java |    16 +
 .../java/org/apache/usergrid/tools/Export.java  |    17 +-
 .../usergrid/tools/ExportDataCreator.java       |    17 +-
 .../usergrid/tools/ExportingToolBase.java       |    23 +-
 .../java/org/apache/usergrid/tools/Import.java  |    17 +-
 .../org/apache/usergrid/tools/ImportFB.java     |    17 +-
 .../org/apache/usergrid/tools/IndexRebuild.java |    17 +-
 .../java/org/apache/usergrid/tools/Metrics.java |    16 +
 .../usergrid/tools/OrganizationExport.java      |    16 +
 .../apache/usergrid/tools/PopulateSample.java   |    17 +-
 .../RepairingMismatchedApplicationMetadata.java |    73 +
 .../apache/usergrid/tools/ResetSuperUser.java   |    17 +-
 .../java/org/apache/usergrid/tools/SetupDB.java |    17 +-
 .../java/org/apache/usergrid/tools/Test.java    |    17 +-
 .../org/apache/usergrid/tools/ToolBase.java     |    16 +-
 .../usergrid/tools/UniqueIndexCleanup.java      |    17 +-
 .../org/apache/usergrid/tools/UserManager.java  |    16 +
 .../apache/usergrid/tools/WarehouseExport.java  |    16 +-
 .../apache/usergrid/tools/WarehouseUpsert.java  |    23 +-
 .../usergrid/tools/apidoc/swagger/Api.java      |    17 +-
 .../tools/apidoc/swagger/ApiListing.java        |    17 +-
 .../tools/apidoc/swagger/ApiOperation.java      |    17 +-
 .../tools/apidoc/swagger/ApiOperationError.java |    17 +-
 .../usergrid/tools/apidoc/swagger/ApiParam.java |    17 +-
 .../apidoc/swagger/ApiParamAllowableValues.java |    17 +-
 .../apache/usergrid/tools/bean/AppScore.java    |    16 +
 .../apache/usergrid/tools/bean/ExportOrg.java   |    17 +-
 .../apache/usergrid/tools/bean/MetricLine.java  |    16 +
 .../apache/usergrid/tools/bean/MetricQuery.java |    16 +
 .../apache/usergrid/tools/bean/MetricSort.java  |    16 +
 .../apache/usergrid/tools/bean/OrgScore.java    |    16 +
 .../src/main/resources/apidoc/applications.yaml |    11 +
 .../src/main/resources/apidoc/management.yaml   |    11 +
 stack/tools/src/main/resources/log4j.xml        |    16 +
 .../main/resources/toolsApplicationContext.xml  |    16 +
 .../src/main/resources/warehouse-schema.sql     |    18 +-
 stack/websocket/pom.xml                         |    16 +
 .../websocket/WebSocketChannelHandler.java      |    17 +-
 .../usergrid/websocket/WebSocketKeyStore.java   |    17 +-
 .../usergrid/websocket/WebSocketServer.java     |    30 +-
 .../websocket/WebSocketServerIndexPage.java     |    30 +-
 .../WebSocketServerPipelineFactory.java         |    17 +-
 .../websocket/WebSocketSslContextFactory.java   |    17 +-
 .../usergrid/websocket/ExampleListener.java     |    17 +-
 .../websocket/SimpleMessageProducer.java        |    17 +-
 .../usergrid/websocket/WebSocketServerTest.java |    17 +-
 .../src/test/resources/test-activemq.xml        |    27 +-
 .../test/resources/testApplicationContext.xml   |    16 +
 1208 files changed, 93737 insertions(+), 10184 deletions(-)
----------------------------------------------------------------------



[25/28] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Todd Nine
# Via Todd Nine
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Ignored test until mockito issues are resolved


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

Branch: refs/heads/two-dot-o
Commit: b341b044bf223abded454129931475ed3f04cea1
Parents: 5a1bcb9 289d66c
Author: grey <gr...@apigee.com>
Authored: Fri Mar 28 10:10:21 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Fri Mar 28 10:10:21 2014 -0700

----------------------------------------------------------------------
 .../usergrid/persistence/graph/GraphManagerTimeoutIT.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[04/28] git commit: Found out that I was using a wrong format. This build still has errors though, so not for review. Now pulling the version from the byte buffer.

Posted by sn...@apache.org.
Found out that I was using a wrong format. This build still has errors though, so not for review.
Now pulling the version from the byte buffer.


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

Branch: refs/heads/two-dot-o
Commit: c739fb02aa08d56ad9a515f298a9c6f1a47d0993
Parents: 5934ab0
Author: grey <gr...@apigee.com>
Authored: Thu Feb 27 10:13:31 2014 -0800
Committer: grey <gr...@apigee.com>
Committed: Thu Feb 27 10:13:31 2014 -0800

----------------------------------------------------------------------
 .../MvccEntitySerializationStrategyImpl.java    | 97 ++++++++++----------
 1 file changed, 46 insertions(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c739fb02/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
index 376cee7..e9466f2 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
@@ -27,11 +27,10 @@ import java.util.List;
 import java.util.UUID;
 
 import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.ObjectReader;
 import org.codehaus.jackson.smile.SmileFactory;
+import org.codehaus.jackson.smile.SmileParser;
 
 import org.apache.cassandra.db.marshal.BytesType;
 import org.apache.cassandra.db.marshal.ReversedType;
@@ -276,12 +275,12 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
         }
     }
 
-    public static class SmileSerializer extends AbstractSerializer<EntityWrapper> {
+    public static class EntitySerializer extends AbstractSerializer<EntityWrapper> {
 
         public static final SmileFactory f = new SmileFactory(  );
 
-        public static final org.codehaus.jackson.map.ObjectMapper mapper = new ObjectMapper( f );
-        private static final BytesArraySerializer BYTES_ARRAY_SERIALIZER = BytesArraySerializer.get();1
+        public static ObjectMapper mapper = new ObjectMapper( f );
+        private static final BytesArraySerializer BYTES_ARRAY_SERIALIZER = BytesArraySerializer.get();
 
 
         private static byte[] STATE_COMPLETE = new byte[] { 0 };
@@ -305,7 +304,11 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
 
 
             builder.addBytes( VERSION );
-
+            f.disable( SmileParser.Feature.REQUIRE_HEADER );
+           // f.enable( SmileGenerator.Feature.WRITE_HEADER );
+            //f.enable( SmileGenerator.Feature.WRITE_END_MARKER );
+            mapper = new ObjectMapper( f );
+            //mapper.enable( SmileGenerator.Feature.WRITE_HEADER );
 
             //mark this version as empty
             if ( !wrapper.entity.isPresent() ) {
@@ -341,52 +344,44 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
             return builder.build();
         }
 
-//problem with this code is that I'd have to use offsets, is that really the way we want to go?
         @Override
         public EntityWrapper fromByteBuffer( final ByteBuffer byteBuffer ) {
-//            CompositeParser parser = Composites.newCompositeParser( byteBuffer );
-//
-//            byte[] version = new byte[0];
-//
-//            try{
-//            version = mapper.readValue(byteBuffer.array(),byte[].class);//parser.read( mapper.reader());
-//            }
-//            catch ( JsonMappingException e ) {
-//                e.printStackTrace();
-//            }
-//            catch ( JsonParseException e ) {
-//                e.printStackTrace();
-//            }
-//            catch ( IOException e ) {
-//                e.printStackTrace();
-//            }
-//
-//            if ( !Arrays.equals( VERSION, version ) ) {
-//                throw new UnsupportedOperationException( "A version of type " + version + " is unsupported" );
-//            }
-//
-//
-//            final byte[] state = mapper.readValue(byteBuffer.array(),)//parser.read( BYTES_ARRAY_SERIALIZER );
-//
-//            /**
-//             * It's been deleted, remove it
-//             */
-//            if ( Arrays.equals( STATE_DELETED, state ) ) {
-//                return new EntityWrapper( MvccEntity.Status.COMPLETE, Optional.<Entity>absent() );
-//            }
-//
-//            final Entity storedEntity = ( Entity ) parser.read( mapper );
-//
-//            final Optional<Entity> entity = Optional.of( storedEntity );
-//
-//            if ( Arrays.equals( STATE_COMPLETE, state ) ) {
-//                return new EntityWrapper( MvccEntity.Status.COMPLETE, entity );
-//            }
-//
-//            //it's partial by default
-//
-//            return new EntityWrapper( MvccEntity.Status.PARTIAL, entity );
-            return null;
+            CompositeParser parser = Composites.newCompositeParser( byteBuffer );
+            byte[] b = new byte[byteBuffer.remaining()];
+            byteBuffer.get( b, 0, b.length );
+            //return mapper.readValue(b, Entity.class);
+
+            final byte[] version = parser.read( BYTES_ARRAY_SERIALIZER );
+
+            if ( !Arrays.equals( VERSION, version ) ) {
+                throw new UnsupportedOperationException( "A version of type " + version + " is unsupported" );
+            }
+
+            final byte[] state = parser.read( BYTES_ARRAY_SERIALIZER );
+
+            /**
+             * It's been deleted, remove it
+             */
+            if ( Arrays.equals( STATE_DELETED, state ) ) {
+                return new EntityWrapper( MvccEntity.Status.COMPLETE, Optional.<Entity>absent() );
+            }
+
+            Entity storedEntity = null;//( Entity ) parser.read( mapper );
+            try {
+                storedEntity = mapper.readValue( b , Entity.class );
+            }
+            catch ( IOException e ) {
+                e.printStackTrace();
+            }
+
+            final Optional<Entity> entity = Optional.of( storedEntity );
+
+            if ( Arrays.equals( STATE_COMPLETE, state ) ) {
+                return new EntityWrapper( MvccEntity.Status.COMPLETE, entity );
+            }
+
+            //it's partial by default
+            return new EntityWrapper( MvccEntity.Status.PARTIAL, entity );
         }
     }
 
@@ -395,7 +390,7 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
      * We want to retain the Optional wrapper.  It helps us easily mark something as cleaned without removing the column
      * and makes it obvious that the entity could be missing in the api
      */
-    private static class EntitySerializer extends AbstractSerializer<EntityWrapper> {
+    private static class ObjSerializer extends AbstractSerializer<EntityWrapper> {
 
         private static final BytesArraySerializer BYTES_ARRAY_SERIALIZER = BytesArraySerializer.get();
         private static final ObjectSerializer SER = ObjectSerializer.get();


[19/28] git commit: Removed old unused jackson imports. Removed indentObjectMapper from json utilities.

Posted by sn...@apache.org.
Removed old unused jackson imports.
Removed indentObjectMapper from json utilities.


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

Branch: refs/heads/two-dot-o
Commit: a16e6e46a5bbd39ad612b88179f7a99bca3e6765
Parents: fcb6c9a
Author: grey <gr...@apigee.com>
Authored: Thu Mar 20 11:28:53 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Thu Mar 20 11:28:53 2014 -0700

----------------------------------------------------------------------
 .../impl/MvccEntitySerializationStrategyImpl.java             | 6 ------
 .../src/main/java/org/apache/usergrid/utils/JsonUtils.java    | 7 -------
 2 files changed, 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a16e6e46/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
index 42016b1..4acc3ee 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
@@ -67,12 +67,6 @@ import com.netflix.astyanax.serializers.ByteBufferSerializer;
 import com.netflix.astyanax.serializers.BytesArraySerializer;
 import com.netflix.astyanax.serializers.UUIDSerializer;
 
-//import org.codehaus.jackson.JsonGenerationException;
-//import org.codehaus.jackson.map.JsonMappingException;
-//import org.codehaus.jackson.map.ObjectMapper;
-//import org.codehaus.jackson.smile.SmileFactory;
-
-
 /**
  * @author tnine
  */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a16e6e46/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java
index 91bf3bb..5b5e2a5 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java
@@ -33,7 +33,6 @@ import org.apache.usergrid.persistence.exceptions.JsonWriteException;
 import com.fasterxml.jackson.core.io.JsonStringEncoder;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
 //import org.apache.usergrid.persistence.Entity;
@@ -57,12 +56,6 @@ public class JsonUtils {
 
     private static ObjectMapper indentObjectMapper = new ObjectMapper();
 
-
-    static {
-        indentObjectMapper.getSerializationConfig().with( SerializationFeature.INDENT_OUTPUT );//set( SerializationConfig.Feature.INDENT_OUTPUT, true );
-    }
-
-
     /** Converts object to JSON string, throws runtime exception JsonWriteException on failure. */
     public static String mapToJsonString( Object obj ) {
         try {


[11/28] git commit: Merge branch 'Fix_Core_Entity_Tests' of github.com:GERey/usergrid-1 into binary_serialization

Posted by sn...@apache.org.
Merge branch 'Fix_Core_Entity_Tests' of github.com:GERey/usergrid-1 into binary_serialization

* 'Fix_Core_Entity_Tests' of github.com:GERey/usergrid-1:
  Fixing tests so that they properly check obj serialization.


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

Branch: refs/heads/two-dot-o
Commit: 4111f15177560958b1cbdf8b4654d72be1f4fb2f
Parents: b4b5564 b6304a5
Author: grey <gr...@apigee.com>
Authored: Mon Mar 17 18:26:34 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Mar 17 18:26:34 2014 -0700

----------------------------------------------------------------------
 ...MvccEntitySerializationStrategyImplTest.java | 57 ++++++++++----------
 1 file changed, 28 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4111f151/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
----------------------------------------------------------------------


[13/28] git commit: Added newest version of jackson into model classes. Added fix for serializing Location values.

Posted by sn...@apache.org.
Added newest version of jackson into model classes.
Added fix for serializing Location values.


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

Branch: refs/heads/two-dot-o
Commit: 8c3b28e37bd423f6a1bbe09d9f21a087f78d1100
Parents: 96ca52e
Author: grey <gr...@apigee.com>
Authored: Tue Mar 18 15:46:43 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Tue Mar 18 15:46:43 2014 -0700

----------------------------------------------------------------------
 .../MvccEntitySerializationStrategyImpl.java    | 16 ++++++----
 ...MvccEntitySerializationStrategyImplTest.java |  5 ---
 stack/corepersistence/model/pom.xml             | 33 ++++++++++++++++++++
 .../persistence/model/entity/Entity.java        |  3 +-
 .../model/field/value/EntityObject.java         | 10 +++---
 .../persistence/model/field/value/Location.java | 12 +++++--
 6 files changed, 59 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8c3b28e3/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
index 5d95fa5..3b5b504 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
@@ -26,11 +26,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.smile.SmileFactory;
-
 import org.apache.cassandra.db.marshal.BytesType;
 import org.apache.cassandra.db.marshal.ReversedType;
 import org.apache.cassandra.db.marshal.UUIDType;
@@ -49,6 +44,10 @@ import org.apache.usergrid.persistence.collection.util.EntityUtils;
 import org.apache.usergrid.persistence.model.entity.Entity;
 import org.apache.usergrid.persistence.model.entity.Id;
 
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.inject.Inject;
@@ -68,6 +67,11 @@ import com.netflix.astyanax.serializers.ByteBufferSerializer;
 import com.netflix.astyanax.serializers.BytesArraySerializer;
 import com.netflix.astyanax.serializers.UUIDSerializer;
 
+//import org.codehaus.jackson.JsonGenerationException;
+//import org.codehaus.jackson.map.JsonMappingException;
+//import org.codehaus.jackson.map.ObjectMapper;
+//import org.codehaus.jackson.smile.SmileFactory;
+
 
 /**
  * @author tnine
@@ -306,7 +310,7 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
             CompositeBuilder builder = Composites.newCompositeBuilder();
 
             builder.addBytes( VERSION );
-
+            //mapper.enableDefaultTyping();
             //mark this version as empty
             if ( !wrapper.entity.isPresent() ) {
                 //we're empty

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8c3b28e3/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
index f26dd2b..db9b9ef 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
@@ -294,14 +294,10 @@ public class MvccEntitySerializationStrategyImplTest {
 
         EntityUtils.setVersion( entity, version );
 
-
         BooleanField boolField = new BooleanField( "boolean", false );
 
-
         entity.setField( boolField );
 
-
-
         MvccEntity saved = new MvccEntityImpl( id, version, MvccEntity.Status.COMPLETE, Optional.of( entity ) );
 
 
@@ -332,7 +328,6 @@ public class MvccEntitySerializationStrategyImplTest {
 
         assertEquals( 1, results.size() );
 
-
         assertEquals( id, entity.getId() );
         assertEquals( version, entity.getVersion() );
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8c3b28e3/stack/corepersistence/model/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/pom.xml b/stack/corepersistence/model/pom.xml
index 8a7af5b..7df87af 100644
--- a/stack/corepersistence/model/pom.xml
+++ b/stack/corepersistence/model/pom.xml
@@ -11,6 +11,10 @@
 
     <artifactId>model</artifactId>
 
+  <properties>
+    <jackson-2-version>2.3.1</jackson-2-version>
+  </properties>
+
     <!-- Runtime Dependencies -->
     <dependencies>
 
@@ -41,6 +45,35 @@
             <scope>test</scope>
         </dependency>
 
+      <!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) -->
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-core</artifactId>
+        <version>${jackson-2-version}</version>
+      </dependency>
+
+      <!-- Just the annotations; use this dependency if you want to attach annotations
+           to classes without connecting them to the code. -->
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-annotations</artifactId>
+        <version>${jackson-2-version}</version>
+      </dependency>
+
+      <!-- databinding; ObjectMapper, JsonNode and related classes are here -->
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>${jackson-2-version}</version>
+      </dependency>
+
+      <!-- smile (binary JSON). Other artifacts in this group do other formats. -->
+      <dependency>
+        <groupId>com.fasterxml.jackson.dataformat</groupId>
+        <artifactId>jackson-dataformat-smile</artifactId>
+        <version>${jackson-2-version}</version>
+      </dependency>
+
     </dependencies>
 
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8c3b28e3/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
index 1444961..26149e7 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
@@ -21,10 +21,11 @@ package org.apache.usergrid.persistence.model.entity;
 
 import java.util.UUID;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+//import org.codehaus.jackson.annotate.JsonIgnore;
 
 import org.apache.usergrid.persistence.model.field.value.EntityObject;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.base.Preconditions;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8c3b28e3/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
index 331516e..69edfcb 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
@@ -24,13 +24,13 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codehaus.jackson.annotate.JsonAnyGetter;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonTypeInfo;
-
 import org.apache.usergrid.persistence.model.field.Field;
 
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
 /**
  * Simple wrapper for holding nested objects
  */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8c3b28e3/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java
index 224c750..82e7c3e 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java
@@ -20,15 +20,21 @@ package org.apache.usergrid.persistence.model.field.value;
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
 /**
  * Geographic point. Should be used when we want to store geo information
  */
+//@JsonTypeInfo( use= JsonTypeInfo.Id.CLASS,include= JsonTypeInfo.As.WRAPPER_OBJECT,property="@class" )
 public class Location implements Serializable {
 
-    private final double latitude;
-    private final double longtitude;
+    private double latitude;
+    private double longtitude;
 
-    public Location( double latitude, double longtitude ) {
+    @JsonCreator
+    public Location(@JsonProperty("latitude") double latitude,@JsonProperty("longtitude") double longtitude ) {
         this.latitude = latitude;
         this.longtitude = longtitude;
     }


[15/28] git commit: Removed extra commented out code. Forced EntityObject to ignore all unknown properties to fix tests and to make sure it only deals with fields. Entity now gets the version for fields.

Posted by sn...@apache.org.
Removed extra commented out code.
Forced EntityObject to ignore all unknown properties to fix tests and to make sure it only deals with fields.
Entity now gets the version for fields.


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

Branch: refs/heads/two-dot-o
Commit: f2d3bbd0dc145ec049702060f7d3bc60c8282bf2
Parents: 9cc4704
Author: grey <gr...@apigee.com>
Authored: Thu Mar 20 10:11:18 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Thu Mar 20 10:11:18 2014 -0700

----------------------------------------------------------------------
 .../serialization/impl/MvccEntitySerializationStrategyImpl.java   | 3 ---
 .../java/org/apache/usergrid/persistence/model/entity/Entity.java | 3 ---
 .../usergrid/persistence/model/field/value/EntityObject.java      | 2 ++
 .../apache/usergrid/persistence/model/field/value/Location.java   | 1 -
 4 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f2d3bbd0/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
index c348c16..42016b1 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
@@ -298,7 +298,6 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
 
         //the marker for when we're passed a "null" value
         private static final byte[] EMPTY = new byte[] { 0x0 };
-        String helper;
 
 //TODO:Make sure your exceptions provide descriptive error messages.
         @Override
@@ -310,7 +309,6 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
             CompositeBuilder builder = Composites.newCompositeBuilder();
 
             builder.addBytes( VERSION );
-            //mapper.enableDefaultTyping();
             //mark this version as empty
             if ( !wrapper.entity.isPresent() ) {
                 //we're empty
@@ -373,7 +371,6 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
                 byte[] array = jsonBytes.array();
                 int start = jsonBytes.arrayOffset();
                 int length = jsonBytes.remaining();
-                //Object derp = mapper.readValue( array,start,length,Object.class);
                 storedEntity = mapper.readValue( array,start,length,Entity.class);
             }
             catch ( IOException e ) {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f2d3bbd0/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
index 8659a7c..0bbf48c 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
@@ -26,7 +26,6 @@ import org.apache.usergrid.persistence.model.field.value.EntityObject;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.base.Preconditions;
 
-//import org.codehaus.jackson.annotate.JsonIgnore;
 
 
 /**
@@ -81,12 +80,10 @@ public class Entity extends EntityObject {
         return id;
     }
 
-
     public UUID getVersion() {
         return version;
     }
 
-
     /**
      * Equality is based both on id and version.  If an entity
      * has the same id but different versions, they are not equals

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f2d3bbd0/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
index 2a48d54..4cc560a 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
@@ -29,11 +29,13 @@ import org.apache.usergrid.persistence.model.field.Field;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 /**
  * Simple wrapper for holding nested objects
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class EntityObject implements Serializable {
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f2d3bbd0/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java
index 82e7c3e..d18df09 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java
@@ -27,7 +27,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 /**
  * Geographic point. Should be used when we want to store geo information
  */
-//@JsonTypeInfo( use= JsonTypeInfo.Id.CLASS,include= JsonTypeInfo.As.WRAPPER_OBJECT,property="@class" )
 public class Location implements Serializable {
 
     private double latitude;


[07/28] git commit: Changing code so that it uses the Object instead of the entity class.

Posted by sn...@apache.org.
Changing code so that it uses the Object instead of the entity class.


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

Branch: refs/heads/two-dot-o
Commit: 0d544e3e9c9a67ad7f72928cbe544479bae57f86
Parents: fe4d388
Author: grey <gr...@apigee.com>
Authored: Mon Mar 17 11:00:57 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Mar 17 11:00:57 2014 -0700

----------------------------------------------------------------------
 .../MvccEntitySerializationStrategyImpl.java    | 48 +++++++++----
 ...MvccEntitySerializationStrategyImplTest.java | 72 ++++++++++++++++++++
 stack/corepersistence/model/pom.xml             |  5 ++
 .../persistence/model/entity/Entity.java        |  3 +
 stack/pom.xml                                   | 43 ++++++++++++
 5 files changed, 157 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0d544e3e/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
index e9466f2..1db0ac0 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
@@ -29,8 +29,6 @@ import java.util.UUID;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.smile.SmileFactory;
-import org.codehaus.jackson.smile.SmileParser;
 
 import org.apache.cassandra.db.marshal.BytesType;
 import org.apache.cassandra.db.marshal.ReversedType;
@@ -277,9 +275,9 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
 
     public static class EntitySerializer extends AbstractSerializer<EntityWrapper> {
 
-        public static final SmileFactory f = new SmileFactory(  );
+        //public static final SmileFactory f = new SmileFactory(  );
 
-        public static ObjectMapper mapper = new ObjectMapper( f );
+        public static ObjectMapper mapper = new ObjectMapper(  );
         private static final BytesArraySerializer BYTES_ARRAY_SERIALIZER = BytesArraySerializer.get();
 
 
@@ -292,6 +290,7 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
 
         //the marker for when we're passed a "null" value
         private static final byte[] EMPTY = new byte[] { 0x0 };
+        String helper;
 
 //TODO:Make sure your exceptions provide descriptive error messages. And to make sure you even needs the descriptions
         @Override
@@ -304,11 +303,9 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
 
 
             builder.addBytes( VERSION );
-            f.disable( SmileParser.Feature.REQUIRE_HEADER );
-           // f.enable( SmileGenerator.Feature.WRITE_HEADER );
-            //f.enable( SmileGenerator.Feature.WRITE_END_MARKER );
-            mapper = new ObjectMapper( f );
-            //mapper.enable( SmileGenerator.Feature.WRITE_HEADER );
+           // f.disable( SmileParser.Feature.REQUIRE_HEADER );
+
+           // mapper = new ObjectMapper( f );
 
             //mark this version as empty
             if ( !wrapper.entity.isPresent() ) {
@@ -330,6 +327,7 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
 
             try {
                 builder.addBytes( mapper.writeValueAsBytes( wrapper.entity.get() ) );
+                helper = mapper.writeValueAsString( wrapper.entity.get() );
             }
             catch ( JsonMappingException e ) {
                 e.printStackTrace();
@@ -348,16 +346,29 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
         public EntityWrapper fromByteBuffer( final ByteBuffer byteBuffer ) {
             CompositeParser parser = Composites.newCompositeParser( byteBuffer );
             byte[] b = new byte[byteBuffer.remaining()];
-            byteBuffer.get( b, 0, b.length );
+
+            //byteBuffer.get( b, 0, b.length );
             //return mapper.readValue(b, Entity.class);
 
-            final byte[] version = parser.read( BYTES_ARRAY_SERIALIZER );
+            byte[] version = parser.read( BYTES_ARRAY_SERIALIZER );
+//            try {
+//                version = mapper.readValue( byteBuffer.array(),0,1, byte[].class);
+//            }
+//            catch ( IOException e ) {
+//                e.printStackTrace();
+//            }
 
             if ( !Arrays.equals( VERSION, version ) ) {
                 throw new UnsupportedOperationException( "A version of type " + version + " is unsupported" );
             }
 
-            final byte[] state = parser.read( BYTES_ARRAY_SERIALIZER );
+            byte[] state = parser.read( BYTES_ARRAY_SERIALIZER );
+//            try {
+//                state = mapper.readValue( byteBuffer.array(),1,2, new TypeReference<Byte>() {});
+//            }
+//            catch ( IOException e ) {
+//                e.printStackTrace();
+//            }
 
             /**
              * It's been deleted, remove it
@@ -366,13 +377,17 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
                 return new EntityWrapper( MvccEntity.Status.COMPLETE, Optional.<Entity>absent() );
             }
 
-            Entity storedEntity = null;//( Entity ) parser.read( mapper );
+            Object storedObject = null;
+            Entity storedEntity = null;
+            String derper = null;
+            byteBuffer.position( 9 );
             try {
-                storedEntity = mapper.readValue( b , Entity.class );
+                storedObject = mapper.readValue( helper,Object.class);
             }
             catch ( IOException e ) {
                 e.printStackTrace();
             }
+            storedEntity = convertToEntity(storedObject);
 
             final Optional<Entity> entity = Optional.of( storedEntity );
 
@@ -383,6 +398,11 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
             //it's partial by default
             return new EntityWrapper( MvccEntity.Status.PARTIAL, entity );
         }
+
+        private Entity convertToEntity( final Object storedObject ) {
+            Entity storedEntity = null;
+            return null;
+        }
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0d544e3e/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
index 5375ead..bc4485d 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
@@ -275,6 +275,78 @@ public class MvccEntitySerializationStrategyImplTest {
         assertNull( returned );
     }
 
+    @Test
+    public void writeLoadDeleteMinimalFields() throws ConnectionException {
+
+        final Id organizationId = new SimpleId( "organization" );
+        final Id applicationId = new SimpleId( "application" );
+        final String name = "test";
+
+        CollectionScope context = new CollectionScopeImpl( organizationId,  applicationId, name );
+
+
+        final UUID entityId = UUIDGenerator.newTimeUUID();
+        final UUID version = UUIDGenerator.newTimeUUID();
+        final String type = "test";
+
+        final Id id = new SimpleId( entityId, type );
+
+        Entity entity = new Entity( id );
+
+        EntityUtils.setVersion( entity, version );
+
+
+        BooleanField boolField = new BooleanField( "boolean", false );
+
+
+        entity.setField( boolField );
+
+
+
+        MvccEntity saved = new MvccEntityImpl( id, version, MvccEntity.Status.COMPLETE, Optional.of( entity ) );
+
+
+        //persist the entity
+        serializationStrategy.write( context, saved ).execute();
+
+        //now load it back
+
+        MvccEntity returned = serializationStrategy.load( context, id, version );
+
+        assertEquals( "Mvcc entities are the same", saved, returned );
+
+
+        assertEquals( id, entity.getId() );
+
+        //TODO: TN-> shouldn't this be testing the returned value to make sure we were able to load it correctly?
+        //YES THIS SHOULD BE DOING WHA TI THOUGHT< BUT ITSN:T
+        Field<Boolean> boolFieldReturned = returned.getEntity().get().getField( boolField.getName() );
+
+        assertSame( boolField, boolFieldReturned );
+
+        Set<Field> results = new HashSet<Field>();
+        results.addAll( entity.getFields() );
+
+
+        assertTrue( results.contains( boolField ) );
+
+
+        assertEquals( 1, results.size() );
+
+
+        assertEquals( id, entity.getId() );
+        assertEquals( version, entity.getVersion() );
+
+
+        //now delete it
+        serializationStrategy.delete( context, id, version ).execute();
+
+        //now get it, should be gone
+
+        returned = serializationStrategy.load( context, id, version );
+
+        assertNull( returned );
+    }
 
     @Test
     public void writeX2ClearDelete() throws ConnectionException {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0d544e3e/stack/corepersistence/model/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/pom.xml b/stack/corepersistence/model/pom.xml
index 8a7af5b..418ae53 100644
--- a/stack/corepersistence/model/pom.xml
+++ b/stack/corepersistence/model/pom.xml
@@ -40,6 +40,11 @@
             <version>${commons.lang.version}</version>
             <scope>test</scope>
         </dependency>
+      <dependency>
+        <groupId>com.facebook.giraph.hive</groupId>
+        <artifactId>hive-io-exp-cmdline</artifactId>
+        <version>0.8-SNAPSHOT</version>
+      </dependency>
 
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0d544e3e/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
index 7a0eb5d..ee6e656 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
@@ -21,6 +21,8 @@ package org.apache.usergrid.persistence.model.entity;
 
 import java.util.UUID;
 import org.apache.usergrid.persistence.model.field.value.EntityObject;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.base.Preconditions;
 
 
@@ -33,6 +35,7 @@ public class Entity extends EntityObject {
     /**
      * The id.  We should never serialize this
      */
+    @JsonIgnore
     private transient Id id;
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0d544e3e/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 46fbc68..621aaf0 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -101,6 +101,7 @@
     <hector-version>1.1-4</hector-version>
     <hector-test-version>1.1-4</hector-test-version>
     <jackson-version>1.9.9</jackson-version>
+    <jackson-2-version>2.3.1</jackson-2-version>
     <jclouds.version>1.6.2-incubating</jclouds.version>
     <jersey-version>1.18</jersey-version>
     <junit-version>4.11</junit-version>
@@ -114,6 +115,7 @@
     <antlr.version>3.4</antlr.version>
     <tika.version>1.4</tika.version>
 
+
   </properties>
 
   <licenses>
@@ -721,6 +723,47 @@
         <version>1.2</version>
       </dependency>
 
+      <!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) -->
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-core</artifactId>
+        <version>${jackson-2-version}</version>
+      </dependency>
+
+      <!-- Just the annotations; use this dependency if you want to attach annotations
+           to classes without connecting them to the code. -->
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-annotations</artifactId>
+        <version>${jackson-2-version}</version>
+      </dependency>
+
+      <!-- databinding; ObjectMapper, JsonNode and related classes are here -->
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>${jackson-2-version}</version>
+      </dependency>
+
+      <!-- smile (binary JSON). Other artifacts in this group do other formats. -->
+      <dependency>
+        <groupId>com.fasterxml.jackson.dataformat</groupId>
+        <artifactId>jackson-dataformat-smile</artifactId>
+        <version>${jackson-2-version}</version>
+      </dependency>
+      <!-- JAX-RS provider -->
+      <dependency>
+        <groupId>com.fasterxml.jackson.jaxrs</groupId>
+        <artifactId>jackson-jaxrs-json-provider</artifactId>
+        <version>${jackson-2-version}</version>
+      </dependency>
+      <!-- Support for JAX-B annotations as additional configuration -->
+      <dependency>
+        <groupId>com.fasterxml.jackson.module</groupId>
+        <artifactId>jackson-module-jaxb-annotations</artifactId>
+        <version>${jackson-2-version}</version>
+      </dependency>
+
       <!-- Other Commercial Dependencies -->
 
       <dependency>


[02/28] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o

Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o

# By Dave Johnson (64) and others
# Via Dave Johnson (18) and others
* 'two-dot-o' of https://github.com/usergrid/usergrid: (207 commits)
  Rename test and add couple more query tests.
  Adding Apache license header.
  More progress on EntityCollectionIndex and tests.
  Use version properties everywhere, define them only in parent.
  Progress towards getting more query tests running.
  More refactoring and removal of unnecessary code.
  More refactoring and removal of unnecessary code.
  Remove classes not needed for query parsing.
  Added cache declaration to column family meta data
  Rename index to query index, add working query parser code.
  Initial commit of the async processor
  Composite ID creation and parsing and some test improvements.
  Refactored to avoid the need to copy for mark check
  Added buffering to ensure we have less chatter with cassandra
  Added validation with time UUIDTest and verified existing impl.  Needs to use new batch for filtering
  Remove unnecessary method.
  Remove redundant code and test.
  Added version property, did some refactoring / renaming and added a larger data set.
  Basic indexing of entities working, more tests needed.
  Progress on EntityIndex tests and impl.
  ...


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

Branch: refs/heads/two-dot-o
Commit: 3e9fd73917abb17f6ac9a20a4d57ae8e336efa4b
Parents: 6eacac3 c5e9a07
Author: grey <gr...@apigee.com>
Authored: Tue Feb 25 15:04:57 2014 -0800
Committer: grey <gr...@apigee.com>
Committed: Tue Feb 25 15:04:57 2014 -0800

----------------------------------------------------------------------
 .gitignore                                      |    11 +-
 README.md                                       |    29 +
 portal/.gitignore                               |     8 -
 portal/.puppet/.gitignore                       |     2 -
 portal/.puppet/Puppetfile                       |     3 -
 portal/.puppet/Puppetfile.lock                  |    12 -
 portal/.puppet/bootstrap.sh                     |    18 -
 portal/.puppet/manifests/main.pp                |    49 -
 portal/.puppet/modules/.gitignore               |     2 -
 portal/.puppet/templates/vhost-ssl.conf.erb     |    33 -
 portal/Deployment.md                            |    23 +
 portal/Gruntfile.js                             |   328 +
 portal/LICENSE                                  |   202 -
 portal/README.md                                |   273 +-
 portal/UnitTests.md                             |    24 +
 portal/Vagrantfile                              |    23 -
 portal/bower.json                               |    12 +
 portal/build.sh                                 |    28 +
 portal/coming_soon.html                         |    31 -
 portal/config.js                                |    87 +-
 portal/css/apigeeGlobalNavigation.css           |   274 +
 .../css/arsmarquette/ARSMaquettePro-Light.otf   |   Bin 0 -> 184600 bytes
 .../css/arsmarquette/ARSMaquettePro-Medium.otf  |   Bin 0 -> 188020 bytes
 .../css/arsmarquette/ARSMaquettePro-Regular.otf |   Bin 0 -> 188096 bytes
 .../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/css/entypo/entypo.eot                    |   Bin 0 -> 35540 bytes
 portal/css/entypo/entypo.svg                    |    13 +
 portal/css/entypo/entypo.ttf                    |   Bin 0 -> 35392 bytes
 portal/css/entypo/entypo.woff                   |   Bin 0 -> 21916 bytes
 portal/css/jquery-ui-timepicker.css             |    53 -
 portal/css/jquery.ui.statusbar.css              |    25 -
 portal/css/main.css                             |  1702 +
 portal/css/prettify.css                         |    52 -
 portal/css/usergrid.css                         |  6358 --
 portal/images/android-sdk-download.png          |   Bin 4848 -> 0 bytes
 portal/images/api-activity.gif                  |   Bin 10819 -> 0 bytes
 portal/images/apigee-logo.png                   |   Bin 3647 -> 0 bytes
 portal/images/apigeetopbar.png                  |   Bin 4658 -> 0 bytes
 portal/images/btn-copyCurl-up.png               |   Bin 2762 -> 0 bytes
 portal/images/clippy-bg.png                     |   Bin 561 -> 0 bytes
 portal/images/close.gif                         |   Bin 718 -> 0 bytes
 portal/images/dotnet-sdk-download.png           |   Bin 7149 -> 0 bytes
 portal/images/down_arrow.png                    |   Bin 1285 -> 0 bytes
 portal/images/error.png                         |   Bin 2009 -> 0 bytes
 portal/images/faviconApigee.ico                 |   Bin 1150 -> 0 bytes
 portal/images/glyphicons-halflings-white.png    |   Bin 4352 -> 0 bytes
 portal/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/images/grid.png                          |   Bin 166 -> 0 bytes
 portal/images/icons.png                         |   Bin 13132 -> 0 bytes
 portal/images/ios-sdk-download.png              |   Bin 4886 -> 0 bytes
 portal/images/javascript-sdk-download.png       |   Bin 4618 -> 0 bytes
 portal/images/left_arrow.png                    |   Bin 1257 -> 0 bytes
 portal/images/logo-white.png                    |   Bin 2014 -> 0 bytes
 portal/images/menuActiveTriangle.png            |   Bin 315 -> 0 bytes
 portal/images/nodejs-sdk-download.png           |   Bin 5273 -> 0 bytes
 portal/images/notice.png                        |   Bin 2112 -> 0 bytes
 portal/images/orange-arrow.png                  |   Bin 242 -> 0 bytes
 portal/images/right_arrow.png                   |   Bin 1251 -> 0 bytes
 portal/images/ruby-sdk-download.png             |   Bin 6343 -> 0 bytes
 portal/images/success.png                       |   Bin 1863 -> 0 bytes
 portal/images/swish_arrow.png                   |   Bin 220 -> 0 bytes
 portal/images/topbackground.png                 |   Bin 2890 -> 0 bytes
 portal/images/up_arrow.png                      |   Bin 1292 -> 0 bytes
 portal/images/user-photo.png                    |   Bin 3849 -> 0 bytes
 portal/images/user_profile.png                  |   Bin 3775 -> 0 bytes
 portal/images/usergrid_200.png                  |   Bin 6397 -> 0 bytes
 portal/images/usergrid_400.png                  |   Bin 8746 -> 0 bytes
 portal/images/warning.png                       |   Bin 1179 -> 0 bytes
 portal/img/appswitcher/apiPlatform_lg.png       |   Bin 0 -> 2397 bytes
 portal/img/appswitcher/appServices_lg.png       |   Bin 0 -> 2295 bytes
 portal/img/appswitcher/console_lg.png           |   Bin 0 -> 1453 bytes
 portal/img/appswitcher/home_lg.png              |   Bin 0 -> 1522 bytes
 portal/img/appswitcher/logo_color.png           |   Bin 0 -> 3459 bytes
 portal/img/appswitcher/max_lg.png               |   Bin 0 -> 1970 bytes
 .../img/appswitcher/triangleMenuItem_right.png  |   Bin 0 -> 1158 bytes
 .../triangleMenuItem_right_hover.png            |   Bin 0 -> 1169 bytes
 portal/img/blue-bars.png                        |   Bin 0 -> 3635 bytes
 portal/img/blue-bolt.png                        |   Bin 0 -> 3942 bytes
 portal/img/blue-carat.png                       |   Bin 0 -> 1006 bytes
 portal/img/green_dot.png                        |   Bin 0 -> 3472 bytes
 portal/img/logo.gif                             |   Bin 0 -> 2279 bytes
 portal/img/nav-device.gif                       |   Bin 0 -> 2184 bytes
 portal/img/nav-sprites.png                      |   Bin 0 -> 7953 bytes
 portal/img/no-data1.png                         |   Bin 0 -> 45300 bytes
 portal/img/phone-small.gif                      |   Bin 0 -> 1300 bytes
 portal/img/push/APNS_cert_upload.png            |   Bin 0 -> 33956 bytes
 portal/img/push/APNS_certification.png          |   Bin 0 -> 16855 bytes
 portal/img/push/android-notification.png        |   Bin 0 -> 41629 bytes
 portal/img/push/google_api_key.png              |   Bin 0 -> 98118 bytes
 portal/img/push/iphone_message.png              |   Bin 0 -> 90307 bytes
 portal/img/push/step_1.png                      |   Bin 0 -> 1953 bytes
 portal/img/push/step_2.png                      |   Bin 0 -> 2117 bytes
 portal/img/push/step_3.png                      |   Bin 0 -> 2162 bytes
 portal/img/red_dot.png                          |   Bin 0 -> 3482 bytes
 portal/img/sdk-sprites-large.png                |   Bin 0 -> 14642 bytes
 portal/img/sdk-sprites.png                      |   Bin 0 -> 5027 bytes
 portal/img/tablet-small.gif                     |   Bin 0 -> 1390 bytes
 portal/img/user-photo.png                       |   Bin 0 -> 3849 bytes
 portal/img/user_profile.png                     |   Bin 0 -> 3775 bytes
 portal/img/yellow_dot.png                       |   Bin 0 -> 3475 bytes
 portal/index-template.html                      |   131 +
 portal/index.html                               |  1412 -
 portal/js/activities/activities-controller.js   |    11 +
 portal/js/activities/activities.html            |    33 +
 .../js/app-overview/app-overview-controller.js  |    76 +
 portal/js/app-overview/app-overview.html        |    34 +
 .../js/app-overview/doc-includes/android.html   |   209 +
 .../app-overview/doc-includes/images/verify.png |   Bin 0 -> 22934 bytes
 portal/js/app-overview/doc-includes/ios.html    |   173 +
 .../app-overview/doc-includes/javascript.html   |    94 +
 portal/js/app-overview/doc-includes/net.html    |     0
 portal/js/app-overview/doc-includes/node.html   |     0
 portal/js/app-overview/doc-includes/ruby.html   |     0
 .../app-overview/getting-started-controller.js  |    90 +
 portal/js/app-overview/getting-started.html     |   108 +
 portal/js/app.js                                |   125 +
 portal/js/app/app.js                            |   118 -
 portal/js/app/console.js                        |  4536 --
 portal/js/app/helpers.js                        |   241 -
 portal/js/app/navigation.js                     |   189 -
 portal/js/app/pages.js                          |   154 -
 portal/js/app/params.js                         |    30 -
 portal/js/app/quickLogin.js                     |    30 -
 portal/js/app/session.js                        |   172 -
 portal/js/app/sso.js                            |    89 -
 portal/js/app/status.js                         |    33 -
 portal/js/app/ui/collections.entity.js          |   320 -
 portal/js/app/ui/collections.user.js            |   120 -
 portal/js/app/ui/ui.js                          |   415 -
 portal/js/app/usergrid.appSDK.js                |  2073 -
 portal/js/app/usergrid.appSDK.orig.js           |  2070 -
 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-controller.js               |   304 +
 portal/js/data/data.html                        |   121 +
 portal/js/data/display-generic.html             |    95 +
 portal/js/data/display-groups.html              |     0
 portal/js/data/display-roles.html               |     1 +
 portal/js/data/display-users.html               |    88 +
 portal/js/data/entity-controller.js             |    69 +
 portal/js/data/entity.html                      |    31 +
 portal/js/data/shell-controller.js              |     9 +
 portal/js/data/shell.html                       |    16 +
 portal/js/dialogs/balloon-directive.js          |    25 +
 portal/js/dialogs/modal-directive.js            |    41 +
 portal/js/dialogs/modal.html                    |    16 +
 portal/js/global/alert-controller.js            |    33 +
 portal/js/global/alert-directive.js             |    40 +
 portal/js/global/app-switcher-directive.js      |    35 +
 portal/js/global/appswitcher-template.html      |    34 +
 portal/js/global/insecure-banner.html           |     7 +
 portal/js/global/insecure-banner.js             |    46 +
 portal/js/global/page-constants.js              |    11 +
 portal/js/global/page-controller.js             |   392 +
 portal/js/global/page-service.js                |   214 +
 portal/js/global/temp.json                      |    18 +
 portal/js/global/ug-service.js                  |   987 +
 portal/js/global/util-directive.js              |    24 +
 portal/js/global/utility-service.js             |    52 +
 portal/js/global/validate-directive.js          |    40 +
 .../js/groups/groups-activities-controller.js   |    27 +
 portal/js/groups/groups-activities.html         |    24 +
 portal/js/groups/groups-controller.js           |   119 +
 portal/js/groups/groups-details-controller.js   |    38 +
 portal/js/groups/groups-details.html            |    28 +
 portal/js/groups/groups-members-controller.js   |   113 +
 portal/js/groups/groups-members.html            |    60 +
 portal/js/groups/groups-roles-controller.js     |   184 +
 portal/js/groups/groups-roles.html              |   127 +
 portal/js/groups/groups-tabs.html               |    31 +
 portal/js/groups/groups.html                    |    92 +
 portal/js/lib/MD5.min.js                        |     1 -
 portal/js/lib/backbone.js                       |  1431 -
 portal/js/lib/bootstrap.min.js                  |     7 -
 portal/js/lib/date.min.js                       |     2 -
 portal/js/lib/jquery-1.7.2.min.js               |     4 -
 portal/js/lib/jquery-ui-1.8.18.min.js           |    15 -
 portal/js/lib/jquery.dataset.min.js             |     1 -
 portal/js/lib/jquery.dform-0.1.3.min.js         |    16 -
 portal/js/lib/jquery.jsonp-2.3.1.min.js         |     3 -
 portal/js/lib/jquery.tmpl.min.js                |    10 -
 portal/js/lib/jquery.ui.statusbar.min.js        |     1 -
 portal/js/lib/jquery.ui.timepicker.min.js       |     1 -
 portal/js/lib/prettify.js                       |  1477 -
 portal/js/lib/underscore-min.js                 |     5 -
 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/MD5.min.js                       |     1 +
 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 +
 portal/js/libs/angular-1.2.5/angular-animate.js |  1323 +
 .../libs/angular-1.2.5/angular-animate.min.js   |    23 +
 .../angular-1.2.5/angular-animate.min.js.map    |     8 +
 portal/js/libs/angular-1.2.5/angular-cookies.js |   202 +
 .../libs/angular-1.2.5/angular-cookies.min.js   |     8 +
 .../angular-1.2.5/angular-cookies.min.js.map    |     8 +
 portal/js/libs/angular-1.2.5/angular-csp.css    |    24 +
 portal/js/libs/angular-1.2.5/angular-loader.js  |   410 +
 .../js/libs/angular-1.2.5/angular-loader.min.js |     9 +
 .../angular-1.2.5/angular-loader.min.js.map     |     8 +
 portal/js/libs/angular-1.2.5/angular-mocks.js   |  2116 +
 .../js/libs/angular-1.2.5/angular-resource.js   |   565 +
 .../libs/angular-1.2.5/angular-resource.min.js  |    13 +
 .../angular-1.2.5/angular-resource.min.js.map   |     8 +
 portal/js/libs/angular-1.2.5/angular-route.js   |   911 +
 .../js/libs/angular-1.2.5/angular-route.min.js  |    14 +
 .../libs/angular-1.2.5/angular-route.min.js.map |     8 +
 .../js/libs/angular-1.2.5/angular-sanitize.js   |   622 +
 .../libs/angular-1.2.5/angular-sanitize.min.js  |    14 +
 .../angular-1.2.5/angular-sanitize.min.js.map   |     8 +
 .../js/libs/angular-1.2.5/angular-scenario.js   | 32374 +++++++++
 portal/js/libs/angular-1.2.5/angular-touch.js   |   563 +
 .../js/libs/angular-1.2.5/angular-touch.min.js  |    13 +
 .../libs/angular-1.2.5/angular-touch.min.js.map |     8 +
 portal/js/libs/angular-1.2.5/angular.js         | 20369 ++++++
 portal/js/libs/angular-1.2.5/angular.min.js     |   201 +
 portal/js/libs/angular-1.2.5/angular.min.js.map |     8 +
 portal/js/libs/angular-1.2.5/errors.json        |     1 +
 portal/js/libs/angular-1.2.5/version.json       |     1 +
 portal/js/libs/angular-1.2.5/version.txt        |     1 +
 .../angularitics-0.8.5-google-analytics.js      |     7 +
 .../js/libs/angularitics/angularitics-0.8.5.js  |     6 +
 .../libs/bootstrap/css/bootstrap-responsive.css |  1345 +
 .../bootstrap/css/bootstrap-responsive.min.css  |  1245 +
 portal/js/libs/bootstrap/css/bootstrap.css      |  6169 ++
 portal/js/libs/bootstrap/css/bootstrap.min.css  |  5469 ++
 .../js/libs/bootstrap/custom/css/bootstrap.css  |  6315 ++
 .../libs/bootstrap/custom/css/bootstrap.min.css |   874 +
 .../custom/img/glyphicons-halflings-white.png   |   Bin 0 -> 8777 bytes
 .../custom/img/glyphicons-halflings.png         |   Bin 0 -> 12799 bytes
 portal/js/libs/bootstrap/custom/js/bootstrap.js |  2291 +
 .../libs/bootstrap/custom/js/bootstrap.min.js   |     7 +
 .../img/glyphicons-halflings-white.png          |   Bin 0 -> 8777 bytes
 .../libs/bootstrap/img/glyphicons-halflings.png |   Bin 0 -> 12799 bytes
 portal/js/libs/bootstrap/js/bootstrap.js        |  2117 +
 portal/js/libs/bootstrap/js/bootstrap.min.js    |   644 +
 portal/js/libs/google-viz-api.js                |    49 +
 portal/js/libs/jquery/jquery-1.9.1.min.js       |     5 +
 .../js/libs/jquery/jquery-migrate-1.1.1.min.js  |     3 +
 portal/js/libs/jquery/jquery.sparkline.min.js   |     5 +
 portal/js/libs/jqueryui/date.min.js             |     2 +
 .../ui-bg_diagonals-thick_90_eeeeee_40x40.png   |   Bin 0 -> 251 bytes
 .../images/ui-bg_flat_100_deedf7_40x100.png     |   Bin 0 -> 182 bytes
 .../images/ui-bg_flat_100_e4f1fb_40x100.png     |   Bin 0 -> 213 bytes
 .../images/ui-bg_flat_100_f2f5f7_40x100.png     |   Bin 0 -> 212 bytes
 .../images/ui-bg_flat_15_cd0a0a_40x100.png      |   Bin 0 -> 181 bytes
 .../images/ui-bg_flat_50_3baae3_40x100.png      |   Bin 0 -> 182 bytes
 .../images/ui-bg_flat_80_d7ebf9_40x100.png      |   Bin 0 -> 183 bytes
 .../ui-bg_highlight-hard_70_000000_1x100.png    |   Bin 0 -> 118 bytes
 .../ui-bg_highlight-soft_25_ffef8f_1x100.png    |   Bin 0 -> 153 bytes
 .../jqueryui/images/ui-icons_000000_256x240.png |   Bin 0 -> 4369 bytes
 .../jqueryui/images/ui-icons_2694e8_256x240.png |   Bin 0 -> 4369 bytes
 .../jqueryui/images/ui-icons_2e83ff_256x240.png |   Bin 0 -> 4369 bytes
 .../jqueryui/images/ui-icons_3d80b3_256x240.png |   Bin 0 -> 4369 bytes
 .../jqueryui/images/ui-icons_72a7cf_256x240.png |   Bin 0 -> 4369 bytes
 .../jqueryui/images/ui-icons_ffffff_256x240.png |   Bin 0 -> 4369 bytes
 portal/js/libs/jqueryui/jquery-ui-1.8.18.min.js |    15 +
 .../js/libs/jqueryui/jquery-ui-1.8.9.custom.css |   573 +
 .../js/libs/jqueryui/jquery-ui-timepicker.css   |    53 +
 .../libs/jqueryui/jquery.ui.timepicker.min.js   |     1 +
 .../ui-bootstrap-custom-0.3.0.min.js            |     1 +
 .../ui-bootstrap-custom-tpls-0.3.0.min.js       |     1 +
 portal/js/libs/usergrid.sdk.js                  |  2469 +
 portal/js/login/forgot-password-controller.js   |    12 +
 portal/js/login/forgot-password.html            |     5 +
 portal/js/login/loading.html                    |     3 +
 portal/js/login/login-controller.js             |    83 +
 portal/js/login/login.html                      |    48 +
 portal/js/login/logout-controller.js            |    10 +
 portal/js/login/logout.html                     |     1 +
 portal/js/login/register-controller.js          |    36 +
 portal/js/login/register.html                   |    80 +
 portal/js/menus/appMenu.html                    |    41 +
 portal/js/menus/menu-directives.js              |   434 +
 portal/js/menus/orgMenu.html                    |    13 +
 .../js/org-overview/org-overview-controller.js  |    86 +
 portal/js/org-overview/org-overview.html        |   121 +
 portal/js/profile/account-controller.js         |    18 +
 portal/js/profile/account.html                  |    18 +
 portal/js/profile/organizations-controller.js   |    73 +
 portal/js/profile/organizations.html            |    71 +
 portal/js/profile/profile-controller.js         |    40 +
 portal/js/profile/profile.html                  |    68 +
 portal/js/roles/roles-controller.js             |   112 +
 portal/js/roles/roles-groups-controller.js      |   113 +
 portal/js/roles/roles-groups.html               |    60 +
 portal/js/roles/roles-settings-controller.js    |    87 +
 portal/js/roles/roles-settings.html             |    80 +
 portal/js/roles/roles-tabs.html                 |    30 +
 portal/js/roles/roles-users-controller.js       |   112 +
 portal/js/roles/roles-users.html                |    59 +
 portal/js/roles/roles.html                      |    91 +
 portal/js/shell/shell-controller.js             |   216 +
 portal/js/shell/shell.html                      |    25 +
 portal/js/spec/client-tests.js                  |   159 -
 portal/js/spec/index.html                       |    20 -
 portal/js/spec/qunit-git.css                    |   238 -
 portal/js/spec/qunit-git.js                     |  1865 -
 portal/js/unit-tests/appSDK-tests.js            |   255 -
 portal/js/unit-tests/ie-jquery-tests.js         |   191 -
 portal/js/unit-tests/qunit.css                  |   231 -
 portal/js/unit-tests/qunit.js                   |  1934 -
 portal/js/users/users-activities-controller.js  |    40 +
 portal/js/users/users-activities.html           |    39 +
 portal/js/users/users-controller.js             |   115 +
 portal/js/users/users-graph-controller.js       |    67 +
 portal/js/users/users-graph.html                |    67 +
 portal/js/users/users-groups-controller.js      |   124 +
 portal/js/users/users-groups.html               |    67 +
 portal/js/users/users-profile-controller.js     |    32 +
 portal/js/users/users-profile.html              |    70 +
 portal/js/users/users-roles-controller.js       |   138 +
 portal/js/users/users-roles.html                |   129 +
 portal/js/users/users-tabs.html                 |     3 +
 portal/js/users/users.html                      |   126 +
 portal/loading.html                             |     9 -
 portal/package.json                             |    48 +
 portal/planned_outage.html                      |    48 -
 portal/sass/.gitignore                          |     1 -
 portal/sass/config.rb                           |    25 -
 portal/sass/usergrid.scss                       |  1855 -
 portal/scripts/e2e-test.bat                     |    11 +
 portal/scripts/e2e-test.sh                      |     9 +
 portal/scripts/test.bat                         |    11 +
 portal/scripts/test.sh                          |     9 +
 portal/scripts/watchr.rb                        |    19 +
 portal/scripts/web-server.js                    |   244 +
 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                                |   244 +
 portal/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        |    65 -
 .../apigee.ui.collections.query.indexes.html    |     5 -
 .../apigee.ui.collections.table_rows.html       |     9 -
 .../apigee.ui.collections.user.header.html      |    21 -
 portal/templates/apigee.ui.curl.detail.html     |    11 -
 portal/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 -
 .../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/templates/test/modalForm2.html           |    32 -
 portal/test/autocomplete.html                   |    25 -
 portal/test/modalForm.html                      |    32 -
 portal/tests/karma.conf.js                      |    68 +
 portal/tests/protractor/applications.spec.js    |    31 +
 portal/tests/protractor/data.spec.js            |    46 +
 portal/tests/protractor/forgotPassword.spec.js  |    33 +
 portal/tests/protractor/monitoring.spec.js      |    15 +
 portal/tests/protractor/organization.spec.js    |    40 +
 portal/tests/protractor/profile.spec.js         |    73 +
 portal/tests/protractor/push.spec.js            |    15 +
 portal/tests/protractor/users.spec.js           |    52 +
 portal/tests/protractor/util.js                 |   107 +
 portal/tests/protractorConf.js                  |    90 +
 portal/tests/selenium/chromedriver              |   Bin 0 -> 22034760 bytes
 .../selenium-server-standalone-2.37.0.jar       |   Bin 0 -> 34730734 bytes
 portal/tests/unit/sample.spec.js                |    46 +
 sdks/android/doc/allclasses-frame.html          |   110 +-
 sdks/android/doc/allclasses-noframe.html        |   110 +-
 sdks/android/doc/constant-values.html           |   859 +-
 sdks/android/doc/deprecated-list.html           |   237 +-
 sdks/android/doc/help-doc.html                  |   419 +-
 sdks/android/doc/index-all.html                 |   371 +
 sdks/android/doc/index-files/index-1.html       |   209 -
 sdks/android/doc/index-files/index-10.html      |   151 -
 sdks/android/doc/index-files/index-11.html      |   154 -
 sdks/android/doc/index-files/index-12.html      |   151 -
 sdks/android/doc/index-files/index-13.html      |   217 -
 sdks/android/doc/index-files/index-14.html      |   268 -
 sdks/android/doc/index-files/index-15.html      |   204 -
 sdks/android/doc/index-files/index-16.html      |   151 -
 sdks/android/doc/index-files/index-17.html      |   466 -
 sdks/android/doc/index-files/index-18.html      |   184 -
 sdks/android/doc/index-files/index-19.html      |   157 -
 sdks/android/doc/index-files/index-2.html       |   193 -
 sdks/android/doc/index-files/index-20.html      |   239 -
 sdks/android/doc/index-files/index-21.html      |   154 -
 sdks/android/doc/index-files/index-3.html       |   161 -
 sdks/android/doc/index-files/index-4.html       |   166 -
 sdks/android/doc/index-files/index-5.html       |   151 -
 sdks/android/doc/index-files/index-6.html       |   547 -
 sdks/android/doc/index-files/index-7.html       |   145 -
 sdks/android/doc/index-files/index-8.html       |   160 -
 sdks/android/doc/index-files/index-9.html       |   145 -
 sdks/android/doc/index.html                     |    89 +-
 .../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 +
 .../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 -
 sdks/android/doc/overview-frame.html            |    71 +-
 sdks/android/doc/overview-summary.html          |   280 +-
 sdks/android/doc/overview-tree.html             |   301 +-
 sdks/android/doc/package-list                   |     8 +-
 sdks/android/doc/resources/background.gif       |   Bin 0 -> 2313 bytes
 sdks/android/doc/resources/inherit.gif          |   Bin 57 -> 0 bytes
 sdks/android/doc/resources/tab.gif              |   Bin 0 -> 291 bytes
 sdks/android/doc/resources/titlebar.gif         |   Bin 0 -> 10701 bytes
 sdks/android/doc/resources/titlebar_end.gif     |   Bin 0 -> 849 bytes
 sdks/android/doc/stylesheet.css                 |   501 +-
 .../0.0.6/usergrid-java-client-0.0.6.jar        |   Bin 0 -> 46389 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                            |    31 +-
 .../apache/usergrid/android/client/Client.java  |   590 +
 .../client/callbacks/ApiResponseCallback.java   |    10 +
 .../client/callbacks/ClientAsyncTask.java       |    38 +
 .../client/callbacks/ClientCallback.java        |     9 +
 .../callbacks/DeviceRegistrationCallback.java   |     9 +
 .../callbacks/GroupsRetrievedCallback.java      |    13 +
 .../client/callbacks/QueryResultsCallback.java  |     9 +
 .../android/client/utils/DeviceUuidFactory.java |   154 +
 .../android/client/utils/ObjectUtils.java       |    20 +
 .../org/usergrid/android/client/Client.java     |   590 -
 .../client/callbacks/ApiResponseCallback.java   |    10 -
 .../client/callbacks/ClientAsyncTask.java       |    38 -
 .../client/callbacks/ClientCallback.java        |     9 -
 .../callbacks/DeviceRegistrationCallback.java   |     9 -
 .../callbacks/GroupsRetrievedCallback.java      |    13 -
 .../client/callbacks/QueryResultsCallback.java  |     9 -
 .../android/client/utils/DeviceUuidFactory.java |   154 -
 .../android/client/utils/ObjectUtils.java       |    20 -
 sdks/html5-javascript/Gruntfile.js              |    96 +
 sdks/html5-javascript/lib/Module.js             |    34 +
 sdks/html5-javascript/lib/Usergrid.js           |   296 +
 sdks/html5-javascript/lib/modules/Asset.js      |   149 +
 sdks/html5-javascript/lib/modules/Client.js     |   749 +
 sdks/html5-javascript/lib/modules/Collection.js |   459 +
 sdks/html5-javascript/lib/modules/Counter.js    |   186 +
 sdks/html5-javascript/lib/modules/Entity.js     |   659 +
 sdks/html5-javascript/lib/modules/Error.js      |   125 +
 sdks/html5-javascript/lib/modules/Folder.js     |   167 +
 sdks/html5-javascript/lib/modules/Group.js      |   233 +
 sdks/html5-javascript/lib/modules/util/Ajax.js  |    74 +
 sdks/html5-javascript/lib/modules/util/Event.js |    33 +
 .../html5-javascript/lib/modules/util/Logger.js |    68 +
 .../lib/modules/util/Promise.js                 |    83 +
 sdks/html5-javascript/package.json              |    22 +
 sdks/html5-javascript/tests/mocha/index.html    |    49 +
 sdks/html5-javascript/tests/mocha/test.js       |  1025 +
 .../tests/qunit/apigee_test.html                |    14 +
 sdks/html5-javascript/tests/qunit/tests.js      |     3 +
 .../resources/css/bootstrap-combined.min.css    |    18 +
 .../tests/resources/css/mocha.css               |   270 +
 .../tests/resources/css/styles.css              |    91 +
 .../tests/resources/images/apigee.png           |   Bin 0 -> 6010 bytes
 .../tests/resources/js/blanket_mocha.min.js     |     1 +
 .../tests/resources/js/json2.js                 |   486 +
 .../tests/resources/js/mocha.js                 |  5341 ++
 sdks/html5-javascript/tests/test.html           |    37 +
 sdks/html5-javascript/tests/test.js             |   910 +
 sdks/html5-javascript/usergrid.js               |  4575 +-
 sdks/html5-javascript/usergrid.min.js           |     4 +-
 sdks/java/doc/allclasses-frame.html             |   123 +-
 sdks/java/doc/allclasses-noframe.html           |   123 +-
 sdks/java/doc/constant-values.html              |  1437 +-
 sdks/java/doc/deprecated-list.html              |   237 +-
 sdks/java/doc/help-doc.html                     |   419 +-
 sdks/java/doc/index-all.html                    |  1299 +
 sdks/java/doc/index-files/index-1.html          |   209 -
 sdks/java/doc/index-files/index-10.html         |   151 -
 sdks/java/doc/index-files/index-11.html         |   154 -
 sdks/java/doc/index-files/index-12.html         |   151 -
 sdks/java/doc/index-files/index-13.html         |   217 -
 sdks/java/doc/index-files/index-14.html         |   268 -
 sdks/java/doc/index-files/index-15.html         |   204 -
 sdks/java/doc/index-files/index-16.html         |   151 -
 sdks/java/doc/index-files/index-17.html         |   466 -
 sdks/java/doc/index-files/index-18.html         |   184 -
 sdks/java/doc/index-files/index-19.html         |   157 -
 sdks/java/doc/index-files/index-2.html          |   193 -
 sdks/java/doc/index-files/index-20.html         |   239 -
 sdks/java/doc/index-files/index-21.html         |   154 -
 sdks/java/doc/index-files/index-3.html          |   161 -
 sdks/java/doc/index-files/index-4.html          |   166 -
 sdks/java/doc/index-files/index-5.html          |   151 -
 sdks/java/doc/index-files/index-6.html          |   547 -
 sdks/java/doc/index-files/index-7.html          |   145 -
 sdks/java/doc/index-files/index-8.html          |   160 -
 sdks/java/doc/index-files/index-9.html          |   145 -
 sdks/java/doc/index.html                        |    89 +-
 .../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 +
 .../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 -
 sdks/java/doc/overview-frame.html               |    73 +-
 sdks/java/doc/overview-summary.html             |   288 +-
 sdks/java/doc/overview-tree.html                |   331 +-
 sdks/java/doc/package-list                      |    10 +-
 sdks/java/doc/resources/background.gif          |   Bin 0 -> 2313 bytes
 sdks/java/doc/resources/inherit.gif             |   Bin 57 -> 0 bytes
 sdks/java/doc/resources/tab.gif                 |   Bin 0 -> 291 bytes
 sdks/java/doc/resources/titlebar.gif            |   Bin 0 -> 10701 bytes
 sdks/java/doc/resources/titlebar_end.gif        |   Bin 0 -> 849 bytes
 sdks/java/doc/serialized-form.html              |   134 +
 sdks/java/doc/stylesheet.css                    |   501 +-
 sdks/java/pom.xml                               |   182 +-
 .../org/apache/usergrid/java/client/Client.java |  1276 +
 .../usergrid/java/client/entities/Activity.java |   627 +
 .../usergrid/java/client/entities/Device.java   |    52 +
 .../usergrid/java/client/entities/Entity.java   |   175 +
 .../usergrid/java/client/entities/Group.java    |    63 +
 .../usergrid/java/client/entities/Message.java  |   132 +
 .../usergrid/java/client/entities/User.java     |   142 +
 .../java/client/exception/ClientException.java  |    40 +
 .../java/client/response/AggregateCounter.java  |    36 +
 .../client/response/AggregateCounterSet.java    |    95 +
 .../java/client/response/ApiResponse.java       |   405 +
 .../client/response/ClientCredentialsInfo.java  |    42 +
 .../java/client/response/QueueInfo.java         |    28 +
 .../usergrid/java/client/utils/JsonUtils.java   |   166 +
 .../usergrid/java/client/utils/MapUtils.java    |    23 +
 .../usergrid/java/client/utils/ObjectUtils.java |    20 +
 .../usergrid/java/client/utils/UrlUtils.java    |   108 +
 .../java/org/usergrid/java/client/Client.java   |  1276 -
 .../usergrid/java/client/entities/Activity.java |   627 -
 .../usergrid/java/client/entities/Device.java   |    52 -
 .../usergrid/java/client/entities/Entity.java   |   175 -
 .../usergrid/java/client/entities/Group.java    |    63 -
 .../usergrid/java/client/entities/Message.java  |   132 -
 .../org/usergrid/java/client/entities/User.java |   142 -
 .../java/client/exception/ClientException.java  |    40 -
 .../java/client/response/AggregateCounter.java  |    36 -
 .../client/response/AggregateCounterSet.java    |    95 -
 .../java/client/response/ApiResponse.java       |   405 -
 .../client/response/ClientCredentialsInfo.java  |    42 -
 .../java/client/response/QueueInfo.java         |    28 -
 .../usergrid/java/client/utils/JsonUtils.java   |   166 -
 .../usergrid/java/client/utils/MapUtils.java    |    23 -
 .../usergrid/java/client/utils/ObjectUtils.java |    20 -
 .../usergrid/java/client/utils/UrlUtils.java    |   108 -
 sdks/nodejs/lib/usergrid.js                     |   187 +
 sdks/nodejs/test.js                             |    94 +-
 sdks/php/lib/vendor/Apigee/Usergrid/Client.php  |     7 +-
 .../lib/vendor/Apigee/Usergrid/Collection.php   |    18 +-
 sdks/php/lib/vendor/Apigee/Usergrid/Entity.php  |    90 +-
 stack/.gitignore                                |     1 +
 stack/README.md                                 |     4 +-
 stack/awscluster/README.md                      |    84 +
 stack/awscluster/assembly.xml                   |    29 +
 stack/awscluster/aws-sample.properties          |     2 +
 stack/awscluster/cassandra-cf.json              |   315 +
 stack/awscluster/pom.xml                        |   139 +
 .../src/main/dist/conf/Priam.properties         |    21 +
 .../src/main/dist/init_instance/create_raid0.sh |    32 +
 .../main/dist/init_instance/init_instance.sh    |    54 +
 .../dist/init_instance/install_cassandra.sh     |    56 +
 .../dist/init_instance/install_elasticsearch.sh |    24 +
 .../dist/init_instance/install_oraclejdk.sh     |    31 +
 .../src/main/dist/lib/priam-agent-1.2.24.jar    |   Bin 0 -> 33020 bytes
 .../dist/lib/priam-cass-extensions-1.2.24.jar   |   Bin 0 -> 5478 bytes
 .../src/main/dist/webapps/priam-web-1.2.24.war  |   Bin 0 -> 31272443 bytes
 .../src/main/groovy/configure_cassandra.groovy  |   113 +
 .../main/groovy/configure_elasticsearch.groovy  |    47 +
 .../src/main/groovy/configure_priam.groovy      |    41 +
 .../src/main/groovy/registry_clear.groovy       |    20 +
 .../src/main/groovy/registry_list.groovy        |    24 +
 .../src/main/groovy/registry_register.groovy    |    38 +
 .../src/main/groovy/tag_instance.groovy         |    28 +
 .../src/main/groovy/wait_for_instances.groovy   |    44 +
 stack/build-tools/pom.xml                       |     4 +-
 .../src/main/resources/usergrid/checkstyle.xml  |     2 +-
 stack/config/pom.xml                            |     4 +-
 stack/config/src/main/resources/log4j.xml       |    14 +-
 .../main/resources/usergrid-default.properties  |     2 +-
 .../config/src/test/resources/log4j.properties  |    14 +-
 stack/config/src/test/resources/log4j.xml       |     4 +-
 stack/core/pom.xml                              |    14 +-
 .../persistence/query/tree/QueryFilter.g        |   311 +
 .../persistence/query/tree/QueryFilter.g        |   311 -
 .../java/org/apache/usergrid/batch/AppArgs.java |    57 +
 .../java/org/apache/usergrid/batch/Job.java     |    20 +
 .../org/apache/usergrid/batch/JobExecution.java |    91 +
 .../apache/usergrid/batch/JobExecutionImpl.java |   202 +
 .../org/apache/usergrid/batch/JobFactory.java   |    19 +
 .../usergrid/batch/JobNotFoundException.java    |    23 +
 .../org/apache/usergrid/batch/JobRuntime.java   |    40 +
 .../usergrid/batch/JobRuntimeException.java     |    49 +
 .../usergrid/batch/UsergridJobFactory.java      |    37 +
 .../apache/usergrid/batch/job/OnlyOnceJob.java  |    85 +
 .../apache/usergrid/batch/job/package-info.java |    18 +
 .../usergrid/batch/repository/JobAccessor.java  |    36 +
 .../batch/repository/JobDescriptor.java         |    80 +
 .../usergrid/batch/repository/package-info.java |    18 +
 .../org/apache/usergrid/batch/service/App.java  |    70 +
 .../usergrid/batch/service/JobListener.java     |    50 +
 .../batch/service/JobRuntimeService.java        |    49 +
 .../batch/service/JobSchedulerService.java      |   315 +
 .../batch/service/SchedulerService.java         |    54 +
 .../batch/service/SchedulerServiceImpl.java     |   428 +
 .../usergrid/batch/service/package-info.java    |    18 +
 .../hazelcast/HazelcastLifecycleMonitor.java    |    78 +
 .../apache/usergrid/count/AbstractBatcher.java  |   175 +
 .../apache/usergrid/count/BatchSubmitter.java   |    30 +
 .../java/org/apache/usergrid/count/Batcher.java |    35 +
 .../usergrid/count/CassandraCounterStore.java   |   100 +
 .../usergrid/count/CassandraSubmitter.java      |    77 +
 .../apache/usergrid/count/CountProducer.java    |    25 +
 .../CounterProcessingUnavailableException.java  |    38 +
 .../org/apache/usergrid/count/CounterStore.java |    30 +
 .../apache/usergrid/count/SimpleBatcher.java    |    40 +
 .../usergrid/count/Slf4JBatchSubmitter.java     |    77 +
 .../org/apache/usergrid/count/common/Count.java |   139 +
 .../usergrid/count/common/CountSerDeUtils.java  |    51 +
 .../common/CountTransportSerDeException.java    |    38 +
 .../org/apache/usergrid/count/package-info.java |     2 +
 .../usergrid/exception/JsonReadException.java   |    27 +
 .../usergrid/exception/JsonWriteException.java  |    27 +
 .../exception/NotImplementedException.java      |    58 +
 .../java/org/apache/usergrid/locking/Lock.java  |    44 +
 .../org/apache/usergrid/locking/LockHelper.java |    51 +
 .../apache/usergrid/locking/LockManager.java    |    40 +
 .../usergrid/locking/LockPathBuilder.java       |    68 +
 .../locking/cassandra/HectorLockImpl.java       |    85 +
 .../cassandra/HectorLockManagerImpl.java        |   141 +
 .../locking/exception/UGLockException.java      |    49 +
 .../usergrid/locking/noop/NoOpLockImpl.java     |    61 +
 .../locking/noop/NoOpLockManagerImpl.java       |    40 +
 .../locking/singlenode/SingleNodeLockImpl.java  |    70 +
 .../singlenode/SingleNodeLockManagerImpl.java   |    93 +
 .../zookeeper/ZooKeeperLockManagerImpl.java     |   114 +
 .../locking/zookeeper/ZookeeperLockImpl.java    |    87 +
 .../org/apache/usergrid/mq/CounterQuery.java    |   313 +
 .../java/org/apache/usergrid/mq/Message.java    |   512 +
 .../main/java/org/apache/usergrid/mq/Query.java |  1857 +
 .../apache/usergrid/mq/QueryFilterLexer.java    |  1842 +
 .../apache/usergrid/mq/QueryFilterParser.java   |  1102 +
 .../org/apache/usergrid/mq/QueryProcessor.java  |   562 +
 .../main/java/org/apache/usergrid/mq/Queue.java |   291 +
 .../org/apache/usergrid/mq/QueueManager.java    |   130 +
 .../apache/usergrid/mq/QueueManagerFactory.java |    41 +
 .../org/apache/usergrid/mq/QueuePosition.java   |    59 +
 .../java/org/apache/usergrid/mq/QueueQuery.java |   306 +
 .../org/apache/usergrid/mq/QueueResults.java    |   128 +
 .../java/org/apache/usergrid/mq/QueueSet.java   |   192 +
 .../usergrid/mq/cassandra/CassandraMQUtils.java |   278 +
 .../mq/cassandra/MessageIndexUpdate.java        |   120 +
 .../usergrid/mq/cassandra/QueueIndexUpdate.java |   349 +
 .../mq/cassandra/QueueManagerFactoryImpl.java   |    85 +
 .../usergrid/mq/cassandra/QueueManagerImpl.java |  1391 +
 .../apache/usergrid/mq/cassandra/QueuesCF.java  |   156 +
 .../mq/cassandra/io/AbstractSearch.java         |   358 +
 .../mq/cassandra/io/ConsumerTransaction.java    |   471 +
 .../usergrid/mq/cassandra/io/EndSearch.java     |    69 +
 .../usergrid/mq/cassandra/io/FilterSearch.java  |   259 +
 .../mq/cassandra/io/NoTransactionSearch.java    |   132 +
 .../usergrid/mq/cassandra/io/QueueBounds.java   |    91 +
 .../usergrid/mq/cassandra/io/QueueSearch.java   |    29 +
 .../usergrid/mq/cassandra/io/StartSearch.java   |    68 +
 .../usergrid/persistence/AbstractEntity.java    |   341 +
 .../usergrid/persistence/AggregateCounter.java  |    48 +
 .../persistence/AggregateCounterSet.java        |   116 +
 .../persistence/AssociatedEntityRef.java        |    21 +
 .../usergrid/persistence/CollectionRef.java     |    26 +
 .../persistence/ConnectedEntityRef.java         |    22 +
 .../usergrid/persistence/ConnectionRef.java     |    34 +
 .../usergrid/persistence/CounterQuery.java      |   312 +
 .../usergrid/persistence/CounterResolution.java |    84 +
 .../usergrid/persistence/CredentialsInfo.java   |   176 +
 .../usergrid/persistence/DynamicEntity.java     |   111 +
 .../org/apache/usergrid/persistence/Entity.java |   102 +
 .../usergrid/persistence/EntityFactory.java     |   131 +
 .../usergrid/persistence/EntityManager.java     |   620 +
 .../persistence/EntityManagerFactory.java       |   108 +
 .../persistence/EntityPropertyComparator.java   |    55 +
 .../apache/usergrid/persistence/EntityRef.java  |    37 +
 .../usergrid/persistence/EntityUtils.java       |    53 +
 .../apache/usergrid/persistence/Identifier.java |   226 +
 .../persistence/IndexBucketLocator.java         |    75 +
 .../persistence/MultiQueryIterator.java         |   106 +
 .../persistence/PagingResultsIterator.java      |   109 +
 .../apache/usergrid/persistence/PathQuery.java  |   115 +
 .../org/apache/usergrid/persistence/Query.java  |  1310 +
 .../apache/usergrid/persistence/QueryUtils.java |    34 +
 .../usergrid/persistence/RelationManager.java   |   113 +
 .../apache/usergrid/persistence/Results.java    |  1294 +
 .../apache/usergrid/persistence/RoleRef.java    |    31 +
 .../org/apache/usergrid/persistence/Schema.java |  1788 +
 .../persistence/SimpleCollectionRef.java        |    84 +
 .../usergrid/persistence/SimpleEntityRef.java   |   149 +
 .../usergrid/persistence/SimpleRoleRef.java     |   125 +
 .../usergrid/persistence/TypedEntity.java       |    37 +
 .../org/apache/usergrid/persistence/Update.java |    75 +
 .../annotations/EntityCollection.java           |    43 +
 .../annotations/EntityDictionary.java           |    38 +
 .../persistence/annotations/EntityProperty.java |    54 +
 .../persistence/cassandra/ApplicationCF.java    |   160 +
 .../usergrid/persistence/cassandra/CFEnum.java  |    37 +
 .../cassandra/CassandraPersistenceUtils.java    |   486 +
 .../persistence/cassandra/CassandraService.java |  1138 +
 .../cassandra/ConnectedEntityRefImpl.java       |    61 +
 .../cassandra/ConnectionRefImpl.java            |   628 +
 .../persistence/cassandra/CounterUtils.java     |   400 +
 .../persistence/cassandra/CursorCache.java      |   121 +
 .../cassandra/EntityManagerFactoryImpl.java     |   411 +
 .../cassandra/EntityManagerImpl.java            |  2858 +
 .../cassandra/EntityValueSerializer.java        |    52 +
 .../persistence/cassandra/GeoIndexManager.java  |   323 +
 .../persistence/cassandra/IndexUpdate.java      |   450 +
 .../persistence/cassandra/QueryProcessor.java   |   720 +
 .../cassandra/RelationManagerImpl.java          |  2334 +
 .../usergrid/persistence/cassandra/Setup.java   |   206 +
 .../cassandra/SimpleIndexBucketLocatorImpl.java |   121 +
 .../cassandra/index/ConnectedIndexScanner.java  |   281 +
 .../cassandra/index/IndexBucketScanner.java     |   239 +
 .../index/IndexMultiBucketSetLoader.java        |   138 +
 .../cassandra/index/IndexScanner.java           |    39 +
 .../cassandra/index/NoOpIndexScanner.java       |    94 +
 .../cassandra/util/Slf4jTraceTagReporter.java   |    47 +
 .../cassandra/util/TaggedOpTimer.java           |    38 +
 .../persistence/cassandra/util/TimedOpTag.java  |   101 +
 .../cassandra/util/TraceParticipant.java        |    20 +
 .../persistence/cassandra/util/TraceTag.java    |    77 +
 .../cassandra/util/TraceTagAspect.java          |    41 +
 .../cassandra/util/TraceTagManager.java         |   156 +
 .../cassandra/util/TraceTagReporter.java        |    10 +
 .../usergrid/persistence/entities/Activity.java |   685 +
 .../persistence/entities/Application.java       |   609 +
 .../usergrid/persistence/entities/Asset.java    |    93 +
 .../usergrid/persistence/entities/Device.java   |   105 +
 .../usergrid/persistence/entities/Event.java    |   155 +
 .../usergrid/persistence/entities/Folder.java   |    93 +
 .../usergrid/persistence/entities/Group.java    |   168 +
 .../usergrid/persistence/entities/JobData.java  |    54 +
 .../usergrid/persistence/entities/JobStat.java  |   175 +
 .../usergrid/persistence/entities/Message.java  |    77 +
 .../usergrid/persistence/entities/Role.java     |   153 +
 .../usergrid/persistence/entities/User.java     |   348 +
 .../ApplicationAlreadyExistsException.java      |    37 +
 .../DuplicateUniquePropertyExistsException.java |    52 +
 .../exceptions/EntityNotFoundException.java     |    45 +
 .../exceptions/LockingException.java            |    65 +
 .../exceptions/NoFullTextIndexException.java    |    50 +
 .../exceptions/NoIndexException.java            |    50 +
 .../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 +
 .../persistence/geo/CollectionGeoSearch.java    |    52 +
 .../persistence/geo/ConnectionGeoSearch.java    |    51 +
 .../persistence/geo/EntityLocationRef.java      |   211 +
 .../EntityLocationRefDistanceComparator.java    |    77 +
 .../persistence/geo/GeoIndexSearcher.java       |   368 +
 .../persistence/geo/GeocellManager.java         |   179 +
 .../usergrid/persistence/geo/GeocellUtils.java  |   539 +
 .../geo/comparator/DoubleTupleComparator.java   |    23 +
 .../persistence/geo/model/BoundingBox.java      |    71 +
 .../persistence/geo/model/CostFunction.java     |    33 +
 .../geo/model/DefaultCostFunction.java          |    34 +
 .../usergrid/persistence/geo/model/Point.java   |    58 +
 .../usergrid/persistence/geo/model/Tuple.java   |    24 +
 .../usergrid/persistence/query/ir/AllNode.java  |    54 +
 .../usergrid/persistence/query/ir/AndNode.java  |    43 +
 .../persistence/query/ir/BooleanNode.java       |    48 +
 .../query/ir/EmailIdentifierNode.java           |    31 +
 .../query/ir/NameIdentifierNode.java            |    28 +
 .../persistence/query/ir/NodeVisitor.java       |    78 +
 .../usergrid/persistence/query/ir/NotNode.java  |    62 +
 .../usergrid/persistence/query/ir/OrNode.java   |    52 +
 .../persistence/query/ir/OrderByNode.java       |    92 +
 .../persistence/query/ir/QueryNode.java         |    28 +
 .../persistence/query/ir/QuerySlice.java        |   344 +
 .../persistence/query/ir/SearchVisitor.java     |   254 +
 .../persistence/query/ir/SliceNode.java         |   167 +
 .../query/ir/UuidIdentifierNode.java            |    32 +
 .../persistence/query/ir/WithinNode.java        |    96 +
 .../query/ir/result/AbstractScanColumn.java     |    70 +
 .../result/CollectionResultsLoaderFactory.java  |    23 +
 .../ir/result/ConnectionIndexSliceParser.java   |    86 +
 .../query/ir/result/ConnectionRefLoader.java    |    65 +
 .../result/ConnectionResultsLoaderFactory.java  |    32 +
 .../ir/result/ConnectionTypesIterator.java      |   179 +
 .../query/ir/result/EmptyIterator.java          |    47 +
 .../query/ir/result/EntityRefLoader.java        |    50 +
 .../query/ir/result/EntityResultsLoader.java    |    46 +
 .../query/ir/result/GeoIterator.java            |   355 +
 .../persistence/query/ir/result/IDLoader.java   |    24 +
 .../query/ir/result/IntersectionIterator.java   |   169 +
 .../query/ir/result/MergeIterator.java          |   149 +
 .../query/ir/result/MultiIterator.java          |    54 +
 .../query/ir/result/OrderByIterator.java        |   252 +
 .../query/ir/result/ResultIterator.java         |    43 +
 .../query/ir/result/ResultsLoader.java          |    29 +
 .../query/ir/result/ResultsLoaderFactory.java   |    21 +
 .../persistence/query/ir/result/ScanColumn.java |    16 +
 .../query/ir/result/ScanColumnTransformer.java  |    23 +
 .../ir/result/SecondaryIndexSliceParser.java    |    60 +
 .../query/ir/result/SliceIterator.java          |   241 +
 .../query/ir/result/SliceParser.java            |    31 +
 .../query/ir/result/StaticIdIterator.java       |    66 +
 .../query/ir/result/SubtractionIterator.java    |   108 +
 .../query/ir/result/UUIDIndexSliceParser.java   |    50 +
 .../query/ir/result/UnionIterator.java          |   267 +
 .../usergrid/persistence/query/tree/.gitignore  |     2 +
 .../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 +
 .../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 +
 .../persistence/schema/CollectionInfo.java      |   207 +
 .../persistence/schema/DictionaryInfo.java      |   117 +
 .../usergrid/persistence/schema/EntityInfo.java |   299 +
 .../persistence/schema/PropertyInfo.java        |   218 +
 .../usergrid/system/UsergridSystemMonitor.java  |    95 +
 .../org/apache/usergrid/utils/AESUtils.java     |    84 +
 .../java/org/apache/usergrid/utils/BCrypt.java  |   627 +
 .../org/apache/usergrid/utils/ClassUtils.java   |    58 +
 .../org/apache/usergrid/utils/CodecUtils.java   |    45 +
 .../apache/usergrid/utils/CompositeUtils.java   |    54 +
 .../apache/usergrid/utils/ConversionUtils.java  |   765 +
 .../org/apache/usergrid/utils/DateUtils.java    |    88 +
 .../org/apache/usergrid/utils/HttpUtils.java    |    51 +
 .../org/apache/usergrid/utils/IndexUtils.java   |   218 +
 .../apache/usergrid/utils/InflectionUtils.java  |    51 +
 .../org/apache/usergrid/utils/Inflector.java    |   553 +
 .../org/apache/usergrid/utils/JsonUtils.java    |   329 +
 .../org/apache/usergrid/utils/ListUtils.java    |   230 +
 .../org/apache/usergrid/utils/MailUtils.java    |   154 +
 .../org/apache/usergrid/utils/MapUtils.java     |   377 +
 .../org/apache/usergrid/utils/NumberUtils.java  |    35 +
 .../apache/usergrid/utils/PasswordUtils.java    |    28 +
 .../org/apache/usergrid/utils/StringUtils.java  |   172 +
 .../org/apache/usergrid/utils/TimeUtils.java    |    88 +
 .../org/apache/usergrid/utils/UUIDUtils.java    |   412 +
 .../java/org/apache/usergrid/utils/Version.java |   428 +
 .../org/apache/usergrid/utils/package-info.java |    18 +
 .../main/java/org/usergrid/batch/AppArgs.java   |    57 -
 .../src/main/java/org/usergrid/batch/Job.java   |    20 -
 .../java/org/usergrid/batch/JobExecution.java   |    91 -
 .../org/usergrid/batch/JobExecutionImpl.java    |   202 -
 .../java/org/usergrid/batch/JobFactory.java     |    19 -
 .../usergrid/batch/JobNotFoundException.java    |    23 -
 .../java/org/usergrid/batch/JobRuntime.java     |    40 -
 .../org/usergrid/batch/JobRuntimeException.java |    49 -
 .../org/usergrid/batch/UsergridJobFactory.java  |    37 -
 .../org/usergrid/batch/job/OnlyOnceJob.java     |    85 -
 .../org/usergrid/batch/job/package-info.java    |    18 -
 .../usergrid/batch/repository/JobAccessor.java  |    36 -
 .../batch/repository/JobDescriptor.java         |    80 -
 .../usergrid/batch/repository/package-info.java |    18 -
 .../java/org/usergrid/batch/service/App.java    |    70 -
 .../org/usergrid/batch/service/JobListener.java |    50 -
 .../batch/service/JobRuntimeService.java        |    49 -
 .../batch/service/JobSchedulerService.java      |   315 -
 .../batch/service/SchedulerService.java         |    54 -
 .../batch/service/SchedulerServiceImpl.java     |   428 -
 .../usergrid/batch/service/package-info.java    |    18 -
 .../hazelcast/HazelcastLifecycleMonitor.java    |    78 -
 .../org/usergrid/count/AbstractBatcher.java     |   175 -
 .../java/org/usergrid/count/BatchSubmitter.java |    30 -
 .../main/java/org/usergrid/count/Batcher.java   |    35 -
 .../usergrid/count/CassandraCounterStore.java   |   100 -
 .../org/usergrid/count/CassandraSubmitter.java  |    77 -
 .../java/org/usergrid/count/CountProducer.java  |    25 -
 .../CounterProcessingUnavailableException.java  |    38 -
 .../java/org/usergrid/count/CounterStore.java   |    30 -
 .../java/org/usergrid/count/SimpleBatcher.java  |    40 -
 .../org/usergrid/count/Slf4JBatchSubmitter.java |    77 -
 .../java/org/usergrid/count/common/Count.java   |   139 -
 .../usergrid/count/common/CountSerDeUtils.java  |    51 -
 .../common/CountTransportSerDeException.java    |    38 -
 .../java/org/usergrid/count/package-info.java   |     0
 .../usergrid/exception/JsonReadException.java   |    27 -
 .../usergrid/exception/JsonWriteException.java  |    27 -
 .../exception/NotImplementedException.java      |    58 -
 .../main/java/org/usergrid/locking/Lock.java    |    44 -
 .../java/org/usergrid/locking/LockHelper.java   |    51 -
 .../java/org/usergrid/locking/LockManager.java  |    40 -
 .../org/usergrid/locking/LockPathBuilder.java   |    68 -
 .../locking/cassandra/HectorLockImpl.java       |    85 -
 .../cassandra/HectorLockManagerImpl.java        |   141 -
 .../locking/exception/UGLockException.java      |    49 -
 .../org/usergrid/locking/noop/NoOpLockImpl.java |    61 -
 .../locking/noop/NoOpLockManagerImpl.java       |    40 -
 .../locking/singlenode/SingleNodeLockImpl.java  |    70 -
 .../singlenode/SingleNodeLockManagerImpl.java   |    93 -
 .../zookeeper/ZooKeeperLockManagerImpl.java     |   114 -
 .../locking/zookeeper/ZookeeperLockImpl.java    |    87 -
 .../main/java/org/usergrid/mq/CounterQuery.java |   314 -
 .../src/main/java/org/usergrid/mq/Message.java  |   512 -
 .../src/main/java/org/usergrid/mq/Query.java    |  1857 -
 .../java/org/usergrid/mq/QueryFilterLexer.java  |  1842 -
 .../java/org/usergrid/mq/QueryFilterParser.java |  1102 -
 .../java/org/usergrid/mq/QueryProcessor.java    |   562 -
 .../src/main/java/org/usergrid/mq/Queue.java    |   291 -
 .../main/java/org/usergrid/mq/QueueManager.java |   130 -
 .../org/usergrid/mq/QueueManagerFactory.java    |    41 -
 .../java/org/usergrid/mq/QueuePosition.java     |    59 -
 .../main/java/org/usergrid/mq/QueueQuery.java   |   306 -
 .../main/java/org/usergrid/mq/QueueResults.java |   128 -
 .../src/main/java/org/usergrid/mq/QueueSet.java |   192 -
 .../usergrid/mq/cassandra/CassandraMQUtils.java |   278 -
 .../mq/cassandra/MessageIndexUpdate.java        |   120 -
 .../usergrid/mq/cassandra/QueueIndexUpdate.java |   349 -
 .../mq/cassandra/QueueManagerFactoryImpl.java   |    85 -
 .../usergrid/mq/cassandra/QueueManagerImpl.java |  1391 -
 .../org/usergrid/mq/cassandra/QueuesCF.java     |   156 -
 .../mq/cassandra/io/AbstractSearch.java         |   358 -
 .../mq/cassandra/io/ConsumerTransaction.java    |   471 -
 .../org/usergrid/mq/cassandra/io/EndSearch.java |    69 -
 .../usergrid/mq/cassandra/io/FilterSearch.java  |   259 -
 .../mq/cassandra/io/NoTransactionSearch.java    |   132 -
 .../usergrid/mq/cassandra/io/QueueBounds.java   |    91 -
 .../usergrid/mq/cassandra/io/QueueSearch.java   |    29 -
 .../usergrid/mq/cassandra/io/StartSearch.java   |    68 -
 .../usergrid/persistence/AbstractEntity.java    |   342 -
 .../usergrid/persistence/AggregateCounter.java  |    48 -
 .../persistence/AggregateCounterSet.java        |   116 -
 .../persistence/AssociatedEntityRef.java        |    21 -
 .../org/usergrid/persistence/CollectionRef.java |    26 -
 .../persistence/ConnectedEntityRef.java         |    22 -
 .../org/usergrid/persistence/ConnectionRef.java |    34 -
 .../org/usergrid/persistence/CounterQuery.java  |   313 -
 .../usergrid/persistence/CounterResolution.java |    84 -
 .../usergrid/persistence/CredentialsInfo.java   |   176 -
 .../org/usergrid/persistence/DynamicEntity.java |   111 -
 .../java/org/usergrid/persistence/Entity.java   |   103 -
 .../org/usergrid/persistence/EntityFactory.java |   131 -
 .../org/usergrid/persistence/EntityManager.java |   620 -
 .../persistence/EntityManagerFactory.java       |   108 -
 .../persistence/EntityPropertyComparator.java   |    55 -
 .../org/usergrid/persistence/EntityRef.java     |    37 -
 .../org/usergrid/persistence/EntityUtils.java   |    53 -
 .../org/usergrid/persistence/Identifier.java    |   226 -
 .../persistence/IndexBucketLocator.java         |    75 -
 .../persistence/MultiQueryIterator.java         |   106 -
 .../persistence/PagingResultsIterator.java      |   109 -
 .../org/usergrid/persistence/PathQuery.java     |   115 -
 .../java/org/usergrid/persistence/Query.java    |  1310 -
 .../org/usergrid/persistence/QueryUtils.java    |    34 -
 .../usergrid/persistence/RelationManager.java   |   113 -
 .../java/org/usergrid/persistence/Results.java  |  1294 -
 .../java/org/usergrid/persistence/RoleRef.java  |    31 -
 .../java/org/usergrid/persistence/Schema.java   |  1788 -
 .../persistence/SimpleCollectionRef.java        |    84 -
 .../usergrid/persistence/SimpleEntityRef.java   |   149 -
 .../org/usergrid/persistence/SimpleRoleRef.java |   125 -
 .../org/usergrid/persistence/TypedEntity.java   |    37 -
 .../java/org/usergrid/persistence/Update.java   |    75 -
 .../annotations/EntityCollection.java           |    43 -
 .../annotations/EntityDictionary.java           |    38 -
 .../persistence/annotations/EntityProperty.java |    54 -
 .../persistence/cassandra/ApplicationCF.java    |   160 -
 .../usergrid/persistence/cassandra/CFEnum.java  |    37 -
 .../cassandra/CassandraPersistenceUtils.java    |   486 -
 .../persistence/cassandra/CassandraService.java |  1135 -
 .../cassandra/ConnectedEntityRefImpl.java       |    61 -
 .../cassandra/ConnectionRefImpl.java            |   628 -
 .../persistence/cassandra/CounterUtils.java     |   400 -
 .../persistence/cassandra/CursorCache.java      |   121 -
 .../cassandra/EntityManagerFactoryImpl.java     |   411 -
 .../cassandra/EntityManagerImpl.java            |  2858 -
 .../cassandra/EntityValueSerializer.java        |    52 -
 .../persistence/cassandra/GeoIndexManager.java  |   323 -
 .../persistence/cassandra/IndexUpdate.java      |   450 -
 .../persistence/cassandra/QueryProcessor.java   |   710 -
 .../cassandra/RelationManagerImpl.java          |  2339 -
 .../usergrid/persistence/cassandra/Setup.java   |   206 -
 .../cassandra/SimpleIndexBucketLocatorImpl.java |   121 -
 .../cassandra/index/ConnectedIndexScanner.java  |   232 -
 .../cassandra/index/IndexBucketScanner.java     |   218 -
 .../index/IndexMultiBucketSetLoader.java        |   138 -
 .../cassandra/index/IndexScanner.java           |    39 -
 .../cassandra/index/NoOpIndexScanner.java       |    94 -
 .../cassandra/util/Slf4jTraceTagReporter.java   |    47 -
 .../cassandra/util/TaggedOpTimer.java           |    38 -
 .../persistence/cassandra/util/TimedOpTag.java  |   101 -
 .../cassandra/util/TraceParticipant.java        |    20 -
 .../persistence/cassandra/util/TraceTag.java    |    77 -
 .../cassandra/util/TraceTagAspect.java          |    41 -
 .../cassandra/util/TraceTagManager.java         |   156 -
 .../cassandra/util/TraceTagReporter.java        |    10 -
 .../usergrid/persistence/entities/Activity.java |   685 -
 .../persistence/entities/Application.java       |   609 -
 .../usergrid/persistence/entities/Asset.java    |    93 -
 .../usergrid/persistence/entities/Device.java   |   105 -
 .../usergrid/persistence/entities/Event.java    |   155 -
 .../usergrid/persistence/entities/Folder.java   |    93 -
 .../usergrid/persistence/entities/Group.java    |   168 -
 .../usergrid/persistence/entities/JobData.java  |    54 -
 .../usergrid/persistence/entities/JobStat.java  |   175 -
 .../usergrid/persistence/entities/Message.java  |    77 -
 .../org/usergrid/persistence/entities/Role.java |   153 -
 .../org/usergrid/persistence/entities/User.java |   348 -
 .../ApplicationAlreadyExistsException.java      |    37 -
 .../DuplicateUniquePropertyExistsException.java |    52 -
 .../exceptions/EntityNotFoundException.java     |    45 -
 .../exceptions/LockingException.java            |    65 -
 .../exceptions/NoFullTextIndexException.java    |    50 -
 .../exceptions/NoIndexException.java            |    50 -
 .../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 -
 .../persistence/geo/CollectionGeoSearch.java    |    52 -
 .../persistence/geo/ConnectionGeoSearch.java    |    51 -
 .../persistence/geo/EntityLocationRef.java      |   211 -
 .../EntityLocationRefDistanceComparator.java    |    77 -
 .../persistence/geo/GeoIndexSearcher.java       |   368 -
 .../persistence/geo/GeocellManager.java         |   179 -
 .../usergrid/persistence/geo/GeocellUtils.java  |   539 -
 .../geo/comparator/DoubleTupleComparator.java   |    23 -
 .../persistence/geo/model/BoundingBox.java      |    71 -
 .../persistence/geo/model/CostFunction.java     |    33 -
 .../geo/model/DefaultCostFunction.java          |    34 -
 .../usergrid/persistence/geo/model/Point.java   |    58 -
 .../usergrid/persistence/geo/model/Tuple.java   |    24 -
 .../usergrid/persistence/query/ir/AllNode.java  |    54 -
 .../usergrid/persistence/query/ir/AndNode.java  |    43 -
 .../persistence/query/ir/BooleanNode.java       |    48 -
 .../query/ir/EmailIdentifierNode.java           |    31 -
 .../query/ir/NameIdentifierNode.java            |    28 -
 .../persistence/query/ir/NodeVisitor.java       |    78 -
 .../usergrid/persistence/query/ir/NotNode.java  |    62 -
 .../usergrid/persistence/query/ir/OrNode.java   |    38 -
 .../persistence/query/ir/OrderByNode.java       |    92 -
 .../persistence/query/ir/QueryNode.java         |    28 -
 .../persistence/query/ir/QuerySlice.java        |   344 -
 .../persistence/query/ir/SearchVisitor.java     |   253 -
 .../persistence/query/ir/SliceNode.java         |   168 -
 .../query/ir/UuidIdentifierNode.java            |    32 -
 .../persistence/query/ir/WithinNode.java        |    96 -
 .../query/ir/result/AbstractScanColumn.java     |    60 -
 .../result/CollectionResultsLoaderFactory.java  |    23 -
 .../ir/result/ConnectionIndexSliceParser.java   |    86 -
 .../query/ir/result/ConnectionRefLoader.java    |    65 -
 .../result/ConnectionResultsLoaderFactory.java  |    32 -
 .../ir/result/ConnectionTypesIterator.java      |   179 -
 .../query/ir/result/EmptyIterator.java          |    47 -
 .../query/ir/result/EntityRefLoader.java        |    50 -
 .../query/ir/result/EntityResultsLoader.java    |    46 -
 .../query/ir/result/GeoIterator.java            |   355 -
 .../persistence/query/ir/result/IDLoader.java   |    24 -
 .../query/ir/result/IntersectionIterator.java   |   167 -
 .../query/ir/result/MergeIterator.java          |   137 -
 .../query/ir/result/MultiIterator.java          |    54 -
 .../query/ir/result/OrderByIterator.java        |   252 -
 .../query/ir/result/ResultIterator.java         |    43 -
 .../query/ir/result/ResultsLoader.java          |    29 -
 .../query/ir/result/ResultsLoaderFactory.java   |    21 -
 .../persistence/query/ir/result/ScanColumn.java |    16 -
 .../query/ir/result/ScanColumnTransformer.java  |    23 -
 .../ir/result/SecondaryIndexSliceParser.java    |    60 -
 .../query/ir/result/SliceIterator.java          |   251 -
 .../query/ir/result/SliceParser.java            |    31 -
 .../query/ir/result/StaticIdIterator.java       |    66 -
 .../query/ir/result/SubtractionIterator.java    |   108 -
 .../query/ir/result/UUIDIndexSliceParser.java   |    50 -
 .../query/ir/result/UnionIterator.java          |   132 -
 .../usergrid/persistence/query/tree/.gitignore  |     2 -
 .../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            |  3106 +
 .../query/tree/QueryFilterParser.java           |  2484 +
 .../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 -
 .../persistence/query/util/PeekingIterator.java |    64 -
 .../persistence/schema/CollectionInfo.java      |   207 -
 .../persistence/schema/DictionaryInfo.java      |   117 -
 .../usergrid/persistence/schema/EntityInfo.java |   299 -
 .../persistence/schema/PropertyInfo.java        |   218 -
 .../usergrid/system/UsergridSystemMonitor.java  |    95 -
 .../main/java/org/usergrid/utils/AESUtils.java  |    84 -
 .../main/java/org/usergrid/utils/BCrypt.java    |   627 -
 .../java/org/usergrid/utils/ClassUtils.java     |    58 -
 .../java/org/usergrid/utils/CodecUtils.java     |    45 -
 .../java/org/usergrid/utils/CompositeUtils.java |    54 -
 .../org/usergrid/utils/ConversionUtils.java     |   765 -
 .../main/java/org/usergrid/utils/DateUtils.java |    88 -
 .../main/java/org/usergrid/utils/HttpUtils.java |    51 -
 .../java/org/usergrid/utils/IndexUtils.java     |   218 -
 .../org/usergrid/utils/InflectionUtils.java     |    51 -
 .../main/java/org/usergrid/utils/Inflector.java |   553 -
 .../main/java/org/usergrid/utils/JsonUtils.java |   329 -
 .../main/java/org/usergrid/utils/ListUtils.java |   230 -
 .../main/java/org/usergrid/utils/MailUtils.java |   154 -
 .../main/java/org/usergrid/utils/MapUtils.java  |   377 -
 .../java/org/usergrid/utils/NumberUtils.java    |    35 -
 .../java/org/usergrid/utils/PasswordUtils.java  |    28 -
 .../java/org/usergrid/utils/StringUtils.java    |   172 -
 .../main/java/org/usergrid/utils/TimeUtils.java |    88 -
 .../main/java/org/usergrid/utils/UUIDUtils.java |   412 -
 .../main/java/org/usergrid/utils/Version.java   |   428 -
 .../java/org/usergrid/utils/package-info.java   |    18 -
 .../main/resources/usergrid-core-context.xml    |    52 +-
 .../resources/usergrid-scheduler-context.xml    |     8 +-
 stack/core/src/test/java/io/baas/Simple.java    |     4 +-
 .../org/apache/usergrid/AbstractCoreIT.java     |    45 +
 .../java/org/apache/usergrid/Application.java   |   124 +
 .../apache/usergrid/ConcurrentCoreITSuite.java  |    50 +
 .../usergrid/ConcurrentCoreIteratorITSuite.java |    62 +
 .../usergrid/ConcurrentCoreTestSuite.java       |    33 +
 .../org/apache/usergrid/CoreApplication.java    |   171 +
 .../java/org/apache/usergrid/CoreITSetup.java   |    43 +
 .../org/apache/usergrid/CoreITSetupImpl.java    |   145 +
 .../java/org/apache/usergrid/CoreITSuite.java   |    34 +
 .../java/org/apache/usergrid/CoreTestSuite.java |    47 +
 .../org/apache/usergrid/batch/AppArgsTest.java  |    52 +
 .../batch/BulkJobExecutionUnitTest.java         |   209 +
 .../apache/usergrid/batch/BulkTestUtils.java    |    38 +
 .../batch/ConcurrentSchedulerITSuite.java       |    31 +
 .../batch/ConcurrentSchedulerTestSuite.java     |    19 +
 .../apache/usergrid/batch/SchedulerITSuite.java |    34 +
 .../usergrid/batch/SchedulerTestSuite.java      |    18 +
 .../usergrid/batch/UsergridJobFactoryTest.java  |    31 +
 .../batch/job/AbstractSchedulerRuntimeIT.java   |    78 +
 .../usergrid/batch/job/CountdownLatchJob.java   |    67 +
 .../usergrid/batch/job/DelayExecution.java      |   104 +
 .../usergrid/batch/job/DelayHeartbeat.java      |   106 +
 .../batch/job/FailureJobExceuction.java         |    74 +
 .../usergrid/batch/job/OnlyOnceExceution.java   |   116 +
 .../job/OnlyOnceUnlockOnFailExceution.java      |   126 +
 .../usergrid/batch/job/SchedulerRuntime1IT.java |    70 +
 .../usergrid/batch/job/SchedulerRuntime2IT.java |    98 +
 .../usergrid/batch/job/SchedulerRuntime3IT.java |    71 +
 .../usergrid/batch/job/SchedulerRuntime4IT.java |    68 +
 .../usergrid/batch/job/SchedulerRuntime5IT.java |    69 +
 .../usergrid/batch/job/SchedulerRuntime6IT.java |    97 +
 .../usergrid/batch/job/SchedulerRuntime7IT.java |    74 +
 .../usergrid/batch/job/SchedulerRuntime8IT.java |    95 +
 .../usergrid/batch/job/TestJobListener.java     |   121 +
 .../usergrid/batch/job/TestJobListenerTest.java |   144 +
 .../apache/usergrid/batch/job/package-info.java |    18 +
 .../clustering/hazelcast/HazelcastTest.java     |   111 +
 .../count/BatchCountParallelismTest.java        |   122 +
 .../usergrid/count/SimpleBatcherTest.java       |    50 +
 .../count/common/CountSerDeUtilsTest.java       |    68 +
 .../apache/usergrid/count/common/CountTest.java |    68 +
 .../locking/cassandra/HectorLockManagerIT.java  |   185 +
 .../SingleNodeLockTestSingleNode.java           |   168 +
 .../zookeeper/AbstractZooKeeperTest.java        |   126 +
 .../usergrid/locking/zookeeper/ZooPut.java      |   113 +
 .../zookeeper/ZookeeperLockManagerTest.java     |   182 +
 .../java/org/apache/usergrid/mq/MessagesIT.java |   278 +
 .../org/apache/usergrid/mq/QueuePathsTest.java  |    48 +
 .../usergrid/persistence/CollectionIT.java      |  1637 +
 .../usergrid/persistence/CoreSchemaManager.java |    66 +
 .../apache/usergrid/persistence/CounterIT.java  |   235 +
 .../persistence/EntityConnectionsIT.java        |   292 +
 .../persistence/EntityDictionaryIT.java         |   133 +
 .../usergrid/persistence/EntityManagerIT.java   |   563 +
 .../EntityPropertyComparatorTest.java           |   206 +
 .../apache/usergrid/persistence/EntityTest.java |   100 +
 .../org/apache/usergrid/persistence/GeoIT.java  |   524 +
 .../apache/usergrid/persistence/IndexIT.java    |   462 +
 .../usergrid/persistence/PathQueryIT.java       |   164 +
 .../usergrid/persistence/PermissionsIT.java     |   191 +
 .../apache/usergrid/persistence/QueryTest.java  |   311 +
 .../usergrid/persistence/QueryUtilsTest.java    |    41 +
 .../apache/usergrid/persistence/SchemaTest.java |   127 +
 .../apache/usergrid/persistence/UtilsTest.java  |    38 +
 .../cassandra/EntityManagerFactoryImplIT.java   |   175 +
 .../cassandra/QueryProcessorTest.java           |   726 +
 .../SimpleIndexBucketLocatorImplTest.java       |   176 +
 .../cassandra/util/TraceTagUnitTest.java        |    38 +
 .../persistence/entities/SampleEntity.java      |    58 +
 ...EntityLocationRefDistanceComparatorTest.java |   102 +
 .../query/AbstractIteratingQueryIT.java         |  1299 +
 .../persistence/query/AllInCollectionIT.java    |    28 +
 .../persistence/query/AllInConnectionIT.java    |    28 +
 .../query/AllInConnectionNoTypeIT.java          |    56 +
 .../query/IntersectionUnionPagingIT.java        |   167 +
 .../query/MultiOrderByCollectionIT.java         |    28 +
 .../MultiOrderByComplexUnionCollectionIT.java   |    28 +
 .../MultiOrderByComplexUnionConnectionIT.java   |    28 +
 .../query/MultiOrderByConnectionIT.java         |    31 +
 .../query/NotOrderByCollectionIT.java           |    28 +
 .../query/NotOrderByConnectionIT.java           |    28 +
 ...gleOrderByBoundRangeScanAscCollectionIT.java |    28 +
 ...gleOrderByBoundRangeScanAscConnectionIT.java |    28 +
 ...leOrderByBoundRangeScanDescCollectionIT.java |    28 +
 ...leOrderByBoundRangeScanDescConnectionIT.java |    28 +
 ...eOrderByComplexIntersectionCollectionIT.java |    28 +
 ...eOrderByComplexIntersectionConnectionIT.java |    29 +
 .../SingleOrderByComplexUnionCollectionIT.java  |    28 +
 .../SingleOrderByComplexUnionConnectionIT.java  |    28 +
 .../SingleOrderByIntersectionCollectionIT.java  |    30 +
 .../SingleOrderByIntersectionConnectionIT.java  |    30 +
 .../SingleOrderByLessThanLimitCollectionIT.java |    28 +
 .../SingleOrderByLessThanLimitConnectionIT.java |    28 +
 .../SingleOrderByMaxLimitCollectionIT.java      |    29 +
 .../SingleOrderByMaxLimitConnectionIT.java      |    29 +
 ...SingleOrderByNoIntersectionCollectionIT.java |    28 +
 ...SingleOrderByNoIntersectionConnectionIT.java |    28 +
 .../query/SingleOrderByNotCollectionIT.java     |    28 +
 .../query/SingleOrderByNotConnectionIT.java     |    28 +
 ...OrderBySameRangeScanGreaterCollectionIT.java |    28 +
 ...OrderBySameRangeScanGreaterConnectionIT.java |    28 +
 ...meRangeScanGreaterThanEqualCollectionIT.java |    28 +
 ...gleOrderBySameRangeScanLessCollectionIT.java |    28 +
 ...gleOrderBySameRangeScanLessConnectionIT.java |    28 +
 ...ySameRangeScanLessThanEqualCollectionIT.java |    28 +
 ...ySameRangeScanLessThanEqualConnectionIT.java |    28 +
 .../query/ir/result/AbstractScanColumnTest.java |    84 +
 .../query/ir/result/InOrderIterator.java        |   115 +
 .../ir/result/IntersectionIteratorTest.java     |   306 +
 .../query/ir/result/IteratorHelper.java         |    18 +
 .../ir/result/SubtractionIteratorTest.java      |   180 +
 .../query/ir/result/UnionIteratorTest.java      |   466 +
 .../persistence/query/tree/GrammarTreeTest.java |   592 +
 .../persistence/query/tree/LongLiteralTest.java |    61 +
 .../query/tree/StringLiteralTest.java           |    87 +
 .../system/UsergridSystemMonitorIT.java         |    51 +
 .../usergrid/utils/ConversionUtilsTest.java     |    49 +
 .../apache/usergrid/utils/IndexUtilsTest.java   |    71 +
 .../apache/usergrid/utils/JsonUtilsTest.java    |    85 +
 .../apache/usergrid/utils/ListUtilsTest.java    |    53 +
 .../apache/usergrid/utils/MailUtilsTest.java    |    90 +
 .../org/apache/usergrid/utils/MapUtilsTest.java |    41 +
 .../apache/usergrid/utils/TestInflector.java    |    81 +
 .../apache/usergrid/utils/TimeUtilsTest.java    |    60 +
 .../apache/usergrid/utils/UUIDUtilsTest.java    |   371 +
 .../org/apache/usergrid/utils/package-info.java |    18 +
 .../test/java/org/usergrid/AbstractCoreIT.java  |    45 -
 .../src/test/java/org/usergrid/Application.java |   124 -
 .../org/usergrid/ConcurrentCoreITSuite.java     |    50 -
 .../usergrid/ConcurrentCoreIteratorITSuite.java |    62 -
 .../org/usergrid/ConcurrentCoreTestSuite.java   |    33 -
 .../test/java/org/usergrid/CoreApplication.java |   171 -
 .../src/test/java/org/usergrid/CoreITSetup.java |    43 -
 .../test/java/org/usergrid/CoreITSetupImpl.java |   145 -
 .../src/test/java/org/usergrid/CoreITSuite.java |    34 -
 .../test/java/org/usergrid/CoreTestSuite.java   |    47 -
 .../java/org/usergrid/batch/AppArgsTest.java    |    52 -
 .../batch/BulkJobExecutionUnitTest.java         |   209 -
 .../java/org/usergrid/batch/BulkTestUtils.java  |    38 -
 .../batch/ConcurrentSchedulerITSuite.java       |    31 -
 .../batch/ConcurrentSchedulerTestSuite.java     |    19 -
 .../org/usergrid/batch/SchedulerITSuite.java    |    34 -
 .../org/usergrid/batch/SchedulerTestSuite.java  |    18 -
 .../usergrid/batch/UsergridJobFactoryTest.java  |    31 -
 .../batch/job/AbstractSchedulerRuntimeIT.java   |    78 -
 .../usergrid/batch/job/CountdownLatchJob.java   |    67 -
 .../org/usergrid/batch/job/DelayExecution.java  |   104 -
 .../org/usergrid/batch/job/DelayHeartbeat.java  |   106 -
 .../batch/job/FailureJobExceuction.java         |    74 -
 .../usergrid/batch/job/OnlyOnceExceution.java   |   116 -
 .../job/OnlyOnceUnlockOnFailExceution.java      |   126 -
 .../usergrid/batch/job/SchedulerRuntime1IT.java |    70 -
 .../usergrid/batch/job/SchedulerRuntime2IT.java |    98 -
 .../usergrid/batch/job/SchedulerRuntime3IT.java |    71 -
 .../usergrid/batch/job/SchedulerRuntime4IT.java |    68 -
 .../usergrid/batch/job/SchedulerRuntime5IT.java |    69 -
 .../usergrid/batch/job/SchedulerRuntime6IT.java |    97 -
 .../usergrid/batch/job/SchedulerRuntime7IT.java |    74 -
 .../usergrid/batch/job/SchedulerRuntime8IT.java |    95 -
 .../org/usergrid/batch/job/TestJobListener.java |   121 -
 .../usergrid/batch/job/TestJobListenerTest.java |   144 -
 .../org/usergrid/batch/job/package-info.java    |    18 -
 .../clustering/hazelcast/HazelcastTest.java     |   111 -
 .../count/BatchCountParallelismTest.java        |   122 -
 .../org/usergrid/count/SimpleBatcherTest.java   |    51 -
 .../count/common/CountSerDeUtilsTest.java       |    68 -
 .../org/usergrid/count/common/CountTest.java    |    68 -
 .../locking/cassandra/HectorLockManagerIT.java  |   185 -
 .../SingleNodeLockTestSingleNode.java           |   168 -
 .../zookeeper/AbstractZooKeeperTest.java        |   126 -
 .../org/usergrid/locking/zookeeper/ZooPut.java  |   113 -
 .../zookeeper/ZookeeperLockManagerTest.java     |   182 -
 .../test/java/org/usergrid/mq/MessagesIT.java   |   278 -
 .../java/org/usergrid/mq/QueuePathsTest.java    |    48 -
 .../org/usergrid/persistence/CollectionIT.java  |  1637 -
 .../usergrid/persistence/CoreSchemaManager.java |    66 -
 .../org/usergrid/persistence/CounterIT.java     |   235 -
 .../persistence/EntityConnectionsIT.java        |   292 -
 .../persistence/EntityDictionaryIT.java         |   133 -
 .../usergrid/persistence/EntityManagerIT.java   |   563 -
 .../EntityPropertyComparatorTest.java           |   206 -
 .../org/usergrid/persistence/EntityTest.java    |   100 -
 .../java/org/usergrid/persistence/GeoIT.java    |   524 -
 .../java/org/usergrid/persistence/IndexIT.java  |   462 -
 .../org/usergrid/persistence/PathQueryIT.java   |   164 -
 .../org/usergrid/persistence/PermissionsIT.java |   191 -
 .../org/usergrid/persistence/QueryTest.java     |   311 -
 .../usergrid/persistence/QueryUtilsTest.java    |    41 -
 .../org/usergrid/persistence/SchemaTest.java    |   127 -
 .../org/usergrid/persistence/UtilsTest.java     |    38 -
 .../cassandra/EntityManagerFactoryImplIT.java   |   175 -
 .../cassandra/QueryProcessorTest.java           |   726 -
 .../SimpleIndexBucketLocatorImplTest.java       |   176 -
 .../cassandra/util/TraceTagUnitTest.java        |    38 -
 .../persistence/entities/SampleEntity.java      |    58 -
 ...EntityLocationRefDistanceComparatorTest.java |   102 -
 .../query/AbstractIteratingQueryIT.java         |  1299 -
 .../persistence/query/AllInCollectionIT.java    |    28 -
 .../persistence/query/AllInConnectionIT.java    |    28 -
 .../query/AllInConnectionNoTypeIT.java          |    55 -
 .../query/IntersectionUnionPagingIT.java        |   163 -
 .../query/MultiOrderByCollectionIT.java         |    28 -
 .../MultiOrderByComplexUnionCollectionIT.java   |    28 -
 .../MultiOrderByComplexUnionConnectionIT.java   |    28 -
 .../query/MultiOrderByConnectionIT.java         |    31 -
 .../query/NotOrderByCollectionIT.java           |    28 -
 .../query/NotOrderByConnectionIT.java           |    28 -
 ...gleOrderByBoundRangeScanAscCollectionIT.java |    28 -
 ...gleOrderByBoundRangeScanAscConnectionIT.java |    28 -
 ...leOrderByBoundRangeScanDescCollectionIT.java |    28 -
 ...leOrderByBoundRangeScanDescConnectionIT.java |    28 -
 ...eOrderByComplexIntersectionCollectionIT.java |    28 -
 ...eOrderByComplexIntersectionConnectionIT.java |    29 -
 .../SingleOrderByComplexUnionCollectionIT.java  |    28 -
 .../SingleOrderByComplexUnionConnectionIT.java  |    28 -
 .../SingleOrderByIntersectionCollectionIT.java  |    30 -
 .../SingleOrderByIntersectionConnectionIT.java  |    30 -
 .../SingleOrderByLessThanLimitCollectionIT.java |    28 -
 .../SingleOrderByLessThanLimitConnectionIT.java |    28 -
 .../SingleOrderByMaxLimitCollectionIT.java      |    29 -
 .../SingleOrderByMaxLimitConnectionIT.java      |    29 -
 ...SingleOrderByNoIntersectionCollectionIT.java |    28 -
 ...SingleOrderByNoIntersectionConnectionIT.java |    28 -
 .../query/SingleOrderByNotCollectionIT.java     |    28 -
 .../query/SingleOrderByNotConnectionIT.java     |    28 -
 ...OrderBySameRangeScanGreaterCollectionIT.java |    28 -
 ...OrderBySameRangeScanGreaterConnectionIT.java |    28 -
 ...meRangeScanGreaterThanEqualCollectionIT.java |    28 -
 ...gleOrderBySameRangeScanLessCollectionIT.java |    28 -
 ...gleOrderBySameRangeScanLessConnectionIT.java |    28 -
 ...ySameRangeScanLessThanEqualCollectionIT.java |    28 -
 ...ySameRangeScanLessThanEqualConnectionIT.java |    28 -
 .../query/ir/result/InOrderIterator.java        |   115 -
 .../ir/result/IntersectionIteratorTest.java     |   304 -
 .../query/ir/result/IteratorHelper.java         |    18 -
 .../ir/result/SubtractionIteratorTest.java      |   180 -
 .../query/ir/result/UnionIteratorTest.java      |   306 -
 .../persistence/query/tree/GrammarTreeTest.java |   592 -
 .../persistence/query/tree/LongLiteralTest.java |    61 -
 .../query/tree/StringLiteralTest.java           |    87 -
 .../system/UsergridSystemMonitorIT.java         |    51 -
 .../org/usergrid/utils/ConversionUtilsTest.java |    49 -
 .../java/org/usergrid/utils/IndexUtilsTest.java |    71 -
 .../java/org/usergrid/utils/JsonUtilsTest.java  |    85 -
 .../java/org/usergrid/utils/ListUtilsTest.java  |    53 -
 .../java/org/usergrid/utils/MailUtilsTest.java  |    90 -
 .../java/org/usergrid/utils/MapUtilsTest.java   |    41 -
 .../java/org/usergrid/utils/TestInflector.java  |    81 -
 .../java/org/usergrid/utils/TimeUtilsTest.java  |    60 -
 .../java/org/usergrid/utils/UUIDUtilsTest.java  |   371 -
 .../java/org/usergrid/utils/package-info.java   |    18 -
 stack/core/src/test/resources/log4j.properties  |    16 +-
 .../test/resources/usergrid-test-context.xml    |     4 +-
 stack/corepersistence/collection/pom.xml        |   388 +-
 .../DynamicCompositeFieldSerializer.java        |    49 +
 .../IdColDynamicCompositeSerializer.java        |    86 +
 .../persistence/collection/CollectionScope.java |    18 +
 .../collection/EntityCollectionManager.java     |    20 +-
 .../EntityCollectionManagerFactory.java         |    52 +-
 .../collection/EntityCollectionManagerSync.java |    22 +-
 .../collection/OrganizationScope.java           |    18 +
 .../astyanax/AstyanaxKeyspaceProvider.java      |    48 +-
 .../collection/astyanax/CassandraFig.java       |    29 +-
 .../astyanax/CompositeFieldSerializer.java      |    18 +
 .../astyanax/IdRowCompositeSerializer.java      |    20 +
 .../astyanax/MultiTennantColumnFamily.java      |    37 +-
 .../MultiTennantColumnFamilyDefinition.java     |    77 +-
 .../collection/astyanax/ScopedRowKey.java       |    22 +-
 .../collection/cassandra/ColumnTypes.java       |    26 +
 .../exception/CollectionRuntimeException.java   |    18 +-
 .../collection/guice/CollectionModule.java      |    29 +-
 .../collection/guice/PropertyUtils.java         |    18 +
 .../collection/hystrix/CassandraCommand.java    |    74 +
 .../collection/hystrix/CollectionCommand.java   |    46 -
 .../collection/hystrix/CommandUtils.java        |    28 +
 .../collection/hystrix/ReadCommand.java         |    50 -
 .../collection/hystrix/WriteCommand.java        |    49 -
 .../collection/impl/CollectionScopeImpl.java    |    18 +
 .../impl/EntityCollectionManagerImpl.java       |   178 +-
 .../impl/EntityCollectionManagerSyncImpl.java   |    18 +
 .../collection/migration/Migration.java         |    18 +
 .../migration/MigrationException.java           |    18 +
 .../collection/migration/MigrationManager.java  |    18 +
 .../mvcc/MvccEntitySerializationStrategy.java   |    24 +-
 .../mvcc/MvccLogEntrySerializationStrategy.java |    20 +-
 .../mvcc/changelog/ChangeLogEntry.java          |     5 +-
 .../mvcc/changelog/ChangeLogGeneratorImpl.java  |    10 +-
 .../collection/mvcc/entity/MvccEntity.java      |    39 +
 .../collection/mvcc/entity/MvccLogEntry.java    |    18 +
 .../collection/mvcc/entity/Stage.java           |    18 +
 .../collection/mvcc/entity/ValidationUtils.java |    19 +-
 .../mvcc/entity/impl/MvccEntityImpl.java        |    49 +-
 .../mvcc/entity/impl/MvccLogEntryImpl.java      |    18 +
 .../mvcc/event/PostProcessObserver.java         |    21 +-
 .../mvcc/stage/CollectionIoEvent.java           |    19 +-
 .../mvcc/stage/delete/DeleteCommit.java         |    95 -
 .../mvcc/stage/delete/DeleteStart.java          |    92 -
 .../mvcc/stage/delete/MarkCommit.java           |   113 +
 .../collection/mvcc/stage/delete/MarkStart.java |   112 +
 .../collection/mvcc/stage/load/Load.java        |    32 +-
 .../mvcc/stage/write/EntityVersion.java         |    62 +
 .../stage/write/EntityVersionSerializer.java    |    67 +
 .../mvcc/stage/write/FieldSerializer.java       |   102 +
 .../mvcc/stage/write/UniqueValue.java           |    37 +
 .../mvcc/stage/write/UniqueValueImpl.java       |   121 +
 .../write/UniqueValueSerializationStrategy.java |    64 +
 .../UniqueValueSerializationStrategyImpl.java   |   176 +
 .../mvcc/stage/write/WriteCommit.java           |    64 +-
 .../collection/mvcc/stage/write/WriteStart.java |     3 +-
 .../mvcc/stage/write/WriteUniqueVerify.java     |   188 +-
 .../collection/rx/CassandraThreadScheduler.java |    54 +-
 .../persistence/collection/rx/Concurrent.java   |    69 -
 .../persistence/collection/rx/RxFig.java        |    24 +-
 .../collection/serialization/UniqueUpdate.java  |    28 -
 .../impl/CollectionScopedRowKeySerializer.java  |    38 +-
 .../MvccEntitySerializationStrategyImpl.java    |   156 +-
 .../MvccLogEntrySerializationStrategyImpl.java  |    23 +-
 .../serialization/impl/SerializationModule.java |     2 +
 .../collection/util/AvailablePortFinder.java    |   186 +
 .../collection/CollectionContextImplTest.java   |     5 +-
 .../EntityCollectionManagerFactoryTest.java     |     5 +-
 .../collection/EntityCollectionManagerIT.java   |    64 +-
 .../EntityCollectionManagerSyncIT.java          |     7 +-
 .../collection/UUIDComparatorTest.java          |    51 +
 .../cassandra/AvailablePortFinder.java          |   187 -
 .../collection/cassandra/CassandraRule.java     |    31 +-
 .../collection/guice/TestCollectionModule.java  |    25 +
 .../collection/guice/TestModule.java            |    32 +
 .../changelog/ChangeLogGeneratorImplTest.java   |    39 +-
 .../mvcc/entity/impl/MvccEntityImplTest.java    |    28 +-
 .../mvcc/stage/AbstractEntityStageTest.java     |    17 +
 .../mvcc/stage/AbstractIdStageTest.java         |    17 +
 .../mvcc/stage/AbstractMvccEntityStageTest.java |    72 +-
 .../mvcc/stage/InvalidMvccEntityGenerator.java  |   118 -
 .../mvcc/stage/TestEntityGenerator.java         |    17 +
 .../mvcc/stage/delete/DeleteCommitTest.java     |   122 -
 .../mvcc/stage/delete/DeleteStartTest.java      |    97 -
 .../mvcc/stage/delete/MarkCommitTest.java       |   125 +
 .../mvcc/stage/delete/MarkStartTest.java        |    97 +
 .../write/EntityVersionSerializerTest.java      |    43 +
 .../mvcc/stage/write/FieldSerializerTest.java   |    51 +
 ...niqueValueSerializationStrategyImplTest.java |   125 +
 .../mvcc/stage/write/WriteCommitTest.java       |    26 +-
 .../mvcc/stage/write/WriteStartTest.java        |    17 +
 .../stage/write/WriteUniqueVerifyStageTest.java |    49 +
 .../mvcc/stage/write/WriteUniqueVerifyTest.java |   128 +-
 .../rx/CassandraThreadSchedulerTest.java        |   327 +
 .../collection/rx/ConcurrentTest.java           |   112 -
 .../persistence/collection/rx/ParallelTest.java |   219 +
 ...MvccEntitySerializationStrategyImplTest.java |   164 +-
 .../impl/MvccLESSTransientTest.java             |     5 +-
 ...ccLogEntrySerializationStrategyImplTest.java |     5 +-
 .../impl/ScopedRowKeySerializerTest.java        |     7 +-
 .../util/AvailablePortFinderTest.java           |    73 +
 .../collection/util/InvalidEntityGenerator.java |    32 +-
 .../collection/util/InvalidIdGenerator.java     |    68 +-
 .../util/InvalidMvccEntityGenerator.java        |   144 +
 .../util/InvalidValueGeneratorTest.java         |    48 +
 .../resources/cassandra-defaults.properties     |    12 -
 .../src/test/resources/cassandra.properties     |     5 -
 .../src/test/resources/log4j.properties         |    10 +-
 .../resources/serialization-defaults.properties |     4 -
 .../src/test/resources/usergrid-CHOP.properties |    12 +
 .../src/test/resources/usergrid-UNIT.properties |    14 +
 .../src/test/resources/usergrid.properties      |     1 +
 stack/corepersistence/graph/pom.xml             |    91 +-
 .../usergrid/persistence/graph/EdgeManager.java |    30 +-
 .../usergrid/persistence/graph/GraphFig.java    |    36 +
 .../usergrid/persistence/graph/MarkedEdge.java  |    35 +
 .../persistence/graph/SearchByEdge.java         |    70 +
 .../persistence/graph/SearchByIdType.java       |     5 -
 .../persistence/graph/SearchEdgeType.java       |     2 -
 .../DynamicCompositeFieldSerializer.java        |    53 -
 .../IdColDynamicCompositeSerializer.java        |    93 -
 .../graph/consistency/AsyncProcessor.java       |    35 +
 .../graph/consistency/AsyncProcessorImpl.java   |    37 +
 .../graph/consistency/SimpleTimeoutEvent.java   |    30 +
 .../graph/consistency/TimeoutEvent.java         |    18 +
 .../graph/consistency/TimeoutQueue.java         |    42 +
 .../persistence/graph/guice/GraphModule.java    |    56 +-
 .../graph/impl/CollectionIndexObserver.java     |     8 +-
 .../persistence/graph/impl/EdgeManagerImpl.java |   273 +-
 .../persistence/graph/impl/SimpleEdge.java      |    65 +-
 .../graph/impl/SimpleMarkedEdge.java            |    69 +
 .../graph/impl/SimpleSearchByEdge.java          |    97 +
 .../graph/impl/SimpleSearchByIdType.java        |     1 -
 .../graph/serialization/CassandraConfig.java    |    32 +
 .../EdgeMetadataSerialization.java              |    24 +-
 .../graph/serialization/EdgeSerialization.java  |    46 +-
 .../graph/serialization/NodeSerialization.java  |    78 +
 .../graph/serialization/impl/CassUtils.java     |    11 +-
 .../serialization/impl/CassandraConfigImpl.java |    75 +
 .../impl/EdgeMetadataSerializationImpl.java     |    95 +-
 .../impl/EdgeSerializationImpl.java             |   725 +-
 .../impl/NodeSerializationImpl.java             |   207 +
 .../impl/parse/ColumnNameIterator.java          |     2 -
 .../impl/parse/ObservableIterator.java          |    12 +-
 .../graph/serialization/stage/GraphIoEvent.java |    32 -
 .../stage/write/EdgeWriteStage.java             |    60 -
 .../graph/serialization/util/EdgeHasher.java    |    26 +-
 .../graph/serialization/util/EdgeUtils.java     |    23 +-
 .../persistence/graph/EdgeManagerIT.java        |   964 +-
 .../graph/guice/TestGraphModule.java            |    20 +
 .../EdgeMetadataSerializationTest.java          |   195 +-
 .../EdgeSerializationChopTest.java              |   129 +
 .../serialization/EdgeSerializationTest.java    |   617 +
 .../serialization/NodeSerializationTest.java    |   183 +
 .../serialization/util/EdgeHasherTest.java      |     2 +-
 .../graph/test/util/EdgeTestUtils.java          |    67 +-
 .../src/test/resources/usergrid-CHOP.properties |    12 +
 .../src/test/resources/usergrid-UNIT.properties |    14 +
 .../src/test/resources/usergrid.properties      |     1 +
 .../astyanax-cassandra-1.56.46-UG-javadoc.jar   |   Bin 616253 -> 0 bytes
 ...styanax-cassandra-1.56.46-UG-sources.sources |   Bin 161740 -> 0 bytes
 .../astyanax-cassandra-1.56.46-UG.jar           |   Bin 224404 -> 0 bytes
 .../astyanax-cassandra-1.56.46-UG.pom           |   112 -
 .../1.56.49-SNAPSHOT/_maven.repositories        |     4 +
 ...yanax-cassandra-1.56.49-SNAPSHOT-javadoc.jar |   Bin 0 -> 629128 bytes
 ...x-cassandra-1.56.49-SNAPSHOT-sources.sources |   Bin 0 -> 161845 bytes
 .../astyanax-cassandra-1.56.49-SNAPSHOT.jar     |   Bin 0 -> 224329 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 +-
 .../astyanax-contrib-1.56.46-UG-javadoc.jar     |   Bin 33029 -> 0 bytes
 .../astyanax-contrib-1.56.46-UG-sources.sources |   Bin 2314 -> 0 bytes
 .../1.56.46-UG/astyanax-contrib-1.56.46-UG.jar  |   Bin 4842 -> 0 bytes
 .../1.56.46-UG/astyanax-contrib-1.56.46-UG.pom  |   112 -
 ...styanax-contrib-1.56.49-SNAPSHOT-javadoc.jar |   Bin 0 -> 32792 bytes
 ...nax-contrib-1.56.49-SNAPSHOT-sources.sources |   Bin 0 -> 2314 bytes
 .../astyanax-contrib-1.56.49-SNAPSHOT.jar       |   Bin 0 -> 4842 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 +-
 .../astyanax-core-1.56.46-UG-javadoc.jar        |   Bin 519966 -> 0 bytes
 .../astyanax-core-1.56.46-UG-sources.sources    |   Bin 141783 -> 0 bytes
 .../1.56.46-UG/astyanax-core-1.56.46-UG.jar     |   Bin 5510008 -> 0 bytes
 .../1.56.46-UG/astyanax-core-1.56.46-UG.pom     |    88 -
 .../1.56.49-SNAPSHOT/_maven.repositories        |     4 +
 .../astyanax-core-1.56.49-SNAPSHOT-javadoc.jar  |   Bin 0 -> 532409 bytes
 ...tyanax-core-1.56.49-SNAPSHOT-sources.sources |   Bin 0 -> 141819 bytes
 .../astyanax-core-1.56.49-SNAPSHOT.jar          |   Bin 0 -> 212622 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      |     8 +-
 ...styanax-entity-mapper-1.56.46-UG-javadoc.jar |   Bin 91123 -> 0 bytes
 ...nax-entity-mapper-1.56.46-UG-sources.sources |   Bin 30392 -> 0 bytes
 .../astyanax-entity-mapper-1.56.46-UG.jar       |   Bin 68615 -> 0 bytes
 .../astyanax-entity-mapper-1.56.46-UG.pom       |   118 -
 ...x-entity-mapper-1.56.49-SNAPSHOT-javadoc.jar |   Bin 0 -> 97504 bytes
 ...tity-mapper-1.56.49-SNAPSHOT-sources.sources |   Bin 0 -> 30591 bytes
 .../astyanax-entity-mapper-1.56.49-SNAPSHOT.jar |   Bin 0 -> 68862 bytes
 .../astyanax-entity-mapper-1.56.49-SNAPSHOT.pom |   118 +
 .../1.56.49-SNAPSHOT/maven-metadata-local.xml   |    12 +
 .../maven-metadata-local.xml                    |     6 +-
 .../astyanax-examples-1.56.46-UG-javadoc.jar    |   Bin 38106 -> 0 bytes
 ...astyanax-examples-1.56.46-UG-sources.sources |   Bin 4457 -> 0 bytes
 .../1.56.46-UG/astyanax-examples-1.56.46-UG.jar |   Bin 8506 -> 0 bytes
 .../1.56.46-UG/astyanax-examples-1.56.46-UG.pom |   106 -
 ...tyanax-examples-1.56.49-SNAPSHOT-javadoc.jar |   Bin 0 -> 37847 bytes
 ...ax-examples-1.56.49-SNAPSHOT-sources.sources |   Bin 0 -> 4457 bytes
 .../astyanax-examples-1.56.49-SNAPSHOT.jar      |   Bin 0 -> 8506 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 +-
 .../astyanax-queue-1.56.46-UG-javadoc.jar       |   Bin 179575 -> 0 bytes
 .../astyanax-queue-1.56.46-UG-sources.sources   |   Bin 44057 -> 0 bytes
 .../1.56.46-UG/astyanax-queue-1.56.46-UG.jar    |   Bin 86618 -> 0 bytes
 .../1.56.46-UG/astyanax-queue-1.56.46-UG.pom    |   112 -
 .../astyanax-queue-1.56.49-SNAPSHOT-javadoc.jar |   Bin 0 -> 182179 bytes
 ...yanax-queue-1.56.49-SNAPSHOT-sources.sources |   Bin 0 -> 44057 bytes
 .../astyanax-queue-1.56.49-SNAPSHOT.jar         |   Bin 0 -> 86544 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 +-
 .../astyanax-recipes-1.56.46-UG-javadoc.jar     |   Bin 203394 -> 0 bytes
 .../astyanax-recipes-1.56.46-UG-sources.sources |   Bin 58144 -> 0 bytes
 .../1.56.46-UG/astyanax-recipes-1.56.46-UG.jar  |   Bin 100221 -> 0 bytes
 .../1.56.46-UG/astyanax-recipes-1.56.46-UG.pom  |   106 -
 ...styanax-recipes-1.56.49-SNAPSHOT-javadoc.jar |   Bin 0 -> 207654 bytes
 ...nax-recipes-1.56.49-SNAPSHOT-sources.sources |   Bin 0 -> 58161 bytes
 .../astyanax-recipes-1.56.49-SNAPSHOT.jar       |   Bin 0 -> 100070 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 +-
 .../astyanax-thrift-1.56.46-UG-javadoc.jar      |   Bin 196141 -> 0 bytes
 .../astyanax-thrift-1.56.46-UG-sources.sources  |   Bin 75715 -> 0 bytes
 .../1.56.46-UG/astyanax-thrift-1.56.46-UG.jar   |   Bin 235965 -> 0 bytes
 .../1.56.46-UG/astyanax-thrift-1.56.46-UG.pom   |   112 -
 .../1.56.49-SNAPSHOT/_maven.repositories        |     4 +
 ...astyanax-thrift-1.56.49-SNAPSHOT-javadoc.jar |   Bin 0 -> 199736 bytes
 ...anax-thrift-1.56.49-SNAPSHOT-sources.sources |   Bin 0 -> 75715 bytes
 .../astyanax-thrift-1.56.49-SNAPSHOT.jar        |   Bin 0 -> 235822 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-javadoc.jar       |   Bin 0 -> 261 bytes
 .../astyanax-1.56.49-SNAPSHOT-sources.sources   |   Bin 0 -> 261 bytes
 .../astyanax-1.56.49-SNAPSHOT.jar               |   Bin 0 -> 261 bytes
 .../astyanax-1.56.49-SNAPSHOT.pom               |   136 +
 .../1.56.49-SNAPSHOT/maven-metadata-local.xml   |    12 +
 .../astyanax/astyanax/maven-metadata-local.xml  |    12 +
 stack/corepersistence/model/pom.xml             |     8 +-
 .../model/builder/EntitySerializer.java         |    19 +-
 .../model/builder/EntitySerializerFactory.java  |    20 +-
 .../persistence/model/entity/Entity.java        |    22 +-
 .../usergrid/persistence/model/entity/Id.java   |    18 +
 .../persistence/model/entity/SimpleId.java      |    26 +-
 .../persistence/model/field/AbstractField.java  |    43 +-
 .../persistence/model/field/ArrayField.java     |    50 +-
 .../persistence/model/field/BooleanField.java   |    24 +-
 .../model/field/ByteBufferField.java            |    40 +-
 .../persistence/model/field/DoubleField.java    |    35 +-
 .../model/field/EntityObjectField.java          |    33 +-
 .../usergrid/persistence/model/field/Field.java |    29 +-
 .../persistence/model/field/IntegerField.java   |    35 +-
 .../persistence/model/field/ListField.java      |    53 +-
 .../persistence/model/field/LocationField.java  |    36 +-
 .../persistence/model/field/LongField.java      |    35 +-
 .../persistence/model/field/SetField.java       |    51 +-
 .../persistence/model/field/StringField.java    |    36 +-
 .../persistence/model/field/UUIDField.java      |    37 +-
 .../model/field/value/EntityObject.java         |    58 +-
 .../persistence/model/field/value/Location.java |    39 +-
 .../persistence/model/util/UUIDGenerator.java   |     2 +-
 .../usergrid/persistence/model/util/Verify.java |    21 +-
 .../persistence/model/field/EntityTest.java     |     4 +-
 stack/corepersistence/pom.xml                   |   159 +-
 .../priamcluster/cassandra-cf.json              |    36 +-
 stack/corepersistence/priamcluster/pom.xml      |    29 +-
 .../src/main/dist/conf/Priam.properties         |    10 +-
 .../src/main/dist/init_instance/create_raid0.sh |    32 +
 .../src/main/dist/init_instance/init_cass.sh    |    73 -
 .../main/dist/init_instance/init_instance.sh    |    54 +
 .../dist/init_instance/install_cassandra.sh     |    56 +
 .../dist/init_instance/install_elasticsearch.sh |    24 +
 .../dist/init_instance/install_oraclejdk.sh     |     3 +
 .../src/main/dist/lib/priam-agent-1.2.24.jar    |   Bin 0 -> 33020 bytes
 .../dist/lib/priam-cass-extensions-1.2.24.jar   |   Bin 0 -> 5478 bytes
 .../priam-cass-extensions-2.0.0-SNAPSHOT.jar    |   Bin 5478 -> 0 bytes
 .../src/main/dist/webapps/priam-web-1.2.24.war  |   Bin 0 -> 31272443 bytes
 .../dist/webapps/priam-web-2.0.0-SNAPSHOT.war   |   Bin 31266622 -> 0 bytes
 .../src/main/groovy/configure_cassandra.groovy  |    12 +-
 .../main/groovy/configure_elasticsearch.groovy  |    47 +
 .../src/main/groovy/registry_clear.groovy       |     2 +-
 .../src/main/groovy/registry_list.groovy        |     2 +-
 .../src/main/groovy/registry_register.groovy    |     3 +-
 .../src/main/groovy/wait_for_cassandra.groovy   |    42 -
 .../src/main/groovy/wait_for_instances.groovy   |    44 +
 stack/corepersistence/queryindex/pom.xml        |   213 +
 .../persistence/query/tree/QueryFilter.g        |   311 +
 .../queryindex/src/main/java/QueryFilter.tokens |    47 +
 .../exceptions/JsonReadException.java           |    29 +
 .../exceptions/JsonWriteException.java          |    29 +
 .../exceptions/NoFullTextIndexException.java    |    52 +
 .../exceptions/NoIndexException.java            |    50 +
 .../exceptions/PersistenceException.java        |    47 +
 .../exceptions/QueryParseException.java         |    65 +
 .../exceptions/QueryTokenException.java         |    54 +
 .../index/EntityCollectionIndex.java            |    48 +
 .../index/impl/EsDslQueryVistor.java            |   108 +
 .../index/impl/EsEntityCollectionIndex.java     |   287 +
 .../persistence/index/impl/IndexModule.java     |    32 +
 .../usergrid/persistence/query/EntityRef.java   |    30 +
 .../usergrid/persistence/query/Query.java       |  1038 +
 .../usergrid/persistence/query/Results.java     |   927 +
 .../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 +
 .../query/tree/QueryFilterLexer.java            |  2565 +
 .../query/tree/QueryFilterParser.java           |  2186 +
 .../persistence/query/tree/QueryVisitor.java    |    99 +
 .../persistence/query/tree/StringLiteral.java   |    85 +
 .../persistence/query/tree/UUIDLiteral.java     |    52 +
 .../persistence/query/tree/WithinOperand.java   |   111 +
 .../persistence/query/tree/WithinProperty.java  |    57 +
 .../usergrid/persistence/utils/ClassUtils.java  |    58 +
 .../persistence/utils/ConversionUtils.java      |   765 +
 .../usergrid/persistence/utils/JsonUtils.java   |   329 +
 .../usergrid/persistence/utils/ListUtils.java   |   232 +
 .../usergrid/persistence/utils/MapUtils.java    |   377 +
 .../usergrid/persistence/utils/StringUtils.java |   172 +
 .../usergrid/persistence/utils/UUIDUtils.java   |   412 +
 .../apache/usergrid/persistence/IndexIT.java    |   453 +
 .../index/impl/ElasticSearchTest.java           |   262 +
 .../index/impl/EntityCollectionIndexTest.java   |   141 +
 .../usergrid/persistence/query/QueryTest.java   |   314 +
 .../persistence/query/tree/GrammarTreeTest.java |   592 +
 .../persistence/query/tree/LongLiteralTest.java |    64 +
 .../query/tree/StringLiteralTest.java           |    88 +
 .../persistence/utils/ElasticSearchRule.java    |    65 +
 .../apache/usergrid/test/AbstractCoreIT.java    |    57 +
 .../org/apache/usergrid/test/Application.java   |   144 +
 .../apache/usergrid/test/CassandraService.java  |    27 +
 .../apache/usergrid/test/CoreApplication.java   |   154 +
 .../org/apache/usergrid/test/CoreITSetup.java   |    31 +
 .../apache/usergrid/test/CoreITSetupImpl.java   |    97 +
 .../usergrid/test/EntityManagerFacade.java      |    73 +
 .../apache/usergrid/test/EntityMapUtils.java    |   178 +
 .../src/test/resources/dynamic-test.properties  |    12 +
 .../src/test/resources/log4j.properties         |    15 +
 .../src/test/resources/sample-large.json        | 39603 ++++++++++
 .../src/test/resources/sample-small.json        |   222 +
 .../src/test/resources/usergrid-CHOP.properties |    12 +
 .../src/test/resources/usergrid-UNIT.properties |    14 +
 .../src/test/resources/usergrid.properties      |     1 +
 stack/launcher/pom.xml                          |    12 +-
 .../java/org/apache/usergrid/launcher/App.java  |   288 +
 .../apache/usergrid/launcher/AppleUtils.java    |    38 +
 .../launcher/ClasspathStaticHttpHandler.java    |   320 +
 .../launcher/CustomJSPTemplateProcessor.java    |   137 +
 .../usergrid/launcher/EmbeddedServerHelper.java |   193 +
 .../org/apache/usergrid/launcher/JarMain.java   |    40 +
 .../apache/usergrid/launcher/LauncherFrame.java |   461 +
 .../usergrid/launcher/LogViewerFrame.java       |   104 +
 .../org/apache/usergrid/launcher/Server.java    |   618 +
 .../apache/usergrid/launcher/package-info.java  |    18 +
 .../main/java/org/usergrid/launcher/App.java    |   288 -
 .../java/org/usergrid/launcher/AppleUtils.java  |    38 -
 .../launcher/ClasspathStaticHttpHandler.java    |   320 -
 .../launcher/CustomJSPTemplateProcessor.java    |   137 -
 .../usergrid/launcher/EmbeddedServerHelper.java |   193 -
 .../java/org/usergrid/launcher/JarMain.java     |    40 -
 .../org/usergrid/launcher/LauncherFrame.java    |   461 -
 .../org/usergrid/launcher/LogViewerFrame.java   |   104 -
 .../main/java/org/usergrid/launcher/Server.java |   618 -
 .../org/usergrid/launcher/package-info.java     |    18 -
 .../src/main/resources/log4j.properties         |    14 +-
 .../org/apache/usergrid/launcher/dock_icon.png  |   Bin 0 -> 11592 bytes
 .../org/apache/usergrid/launcher/icon_16.png    |   Bin 0 -> 3273 bytes
 .../org/apache/usergrid/launcher/icon_256.png   |   Bin 0 -> 12578 bytes
 .../org/apache/usergrid/launcher/icon_32.png    |   Bin 0 -> 3862 bytes
 .../org/apache/usergrid/launcher/icon_64.png    |   Bin 0 -> 5079 bytes
 .../org/apache/usergrid/launcher/log_viewer.png |   Bin 0 -> 6610 bytes
 .../org/apache/usergrid/launcher/start.png      |   Bin 0 -> 9253 bytes
 .../apache/usergrid/launcher/start_active.png   |   Bin 0 -> 9334 bytes
 .../apache/usergrid/launcher/status_green.png   |   Bin 0 -> 2048 bytes
 .../org/apache/usergrid/launcher/status_off.png |   Bin 0 -> 1847 bytes
 .../org/apache/usergrid/launcher/status_red.png |   Bin 0 -> 2047 bytes
 .../apache/usergrid/launcher/status_yellow.png  |   Bin 0 -> 2092 bytes
 .../org/apache/usergrid/launcher/stop.png       |   Bin 0 -> 8858 bytes
 .../apache/usergrid/launcher/stop_active.png    |   Bin 0 -> 8844 bytes
 .../apache/usergrid/launcher/web_browser.png    |   Bin 0 -> 4531 bytes
 .../org/usergrid/launcher/dock_icon.png         |   Bin 11592 -> 0 bytes
 .../resources/org/usergrid/launcher/icon_16.png |   Bin 3273 -> 0 bytes
 .../org/usergrid/launcher/icon_256.png          |   Bin 12578 -> 0 bytes
 .../resources/org/usergrid/launcher/icon_32.png |   Bin 3862 -> 0 bytes
 .../resources/org/usergrid/launcher/icon_64.png |   Bin 5079 -> 0 bytes
 .../org/usergrid/launcher/log_viewer.png        |   Bin 6610 -> 0 bytes
 .../resources/org/usergrid/launcher/start.png   |   Bin 9253 -> 0 bytes
 .../org/usergrid/launcher/start_active.png      |   Bin 9334 -> 0 bytes
 .../org/usergrid/launcher/status_green.png      |   Bin 2048 -> 0 bytes
 .../org/usergrid/launcher/status_off.png        |   Bin 1847 -> 0 bytes
 .../org/usergrid/launcher/status_red.png        |   Bin 2047 -> 0 bytes
 .../org/usergrid/launcher/status_yellow.png     |   Bin 2092 -> 0 bytes
 .../resources/org/usergrid/launcher/stop.png    |   Bin 8858 -> 0 bytes
 .../org/usergrid/launcher/stop_active.png       |   Bin 8844 -> 0 bytes
 .../org/usergrid/launcher/web_browser.png       |   Bin 4531 -> 0 bytes
 .../resources/usergrid-standalone-context.xml   |     2 +-
 .../0.0.3/usergrid-java-client-0.0.3.jar        |   Bin 0 -> 45750 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/README.txt                 |     2 +-
 stack/mongo-emulator/pom.xml                    |    14 +-
 .../usergrid/mongo/MongoChannelHandler.java     |   144 +
 .../usergrid/mongo/MongoMessageDecoder.java     |   115 +
 .../usergrid/mongo/MongoMessageEncoder.java     |    46 +
 .../org/apache/usergrid/mongo/MongoQuery.java   |    30 +
 .../org/apache/usergrid/mongo/MongoServer.java  |   171 +
 .../mongo/MongoServerPipelineFactory.java       |    55 +
 .../usergrid/mongo/commands/Buildinfo.java      |    43 +
 .../usergrid/mongo/commands/Collstats.java      |    58 +
 .../apache/usergrid/mongo/commands/Count.java   |    65 +
 .../apache/usergrid/mongo/commands/Dbstats.java |    40 +
 .../usergrid/mongo/commands/Getlasterror.java   |    48 +
 .../usergrid/mongo/commands/ListDatabases.java  |    51 +
 .../usergrid/mongo/commands/MongoCommand.java   |    81 +
 .../mongo/commands/ReplSetGetStatus.java        |    37 +
 .../usergrid/mongo/commands/ServerStatus.java   |    62 +
 .../usergrid/mongo/commands/Whatsmyuri.java     |    41 +
 .../apache/usergrid/mongo/protocol/Message.java |   191 +
 .../apache/usergrid/mongo/protocol/OpCrud.java  |    46 +
 .../usergrid/mongo/protocol/OpDelete.java       |   196 +
 .../usergrid/mongo/protocol/OpGetMore.java      |   112 +
 .../usergrid/mongo/protocol/OpInsert.java       |   180 +
 .../usergrid/mongo/protocol/OpKillCursors.java  |   115 +
 .../apache/usergrid/mongo/protocol/OpMsg.java   |    77 +
 .../apache/usergrid/mongo/protocol/OpQuery.java |   447 +
 .../apache/usergrid/mongo/protocol/OpReply.java |   189 +
 .../usergrid/mongo/protocol/OpUpdate.java       |   206 +
 .../usergrid/mongo/query/MongoQueryParser.java  |   291 +
 .../mongo/testproxy/MongoMessageFrame.java      |    55 +
 .../testproxy/MongoProxyInboundHandler.java     |   197 +
 .../testproxy/MongoProxyPipelineFactory.java    |    53 +
 .../mongo/testproxy/MongoProxyServer.java       |    55 +
 .../testproxy/MongoProxyServerHandler.java      |    58 +
 .../apache/usergrid/mongo/utils/BSONUtils.java  |    50 +
 .../org/usergrid/mongo/MongoChannelHandler.java |   144 -
 .../org/usergrid/mongo/MongoMessageDecoder.java |   115 -
 .../org/usergrid/mongo/MongoMessageEncoder.java |    46 -
 .../java/org/usergrid/mongo/MongoQuery.java     |    30 -
 .../java/org/usergrid/mongo/MongoServer.java    |   171 -
 .../mongo/MongoServerPipelineFactory.java       |    55 -
 .../org/usergrid/mongo/commands/Buildinfo.java  |    43 -
 .../org/usergrid/mongo/commands/Collstats.java  |    58 -
 .../java/org/usergrid/mongo/commands/Count.java |    65 -
 .../org/usergrid/mongo/commands/Dbstats.java    |    40 -
 .../usergrid/mongo/commands/Getlasterror.java   |    48 -
 .../usergrid/mongo/commands/ListDatabases.java  |    51 -
 .../usergrid/mongo/commands/MongoCommand.java   |    81 -
 .../mongo/commands/ReplSetGetStatus.java        |    37 -
 .../usergrid/mongo/commands/ServerStatus.java   |    63 -
 .../org/usergrid/mongo/commands/Whatsmyuri.java |    41 -
 .../org/usergrid/mongo/protocol/Message.java    |   191 -
 .../org/usergrid/mongo/protocol/OpCrud.java     |    46 -
 .../org/usergrid/mongo/protocol/OpDelete.java   |   196 -
 .../org/usergrid/mongo/protocol/OpGetMore.java  |   112 -
 .../org/usergrid/mongo/protocol/OpInsert.java   |   180 -
 .../usergrid/mongo/protocol/OpKillCursors.java  |   115 -
 .../java/org/usergrid/mongo/protocol/OpMsg.java |    77 -
 .../org/usergrid/mongo/protocol/OpQuery.java    |   447 -
 .../org/usergrid/mongo/protocol/OpReply.java    |   189 -
 .../org/usergrid/mongo/protocol/OpUpdate.java   |   206 -
 .../usergrid/mongo/query/MongoQueryParser.java  |   291 -
 .../mongo/testproxy/MongoMessageFrame.java      |    55 -
 .../testproxy/MongoProxyInboundHandler.java     |   197 -
 .../testproxy/MongoProxyPipelineFactory.java    |    53 -
 .../mongo/testproxy/MongoProxyServer.java       |    55 -
 .../testproxy/MongoProxyServerHandler.java      |    58 -
 .../org/usergrid/mongo/utils/BSONUtils.java     |    50 -
 .../usergrid/mongo/AbstractMongoTest.java       |    62 +
 .../apache/usergrid/mongo/BasicMongoTest.java   |   340 +
 .../usergrid/mongo/DatabaseInitializer.java     |   145 +
 .../apache/usergrid/mongo/MongoQueryTest.java   |   503 +
 .../org/usergrid/mongo/AbstractMongoTest.java   |    61 -
 .../java/org/usergrid/mongo/BasicMongoTest.java |   340 -
 .../org/usergrid/mongo/DatabaseInitializer.java |   145 -
 .../java/org/usergrid/mongo/MongoQueryTest.java |   503 -
 .../test/resources/usergrid-test-context.xml    |     4 +-
 stack/pom.xml                                   |    44 +-
 stack/query-validator/.gitignore                |     1 +
 stack/query-validator/README.md                 |     3 +
 stack/query-validator/pom.xml                   |   230 +-
 stack/query-validator/sql.db                    |   Bin 4096 -> 0 bytes
 .../query/validator/ApiServerRunner.java        |   212 +
 .../validator/DefaultQueryResultsMatcher.java   |    32 +
 .../usergrid/query/validator/QueryEntity.java   |    63 +
 .../usergrid/query/validator/QueryRequest.java  |    67 +
 .../usergrid/query/validator/QueryResponse.java |   105 +
 .../query/validator/QueryResultsMatcher.java    |    29 +
 .../usergrid/query/validator/QueryRunner.java   |    31 +
 .../validator/QueryValidationConfiguration.java |    94 +
 .../query/validator/QueryValidator.java         |    78 +
 .../usergrid/query/validator/SqliteRunner.java  |   192 +
 .../query/validator/ApiServerRunner.java        |   212 -
 .../usergrid/query/validator/QueryEntity.java   |    34 -
 .../usergrid/query/validator/QueryRequest.java  |    74 -
 .../usergrid/query/validator/QueryResponse.java |   103 -
 .../usergrid/query/validator/QueryRunner.java   |    28 -
 .../validator/QueryValidationConfiguration.java |    74 -
 .../query/validator/QueryValidator.java         |    77 -
 .../usergrid/query/validator/SqliteRunner.java  |   160 -
 .../usergrid-query-validator-context.xml        |    14 +-
 .../query/validator/AbstractQueryIT.java        |   133 +
 .../usergrid/query/validator/QueryITSuite.java  |    39 +
 .../query/validator/users/UserQueryIT.java      |   877 +
 .../query/validator/QueryValidationTest.java    |   339 -
 .../query/validator/QueryValidatorRunner.java   |   209 -
 .../src/test/resources/log4j.properties         |    18 +-
 .../src/test/resources/project.properties       |     1 +
 .../src/test/resources/user.json                |    15 +-
 .../resources/usergrid-custom-test.properties   |    13 +-
 .../test/resources/usergrid-test-context.xml    |    26 +-
 stack/rest/pom.xml                              |    32 +-
 .../usergrid/rest/AbstractContextResource.java  |   164 +
 .../org/apache/usergrid/rest/ApiResponse.java   |   636 +
 .../rest/JacksonCustomMapperProvider.java       |    65 +
 .../org/apache/usergrid/rest/RootResource.java  |   397 +
 .../rest/ServerEnvironmentProperties.java       |    47 +
 .../apache/usergrid/rest/SwaggerServlet.java    |   171 +
 .../apache/usergrid/rest/SystemResource.java    |   110 +
 .../usergrid/rest/TextToJsonSwapWriter.java     |   119 +
 .../rest/applications/ApplicationResource.java  |   610 +
 .../rest/applications/AuthResource.java         |   251 +
 .../rest/applications/ServiceResource.java      |   662 +
 .../applications/assets/AssetsResource.java     |   190 +
 .../applications/events/EventsResource.java     |    69 +
 .../rest/applications/queues/QueueResource.java |   204 +
 .../queues/QueueSubscriberResource.java         |   158 +
 .../queues/QueueSubscriptionResource.java       |   160 +
 .../queues/QueueTransactionsResource.java       |    99 +
 .../users/AbstractUserExtensionResource.java    |    47 +
 .../rest/applications/users/UserResource.java   |   580 +
 .../rest/applications/users/UsersResource.java  |   264 +
 .../exceptions/AbstractExceptionMapper.java     |   106 +
 .../usergrid/rest/exceptions/AuthErrorInfo.java |   111 +
 .../AuthorizationExceptionMapper.java           |    36 +
 ...cateUniquePropertyExistsExceptionMapper.java |    35 +
 .../EntityNotFoundExceptionMapper.java          |    34 +
 ...orbiddenServiceOperationExceptionMapper.java |    35 +
 .../IllegalArgumentExceptionMapper.java         |    32 +
 .../exceptions/JsonReadExceptionMapper.java     |    35 +
 .../exceptions/JsonWriteExceptionMapper.java    |    35 +
 .../exceptions/ManagementExceptionMapper.java   |    38 +
 .../usergrid/rest/exceptions/NoOpException.java |    50 +
 .../rest/exceptions/NoOpExceptionMapper.java    |    32 +
 .../NotImplementedExceptionMapper.java          |    32 +
 .../exceptions/OAuthProblemExceptionMapper.java |    51 +
 ...rganizationApplicationNotFoundException.java |    39 +
 ...ationApplicationNotFoundExceptionMapper.java |    16 +
 .../exceptions/PersistenceExceptionMapper.java  |    27 +
 .../exceptions/QueryParseExceptionMapper.java   |    34 +
 .../exceptions/QueryTokenExceptionMapper.java   |    36 +
 .../RecentlyUsedPasswordExceptionMapper.java    |    21 +
 .../rest/exceptions/RedirectionException.java   |    27 +
 .../exceptions/RedirectionExceptionMapper.java  |    30 +
 ...RequiredPropertyNotFoundExceptionMapper.java |    35 +
 .../rest/exceptions/SecurityException.java      |    88 +
 .../exceptions/SecurityExceptionMapper.java     |    45 +
 .../rest/exceptions/ServiceExceptionMapper.java |    28 +
 .../ServiceResourceNotFoundExceptionMapper.java |    41 +
 .../rest/exceptions/ThrowableMapper.java        |    26 +
 .../TransactionNotFoundExceptionMapper.java     |    34 +
 .../rest/filters/ContentTypeFilter.java         |   323 +
 .../rest/filters/JSONPCallbackFilter.java       |    66 +
 .../usergrid/rest/filters/MeteringFilter.java   |   343 +
 .../usergrid/rest/filters/TracingFilter.java    |    74 +
 .../rest/management/ManagementResource.java     |   478 +
 .../management/metrics/MetricsResource.java     |    39 +
 .../organizations/OrganizationResource.java     |   254 +
 .../organizations/OrganizationsResource.java    |   192 +
 .../applications/ApplicationResource.java       |   195 +
 .../applications/ApplicationsResource.java      |   158 +
 .../organizations/users/UsersResource.java      |   341 +
 .../rest/management/users/UserResource.java     |   423 +
 .../rest/management/users/UsersResource.java    |   211 +
 .../organizations/OrganizationsResource.java    |   206 +
 .../organizations/OrganizationResource.java     |   159 +
 .../rest/security/CrossOriginRequestFilter.java |    38 +
 .../security/SecuredResourceFilterFactory.java  |   325 +
 .../annotations/RequireAdminUserAccess.java     |    31 +
 .../annotations/RequireApplicationAccess.java   |    34 +
 .../annotations/RequireOrganizationAccess.java  |    34 +
 .../annotations/RequireSystemAccess.java        |    31 +
 .../security/shiro/RestSecurityManager.java     |    60 +
 .../ShiroAuthenticationExceptionMapper.java     |    59 +
 .../shiro/filters/BasicAuthSecurityFilter.java  |   111 +
 .../ClientCredentialsSecurityFilter.java        |    69 +
 .../OAuth2AccessTokenSecurityFilter.java        |   211 +
 .../security/shiro/filters/SecurityFilter.java  |   136 +
 .../session/HttpRequestSessionManager.java      |    87 +
 .../session/HttpServletRequestSession.java      |   132 +
 .../usergrid/rest/test/PropertiesResource.java  |    87 +
 .../apache/usergrid/rest/utils/CORSUtils.java   |   173 +
 .../apache/usergrid/rest/utils/JSONPUtils.java  |   103 +
 .../usergrid/rest/utils/PathingUtils.java       |    35 +
 .../usergrid/rest/AbstractContextResource.java  |   164 -
 .../java/org/usergrid/rest/ApiResponse.java     |   636 -
 .../rest/JacksonCustomMapperProvider.java       |    65 -
 .../java/org/usergrid/rest/RootResource.java    |   397 -
 .../rest/ServerEnvironmentProperties.java       |    47 -
 .../java/org/usergrid/rest/SwaggerServlet.java  |   171 -
 .../java/org/usergrid/rest/SystemResource.java  |   110 -
 .../org/usergrid/rest/TextToJsonSwapWriter.java |   119 -
 .../rest/applications/ApplicationResource.java  |   610 -
 .../rest/applications/AuthResource.java         |   251 -
 .../rest/applications/ServiceResource.java      |   662 -
 .../applications/assets/AssetsResource.java     |   190 -
 .../applications/events/EventsResource.java     |    69 -
 .../rest/applications/queues/QueueResource.java |   204 -
 .../queues/QueueSubscriberResource.java         |   158 -
 .../queues/QueueSubscriptionResource.java       |   160 -
 .../queues/QueueTransactionsResource.java       |    99 -
 .../users/AbstractUserExtensionResource.java    |    47 -
 .../rest/applications/users/UserResource.java   |   580 -
 .../rest/applications/users/UsersResource.java  |   264 -
 .../exceptions/AbstractExceptionMapper.java     |   106 -
 .../usergrid/rest/exceptions/AuthErrorInfo.java |   111 -
 .../AuthorizationExceptionMapper.java           |    36 -
 ...cateUniquePropertyExistsExceptionMapper.java |    35 -
 .../EntityNotFoundExceptionMapper.java          |    34 -
 ...orbiddenServiceOperationExceptionMapper.java |    35 -
 .../IllegalArgumentExceptionMapper.java         |    32 -
 .../exceptions/JsonReadExceptionMapper.java     |    35 -
 .../exceptions/JsonWriteExceptionMapper.java    |    35 -
 .../exceptions/ManagementExceptionMapper.java   |    38 -
 .../usergrid/rest/exceptions/NoOpException.java |    50 -
 .../rest/exceptions/NoOpExceptionMapper.java    |    32 -
 .../NotImplementedExceptionMapper.java          |    32 -
 .../exceptions/OAuthProblemExceptionMapper.java |    51 -
 ...rganizationApplicationNotFoundException.java |    39 -
 ...ationApplicationNotFoundExceptionMapper.java |    16 -
 .../exceptions/PersistenceExceptionMapper.java  |    27 -
 .../exceptions/QueryParseExceptionMapper.java   |    34 -
 .../exceptions/QueryTokenExceptionMapper.java   |    36 -
 .../RecentlyUsedPasswordExceptionMapper.java    |    21 -
 .../rest/exceptions/RedirectionException.java   |    27 -
 .../exceptions/RedirectionExceptionMapper.java  |    30 -
 ...RequiredPropertyNotFoundExceptionMapper.java |    35 -
 .../rest/exceptions/SecurityException.java      |    88 -
 .../exceptions/SecurityExceptionMapper.java     |    45 -
 .../rest/exceptions/ServiceExceptionMapper.java |    28 -
 .../ServiceResourceNotFoundExceptionMapper.java |    41 -
 .../rest/exceptions/ThrowableMapper.java        |    26 -
 .../TransactionNotFoundExceptionMapper.java     |    34 -
 .../rest/filters/ContentTypeFilter.java         |   323 -
 .../rest/filters/JSONPCallbackFilter.java       |    66 -
 .../usergrid/rest/filters/MeteringFilter.java   |   343 -
 .../usergrid/rest/filters/TracingFilter.java    |    74 -
 .../rest/management/ManagementResource.java     |   478 -
 .../management/metrics/MetricsResource.java     |    39 -
 .../organizations/OrganizationResource.java     |   254 -
 .../organizations/OrganizationsResource.java    |   192 -
 .../applications/ApplicationResource.java       |   195 -
 .../applications/ApplicationsResource.java      |   158 -
 .../organizations/users/UsersResource.java      |   341 -
 .../rest/management/users/UserResource.java     |   423 -
 .../rest/management/users/UsersResource.java    |   211 -
 .../organizations/OrganizationsResource.java    |   206 -
 .../organizations/OrganizationResource.java     |   159 -
 .../rest/security/CrossOriginRequestFilter.java |    38 -
 .../security/SecuredResourceFilterFactory.java  |   325 -
 .../annotations/RequireAdminUserAccess.java     |    31 -
 .../annotations/RequireApplicationAccess.java   |    34 -
 .../annotations/RequireOrganizationAccess.java  |    34 -
 .../annotations/RequireSystemAccess.java        |    31 -
 .../security/shiro/RestSecurityManager.java     |    60 -
 .../ShiroAuthenticationExceptionMapper.java     |    59 -
 .../shiro/filters/BasicAuthSecurityFilter.java  |   111 -
 .../ClientCredentialsSecurityFilter.java        |    69 -
 .../OAuth2AccessTokenSecurityFilter.java        |   211 -
 .../security/shiro/filters/SecurityFilter.java  |   136 -
 .../session/HttpRequestSessionManager.java      |    87 -
 .../session/HttpServletRequestSession.java      |   132 -
 .../usergrid/rest/test/PropertiesResource.java  |    87 -
 .../java/org/usergrid/rest/utils/CORSUtils.java |   173 -
 .../org/usergrid/rest/utils/JSONPUtils.java     |   103 -
 .../org/usergrid/rest/utils/PathingUtils.java   |    35 -
 .../main/resources/swagger/applications.json    |     4 +-
 .../main/resources/usergrid-rest-context.xml    |    12 +-
 .../apache/usergrid/rest/TestResource/error.jsp |    17 +
 .../apache/usergrid/rest/TestResource/test.jsp  |    13 +
 .../ApplicationResource/authorize_form.jsp      |    43 +
 .../applications/ApplicationResource/error.jsp  |    17 +
 .../users/UserResource/activate.jsp             |    16 +
 .../applications/users/UserResource/confirm.jsp |    17 +
 .../applications/users/UserResource/error.jsp   |    17 +
 .../users/UserResource/resetpw_email_form.jsp   |    31 +
 .../UserResource/resetpw_email_success.jsp      |    19 +
 .../users/UserResource/resetpw_set_form.jsp     |    41 +
 .../users/UserResource/resetpw_set_success.jsp  |    19 +
 .../applications/users/UsersResource/error.jsp  |    17 +
 .../users/UsersResource/resetpw_email_form.jsp  |    37 +
 .../UsersResource/resetpw_email_success.jsp     |    19 +
 .../ManagementResource/authorize_form.jsp       |    43 +
 .../management/ManagementResource/error.jsp     |    17 +
 .../OrganizationResource/activate.jsp           |    16 +
 .../OrganizationResource/confirm.jsp            |    17 +
 .../OrganizationResource/error.jsp              |    17 +
 .../management/users/UserResource/activate.jsp  |    16 +
 .../management/users/UserResource/confirm.jsp   |    17 +
 .../management/users/UserResource/error.jsp     |    17 +
 .../users/UserResource/resetpw_email_form.jsp   |    31 +
 .../UserResource/resetpw_email_success.jsp      |    19 +
 .../users/UserResource/resetpw_set_form.jsp     |    41 +
 .../users/UserResource/resetpw_set_success.jsp  |    19 +
 .../management/users/UsersResource/error.jsp    |    17 +
 .../users/UsersResource/resetpw_email_form.jsp  |    34 +
 .../UsersResource/resetpw_email_success.jsp     |    19 +
 .../org/usergrid/rest/TestResource/error.jsp    |    17 -
 .../jsp/org/usergrid/rest/TestResource/test.jsp |    13 -
 .../ApplicationResource/authorize_form.jsp      |    43 -
 .../applications/ApplicationResource/error.jsp  |    17 -
 .../users/UserResource/activate.jsp             |    16 -
 .../applications/users/UserResource/confirm.jsp |    17 -
 .../applications/users/UserResource/error.jsp   |    17 -
 .../users/UserResource/resetpw_email_form.jsp   |    31 -
 .../UserResource/resetpw_email_success.jsp      |    19 -
 .../users/UserResource/resetpw_set_form.jsp     |    41 -
 .../users/UserResource/resetpw_set_success.jsp  |    19 -
 .../applications/users/UsersResource/error.jsp  |    17 -
 .../users/UsersResource/resetpw_email_form.jsp  |    37 -
 .../UsersResource/resetpw_email_success.jsp     |    19 -
 .../ManagementResource/authorize_form.jsp       |    43 -
 .../management/ManagementResource/error.jsp     |    17 -
 .../OrganizationResource/activate.jsp           |    16 -
 .../OrganizationResource/confirm.jsp            |    17 -
 .../OrganizationResource/error.jsp              |    17 -
 .../management/users/UserResource/activate.jsp  |    16 -
 .../management/users/UserResource/confirm.jsp   |    17 -
 .../management/users/UserResource/error.jsp     |    17 -
 .../users/UserResource/resetpw_email_form.jsp   |    31 -
 .../UserResource/resetpw_email_success.jsp      |    19 -
 .../users/UserResource/resetpw_set_form.jsp     |    41 -
 .../users/UserResource/resetpw_set_success.jsp  |    19 -
 .../management/users/UsersResource/error.jsp    |    17 -
 .../users/UsersResource/resetpw_email_form.jsp  |    34 -
 .../UsersResource/resetpw_email_success.jsp     |    19 -
 stack/rest/src/main/webapp/WEB-INF/web.xml      |   169 +-
 .../apache/usergrid/rest/AbstractRestIT.java    |   355 +
 .../java/org/apache/usergrid/rest/BasicIT.java  |   310 +
 .../usergrid/rest/ConcurrentRestITSuite.java    |    47 +
 .../usergrid/rest/DatabaseInitializer.java      |   145 +
 .../java/org/apache/usergrid/rest/ITSetup.java  |   170 +
 .../org/apache/usergrid/rest/RestITSuite.java   |    55 +
 .../apache/usergrid/rest/TestContextSetup.java  |    58 +
 .../apache/usergrid/rest/TomcatResource.java    |    69 +
 .../ApplicationRequestCounterIT.java            |    93 +
 .../applications/ApplicationResourceIT.java     |   531 +
 .../rest/applications/DevicesResourceIT.java    |    62 +
 .../applications/assets/AssetResourceIT.java    |   260 +
 .../collection/BadGrammarQueryTest.java         |    60 +
 .../collection/BrowserCompatibilityTest.java    |    86 +
 .../collection/PagingResourceIT.java            |   218 +
 .../collection/activities/AndOrQueryTest.java   |   176 +
 .../collection/activities/OrderByTest.java      |   149 +
 .../activities/PagingEntitiesTest.java          |   119 +
 .../collection/activities/PutTest.java          |    64 +
 .../collection/groups/GeoPagingTest.java        |   124 +
 .../collection/groups/UpdateGroupIT.java        |   108 +
 .../applications/events/EventsResourceIT.java   |   109 +
 .../queues/AbstractQueueResourceIT.java         |   468 +
 .../queues/QueueResourceLong1IT.java            |   130 +
 .../queues/QueueResourceLong2IT.java            |    82 +
 .../queues/QueueResourceLong3IT.java            |   184 +
 .../queues/QueueResourceShortIT.java            |   415 +
 .../applications/users/ActivityResourceIT.java  |   180 +
 .../users/CollectionsResourceIT.java            |   199 +
 .../users/ConnectionResourceTest.java           |   236 +
 .../applications/users/GroupResourceIT.java     |   270 +
 .../applications/users/OwnershipResourceIT.java |   344 +
 .../users/PermissionsResourceIT.java            |   699 +
 .../applications/users/RetrieveUsersTest.java   |    66 +
 .../rest/applications/users/UserResourceIT.java |  1286 +
 .../users/extensions/TestResource.java          |    50 +
 .../rest/applications/utils/TestUtils.java      |    46 +
 .../rest/applications/utils/UserRepo.java       |    65 +
 .../rest/filters/ContentTypeResourceIT.java     |   310 +
 .../rest/management/ManagementResourceIT.java   |   531 +
 .../rest/management/RegistrationIT.java         |   351 +
 .../organizations/AdminEmailEncodingIT.java     |   101 +
 .../organizations/OrganizationResourceIT.java   |    71 +
 .../organizations/OrganizationsResourceIT.java  |   257 +
 .../rest/management/users/MUUserResourceIT.java |   602 +
 .../UsersOrganizationsResourceIT.java           |    56 +
 .../rest/test/PropertiesResourceIT.java         |    75 +
 .../rest/test/resource/CollectionResource.java  |    26 +
 .../usergrid/rest/test/resource/Connection.java |    51 +
 .../rest/test/resource/CustomCollection.java    |    31 +
 .../rest/test/resource/EntityResource.java      |   104 +
 .../apache/usergrid/rest/test/resource/Me.java  |    35 +
 .../rest/test/resource/NamedResource.java       |   185 +
 .../rest/test/resource/ResultsParser.java       |    22 +
 .../rest/test/resource/RootResource.java        |    64 +
 .../rest/test/resource/SetResource.java         |    82 +
 .../rest/test/resource/TestContext.java         |   170 +
 .../rest/test/resource/ValueResource.java       |   307 +
 .../rest/test/resource/app/Application.java     |    72 +
 .../usergrid/rest/test/resource/app/Device.java |    48 +
 .../usergrid/rest/test/resource/app/User.java   |    54 +
 .../rest/test/resource/app/UsersCollection.java |    62 +
 .../resource/app/queue/DevicesCollection.java   |    36 +
 .../rest/test/resource/app/queue/Queue.java     |   183 +
 .../resource/app/queue/QueuesCollection.java    |    35 +
 .../app/queue/SubscribersCollection.java        |    59 +
 .../test/resource/app/queue/Transaction.java    |    76 +
 .../app/queue/TransactionsCollection.java       |    35 +
 .../rest/test/resource/mgmt/Application.java    |    48 +
 .../resource/mgmt/ApplicationsCollection.java   |    51 +
 .../rest/test/resource/mgmt/Management.java     |    93 +
 .../rest/test/resource/mgmt/Organization.java   |    59 +
 .../resource/mgmt/OrganizationsCollection.java  |    54 +
 .../rest/test/security/TestAdminUser.java       |    53 +
 .../rest/test/security/TestAppUser.java         |    53 +
 .../usergrid/rest/test/security/TestUser.java   |   126 +
 .../java/org/usergrid/rest/AbstractRestIT.java  |   355 -
 .../test/java/org/usergrid/rest/BasicIT.java    |   310 -
 .../usergrid/rest/ConcurrentRestITSuite.java    |    47 -
 .../org/usergrid/rest/DatabaseInitializer.java  |   145 -
 .../test/java/org/usergrid/rest/ITSetup.java    |   166 -
 .../java/org/usergrid/rest/RestITSuite.java     |    55 -
 .../org/usergrid/rest/TestContextSetup.java     |    58 -
 .../java/org/usergrid/rest/TomcatResource.java  |    74 -
 .../ApplicationRequestCounterIT.java            |    93 -
 .../applications/ApplicationResourceIT.java     |   531 -
 .../rest/applications/DevicesResourceIT.java    |    62 -
 .../applications/assets/AssetResourceIT.java    |   260 -
 .../collection/BadGrammarQueryTest.java         |    60 -
 .../collection/BrowserCompatibilityTest.java    |    86 -
 .../collection/PagingResourceIT.java            |   218 -
 .../collection/activities/AndOrQueryTest.java   |   176 -
 .../collection/activities/OrderByTest.java      |   149 -
 .../activities/PagingEntitiesTest.java          |   119 -
 .../collection/activities/PutTest.java          |    64 -
 .../collection/groups/GeoPagingTest.java        |   124 -
 .../collection/groups/UpdateGroupIT.java        |   108 -
 .../applications/events/EventsResourceIT.java   |   109 -
 .../queues/AbstractQueueResourceIT.java         |   468 -
 .../queues/QueueResourceLong1IT.java            |   130 -
 .../queues/QueueResourceLong2IT.java            |    82 -
 .../queues/QueueResourceLong3IT.java            |   184 -
 .../queues/QueueResourceShortIT.java            |   415 -
 .../applications/users/ActivityResourceIT.java  |   180 -
 .../users/CollectionsResourceIT.java            |   199 -
 .../users/ConnectionResourceTest.java           |   193 -
 .../applications/users/GroupResourceIT.java     |   270 -
 .../applications/users/OwnershipResourceIT.java |   344 -
 .../users/PermissionsResourceIT.java            |   699 -
 .../applications/users/RetrieveUsersTest.java   |    66 -
 .../rest/applications/users/UserResourceIT.java |  1286 -
 .../users/extensions/TestResource.java          |    50 -
 .../rest/applications/utils/TestUtils.java      |    46 -
 .../rest/applications/utils/UserRepo.java       |    65 -
 .../rest/filters/ContentTypeResourceIT.java     |   310 -
 .../rest/management/ManagementResourceIT.java   |   524 -
 .../rest/management/RegistrationIT.java         |   351 -
 .../organizations/AdminEmailEncodingIT.java     |   101 -
 .../organizations/OrganizationResourceIT.java   |    70 -
 .../organizations/OrganizationsResourceIT.java  |   256 -
 .../rest/management/users/MUUserResourceIT.java |   602 -
 .../UsersOrganizationsResourceIT.java           |    56 -
 .../rest/test/PropertiesResourceIT.java         |    75 -
 .../rest/test/resource/CollectionResource.java  |    26 -
 .../usergrid/rest/test/resource/Connection.java |    51 -
 .../rest/test/resource/CustomCollection.java    |    31 -
 .../rest/test/resource/EntityResource.java      |   104 -
 .../org/usergrid/rest/test/resource/Me.java     |    35 -
 .../rest/test/resource/NamedResource.java       |   185 -
 .../rest/test/resource/ResultsParser.java       |    22 -
 .../rest/test/resource/RootResource.java        |    64 -
 .../rest/test/resource/SetResource.java         |    82 -
 .../rest/test/resource/TestContext.java         |   170 -
 .../rest/test/resource/ValueResource.java       |   307 -
 .../rest/test/resource/app/Application.java     |    72 -
 .../usergrid/rest/test/resource/app/Device.java |    48 -
 .../usergrid/rest/test/resource/app/User.java   |    54 -
 .../rest/test/resource/app/UsersCollection.java |    62 -
 .../resource/app/queue/DevicesCollection.java   |    36 -
 .../rest/test/resource/app/queue/Queue.java     |   183 -
 .../resource/app/queue/QueuesCollection.java    |    35 -
 .../app/queue/SubscribersCollection.java        |    59 -
 .../test/resource/app/queue/Transaction.java    |    76 -
 .../app/queue/TransactionsCollection.java       |    35 -
 .../rest/test/resource/mgmt/Application.java    |    48 -
 .../resource/mgmt/ApplicationsCollection.java   |    51 -
 .../rest/test/resource/mgmt/Management.java     |    93 -
 .../rest/test/resource/mgmt/Organization.java   |    59 -
 .../resource/mgmt/OrganizationsCollection.java  |    54 -
 .../rest/test/security/TestAdminUser.java       |    53 -
 .../rest/test/security/TestAppUser.java         |    53 -
 .../usergrid/rest/test/security/TestUser.java   |   126 -
 stack/rest/src/test/resources/log4j.properties  |    16 +-
 .../test/resources/usergrid-test-context.xml    |    12 +-
 stack/services/groupstest.out                   | 64570 -----------------
 stack/services/pom.xml                          |    14 +-
 .../management/AccountCreationProps.java        |   128 +
 .../usergrid/management/ActivationState.java    |     8 +
 .../usergrid/management/ApplicationCreator.java |    14 +
 .../usergrid/management/ApplicationInfo.java    |   134 +
 .../usergrid/management/ManagementService.java  |   319 +
 .../usergrid/management/OrganizationInfo.java   |   185 +
 .../management/OrganizationOwnerInfo.java       |    53 +
 .../management/OrganizationProfile.java         |    87 +
 .../apache/usergrid/management/UserInfo.java    |   149 +
 .../cassandra/AccountCreationPropsImpl.java     |   157 +
 .../cassandra/ApplicationCreatorImpl.java       |    77 +
 .../cassandra/ManagementServiceImpl.java        |  2923 +
 .../ApplicationCreationException.java           |    26 +
 .../exceptions/DisabledAdminUserException.java  |    42 +
 .../exceptions/DisabledAppUserException.java    |    42 +
 .../exceptions/IncorrectPasswordException.java  |    42 +
 .../exceptions/ManagementException.java         |    42 +
 .../RecentlyUsedPasswordException.java          |    27 +
 .../UnableToLeaveOrganizationException.java     |    42 +
 .../UnactivatedAdminUserException.java          |    42 +
 .../exceptions/UnactivatedAppUserException.java |    42 +
 .../UnactivatedOrganizationException.java       |    42 +
 .../UnconfirmedAdminUserException.java          |    42 +
 .../usergrid/management/utils/AccountUtils.java |    41 +
 .../usergrid/security/AuthPrincipalInfo.java    |    71 +
 .../usergrid/security/AuthPrincipalType.java    |   115 +
 .../security/crypto/EncryptionService.java      |    70 +
 .../security/crypto/EncryptionServiceImpl.java  |   208 +
 .../security/crypto/command/BcryptCommand.java  |    92 +
 .../crypto/command/EncryptionCommand.java       |    49 +
 .../security/crypto/command/Md5HashCommand.java |    61 +
 .../crypto/command/PlainTextCommand.java        |    64 +
 .../crypto/command/SaltedHasherCommand.java     |    67 +
 .../crypto/command/Sha1HashCommand.java         |    73 +
 .../usergrid/security/oauth/AccessInfo.java     |   187 +
 .../security/oauth/ClientCredentialsInfo.java   |    93 +
 .../usergrid/security/oauth/OAuthProxy.java     |    43 +
 .../security/oauth/OAuthProxyFactory.java       |    31 +
 .../security/providers/AbstractProvider.java    |    61 +
 .../security/providers/FacebookProvider.java    |   183 +
 .../security/providers/FoursquareProvider.java  |   159 +
 .../providers/PingIdentityProvider.java         |   143 +
 .../security/providers/SignInAsProvider.java    |    19 +
 .../providers/SignInProviderFactory.java        |    51 +
 .../security/salt/NoOpSaltProvider.java         |    36 +
 .../security/salt/PropertiesSaltProvider.java   |    53 +
 .../usergrid/security/salt/SaltProvider.java    |    31 +
 .../security/shiro/CustomPermission.java        |   225 +
 .../shiro/CustomPermissionResolver.java         |    29 +
 .../shiro/PrincipalCredentialsToken.java        |   139 +
 .../apache/usergrid/security/shiro/Realm.java   |   540 +
 .../AbstractAccessTokenCredentials.java         |    33 +
 .../credentials/AbstractClientCredentials.java  |    28 +
 .../AbstractPasswordCredentials.java            |    33 +
 .../credentials/AccessTokenCredentials.java     |    22 +
 .../shiro/credentials/AdminUserAccessToken.java |    24 +
 .../shiro/credentials/AdminUserCredentials.java |    21 +
 .../shiro/credentials/AdminUserPassword.java    |    24 +
 .../credentials/ApplicationAccessToken.java     |    24 +
 .../ApplicationClientCredentials.java           |    24 +
 .../credentials/ApplicationCredentials.java     |    21 +
 .../shiro/credentials/ApplicationGuest.java     |    24 +
 .../credentials/ApplicationUserAccessToken.java |    24 +
 .../credentials/ApplicationUserCredentials.java |    21 +
 .../credentials/ApplicationUserPassword.java    |    24 +
 .../shiro/credentials/ClientCredentials.java    |    24 +
 .../credentials/OrganizationAccessToken.java    |    24 +
 .../OrganizationClientCredentials.java          |    24 +
 .../credentials/OrganizationCredentials.java    |    21 +
 .../shiro/credentials/PasswordCredentials.java  |    22 +
 .../shiro/credentials/PrincipalCredentials.java |    21 +
 .../shiro/principals/AdminUserPrincipal.java    |    29 +
 .../principals/ApplicationGuestPrincipal.java   |    48 +
 .../shiro/principals/ApplicationPrincipal.java  |    48 +
 .../principals/ApplicationUserPrincipal.java    |    35 +
 .../shiro/principals/OrganizationPrincipal.java |    48 +
 .../shiro/principals/PrincipalIdentifier.java   |    51 +
 .../shiro/principals/UserPrincipal.java         |    69 +
 .../security/shiro/utils/SubjectUtils.java      |   449 +
 .../usergrid/security/tokens/TokenCategory.java |    83 +
 .../usergrid/security/tokens/TokenInfo.java     |   125 +
 .../usergrid/security/tokens/TokenService.java  |    39 +
 .../tokens/cassandra/TokenServiceImpl.java      |   627 +
 .../tokens/exceptions/BadTokenException.java    |    32 +
 .../exceptions/ExpiredTokenException.java       |    32 +
 .../exceptions/InvalidTokenException.java       |    32 +
 .../tokens/exceptions/TokenException.java       |    35 +
 .../services/AbstractCollectionService.java     |   571 +
 .../services/AbstractConnectionsService.java    |   520 +
 .../AbstractPathBasedColllectionService.java    |   148 +
 .../usergrid/services/AbstractService.java      |  1306 +
 .../org/apache/usergrid/services/Service.java   |    49 +
 .../apache/usergrid/services/ServiceAction.java |    21 +
 .../ServiceCollectionEventListener.java         |    22 +
 .../usergrid/services/ServiceContext.java       |   448 +
 .../services/ServiceExecutionEvent.java         |    79 +
 .../services/ServiceExecutionEventListener.java |    22 +
 .../apache/usergrid/services/ServiceInfo.java   |   438 +
 .../usergrid/services/ServiceManager.java       |   431 +
 .../services/ServiceManagerFactory.java         |   131 +
 .../usergrid/services/ServiceParameter.java     |   452 +
 .../usergrid/services/ServicePayload.java       |   199 +
 .../usergrid/services/ServiceRequest.java       |   372 +
 .../usergrid/services/ServiceResults.java       |   304 +
 .../apache/usergrid/services/ServiceUtils.java  |    21 +
 .../services/activities/ActivitiesService.java  |    33 +
 .../applications/ApplicationsService.java       |   215 +
 .../usergrid/services/assets/AssetsService.java |    57 +
 .../services/assets/data/AssetMimeHandler.java  |    90 +
 .../services/assets/data/AssetUtils.java        |   107 +
 .../services/assets/data/BinaryStore.java       |    27 +
 .../assets/data/LocalFileBinaryStore.java       |    85 +
 .../services/assets/data/S3BinaryStore.java     |   202 +
 .../services/devices/DevicesService.java        |    51 +
 .../services/devices/users/UsersService.java    |    32 +
 .../ForbiddenServiceOperationException.java     |    41 +
 .../services/exceptions/ServiceException.java   |    45 +
 .../exceptions/ServiceInvocationException.java  |    83 +
 .../ServiceResourceNotFoundException.java       |    39 +
 .../UndefinedServiceEntityTypeException.java    |    45 +
 .../UnsupportedServiceOperationException.java   |    39 +
 .../generic/GenericCollectionService.java       |    27 +
 .../generic/GenericConnectionsService.java      |    27 +
 .../services/generic/RootCollectionService.java |    27 +
 .../usergrid/services/groups/GroupsService.java |   224 +
 .../groups/activities/ActivitiesService.java    |    74 +
 .../services/groups/roles/RolesService.java     |    32 +
 .../services/groups/users/UsersService.java     |    32 +
 .../users/activities/ActivitiesService.java     |    84 +
 .../groups/users/devices/DevicesService.java    |    32 +
 .../services/messages/MessagesService.java      |    33 +
 .../usergrid/services/roles/RolesService.java   |   236 +
 .../services/roles/groups/GroupsService.java    |    32 +
 .../services/roles/users/UsersService.java      |    84 +
 .../usergrid/services/users/UsersService.java   |   287 +
 .../users/activities/ActivitiesService.java     |   142 +
 .../services/users/devices/DevicesService.java  |    32 +
 .../users/following/FollowingService.java       |    47 +
 .../services/users/groups/GroupsService.java    |    32 +
 .../services/users/roles/RolesService.java      |    84 +
 .../org/apache/usergrid/utils/PythonUtils.java  |   102 +
 .../management/AccountCreationProps.java        |   119 -
 .../usergrid/management/ActivationState.java    |     8 -
 .../usergrid/management/ApplicationCreator.java |    14 -
 .../usergrid/management/ApplicationInfo.java    |   134 -
 .../usergrid/management/ManagementService.java  |   319 -
 .../usergrid/management/OrganizationInfo.java   |   185 -
 .../management/OrganizationOwnerInfo.java       |    53 -
 .../management/OrganizationProfile.java         |    87 -
 .../java/org/usergrid/management/UserInfo.java  |   149 -
 .../cassandra/AccountCreationPropsImpl.java     |   112 -
 .../cassandra/ApplicationCreatorImpl.java       |    77 -
 .../cassandra/ManagementServiceImpl.java        |  2909 -
 .../ApplicationCreationException.java           |    26 -
 .../exceptions/DisabledAdminUserException.java  |    42 -
 .../exceptions/DisabledAppUserException.java    |    42 -
 .../exceptions/IncorrectPasswordException.java  |    42 -
 .../exceptions/ManagementException.java         |    42 -
 .../RecentlyUsedPasswordException.java          |    27 -
 .../UnableToLeaveOrganizationException.java     |    42 -
 .../UnactivatedAdminUserException.java          |    42 -
 .../exceptions/UnactivatedAppUserException.java |    42 -
 .../UnactivatedOrganizationException.java       |    42 -
 .../UnconfirmedAdminUserException.java          |    42 -
 .../usergrid/management/utils/AccountUtils.java |    42 -
 .../usergrid/security/AuthPrincipalInfo.java    |    71 -
 .../usergrid/security/AuthPrincipalType.java    |   115 -
 .../security/crypto/EncryptionService.java      |    70 -
 .../security/crypto/EncryptionServiceImpl.java  |   208 -
 .../security/crypto/command/BcryptCommand.java  |    92 -
 .../crypto/command/EncryptionCommand.java       |    49 -
 .../security/crypto/command/Md5HashCommand.java |    61 -
 .../crypto/command/PlainTextCommand.java        |    64 -
 .../crypto/command/SaltedHasherCommand.java     |    67 -
 .../crypto/command/Sha1HashCommand.java         |    73 -
 .../org/usergrid/security/oauth/AccessInfo.java |   187 -
 .../security/oauth/ClientCredentialsInfo.java   |    93 -
 .../org/usergrid/security/oauth/OAuthProxy.java |    43 -
 .../security/oauth/OAuthProxyFactory.java       |    31 -
 .../security/providers/AbstractProvider.java    |    61 -
 .../security/providers/FacebookProvider.java    |   183 -
 .../security/providers/FoursquareProvider.java  |   159 -
 .../providers/PingIdentityProvider.java         |   143 -
 .../security/providers/SignInAsProvider.java    |    19 -
 .../providers/SignInProviderFactory.java        |    51 -
 .../security/salt/NoOpSaltProvider.java         |    36 -
 .../security/salt/PropertiesSaltProvider.java   |    53 -
 .../usergrid/security/salt/SaltProvider.java    |    31 -
 .../security/shiro/CustomPermission.java        |   225 -
 .../shiro/CustomPermissionResolver.java         |    29 -
 .../shiro/PrincipalCredentialsToken.java        |   139 -
 .../java/org/usergrid/security/shiro/Realm.java |   540 -
 .../AbstractAccessTokenCredentials.java         |    33 -
 .../credentials/AbstractClientCredentials.java  |    28 -
 .../AbstractPasswordCredentials.java            |    33 -
 .../credentials/AccessTokenCredentials.java     |    22 -
 .../shiro/credentials/AdminUserAccessToken.java |    24 -
 .../shiro/credentials/AdminUserCredentials.java |    21 -
 .../shiro/credentials/AdminUserPassword.java    |    24 -
 .../credentials/ApplicationAccessToken.java     |    24 -
 .../ApplicationClientCredentials.java           |    24 -
 .../credentials/ApplicationCredentials.java     |    21 -
 .../shiro/credentials/ApplicationGuest.java     |    24 -
 .../credentials/ApplicationUserAccessToken.java |    24 -
 .../credentials/ApplicationUserCredentials.java |    21 -
 .../credentials/ApplicationUserPassword.java    |    24 -
 .../shiro/credentials/ClientCredentials.java    |    24 -
 .../credentials/OrganizationAccessToken.java    |    24 -
 .../OrganizationClientCredentials.java          |    24 -
 .../credentials/OrganizationCredentials.java    |    21 -
 .../shiro/credentials/PasswordCredentials.java  |    22 -
 .../shiro/credentials/PrincipalCredentials.java |    21 -
 .../shiro/principals/AdminUserPrincipal.java    |    29 -
 .../principals/ApplicationGuestPrincipal.java   |    48 -
 .../shiro/principals/ApplicationPrincipal.java  |    48 -
 .../principals/ApplicationUserPrincipal.java    |    35 -
 .../shiro/principals/OrganizationPrincipal.java |    48 -
 .../shiro/principals/PrincipalIdentifier.java   |    51 -
 .../shiro/principals/UserPrincipal.java         |    69 -
 .../security/shiro/utils/SubjectUtils.java      |   449 -
 .../usergrid/security/tokens/TokenCategory.java |    83 -
 .../org/usergrid/security/tokens/TokenInfo.java |   125 -
 .../usergrid/security/tokens/TokenService.java  |    39 -
 .../tokens/cassandra/TokenServiceImpl.java      |   627 -
 .../tokens/exceptions/BadTokenException.java    |    32 -
 .../exceptions/ExpiredTokenException.java       |    32 -
 .../exceptions/InvalidTokenException.java       |    32 -
 .../tokens/exceptions/TokenException.java       |    35 -
 .../services/AbstractCollectionService.java     |   571 -
 .../services/AbstractConnectionsService.java    |   521 -
 .../AbstractPathBasedColllectionService.java    |   149 -
 .../org/usergrid/services/AbstractService.java  |  1306 -
 .../java/org/usergrid/services/Service.java     |    49 -
 .../org/usergrid/services/ServiceAction.java    |    21 -
 .../ServiceCollectionEventListener.java         |    22 -
 .../org/usergrid/services/ServiceContext.java   |   449 -
 .../services/ServiceExecutionEvent.java         |    79 -
 .../services/ServiceExecutionEventListener.java |    22 -
 .../java/org/usergrid/services/ServiceInfo.java |   438 -
 .../org/usergrid/services/ServiceManager.java   |   431 -
 .../services/ServiceManagerFactory.java         |   131 -
 .../org/usergrid/services/ServiceParameter.java |   452 -
 .../org/usergrid/services/ServicePayload.java   |   199 -
 .../org/usergrid/services/ServiceRequest.java   |   372 -
 .../org/usergrid/services/ServiceResults.java   |   304 -
 .../org/usergrid/services/ServiceUtils.java     |    21 -
 .../services/activities/ActivitiesService.java  |    33 -
 .../applications/ApplicationsService.java       |   215 -
 .../usergrid/services/assets/AssetsService.java |    57 -
 .../services/assets/data/AssetMimeHandler.java  |    90 -
 .../services/assets/data/AssetUtils.java        |   107 -
 .../services/assets/data/BinaryStore.java       |    27 -
 .../assets/data/LocalFileBinaryStore.java       |    85 -
 .../services/assets/data/S3BinaryStore.java     |   202 -
 .../services/devices/DevicesService.java        |    51 -
 .../services/devices/users/UsersService.java    |    32 -
 .../ForbiddenServiceOperationException.java     |    41 -
 .../services/exceptions/ServiceException.java   |    45 -
 .../exceptions/ServiceInvocationException.java  |    83 -
 .../ServiceResourceNotFoundException.java       |    39 -
 .../UndefinedServiceEntityTypeException.java    |    45 -
 .../UnsupportedServiceOperationException.java   |    39 -
 .../generic/GenericCollectionService.java       |    27 -
 .../generic/GenericConnectionsService.java      |    27 -
 .../services/generic/RootCollectionService.java |    27 -
 .../usergrid/services/groups/GroupsService.java |   224 -
 .../groups/activities/ActivitiesService.java    |    74 -
 .../services/groups/roles/RolesService.java     |    32 -
 .../services/groups/users/UsersService.java     |    32 -
 .../users/activities/ActivitiesService.java     |    84 -
 .../groups/users/devices/DevicesService.java    |    32 -
 .../services/messages/MessagesService.java      |    33 -
 .../usergrid/services/roles/RolesService.java   |   236 -
 .../services/roles/groups/GroupsService.java    |    32 -
 .../services/roles/users/UsersService.java      |    84 -
 .../usergrid/services/users/UsersService.java   |   287 -
 .../users/activities/ActivitiesService.java     |   142 -
 .../services/users/devices/DevicesService.java  |    32 -
 .../users/following/FollowingService.java       |    47 -
 .../services/users/groups/GroupsService.java    |    32 -
 .../services/users/roles/RolesService.java      |    84 -
 .../java/org/usergrid/utils/PythonUtils.java    |   102 -
 .../pyusergrid/services/pytest/PytestService.py |     4 +-
 .../python/pyusergrid/services/pytest/test.py   |     2 +-
 stack/services/src/main/python/test/test.py     |     2 +-
 .../resources/usergrid-services-context.xml     |    18 +-
 .../test/java/baas/io/simple/SimpleService.java |     2 +-
 .../usergrid/ConcurrentServiceITSuite.java      |    43 +
 .../org/apache/usergrid/ServiceApplication.java |   188 +
 .../org/apache/usergrid/ServiceITSetup.java     |    44 +
 .../org/apache/usergrid/ServiceITSetupImpl.java |   129 +
 .../org/apache/usergrid/ServiceITSuite.java     |    41 +
 .../apache/usergrid/management/EmailFlowIT.java |   419 +
 .../management/ManagementTestHelper.java        |    40 +
 .../usergrid/management/MockImapClient.java     |    83 +
 .../usergrid/management/OrganizationIT.java     |   229 +
 .../org/apache/usergrid/management/RoleIT.java  |    97 +
 .../cassandra/ApplicationCreatorIT.java         |    66 +
 .../cassandra/ManagementServiceIT.java          |   729 +
 .../cassandra/ManagementTestHelperImpl.java     |    85 +
 .../org/apache/usergrid/python/JythonTest.java  |    38 +
 .../usergrid/security/CustomResolverTest.java   |   169 +
 .../crypto/EncryptionServiceImplTest.java       |   170 +
 .../crypto/command/BcryptCommandTest.java       |   165 +
 .../crypto/command/Md5HashCommandTest.java      |    71 +
 .../crypto/command/Sha1HashCommandTest.java     |    67 +
 .../security/providers/FacebookProviderIT.java  |    81 +
 .../providers/PingIdentityProviderIT.java       |    63 +
 .../security/tokens/TokenServiceIT.java         |   440 +
 .../usergrid/services/AbstractServiceIT.java    |    38 +
 .../usergrid/services/ActivitiesServiceIT.java  |   111 +
 .../services/ApplicationsServiceIT.java         |    35 +
 .../usergrid/services/CollectionServiceIT.java  |   290 +
 .../usergrid/services/ConnectionsServiceIT.java |    82 +
 .../usergrid/services/GroupServiceIT.java       |    80 +
 .../usergrid/services/RolesServiceIT.java       |   279 +
 .../usergrid/services/ServiceFactoryIT.java     |    57 +
 .../usergrid/services/ServiceInfoTest.java      |   108 +
 .../usergrid/services/ServiceInvocationIT.java  |   145 +
 .../usergrid/services/ServiceRequestIT.java     |    78 +
 .../usergrid/services/UsersServiceIT.java       |    52 +
 .../services/assets/data/AssetUtilsTest.java    |    44 +
 .../org/usergrid/ConcurrentServiceITSuite.java  |    43 -
 .../java/org/usergrid/ServiceApplication.java   |   188 -
 .../test/java/org/usergrid/ServiceITSetup.java  |    44 -
 .../java/org/usergrid/ServiceITSetupImpl.java   |   129 -
 .../test/java/org/usergrid/ServiceITSuite.java  |    41 -
 .../org/usergrid/management/EmailFlowIT.java    |   419 -
 .../management/ManagementTestHelper.java        |    40 -
 .../org/usergrid/management/MockImapClient.java |    83 -
 .../org/usergrid/management/OrganizationIT.java |   229 -
 .../java/org/usergrid/management/RoleIT.java    |    97 -
 .../cassandra/ApplicationCreatorIT.java         |    66 -
 .../cassandra/ManagementServiceIT.java          |   729 -
 .../cassandra/ManagementTestHelperImpl.java     |    85 -
 .../java/org/usergrid/python/JythonTest.java    |    38 -
 .../usergrid/security/CustomResolverTest.java   |   169 -
 .../crypto/EncryptionServiceImplTest.java       |   170 -
 .../crypto/command/BcryptCommandTest.java       |   165 -
 .../crypto/command/Md5HashCommandTest.java      |    71 -
 .../crypto/command/Sha1HashCommandTest.java     |    67 -
 .../security/providers/FacebookProviderIT.java  |    81 -
 .../providers/PingIdentityProviderIT.java       |    63 -
 .../security/tokens/TokenServiceIT.java         |   440 -
 .../usergrid/services/AbstractServiceIT.java    |    38 -
 .../usergrid/services/ActivitiesServiceIT.java  |   111 -
 .../services/ApplicationsServiceIT.java         |    35 -
 .../usergrid/services/CollectionServiceIT.java  |   290 -
 .../usergrid/services/ConnectionsServiceIT.java |    82 -
 .../org/usergrid/services/GroupServiceIT.java   |    80 -
 .../org/usergrid/services/RolesServiceIT.java   |   279 -
 .../org/usergrid/services/ServiceFactoryIT.java |    57 -
 .../org/usergrid/services/ServiceInfoTest.java  |   108 -
 .../usergrid/services/ServiceInvocationIT.java  |   145 -
 .../org/usergrid/services/ServiceRequestIT.java |    78 -
 .../org/usergrid/services/UsersServiceIT.java   |    52 -
 .../services/assets/data/AssetUtilsTest.java    |    44 -
 .../src/test/resources/log4j.properties         |    14 +-
 .../test/resources/usergrid-test-context.xml    |     8 +-
 stack/test-utils/pom.xml                        |     8 +-
 .../apache/usergrid/NoExitSecurityManager.java  |    64 +
 .../usergrid/cassandra/AvailablePortFinder.java |   211 +
 .../usergrid/cassandra/CassandraResource.java   |   505 +
 .../usergrid/cassandra/ClearShiroSubject.java   |    31 +
 .../apache/usergrid/cassandra/Concurrent.java   |    15 +
 .../cassandra/ConcurrentJunitRunner.java        |    75 +
 .../usergrid/cassandra/ConcurrentSuite.java     |   101 +
 .../apache/usergrid/cassandra/DataControl.java  |    17 +
 .../apache/usergrid/cassandra/DataLoader.java   |     9 +
 .../usergrid/cassandra/SchemaManager.java       |    18 +
 .../org/usergrid/NoExitSecurityManager.java     |    64 -
 .../usergrid/cassandra/AvailablePortFinder.java |   211 -
 .../usergrid/cassandra/CassandraResource.java   |   505 -
 .../usergrid/cassandra/ClearShiroSubject.java   |    31 -
 .../java/org/usergrid/cassandra/Concurrent.java |    15 -
 .../cassandra/ConcurrentJunitRunner.java        |    75 -
 .../org/usergrid/cassandra/ConcurrentSuite.java |   101 -
 .../org/usergrid/cassandra/DataControl.java     |    17 -
 .../java/org/usergrid/cassandra/DataLoader.java |     9 -
 .../org/usergrid/cassandra/SchemaManager.java   |    18 -
 .../cassandra/AnotherCassandraResourceIT.java   |    68 +
 .../cassandra/CassandraResourceITSuite.java     |    25 +
 .../cassandra/CassandraResourceTest.java        |   104 +
 .../usergrid/cassandra/FakeSchemaManager.java   |    32 +
 .../usergrid/cassandra/OkThisIsTheLastIT.java   |    76 +
 .../YetAnotherCassandraResourceIT.java          |    70 +
 .../cassandra/AnotherCassandraResourceIT.java   |    68 -
 .../cassandra/CassandraResourceITSuite.java     |    25 -
 .../cassandra/CassandraResourceTest.java        |   104 -
 .../usergrid/cassandra/FakeSchemaManager.java   |    32 -
 .../usergrid/cassandra/OkThisIsTheLastIT.java   |    76 -
 .../YetAnotherCassandraResourceIT.java          |    70 -
 .../test/resources/usergrid-test-context.xml    |     6 +-
 stack/tools/README.md                           |     4 +-
 stack/tools/pom.xml                             |    20 +-
 .../java/org/apache/usergrid/tools/ApiDoc.java  |   114 +
 .../org/apache/usergrid/tools/AppAudit.java     |   231 +
 .../org/apache/usergrid/tools/AppNameFix.java   |   109 +
 .../java/org/apache/usergrid/tools/Cli.java     |   269 +
 .../java/org/apache/usergrid/tools/Command.java |    99 +
 .../org/apache/usergrid/tools/CredExport.java   |   122 +
 .../apache/usergrid/tools/DupAdminRepair.java   |   310 +
 .../org/apache/usergrid/tools/DupOrgRepair.java |   266 +
 .../apache/usergrid/tools/EntityCleanup.java    |   176 +
 .../usergrid/tools/EntityInsertBenchMark.java   |   273 +
 .../usergrid/tools/EntityReadBenchMark.java     |   360 +
 .../org/apache/usergrid/tools/EntityUpdate.java |   191 +
 .../java/org/apache/usergrid/tools/Export.java  |   431 +
 .../usergrid/tools/ExportDataCreator.java       |   105 +
 .../usergrid/tools/ExportingToolBase.java       |   183 +
 .../java/org/apache/usergrid/tools/Import.java  |   545 +
 .../org/apache/usergrid/tools/ImportFB.java     |   101 +
 .../org/apache/usergrid/tools/IndexRebuild.java |   206 +
 .../java/org/apache/usergrid/tools/Metrics.java |   213 +
 .../usergrid/tools/OrganizationExport.java      |   117 +
 .../apache/usergrid/tools/PopulateSample.java   |   142 +
 .../apache/usergrid/tools/ResetSuperUser.java   |   105 +
 .../java/org/apache/usergrid/tools/SetupDB.java |    57 +
 .../java/org/apache/usergrid/tools/Test.java    |    53 +
 .../org/apache/usergrid/tools/ToolBase.java     |   246 +
 .../usergrid/tools/UniqueIndexCleanup.java      |   381 +
 .../org/apache/usergrid/tools/UserManager.java  |    45 +
 .../apache/usergrid/tools/WarehouseExport.java  |   516 +
 .../apache/usergrid/tools/WarehouseUpsert.java  |   153 +
 .../usergrid/tools/apidoc/swagger/Api.java      |    92 +
 .../tools/apidoc/swagger/ApiListing.java        |   145 +
 .../tools/apidoc/swagger/ApiOperation.java      |   247 +
 .../tools/apidoc/swagger/ApiOperationError.java |    60 +
 .../usergrid/tools/apidoc/swagger/ApiParam.java |   184 +
 .../apidoc/swagger/ApiParamAllowableValues.java |    62 +
 .../apache/usergrid/tools/bean/AppScore.java    |    82 +
 .../apache/usergrid/tools/bean/ExportOrg.java   |    69 +
 .../apache/usergrid/tools/bean/MetricLine.java  |    82 +
 .../apache/usergrid/tools/bean/MetricQuery.java |    93 +
 .../apache/usergrid/tools/bean/MetricSort.java  |    26 +
 .../apache/usergrid/tools/bean/OrgScore.java    |    93 +
 .../main/java/org/usergrid/tools/ApiDoc.java    |   114 -
 .../main/java/org/usergrid/tools/AppAudit.java  |   231 -
 .../java/org/usergrid/tools/AppNameFix.java     |   109 -
 .../src/main/java/org/usergrid/tools/Cli.java   |   269 -
 .../main/java/org/usergrid/tools/Command.java   |    99 -
 .../java/org/usergrid/tools/CredExport.java     |   122 -
 .../java/org/usergrid/tools/DupAdminRepair.java |   310 -
 .../java/org/usergrid/tools/DupOrgRepair.java   |   266 -
 .../java/org/usergrid/tools/EntityCleanup.java  |   176 -
 .../usergrid/tools/EntityInsertBenchMark.java   |   273 -
 .../org/usergrid/tools/EntityReadBenchMark.java |   360 -
 .../java/org/usergrid/tools/EntityUpdate.java   |   191 -
 .../main/java/org/usergrid/tools/Export.java    |   431 -
 .../org/usergrid/tools/ExportDataCreator.java   |   105 -
 .../org/usergrid/tools/ExportingToolBase.java   |   183 -
 .../main/java/org/usergrid/tools/Import.java    |   545 -
 .../main/java/org/usergrid/tools/ImportFB.java  |   101 -
 .../java/org/usergrid/tools/IndexRebuild.java   |   206 -
 .../main/java/org/usergrid/tools/Metrics.java   |   213 -
 .../org/usergrid/tools/OrganizationExport.java  |   117 -
 .../java/org/usergrid/tools/PopulateSample.java |   142 -
 .../java/org/usergrid/tools/ResetSuperUser.java |   105 -
 .../main/java/org/usergrid/tools/SetupDB.java   |    57 -
 .../src/main/java/org/usergrid/tools/Test.java  |    53 -
 .../main/java/org/usergrid/tools/ToolBase.java  |   246 -
 .../org/usergrid/tools/UniqueIndexCleanup.java  |   381 -
 .../java/org/usergrid/tools/UserManager.java    |    45 -
 .../org/usergrid/tools/WarehouseExport.java     |   516 -
 .../org/usergrid/tools/WarehouseUpsert.java     |   153 -
 .../org/usergrid/tools/apidoc/swagger/Api.java  |    92 -
 .../tools/apidoc/swagger/ApiListing.java        |   145 -
 .../tools/apidoc/swagger/ApiOperation.java      |   247 -
 .../tools/apidoc/swagger/ApiOperationError.java |    60 -
 .../usergrid/tools/apidoc/swagger/ApiParam.java |   184 -
 .../apidoc/swagger/ApiParamAllowableValues.java |    62 -
 .../java/org/usergrid/tools/bean/AppScore.java  |    82 -
 .../java/org/usergrid/tools/bean/ExportOrg.java |    58 -
 .../org/usergrid/tools/bean/MetricLine.java     |    82 -
 .../org/usergrid/tools/bean/MetricQuery.java    |    93 -
 .../org/usergrid/tools/bean/MetricSort.java     |    26 -
 .../java/org/usergrid/tools/bean/OrgScore.java  |    93 -
 stack/tools/src/main/resources/log4j.xml        |     2 +-
 stack/websocket/pom.xml                         |    12 +-
 .../websocket/WebSocketChannelHandler.java      |   357 +
 .../usergrid/websocket/WebSocketKeyStore.java   |    49 +
 .../usergrid/websocket/WebSocketServer.java     |   195 +
 .../websocket/WebSocketServerIndexPage.java     |    71 +
 .../WebSocketServerPipelineFactory.java         |    75 +
 .../websocket/WebSocketSslContextFactory.java   |    62 +
 .../websocket/WebSocketChannelHandler.java      |   357 -
 .../usergrid/websocket/WebSocketKeyStore.java   |    49 -
 .../org/usergrid/websocket/WebSocketServer.java |   195 -
 .../websocket/WebSocketServerIndexPage.java     |    71 -
 .../WebSocketServerPipelineFactory.java         |    75 -
 .../websocket/WebSocketSslContextFactory.java   |    62 -
 .../usergrid/websocket/ExampleListener.java     |    41 +
 .../websocket/SimpleMessageProducer.java        |    61 +
 .../usergrid/websocket/WebSocketServerTest.java |    43 +
 .../org/usergrid/websocket/ExampleListener.java |    41 -
 .../websocket/SimpleMessageProducer.java        |    61 -
 .../usergrid/websocket/WebSocketServerTest.java |    42 -
 .../test/resources/testApplicationContext.xml   |    20 +-
 3124 files changed, 422988 insertions(+), 301090 deletions(-)
----------------------------------------------------------------------



[14/28] git commit: Updated the json utils to see if the tests are fixed now.

Posted by sn...@apache.org.
Updated the json utils to see if the tests are fixed now.


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

Branch: refs/heads/two-dot-o
Commit: 9cc4704d0f45b7bc17137027771aea24cfcaf5e4
Parents: 8c3b28e
Author: grey <gr...@apigee.com>
Authored: Wed Mar 19 08:09:55 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Wed Mar 19 08:09:55 2014 -0700

----------------------------------------------------------------------
 .../MvccEntitySerializationStrategyImpl.java    |  2 +-
 .../persistence/model/entity/Entity.java        |  4 +-
 .../model/field/value/EntityObject.java         |  4 ++
 .../index/impl/EsEntityCollectionIndex.java     | 47 +++++++++++---------
 .../org/apache/usergrid/utils/JsonUtils.java    | 30 +++++++------
 5 files changed, 49 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9cc4704d/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
index 3b5b504..c348c16 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
@@ -373,7 +373,7 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
                 byte[] array = jsonBytes.array();
                 int start = jsonBytes.arrayOffset();
                 int length = jsonBytes.remaining();
-
+                //Object derp = mapper.readValue( array,start,length,Object.class);
                 storedEntity = mapper.readValue( array,start,length,Entity.class);
             }
             catch ( IOException e ) {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9cc4704d/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
index 26149e7..8659a7c 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
@@ -21,13 +21,13 @@ package org.apache.usergrid.persistence.model.entity;
 
 import java.util.UUID;
 
-//import org.codehaus.jackson.annotate.JsonIgnore;
-
 import org.apache.usergrid.persistence.model.field.value.EntityObject;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.base.Preconditions;
 
+//import org.codehaus.jackson.annotate.JsonIgnore;
+
 
 /**
  * Simple entity that is used for persistence.  It has 1 required property, the Id.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9cc4704d/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
index 69edfcb..2a48d54 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
@@ -64,6 +64,10 @@ public class EntityObject implements Serializable {
             return;
 
         for(int i = 0; i < al.size(); i++) {
+            String str = al.get( i ).toString();
+            if(str.contains( "version" )){
+                continue;
+            }
             Field fd = ( Field ) al.get( i );
             fields.put( fd.getName(), fd);
         }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9cc4704d/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
index 4d750a7..b92d70f 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
@@ -17,9 +17,6 @@
  */
 package org.apache.usergrid.persistence.index.impl;
 
-import com.google.common.util.concurrent.AtomicDouble;
-import com.google.inject.Inject;
-import com.google.inject.assistedinject.Assisted;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -29,7 +26,28 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
+
+import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
+import org.elasticsearch.action.admin.indices.exists.types.TypesExistsRequest;
+import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
+import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
+import org.elasticsearch.action.index.IndexRequestBuilder;
+import org.elasticsearch.action.search.SearchRequestBuilder;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.search.SearchScrollRequestBuilder;
+import org.elasticsearch.client.AdminClient;
+import org.elasticsearch.client.Client;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.index.query.FilterBuilder;
+import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.search.SearchHit;
+import org.elasticsearch.search.SearchHits;
+import org.elasticsearch.search.sort.SortOrder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.commons.lang3.time.StopWatch;
+
 import org.apache.usergrid.persistence.collection.CollectionScope;
 import org.apache.usergrid.persistence.collection.EntityCollectionManager;
 import org.apache.usergrid.persistence.collection.EntityCollectionManagerFactory;
@@ -49,25 +67,12 @@ import org.apache.usergrid.persistence.model.field.SetField;
 import org.apache.usergrid.persistence.model.field.StringField;
 import org.apache.usergrid.persistence.query.Query;
 import org.apache.usergrid.persistence.query.Results;
-import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
-import org.elasticsearch.action.admin.indices.exists.types.TypesExistsRequest;
-import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
-import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.search.SearchScrollRequestBuilder;
-import org.elasticsearch.client.AdminClient;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.common.xcontent.XContentBuilder;
+
+import com.google.common.util.concurrent.AtomicDouble;
+import com.google.inject.Inject;
+import com.google.inject.assistedinject.Assisted;
+
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import org.elasticsearch.index.query.FilterBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHits;
-import org.elasticsearch.search.sort.SortOrder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9cc4704d/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java
index 4b3e40d..91bf3bb 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java
@@ -20,27 +20,29 @@ package org.apache.usergrid.utils;
 import java.io.File;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.usergrid.persistence.exceptions.JsonReadException;
-import org.apache.usergrid.persistence.exceptions.JsonWriteException;
-//import org.apache.usergrid.persistence.Entity;
-
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.io.JsonStringEncoder;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig.Feature;
-import org.codehaus.jackson.smile.SmileFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.apache.commons.lang.StringUtils.substringAfter;
+import org.apache.usergrid.persistence.exceptions.JsonReadException;
+import org.apache.usergrid.persistence.exceptions.JsonWriteException;
 
-import static org.apache.usergrid.utils.StringUtils.stringOrSubstringBeforeFirst;
+import com.fasterxml.jackson.core.io.JsonStringEncoder;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
+
+//import org.apache.usergrid.persistence.Entity;
+//import org.codehaus.jackson.JsonNode;
+//import org.codehaus.jackson.io.JsonStringEncoder;
+//import org.codehaus.jackson.map.ObjectMapper;
+//import org.codehaus.jackson.map.SerializationConfig.Feature;
+//import org.codehaus.jackson.smile.SmileFactory;
+//import com.fasterxml.jackson.
 
 
 public class JsonUtils {
@@ -57,7 +59,7 @@ public class JsonUtils {
 
 
     static {
-        indentObjectMapper.getSerializationConfig().set( Feature.INDENT_OUTPUT, true );
+        indentObjectMapper.getSerializationConfig().with( SerializationFeature.INDENT_OUTPUT );//set( SerializationConfig.Feature.INDENT_OUTPUT, true );
     }
 
 


[09/28] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Changes to get non-embedded ElasticSearch working.
  Minor refactoring to allow legacy EntityManager to be used outside of tests.
  Adding support for REST instance.
  Adding support for REST instance.
  Remove redundant copy of aws-cluster module.


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

Branch: refs/heads/two-dot-o
Commit: ccdf99a259c33849c6f8739e806abf9071e14e62
Parents: 596147a 6979ae6
Author: grey <gr...@apigee.com>
Authored: Mon Mar 17 14:29:14 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Mar 17 14:29:14 2014 -0700

----------------------------------------------------------------------
 stack/awscluster/cassandra-cf.json              | 315 ---------
 stack/awscluster/pom.xml                        |   6 +-
 .../main/dist/init_instance/init_db_server.sh   |  54 ++
 .../main/dist/init_instance/init_instance.sh    |  54 --
 .../main/dist/init_instance/init_rest_server.sh |  41 ++
 .../dist/init_instance/install_cassandra.sh     |  63 +-
 stack/awscluster/src/main/dist/update.sh        |  16 +
 .../src/main/groovy/configure_cassandra.groovy  |   2 +-
 .../src/main/groovy/configure_portal_new.groovy |  17 +
 .../src/main/groovy/configure_usergrid.groovy   | 126 ++++
 stack/awscluster/ugcluster-cf.json              | 647 +++++++++++++++++++
 .../serialization/SerializationFig.java         |   5 +
 stack/corepersistence/priamcluster/README.md    |  83 ---
 stack/corepersistence/priamcluster/assembly.xml |  29 -
 .../priamcluster/aws-sample.properties          |   2 -
 .../priamcluster/cassandra-cf.json              | 315 ---------
 stack/corepersistence/priamcluster/pom.xml      | 139 ----
 .../src/main/dist/conf/Priam.properties         |  21 -
 .../src/main/dist/init_instance/create_raid0.sh |  32 -
 .../main/dist/init_instance/init_instance.sh    |  54 --
 .../dist/init_instance/install_cassandra.sh     |  56 --
 .../dist/init_instance/install_elasticsearch.sh |  24 -
 .../dist/init_instance/install_oraclejdk.sh     |  31 -
 .../src/main/dist/lib/priam-agent-1.2.24.jar    | Bin 33020 -> 0 bytes
 .../dist/lib/priam-cass-extensions-1.2.24.jar   | Bin 5478 -> 0 bytes
 .../src/main/dist/webapps/priam-web-1.2.24.war  | Bin 31272443 -> 0 bytes
 .../src/main/groovy/configure_cassandra.groovy  | 113 ----
 .../main/groovy/configure_elasticsearch.groovy  |  47 --
 .../src/main/groovy/configure_priam.groovy      |  41 --
 .../src/main/groovy/registry_clear.groovy       |  20 -
 .../src/main/groovy/registry_list.groovy        |  24 -
 .../src/main/groovy/registry_register.groovy    |  38 --
 .../src/main/groovy/tag_instance.groovy         |  28 -
 .../src/main/groovy/wait_for_instances.groovy   |  44 --
 .../usergrid/persistence/index/IndexFig.java    |   8 +-
 .../index/impl/EsEntityCollectionIndex.java     |   3 +-
 .../persistence/index/impl/EsProvider.java      |  53 +-
 .../index/legacy/EntityManagerFacade.java       | 200 ++++++
 .../apache/usergrid/utils/EntityBuilder.java    | 177 +++++
 .../index/impl/EntityCollectionIndexTest.java   |   2 +-
 .../persistence/index/legacy/EntityBuilder.java | 177 -----
 .../index/legacy/EntityManagerFacade.java       | 200 ------
 .../src/test/resources/dynamic-test.properties  |   2 +-
 .../src/test/resources/usergrid-CHOP.properties |   5 +-
 .../src/test/resources/usergrid-UNIT.properties |   2 +-
 45 files changed, 1360 insertions(+), 1956 deletions(-)
----------------------------------------------------------------------



[16/28] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  JUnit test version of the code I've been using to test Core Persistence load and read performance.


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

Branch: refs/heads/two-dot-o
Commit: fc2bf6890968749abb4581cb4f76b91ffdf1b54a
Parents: f2d3bbd b3b46e4
Author: grey <gr...@apigee.com>
Authored: Thu Mar 20 10:13:03 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Thu Mar 20 10:13:03 2014 -0700

----------------------------------------------------------------------
 .../index/impl/CorePerformanceIT.java           | 304 +++++++++++++++++++
 1 file changed, 304 insertions(+)
----------------------------------------------------------------------



[28/28] git commit: Merge pull request #77 from GERey/binary_serialization

Posted by sn...@apache.org.
Merge pull request #77 from GERey/binary_serialization

Binary serialization

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

Branch: refs/heads/two-dot-o
Commit: 77902384fd42b696404dc4d0c1f01a2c5e0f9dda
Parents: a371f92 b1c1219
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Apr 7 14:06:46 2014 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Apr 7 14:06:46 2014 -0600

----------------------------------------------------------------------
 .../MvccEntitySerializationStrategyImpl.java    | 63 ++++++++++--------
 ...MvccEntitySerializationStrategyImplTest.java | 67 ++++++++++++++++++++
 stack/corepersistence/model/pom.xml             | 33 ++++++++++
 .../persistence/model/entity/Entity.java        |  8 ++-
 .../model/field/value/EntityObject.java         | 30 +++++++++
 .../persistence/model/field/value/Location.java | 11 +++-
 stack/pom.xml                                   | 43 +++++++++++++
 7 files changed, 225 insertions(+), 30 deletions(-)
----------------------------------------------------------------------



[22/28] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Updating to reflect current state of awscluster.
  Typo.
  Minor fixes, clean-ups.
  Write, index and read performance test modules for new Core Persistence API and old Entity Manager API.


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

Branch: refs/heads/two-dot-o
Commit: fe2bb3bb1a69f13e847f833cb3f3170bd70f83d6
Parents: e04bc77 9d6ed41
Author: grey <gr...@apigee.com>
Authored: Fri Mar 21 12:10:34 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Fri Mar 21 12:10:34 2014 -0700

----------------------------------------------------------------------
 .gitignore                                      |   6 +
 stack/awscluster/README.md                      |  31 +-
 stack/corepersistence/perftest1/pom.xml         |  76 +++++
 .../usergrid/persistence/UsergridBootstrap.java | 303 ++++++++++++++++++
 .../src/main/resources/log4j.properties         |  44 +++
 .../src/main/resources/project.properties       |   1 +
 .../main/resources/usergrid-test-context.xml    |  39 +++
 .../persistence/Usergrid1PerformanceTest.java   | 302 ++++++++++++++++++
 .../persistence/UsergridBootstrapTest.java      |  56 ++++
 stack/corepersistence/perftest2/pom.xml         |  64 ++++
 .../main/groovy/perftest2/CreateEntity.groovy   | 100 ++++++
 .../persistence/CorePerformanceTest.java        | 318 +++++++++++++++++++
 .../index/guice/TestIndexModule.java            |  30 ++
 13 files changed, 1351 insertions(+), 19 deletions(-)
----------------------------------------------------------------------



[05/28] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid: (31 commits)
  Correcting document type generation because . , _ # and | are not allowed.
  Adding some issues to README.
  Still working on debugging IndexIT tests.
  Update README.md
  Update README.md
  Informative README for Query Index module.
  Eliminate redundant class.
  Add test for deindex() and ignore two problematic tests.
  Don't need the ElasticSearchRule
  Support for non-embedded ElasticSearch
  Ignore ANTLR output.
  re-enable ANTLR plugin.
  Enable testCollectionOrdering() test, also: use more specific exceptions.
  Enable another test, and make tests use different collection names because they were interfering with each other.
  Package re-org.
  Cursor support complete.
  Simple stress tests.
  Re-organize test packages.
  More GeoIT tests working.
  Basic geo queries working as well as part of one of the GeoIT tests.
  ...


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

Branch: refs/heads/two-dot-o
Commit: 3af1805fd655e07ca1f818c4de0f2650acd1cf9f
Parents: c739fb0 24a8f4d
Author: grey <gr...@apigee.com>
Authored: Fri Mar 7 07:55:33 2014 -0800
Committer: grey <gr...@apigee.com>
Committed: Fri Mar 7 07:55:33 2014 -0800

----------------------------------------------------------------------
 .gitignore                                      |    7 +-
 .../query/tree/QueryFilterLexer.java            | 3106 ------------------
 .../query/tree/QueryFilterParser.java           | 2484 --------------
 .../collection/astyanax/CassandraFig.java       |    1 -
 .../MvccLogEntrySerializationStrategyImpl.java  |    3 +-
 .../collection/EntityCollectionManagerST.java   |   89 +
 .../collection/cassandra/CassandraRule.java     |    2 +-
 .../collection/guice/TestCollectionModule.java  |   31 +-
 .../collection/guice/TestModule.java            |   26 +-
 .../persistence/graph/guice/GraphModule.java    |    7 +-
 .../graph/guice/TestGraphModule.java            |   24 +-
 .../persistence/model/field/FloatField.java     |   35 +
 stack/corepersistence/pom.xml                   |    7 +-
 stack/corepersistence/queryindex/README.md      |   64 +
 stack/corepersistence/queryindex/pom.xml        |   98 +-
 .../persistence/query/tree/QueryFilter.g        |    4 +-
 .../persistence/exceptions/IndexException.java  |   41 +
 .../persistence/exceptions/QueryException.java  |   41 +
 .../index/EntityCollectionIndex.java            |    9 +
 .../index/EntityCollectionIndexFactory.java     |   27 +
 .../usergrid/persistence/index/IndexFig.java    |   71 +
 .../persistence/index/guice/IndexModule.java    |   47 +
 .../index/impl/EsDslQueryVistor.java            |  108 -
 .../index/impl/EsEntityCollectionIndex.java     |  393 ++-
 .../persistence/index/impl/EsProvider.java      |   97 +
 .../persistence/index/impl/EsQueryVistor.java   |  165 +
 .../persistence/index/impl/IndexModule.java     |   32 -
 .../usergrid/persistence/query/Query.java       |   83 +-
 .../usergrid/persistence/query/Results.java     |   14 +-
 .../query/tree/QueryFilterLexer.java            | 2565 ---------------
 .../query/tree/QueryFilterParser.java           | 2186 ------------
 .../persistence/query/tree/QueryVisitor.java    |    3 +
 .../persistence/query/tree/WithinOperand.java   |    8 +-
 .../usergrid/persistence/utils/ClassUtils.java  |   58 -
 .../persistence/utils/ConversionUtils.java      |  765 -----
 .../usergrid/persistence/utils/JsonUtils.java   |  329 --
 .../usergrid/persistence/utils/ListUtils.java   |  232 --
 .../usergrid/persistence/utils/MapUtils.java    |  377 ---
 .../usergrid/persistence/utils/StringUtils.java |  172 -
 .../usergrid/persistence/utils/UUIDUtils.java   |  412 ---
 .../org/apache/usergrid/utils/ClassUtils.java   |   58 +
 .../apache/usergrid/utils/ConversionUtils.java  |  765 +++++
 .../org/apache/usergrid/utils/JsonUtils.java    |  329 ++
 .../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 +++
 .../apache/usergrid/persistence/IndexIT.java    |  453 ---
 .../index/guice/TestIndexModule.java            |   30 +
 .../persistence/index/impl/CollectionIT.java    | 1643 +++++++++
 .../index/impl/ElasticSearchRule.java           |   61 +
 .../index/impl/ElasticSearchTest.java           |   25 +-
 .../impl/EntityCollectionIndexStressTest.java   |   78 +
 .../index/impl/EntityCollectionIndexTest.java   |  132 +-
 .../usergrid/persistence/index/impl/GeoIT.java  |  560 ++++
 .../persistence/index/impl/IndexIT.java         |  488 +++
 .../persistence/index/legacy/Application.java   |  145 +
 .../index/legacy/CoreApplication.java           |  155 +
 .../persistence/index/legacy/CoreITSetup.java   |   31 +
 .../index/legacy/CoreITSetupImpl.java           |   96 +
 .../persistence/index/legacy/EntityBuilder.java |  177 +
 .../index/legacy/EntityManagerFacade.java       |  167 +
 .../persistence/index/legacy/Point.java         |   58 +
 .../usergrid/persistence/query/QueryTest.java   |    6 +-
 .../persistence/query/tree/GrammarTreeTest.java |   11 +-
 .../persistence/utils/ElasticSearchRule.java    |   65 -
 .../apache/usergrid/test/AbstractCoreIT.java    |   57 -
 .../org/apache/usergrid/test/Application.java   |  144 -
 .../apache/usergrid/test/CassandraService.java  |   27 -
 .../apache/usergrid/test/CoreApplication.java   |  154 -
 .../org/apache/usergrid/test/CoreITSetup.java   |   31 -
 .../apache/usergrid/test/CoreITSetupImpl.java   |   97 -
 .../usergrid/test/EntityManagerFacade.java      |   73 -
 .../apache/usergrid/test/EntityMapUtils.java    |  178 -
 .../src/test/resources/dynamic-test.properties  |    4 +
 .../src/test/resources/log4j.properties         |   12 +-
 .../src/test/resources/usergrid-CHOP.properties |    6 +-
 .../src/test/resources/usergrid-UNIT.properties |    5 +
 78 files changed, 7315 insertions(+), 14422 deletions(-)
----------------------------------------------------------------------



[03/28] git commit: Added a toByteBuffer method using Smile.

Posted by sn...@apache.org.
Added a toByteBuffer method using Smile.


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

Branch: refs/heads/two-dot-o
Commit: 5934ab03f84d0763c2501a6be095165a1e3d16cb
Parents: 3e9fd73
Author: grey <gr...@apigee.com>
Authored: Wed Feb 26 16:38:51 2014 -0800
Committer: grey <gr...@apigee.com>
Committed: Wed Feb 26 16:38:51 2014 -0800

----------------------------------------------------------------------
 .../MvccEntitySerializationStrategyImpl.java    | 121 +++++++++++++++++++
 1 file changed, 121 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5934ab03/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
index ebb6edb..376cee7 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
@@ -18,6 +18,7 @@
 package org.apache.usergrid.persistence.collection.serialization.impl;
 
 
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,6 +26,13 @@ import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
+import org.codehaus.jackson.JsonGenerationException;
+import org.codehaus.jackson.JsonParseException;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.ObjectReader;
+import org.codehaus.jackson.smile.SmileFactory;
+
 import org.apache.cassandra.db.marshal.BytesType;
 import org.apache.cassandra.db.marshal.ReversedType;
 import org.apache.cassandra.db.marshal.UUIDType;
@@ -268,6 +276,119 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
         }
     }
 
+    public static class SmileSerializer extends AbstractSerializer<EntityWrapper> {
+
+        public static final SmileFactory f = new SmileFactory(  );
+
+        public static final org.codehaus.jackson.map.ObjectMapper mapper = new ObjectMapper( f );
+        private static final BytesArraySerializer BYTES_ARRAY_SERIALIZER = BytesArraySerializer.get();1
+
+
+        private static byte[] STATE_COMPLETE = new byte[] { 0 };
+        private static byte[] STATE_DELETED = new byte[] { 1 };
+        private static byte[] STATE_PARTIAL = new byte[] { 2 };
+
+        private static byte[] VERSION = new byte[] { 0 };
+
+
+        //the marker for when we're passed a "null" value
+        private static final byte[] EMPTY = new byte[] { 0x0 };
+
+//TODO:Make sure your exceptions provide descriptive error messages. And to make sure you even needs the descriptions
+        @Override
+        public ByteBuffer toByteBuffer( final EntityWrapper wrapper ) {
+            if ( wrapper == null ) {
+                return null;
+            }
+
+            CompositeBuilder builder = Composites.newCompositeBuilder();
+
+
+            builder.addBytes( VERSION );
+
+
+            //mark this version as empty
+            if ( !wrapper.entity.isPresent() ) {
+                //we're empty
+                builder.addBytes( STATE_DELETED );
+
+                return builder.build();
+            }
+
+            //we have an entity
+
+            if ( wrapper.status == MvccEntity.Status.COMPLETE ) {
+                builder.addBytes( STATE_COMPLETE );
+            }
+
+            else {
+                builder.addBytes( STATE_PARTIAL );
+            }
+
+            try {
+                builder.addBytes( mapper.writeValueAsBytes( wrapper.entity.get() ) );
+            }
+            catch ( JsonMappingException e ) {
+                e.printStackTrace();
+            }
+            catch ( JsonGenerationException e ) {
+                e.printStackTrace();
+            }
+            catch ( IOException e ) {
+                e.printStackTrace();
+            }
+
+            return builder.build();
+        }
+
+//problem with this code is that I'd have to use offsets, is that really the way we want to go?
+        @Override
+        public EntityWrapper fromByteBuffer( final ByteBuffer byteBuffer ) {
+//            CompositeParser parser = Composites.newCompositeParser( byteBuffer );
+//
+//            byte[] version = new byte[0];
+//
+//            try{
+//            version = mapper.readValue(byteBuffer.array(),byte[].class);//parser.read( mapper.reader());
+//            }
+//            catch ( JsonMappingException e ) {
+//                e.printStackTrace();
+//            }
+//            catch ( JsonParseException e ) {
+//                e.printStackTrace();
+//            }
+//            catch ( IOException e ) {
+//                e.printStackTrace();
+//            }
+//
+//            if ( !Arrays.equals( VERSION, version ) ) {
+//                throw new UnsupportedOperationException( "A version of type " + version + " is unsupported" );
+//            }
+//
+//
+//            final byte[] state = mapper.readValue(byteBuffer.array(),)//parser.read( BYTES_ARRAY_SERIALIZER );
+//
+//            /**
+//             * It's been deleted, remove it
+//             */
+//            if ( Arrays.equals( STATE_DELETED, state ) ) {
+//                return new EntityWrapper( MvccEntity.Status.COMPLETE, Optional.<Entity>absent() );
+//            }
+//
+//            final Entity storedEntity = ( Entity ) parser.read( mapper );
+//
+//            final Optional<Entity> entity = Optional.of( storedEntity );
+//
+//            if ( Arrays.equals( STATE_COMPLETE, state ) ) {
+//                return new EntityWrapper( MvccEntity.Status.COMPLETE, entity );
+//            }
+//
+//            //it's partial by default
+//
+//            return new EntityWrapper( MvccEntity.Status.PARTIAL, entity );
+            return null;
+        }
+    }
 
     /**
      * TODO: Serializer for the entity. This just uses object serialization, change this to use SMILE before production!


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

Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Fixing annotation compile error.


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

Branch: refs/heads/two-dot-o
Commit: fcb6c9ac79b9d0fcf62c74ad92728d7b72ab1fef
Parents: 50347dd 5d5ee39
Author: grey <gr...@apigee.com>
Authored: Thu Mar 20 11:06:13 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Thu Mar 20 11:06:13 2014 -0700

----------------------------------------------------------------------
 .../apache/usergrid/persistence/index/impl/CorePerformanceIT.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fcb6c9ac/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/CorePerformanceIT.java
----------------------------------------------------------------------