usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [34/34] git commit: Merge 9fec2baafe85ac97d3b16f4497166b1e79b87fe6 into 33e00189bfe2b51b0795803fb8b258fe3841217d
Date Thu, 30 Jan 2014 15:21:10 GMT
Merge 9fec2baafe85ac97d3b16f4497166b1e79b87fe6 into 33e00189bfe2b51b0795803fb8b258fe3841217d


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

Branch: refs/pull/39/merge
Commit: 60b2638b8ebb25b8c76cff4872938768965f80ff
Parents: 33e0018 9fec2ba
Author: Lewis John McGibbney <lewis.mcgibbney@gmail.com>
Authored: Thu Jan 30 06:20:51 2014 -0800
Committer: Lewis John McGibbney <lewis.mcgibbney@gmail.com>
Committed: Thu Jan 30 06:20:51 2014 -0800

----------------------------------------------------------------------
 sdks/android/README.txt                         |      4 +-
 sdks/android/doc/allclasses-frame.html          |     56 +-
 sdks/android/doc/allclasses-noframe.html        |     56 +-
 sdks/android/doc/constant-values.html           |    180 +-
 sdks/android/doc/index-files/index-1.html       |     72 +-
 sdks/android/doc/index-files/index-10.html      |      6 +-
 sdks/android/doc/index-files/index-11.html      |     14 +-
 sdks/android/doc/index-files/index-12.html      |      8 +-
 sdks/android/doc/index-files/index-13.html      |     60 +-
 sdks/android/doc/index-files/index-14.html      |     96 +-
 sdks/android/doc/index-files/index-15.html      |     62 +-
 sdks/android/doc/index-files/index-16.html      |      8 +-
 sdks/android/doc/index-files/index-17.html      |    238 +-
 sdks/android/doc/index-files/index-18.html      |     30 +-
 sdks/android/doc/index-files/index-19.html      |     16 +-
 sdks/android/doc/index-files/index-2.html       |     54 +-
 sdks/android/doc/index-files/index-20.html      |     64 +-
 sdks/android/doc/index-files/index-21.html      |      8 +-
 sdks/android/doc/index-files/index-3.html       |     20 +-
 sdks/android/doc/index-files/index-4.html       |     18 +-
 sdks/android/doc/index-files/index-5.html       |      6 +-
 sdks/android/doc/index-files/index-6.html       |    280 +-
 sdks/android/doc/index-files/index-7.html       |      2 +-
 sdks/android/doc/index-files/index-8.html       |     12 +-
 sdks/android/doc/index-files/index-9.html       |      4 +-
 .../usergrid/android/client/Client.Query.html   |     20 +-
 .../android/client/Client.QueuePosition.html    |     38 +-
 .../doc/org/usergrid/android/client/Client.html |    440 +-
 .../client/callbacks/ApiResponseCallback.html   |     20 +-
 .../client/callbacks/ClientAsyncTask.html       |     18 +-
 .../client/callbacks/ClientCallback.html        |     12 +-
 .../callbacks/DeviceRegistrationCallback.html   |     22 +-
 .../callbacks/GroupsRetrievedCallback.html      |     20 +-
 .../client/callbacks/QueryResultsCallback.html  |     18 +-
 .../class-use/ApiResponseCallback.html          |     84 +-
 .../callbacks/class-use/ClientAsyncTask.html    |     12 +-
 .../callbacks/class-use/ClientCallback.html     |     32 +-
 .../class-use/DeviceRegistrationCallback.html   |     24 +-
 .../class-use/GroupsRetrievedCallback.html      |     24 +-
 .../class-use/QueryResultsCallback.html         |     52 +-
 .../android/client/callbacks/package-frame.html |     16 +-
 .../client/callbacks/package-summary.html       |     18 +-
 .../android/client/callbacks/package-tree.html  |     12 +-
 .../android/client/callbacks/package-use.html   |     30 +-
 .../android/client/class-use/Client.Query.html  |     52 +-
 .../client/class-use/Client.QueuePosition.html  |     34 +-
 .../android/client/class-use/Client.html        |     28 +-
 .../entities/Activity.ActivityCollection.html   |     24 +-
 .../entities/Activity.ActivityObject.html       |     44 +-
 .../client/entities/Activity.MediaLink.html     |     14 +-
 .../android/client/entities/Activity.html       |    206 +-
 .../android/client/entities/Device.html         |     36 +-
 .../android/client/entities/Entity.html         |     40 +-
 .../usergrid/android/client/entities/Group.html |     38 +-
 .../android/client/entities/Message.html        |     50 +-
 .../usergrid/android/client/entities/User.html  |     48 +-
 .../class-use/Activity.ActivityCollection.html  |     12 +-
 .../class-use/Activity.ActivityObject.html      |     46 +-
 .../entities/class-use/Activity.MediaLink.html  |     30 +-
 .../client/entities/class-use/Activity.html     |     48 +-
 .../client/entities/class-use/Device.html       |     32 +-
 .../client/entities/class-use/Entity.html       |    156 +-
 .../client/entities/class-use/Group.html        |     32 +-
 .../client/entities/class-use/Message.html      |     30 +-
 .../android/client/entities/class-use/User.html |     88 +-
 .../android/client/entities/package-frame.html  |     22 +-
 .../client/entities/package-summary.html        |     24 +-
 .../android/client/entities/package-tree.html   |     10 +-
 .../android/client/entities/package-use.html    |     62 +-
 .../usergrid/android/client/package-frame.html  |     10 +-
 .../android/client/package-summary.html         |     12 +-
 .../usergrid/android/client/package-tree.html   |     12 +-
 .../usergrid/android/client/package-use.html    |     28 +-
 .../client/response/AggregateCounter.html       |      8 +-
 .../client/response/AggregateCounterSet.html    |     28 +-
 .../android/client/response/ApiResponse.html    |    100 +-
 .../client/response/ClientCredentialsInfo.html  |     12 +-
 .../android/client/response/QueueInfo.html      |      8 +-
 .../response/class-use/AggregateCounter.html    |     32 +-
 .../response/class-use/AggregateCounterSet.html |     26 +-
 .../client/response/class-use/ApiResponse.html  |    102 +-
 .../class-use/ClientCredentialsInfo.html        |     26 +-
 .../client/response/class-use/QueueInfo.html    |     32 +-
 .../android/client/response/package-frame.html  |     14 +-
 .../client/response/package-summary.html        |     16 +-
 .../android/client/response/package-tree.html   |      8 +-
 .../android/client/response/package-use.html    |     38 +-
 .../android/client/utils/DeviceUuidFactory.html |      8 +-
 .../android/client/utils/JsonUtils.html         |     12 +-
 .../usergrid/android/client/utils/MapUtils.html |     12 +-
 .../android/client/utils/ObjectUtils.html       |     12 +-
 .../usergrid/android/client/utils/UrlUtils.html |      8 +-
 .../utils/class-use/DeviceUuidFactory.html      |     12 +-
 .../client/utils/class-use/JsonUtils.html       |     12 +-
 .../client/utils/class-use/MapUtils.html        |     12 +-
 .../client/utils/class-use/ObjectUtils.html     |     12 +-
 .../client/utils/class-use/UrlUtils.html        |     12 +-
 .../android/client/utils/package-frame.html     |     14 +-
 .../android/client/utils/package-summary.html   |     16 +-
 .../android/client/utils/package-tree.html      |      8 +-
 .../android/client/utils/package-use.html       |      8 +-
 sdks/android/doc/overview-frame.html            |     10 +-
 sdks/android/doc/overview-summary.html          |     10 +-
 sdks/android/doc/overview-tree.html             |     18 +-
 sdks/android/doc/package-list                   |     10 +-
 sdks/android/pom.xml                            |     11 +-
 .../apache/usergrid/android/client/Client.java  |    591 +
 .../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/java/README.txt                            |      5 +-
 sdks/java/pom.xml                               |      9 +-
 .../org/apache/usergrid/java/client/Client.java |   1277 +
 .../usergrid/java/client/entities/Activity.java |    627 +
 .../usergrid/java/client/entities/Device.java   |     52 +
 .../usergrid/java/client/entities/Entity.java   |    172 +
 .../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       |    406 +
 .../client/response/ClientCredentialsInfo.java  |     42 +
 .../java/client/response/QueueInfo.java         |     28 +
 .../usergrid/java/client/utils/JsonUtils.java   |    167 +
 .../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 -
 stack/build-tools/pom.xml                       |      2 +-
 .../src/main/resources/usergrid/checkstyle.xml  |      2 +-
 stack/config/pom.xml                            |      2 +-
 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                              |     12 +-
 .../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     |    427 +
 .../usergrid/batch/service/package-info.java    |     18 +
 .../hazelcast/HazelcastLifecycleMonitor.java    |     78 +
 .../apache/usergrid/count/AbstractBatcher.java  |    176 +
 .../apache/usergrid/count/BatchSubmitter.java   |     30 +
 .../java/org/apache/usergrid/count/Batcher.java |     35 +
 .../usergrid/count/CassandraCounterStore.java   |     99 +
 .../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    |     39 +
 .../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 |      1 +
 .../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 |     50 +
 .../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    |    314 +
 .../java/org/apache/usergrid/mq/Message.java    |    512 +
 .../main/java/org/apache/usergrid/mq/Query.java |   1856 +
 .../apache/usergrid/mq/QueryFilterLexer.java    |   1842 +
 .../apache/usergrid/mq/QueryFilterParser.java   |   1102 +
 .../org/apache/usergrid/mq/QueryProcessor.java  |    560 +
 .../main/java/org/apache/usergrid/mq/Queue.java |    289 +
 .../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 |    305 +
 .../org/apache/usergrid/mq/QueueResults.java    |    128 +
 .../java/org/apache/usergrid/mq/QueueSet.java   |    192 +
 .../usergrid/mq/cassandra/CassandraMQUtils.java |    277 +
 .../mq/cassandra/MessageIndexUpdate.java        |    119 +
 .../usergrid/mq/cassandra/QueueIndexUpdate.java |    347 +
 .../mq/cassandra/QueueManagerFactoryImpl.java   |     85 +
 .../usergrid/mq/cassandra/QueueManagerImpl.java |   1390 +
 .../apache/usergrid/mq/cassandra/QueuesCF.java  |    155 +
 .../mq/cassandra/io/AbstractSearch.java         |    357 +
 .../mq/cassandra/io/ConsumerTransaction.java    |    470 +
 .../usergrid/mq/cassandra/io/EndSearch.java     |     69 +
 .../usergrid/mq/cassandra/io/FilterSearch.java  |    258 +
 .../mq/cassandra/io/NoTransactionSearch.java    |    131 +
 .../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 +
 .../usergrid/persistence/CollectionRef.java     |     26 +
 .../persistence/ConnectedEntityRef.java         |     22 +
 .../usergrid/persistence/ConnectionRef.java     |     34 +
 .../usergrid/persistence/CounterQuery.java      |    313 +
 .../usergrid/persistence/CounterResolution.java |     84 +
 .../usergrid/persistence/CredentialsInfo.java   |    176 +
 .../usergrid/persistence/DynamicEntity.java     |    111 +
 .../org/apache/usergrid/persistence/Entity.java |    103 +
 .../usergrid/persistence/EntityFactory.java     |    131 +
 .../usergrid/persistence/EntityManager.java     |    605 +
 .../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  |   1309 +
 .../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 |   1786 +
 .../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    |    159 +
 .../usergrid/persistence/cassandra/CFEnum.java  |     37 +
 .../cassandra/CassandraPersistenceUtils.java    |    483 +
 .../persistence/cassandra/CassandraService.java |   1137 +
 .../cassandra/ConnectedEntityRefImpl.java       |     61 +
 .../cassandra/ConnectionRefImpl.java            |    627 +
 .../persistence/cassandra/CounterUtils.java     |    397 +
 .../persistence/cassandra/CursorCache.java      |    120 +
 .../cassandra/EntityManagerFactoryImpl.java     |    408 +
 .../cassandra/EntityManagerImpl.java            |   2856 +
 .../cassandra/EntityValueSerializer.java        |     51 +
 .../persistence/cassandra/GeoIndexManager.java  |    322 +
 .../persistence/cassandra/IndexUpdate.java      |    448 +
 .../persistence/cassandra/QueryProcessor.java   |    719 +
 .../cassandra/RelationManagerImpl.java          |   2327 +
 .../usergrid/persistence/cassandra/Setup.java   |    205 +
 .../cassandra/SimpleIndexBucketLocatorImpl.java |    121 +
 .../cassandra/index/ConnectedIndexScanner.java  |    280 +
 .../cassandra/index/IndexBucketScanner.java     |    238 +
 .../index/IndexMultiBucketSetLoader.java        |    137 +
 .../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    |     51 +
 .../persistence/geo/ConnectionGeoSearch.java    |     50 +
 .../persistence/geo/EntityLocationRef.java      |    210 +
 .../EntityLocationRefDistanceComparator.java    |     77 +
 .../persistence/geo/GeoIndexSearcher.java       |    366 +
 .../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        |    343 +
 .../persistence/query/ir/SearchVisitor.java     |    254 +
 .../persistence/query/ir/SliceNode.java         |    168 +
 .../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      |    178 +
 .../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        |    251 +
 .../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    |    327 +
 .../org/apache/usergrid/utils/ListUtils.java    |    230 +
 .../org/apache/usergrid/utils/MailUtils.java    |    154 +
 .../org/apache/usergrid/utils/MapUtils.java     |    376 +
 .../org/apache/usergrid/utils/NumberUtils.java  |     35 +
 .../apache/usergrid/utils/PasswordUtils.java    |     28 +
 .../org/apache/usergrid/utils/StringUtils.java  |    171 +
 .../org/apache/usergrid/utils/TimeUtils.java    |     88 +
 .../org/apache/usergrid/utils/UUIDUtils.java    |    411 +
 .../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 |   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          |   2329 -
 .../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 -
 .../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   |     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         |    168 -
 .../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 -
 .../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    |     19 -
 .../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  |     53 +
 .../batch/BulkJobExecutionUnitTest.java         |    211 +
 .../apache/usergrid/batch/BulkTestUtils.java    |     41 +
 .../batch/ConcurrentSchedulerITSuite.java       |     31 +
 .../batch/ConcurrentSchedulerTestSuite.java     |     19 +
 .../apache/usergrid/batch/SchedulerITSuite.java |     34 +
 .../usergrid/batch/SchedulerTestSuite.java      |     18 +
 .../usergrid/batch/UsergridJobFactoryTest.java  |     33 +
 .../batch/job/AbstractSchedulerRuntimeIT.java   |     77 +
 .../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   |    117 +
 .../job/OnlyOnceUnlockOnFailExceution.java      |    127 +
 .../usergrid/batch/job/SchedulerRuntime1IT.java |     70 +
 .../usergrid/batch/job/SchedulerRuntime2IT.java |     98 +
 .../usergrid/batch/job/SchedulerRuntime3IT.java |     70 +
 .../usergrid/batch/job/SchedulerRuntime4IT.java |     67 +
 .../usergrid/batch/job/SchedulerRuntime5IT.java |     68 +
 .../usergrid/batch/job/SchedulerRuntime6IT.java |     96 +
 .../usergrid/batch/job/SchedulerRuntime7IT.java |     73 +
 .../usergrid/batch/job/SchedulerRuntime8IT.java |     94 +
 .../usergrid/batch/job/TestJobListener.java     |    121 +
 .../usergrid/batch/job/TestJobListenerTest.java |    143 +
 .../apache/usergrid/batch/job/package-info.java |     18 +
 .../clustering/hazelcast/HazelcastTest.java     |    111 +
 .../count/BatchCountParallelismTest.java        |    124 +
 .../usergrid/count/SimpleBatcherTest.java       |     52 +
 .../count/common/CountSerDeUtilsTest.java       |     70 +
 .../apache/usergrid/count/common/CountTest.java |     69 +
 .../org/apache/usergrid/io/baas/Simple.java     |     19 +
 .../locking/cassandra/HectorLockManagerIT.java  |    186 +
 .../SingleNodeLockTestSingleNode.java           |    169 +
 .../zookeeper/AbstractZooKeeperTest.java        |    126 +
 .../usergrid/locking/zookeeper/ZooPut.java      |    113 +
 .../zookeeper/ZookeeperLockManagerTest.java     |    183 +
 .../java/org/apache/usergrid/mq/MessagesIT.java |    285 +
 .../org/apache/usergrid/mq/QueuePathsTest.java  |     48 +
 .../usergrid/persistence/CollectionIT.java      |   1644 +
 .../usergrid/persistence/CoreSchemaManager.java |     66 +
 .../apache/usergrid/persistence/CounterIT.java  |    240 +
 .../persistence/EntityConnectionsIT.java        |    296 +
 .../persistence/EntityDictionaryIT.java         |    136 +
 .../usergrid/persistence/EntityManagerIT.java   |    569 +
 .../EntityPropertyComparatorTest.java           |    208 +
 .../apache/usergrid/persistence/EntityTest.java |    104 +
 .../org/apache/usergrid/persistence/GeoIT.java  |    529 +
 .../apache/usergrid/persistence/IndexIT.java    |    465 +
 .../usergrid/persistence/PathQueryIT.java       |    170 +
 .../usergrid/persistence/PermissionsIT.java     |    194 +
 .../apache/usergrid/persistence/QueryTest.java  |    312 +
 .../usergrid/persistence/QueryUtilsTest.java    |     42 +
 .../apache/usergrid/persistence/SchemaTest.java |    127 +
 .../apache/usergrid/persistence/UtilsTest.java  |     39 +
 .../cassandra/EntityManagerFactoryImplIT.java   |    176 +
 .../cassandra/QueryProcessorTest.java           |    727 +
 .../SimpleIndexBucketLocatorImplTest.java       |    177 +
 .../cassandra/util/TraceTagUnitTest.java        |     43 +
 .../persistence/entities/SampleEntity.java      |     58 +
 ...EntityLocationRefDistanceComparatorTest.java |    104 +
 .../query/AbstractIteratingQueryIT.java         |   1299 +
 .../persistence/query/AllInCollectionIT.java    |     28 +
 .../persistence/query/AllInConnectionIT.java    |     28 +
 .../query/AllInConnectionNoTypeIT.java          |     56 +
 .../query/IntersectionUnionPagingIT.java        |    172 +
 .../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 |     85 +
 .../query/ir/result/InOrderIterator.java        |    118 +
 .../ir/result/IntersectionIteratorTest.java     |    308 +
 .../query/ir/result/IteratorHelper.java         |     21 +
 .../ir/result/SubtractionIteratorTest.java      |    182 +
 .../query/ir/result/UnionIteratorTest.java      |    467 +
 .../persistence/query/tree/GrammarTreeTest.java |    607 +
 .../persistence/query/tree/LongLiteralTest.java |     62 +
 .../query/tree/StringLiteralTest.java           |     88 +
 .../system/UsergridSystemMonitorIT.java         |     51 +
 .../usergrid/utils/ConversionUtilsTest.java     |     50 +
 .../apache/usergrid/utils/IndexUtilsTest.java   |     71 +
 .../apache/usergrid/utils/JsonUtilsTest.java    |     88 +
 .../apache/usergrid/utils/ListUtilsTest.java    |     55 +
 .../apache/usergrid/utils/MailUtilsTest.java    |     92 +
 .../org/apache/usergrid/utils/MapUtilsTest.java |     43 +
 .../apache/usergrid/utils/TestInflector.java    |     82 +
 .../apache/usergrid/utils/TimeUtilsTest.java    |     61 +
 .../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          |     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 -
 .../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/launcher/pom.xml                          |     10 +-
 .../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 +-
 stack/mongo-emulator/README.txt                 |      2 +-
 stack/mongo-emulator/pom.xml                    |     12 +-
 .../usergrid/mongo/MongoChannelHandler.java     |    143 +
 .../usergrid/mongo/MongoMessageDecoder.java     |    115 +
 .../usergrid/mongo/MongoMessageEncoder.java     |     46 +
 .../org/apache/usergrid/mongo/MongoQuery.java   |     30 +
 .../org/apache/usergrid/mongo/MongoServer.java  |    170 +
 .../mongo/MongoServerPipelineFactory.java       |     54 +
 .../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   |     63 +
 .../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 |    446 +
 .../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                                   |      4 +-
 stack/query-validator/pom.xml                   |     22 +-
 .../query/validator/ApiServerRunner.java        |     24 +-
 .../usergrid/query/validator/QueryEntity.java   |      4 +-
 .../usergrid/query/validator/QueryRequest.java  |      2 +-
 .../usergrid/query/validator/QueryResponse.java |      4 +-
 .../usergrid/query/validator/QueryRunner.java   |      4 +-
 .../validator/QueryValidationConfiguration.java |      6 +-
 .../query/validator/QueryValidator.java         |      4 +-
 .../usergrid/query/validator/SqliteRunner.java  |      6 +-
 .../usergrid-query-validator-context.xml        |      2 +-
 .../query/validator/QueryValidationTest.java    |      2 +-
 .../query/validator/QueryValidatorRunner.java   |     14 +-
 .../src/test/resources/log4j.properties         |     18 +-
 .../test/resources/usergrid-test-context.xml    |      4 +-
 stack/rest/pom.xml                              |     18 +-
 .../usergrid/rest/AbstractContextResource.java  |    163 +
 .../org/apache/usergrid/rest/ApiResponse.java   |    635 +
 .../rest/JacksonCustomMapperProvider.java       |     65 +
 .../org/apache/usergrid/rest/RootResource.java  |    396 +
 .../rest/ServerEnvironmentProperties.java       |     47 +
 .../apache/usergrid/rest/SwaggerServlet.java    |    170 +
 .../apache/usergrid/rest/SystemResource.java    |    110 +
 .../usergrid/rest/TextToJsonSwapWriter.java     |    119 +
 .../rest/applications/ApplicationResource.java  |    608 +
 .../rest/applications/AuthResource.java         |    249 +
 .../rest/applications/ServiceResource.java      |    660 +
 .../applications/assets/AssetsResource.java     |    190 +
 .../applications/events/EventsResource.java     |     69 +
 .../rest/applications/queues/QueueResource.java |    203 +
 .../queues/QueueSubscriberResource.java         |    157 +
 .../queues/QueueSubscriptionResource.java       |    159 +
 .../queues/QueueTransactionsResource.java       |     99 +
 .../users/AbstractUserExtensionResource.java    |     47 +
 .../rest/applications/users/UserResource.java   |    577 +
 .../rest/applications/users/UsersResource.java  |    263 +
 .../exceptions/AbstractExceptionMapper.java     |    105 +
 .../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   |     33 +
 .../exceptions/QueryTokenExceptionMapper.java   |     35 +
 .../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     |    476 +
 .../management/metrics/MetricsResource.java     |     39 +
 .../organizations/OrganizationResource.java     |    254 +
 .../organizations/OrganizationsResource.java    |    191 +
 .../applications/ApplicationResource.java       |    194 +
 .../applications/ApplicationsResource.java      |    158 +
 .../organizations/users/UsersResource.java      |    341 +
 .../rest/management/users/UserResource.java     |    422 +
 .../rest/management/users/UsersResource.java    |    210 +
 .../organizations/OrganizationsResource.java    |    206 +
 .../organizations/OrganizationResource.java     |    158 +
 .../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     |     59 +
 .../ShiroAuthenticationExceptionMapper.java     |     58 +
 .../shiro/filters/BasicAuthSecurityFilter.java  |    111 +
 .../ClientCredentialsSecurityFilter.java        |     68 +
 .../OAuth2AccessTokenSecurityFilter.java        |    210 +
 .../security/shiro/filters/SecurityFilter.java  |    135 +
 .../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  |    102 +
 .../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/usergrid-rest-context.xml    |     12 +-
 .../org/usergrid/rest/TestResource/error.jsp    |      2 +-
 .../ApplicationResource/authorize_form.jsp      |      2 +-
 .../applications/ApplicationResource/error.jsp  |      2 +-
 .../applications/users/UserResource/error.jsp   |      2 +-
 .../UserResource/resetpw_email_success.jsp      |      2 +-
 .../users/UserResource/resetpw_set_form.jsp     |      2 +-
 .../users/UserResource/resetpw_set_success.jsp  |      2 +-
 .../applications/users/UsersResource/error.jsp  |      2 +-
 .../UsersResource/resetpw_email_success.jsp     |      2 +-
 .../ManagementResource/authorize_form.jsp       |      2 +-
 .../management/ManagementResource/error.jsp     |      2 +-
 .../OrganizationResource/error.jsp              |      2 +-
 .../management/users/UserResource/error.jsp     |      2 +-
 .../UserResource/resetpw_email_success.jsp      |      2 +-
 .../users/UserResource/resetpw_set_form.jsp     |      2 +-
 .../users/UserResource/resetpw_set_success.jsp  |      2 +-
 .../management/users/UsersResource/error.jsp    |      2 +-
 .../UsersResource/resetpw_email_success.jsp     |      2 +-
 stack/rest/src/main/webapp/WEB-INF/web.xml      |     12 +-
 .../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  |    166 +
 .../org/apache/usergrid/rest/RestITSuite.java   |     55 +
 .../apache/usergrid/rest/TestContextSetup.java  |     58 +
 .../apache/usergrid/rest/TomcatResource.java    |     73 +
 .../ApplicationRequestCounterIT.java            |     93 +
 .../applications/ApplicationResourceIT.java     |    530 +
 .../rest/applications/DevicesResourceIT.java    |     62 +
 .../applications/assets/AssetResourceIT.java    |    259 +
 .../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          |    118 +
 .../collection/activities/PutTest.java          |     64 +
 .../collection/groups/GeoPagingTest.java        |    124 +
 .../collection/groups/UpdateGroupIT.java        |    106 +
 .../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     |    309 +
 .../rest/management/ManagementResourceIT.java   |    530 +
 .../rest/management/RegistrationIT.java         |    350 +
 .../organizations/AdminEmailEncodingIT.java     |    101 +
 .../organizations/OrganizationResourceIT.java   |     70 +
 .../organizations/OrganizationsResourceIT.java  |    257 +
 .../rest/management/users/MUUserResourceIT.java |    601 +
 .../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   |    531 -
 .../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  |     14 +-
 .../test/resources/usergrid-test-context.xml    |     12 +-
 stack/services/groupstest.out                   | 126088 ++++++++--------
 stack/services/pom.xml                          |     12 +-
 .../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 +
 .../apache/usergrid/management/UserInfo.java    |    149 +
 .../cassandra/AccountCreationPropsImpl.java     |    111 +
 .../cassandra/ApplicationCreatorImpl.java       |     77 +
 .../cassandra/ManagementServiceImpl.java        |   2907 +
 .../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 |     60 +
 .../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        |    224 +
 .../shiro/CustomPermissionResolver.java         |     29 +
 .../shiro/PrincipalCredentialsToken.java        |    139 +
 .../apache/usergrid/security/shiro/Realm.java   |    539 +
 .../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      |    448 +
 .../usergrid/security/tokens/TokenCategory.java |     83 +
 .../usergrid/security/tokens/TokenInfo.java     |    125 +
 .../usergrid/security/tokens/TokenService.java  |     39 +
 .../tokens/cassandra/TokenServiceImpl.java      |    625 +
 .../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 +
 .../usergrid/services/AbstractService.java      |   1305 +
 .../org/apache/usergrid/services/Service.java   |     49 +
 .../apache/usergrid/services/ServiceAction.java |     21 +
 .../ServiceCollectionEventListener.java         |     22 +
 .../usergrid/services/ServiceContext.java       |    449 +
 .../services/ServiceExecutionEvent.java         |     79 +
 .../services/ServiceExecutionEventListener.java |     22 +
 .../apache/usergrid/services/ServiceInfo.java   |    438 +
 .../usergrid/services/ServiceManager.java       |    430 +
 .../services/ServiceManagerFactory.java         |    131 +
 .../usergrid/services/ServiceParameter.java     |    452 +
 .../usergrid/services/ServicePayload.java       |    198 +
 .../usergrid/services/ServiceRequest.java       |    371 +
 .../usergrid/services/ServiceResults.java       |    304 +
 .../apache/usergrid/services/ServiceUtils.java  |     21 +
 .../services/activities/ActivitiesService.java  |     33 +
 .../applications/ApplicationsService.java       |    214 +
 .../usergrid/services/assets/AssetsService.java |     57 +
 .../services/assets/data/AssetMimeHandler.java  |     89 +
 .../services/assets/data/AssetUtils.java        |    106 +
 .../services/assets/data/BinaryStore.java       |     27 +
 .../assets/data/LocalFileBinaryStore.java       |     84 +
 .../services/assets/data/S3BinaryStore.java     |    201 +
 .../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 -
 .../org/apache/usergrid/pyusergrid/__init__.py  |      0
 .../usergrid/pyusergrid/services/__init__.py    |      0
 .../pyusergrid/services/pytest/PytestService.py |     15 +
 .../pyusergrid/services/pytest/__init__.py      |      0
 .../usergrid/pyusergrid/services/pytest/test.py |     13 +
 .../python/org/apache/usergrid/test/__init__.py |      0
 .../python/org/apache/usergrid/test/test.py     |     13 +
 .../src/main/python/pyusergrid/__init__.py      |      0
 .../main/python/pyusergrid/services/__init__.py |      0
 .../pyusergrid/services/pytest/PytestService.py |     15 -
 .../pyusergrid/services/pytest/__init__.py      |      0
 .../python/pyusergrid/services/pytest/test.py   |     13 -
 stack/services/src/main/python/test/__init__.py |      0
 stack/services/src/main/python/test/test.py     |     13 -
 .../resources/usergrid-services-context.xml     |     18 +-
 .../test/java/baas/io/simple/SimpleService.java |     18 -
 .../usergrid/ConcurrentServiceITSuite.java      |     43 +
 .../org/apache/usergrid/ServiceApplication.java |    189 +
 .../org/apache/usergrid/ServiceITSetup.java     |     45 +
 .../org/apache/usergrid/ServiceITSetupImpl.java |    130 +
 .../org/apache/usergrid/ServiceITSuite.java     |     41 +
 .../usergrid/baas/io/simple/SimpleService.java  |     18 +
 .../apache/usergrid/management/EmailFlowIT.java |    421 +
 .../management/ManagementTestHelper.java        |     41 +
 .../usergrid/management/MockImapClient.java     |     83 +
 .../usergrid/management/OrganizationIT.java     |    231 +
 .../org/apache/usergrid/management/RoleIT.java  |     99 +
 .../cassandra/ApplicationCreatorIT.java         |     67 +
 .../cassandra/ManagementServiceIT.java          |    729 +
 .../cassandra/ManagementTestHelperImpl.java     |     85 +
 .../org/apache/usergrid/python/JythonTest.java  |     38 +
 .../usergrid/security/CustomResolverTest.java   |    168 +
 .../crypto/EncryptionServiceImplTest.java       |    171 +
 .../crypto/command/BcryptCommandTest.java       |    166 +
 .../crypto/command/Md5HashCommandTest.java      |     71 +
 .../crypto/command/Sha1HashCommandTest.java     |     68 +
 .../security/providers/FacebookProviderIT.java  |     83 +
 .../providers/PingIdentityProviderIT.java       |     64 +
 .../security/tokens/TokenServiceIT.java         |    442 +
 .../usergrid/services/AbstractServiceIT.java    |     38 +
 .../usergrid/services/ActivitiesServiceIT.java  |    112 +
 .../services/ApplicationsServiceIT.java         |     36 +
 .../usergrid/services/CollectionServiceIT.java  |    292 +
 .../usergrid/services/ConnectionsServiceIT.java |     83 +
 .../usergrid/services/GroupServiceIT.java       |     81 +
 .../usergrid/services/RolesServiceIT.java       |    281 +
 .../usergrid/services/ServiceFactoryIT.java     |     58 +
 .../usergrid/services/ServiceInfoTest.java      |    109 +
 .../usergrid/services/ServiceInvocationIT.java  |    146 +
 .../usergrid/services/ServiceRequestIT.java     |     82 +
 .../usergrid/services/UsersServiceIT.java       |     53 +
 .../services/assets/data/AssetUtilsTest.java    |     45 +
 .../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                        |      6 +-
 .../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   |     69 +
 .../cassandra/CassandraResourceITSuite.java     |     28 +
 .../cassandra/CassandraResourceTest.java        |    107 +
 .../usergrid/cassandra/FakeSchemaManager.java   |     33 +
 .../usergrid/cassandra/OkThisIsTheLastIT.java   |     78 +
 .../YetAnotherCassandraResourceIT.java          |     72 +
 .../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                             |     12 +-
 .../java/org/apache/usergrid/tools/ApiDoc.java  |    113 +
 .../org/apache/usergrid/tools/AppAudit.java     |    230 +
 .../org/apache/usergrid/tools/AppNameFix.java   |    108 +
 .../java/org/apache/usergrid/tools/Cli.java     |    268 +
 .../java/org/apache/usergrid/tools/Command.java |     99 +
 .../org/apache/usergrid/tools/CredExport.java   |    121 +
 .../apache/usergrid/tools/DupAdminRepair.java   |    309 +
 .../org/apache/usergrid/tools/DupOrgRepair.java |    265 +
 .../apache/usergrid/tools/EntityCleanup.java    |    174 +
 .../usergrid/tools/EntityInsertBenchMark.java   |    271 +
 .../usergrid/tools/EntityReadBenchMark.java     |    358 +
 .../org/apache/usergrid/tools/EntityUpdate.java |    190 +
 .../java/org/apache/usergrid/tools/Export.java  |    430 +
 .../usergrid/tools/ExportDataCreator.java       |    105 +
 .../usergrid/tools/ExportingToolBase.java       |    182 +
 .../java/org/apache/usergrid/tools/Import.java  |    544 +
 .../org/apache/usergrid/tools/ImportFB.java     |    100 +
 .../org/apache/usergrid/tools/IndexRebuild.java |    205 +
 .../java/org/apache/usergrid/tools/Metrics.java |    212 +
 .../usergrid/tools/OrganizationExport.java      |    115 +
 .../apache/usergrid/tools/PopulateSample.java   |    141 +
 .../apache/usergrid/tools/ResetSuperUser.java   |    103 +
 .../java/org/apache/usergrid/tools/SetupDB.java |     57 +
 .../java/org/apache/usergrid/tools/Test.java    |     53 +
 .../org/apache/usergrid/tools/ToolBase.java     |    244 +
 .../usergrid/tools/UniqueIndexCleanup.java      |    379 +
 .../org/apache/usergrid/tools/UserManager.java  |     44 +
 .../apache/usergrid/tools/WarehouseExport.java  |    514 +
 .../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 |     69 -
 .../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                         |     10 +-
 .../websocket/WebSocketChannelHandler.java      |    356 +
 .../usergrid/websocket/WebSocketKeyStore.java   |     49 +
 .../usergrid/websocket/WebSocketServer.java     |    194 +
 .../websocket/WebSocketServerIndexPage.java     |     71 +
 .../WebSocketServerPipelineFactory.java         |     74 +
 .../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 +-
 1986 files changed, 201143 insertions(+), 201153 deletions(-)
----------------------------------------------------------------------



Mime
View raw message