You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/07 17:21:24 UTC

[22/61] [abbrv] git commit: Merge pull request #55 from usergrid/USERGRID-4

Merge pull request #55 from usergrid/USERGRID-4

Adding licence headers

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

Branch: refs/pull/59/merge
Commit: e33c9284b034a528c1891bb13249f1c40c94b738
Parents: 4840190 bb54303
Author: Nate McCall <zz...@gmail.com>
Authored: Thu Feb 27 08:56:18 2014 -0600
Committer: Nate McCall <zz...@gmail.com>
Committed: Thu Feb 27 08:56:18 2014 -0600

----------------------------------------------------------------------
 stack/build-tools/pom.xml                       | 16 ++++++
 .../src/main/resources/usergrid/checkstyle.xml  | 16 ++++++
 stack/config/pom.xml                            | 16 ++++++
 stack/config/src/main/resources/log4j.xml       | 16 ++++++
 .../main/resources/usergrid-default.properties  | 12 +++++
 stack/config/src/test/resources/cassandra.yaml  | 14 ++++-
 stack/config/src/test/resources/hazelcast.xml   | 16 ++++++
 stack/config/src/test/resources/log4j.xml       | 16 ++++++
 stack/core/pom.xml                              | 16 ++++++
 .../persistence/query/tree/QueryFilter.g        | 34 ++++++++++++
 .../java/org/apache/usergrid/batch/AppArgs.java | 16 ++++++
 .../java/org/apache/usergrid/batch/Job.java     | 16 ++++++
 .../org/apache/usergrid/batch/JobExecution.java | 17 +++---
 .../apache/usergrid/batch/JobExecutionImpl.java | 16 ++++++
 .../org/apache/usergrid/batch/JobFactory.java   | 16 ++++++
 .../usergrid/batch/JobNotFoundException.java    | 16 ++++++
 .../org/apache/usergrid/batch/JobRuntime.java   | 17 +++---
 .../usergrid/batch/JobRuntimeException.java     | 16 ++++++
 .../usergrid/batch/UsergridJobFactory.java      | 16 ++++++
 .../apache/usergrid/batch/job/OnlyOnceJob.java  | 17 +++---
 .../apache/usergrid/batch/job/package-info.java |  1 -
 .../usergrid/batch/repository/JobAccessor.java  |  1 -
 .../batch/repository/JobDescriptor.java         | 16 ++++++
 .../usergrid/batch/repository/package-info.java |  1 -
 .../org/apache/usergrid/batch/service/App.java  | 16 ++++++
 .../usergrid/batch/service/JobListener.java     |  1 -
 .../batch/service/JobSchedulerService.java      |  1 -
 .../usergrid/batch/service/package-info.java    |  1 -
 .../hazelcast/HazelcastLifecycleMonitor.java    | 17 +++---
 .../apache/usergrid/count/AbstractBatcher.java  | 17 +++---
 .../apache/usergrid/count/BatchSubmitter.java   | 17 +++---
 .../java/org/apache/usergrid/count/Batcher.java | 17 +++---
 .../usergrid/count/CassandraCounterStore.java   | 17 +++---
 .../usergrid/count/CassandraSubmitter.java      | 17 +++---
 .../apache/usergrid/count/CountProducer.java    | 17 +++---
 .../CounterProcessingUnavailableException.java  | 17 +++---
 .../org/apache/usergrid/count/CounterStore.java | 17 +++---
 .../apache/usergrid/count/SimpleBatcher.java    | 17 +++---
 .../usergrid/count/Slf4JBatchSubmitter.java     | 17 +++---
 .../org/apache/usergrid/count/common/Count.java | 17 +++---
 .../usergrid/count/common/CountSerDeUtils.java  | 17 +++---
 .../common/CountTransportSerDeException.java    | 17 +++---
 .../org/apache/usergrid/count/package-info.java | 16 ++++++
 .../usergrid/exception/JsonReadException.java   | 18 +++----
 .../usergrid/exception/JsonWriteException.java  | 18 +++----
 .../exception/NotImplementedException.java      | 17 +++---
 .../java/org/apache/usergrid/locking/Lock.java  | 17 +++---
 .../org/apache/usergrid/locking/LockHelper.java | 17 +++---
 .../apache/usergrid/locking/LockManager.java    | 17 +++---
 .../usergrid/locking/LockPathBuilder.java       | 17 +++---
 .../locking/cassandra/HectorLockImpl.java       | 17 +++---
 .../cassandra/HectorLockManagerImpl.java        | 17 +++---
 .../locking/exception/UGLockException.java      | 17 +++---
 .../usergrid/locking/noop/NoOpLockImpl.java     | 17 +++---
 .../locking/noop/NoOpLockManagerImpl.java       | 17 +++---
 .../locking/singlenode/SingleNodeLockImpl.java  | 17 +++---
 .../singlenode/SingleNodeLockManagerImpl.java   | 17 +++---
 .../zookeeper/ZooKeeperLockManagerImpl.java     | 17 +++---
 .../locking/zookeeper/ZookeeperLockImpl.java    | 17 +++---
 .../org/apache/usergrid/mq/CounterQuery.java    | 17 +++---
 .../java/org/apache/usergrid/mq/Message.java    | 17 +++---
 .../main/java/org/apache/usergrid/mq/Query.java | 17 +++---
 .../apache/usergrid/mq/QueryFilterLexer.java    | 16 ++++++
 .../apache/usergrid/mq/QueryFilterParser.java   | 16 ++++++
 .../org/apache/usergrid/mq/QueryProcessor.java  | 16 ++++++
 .../main/java/org/apache/usergrid/mq/Queue.java | 17 +++---
 .../org/apache/usergrid/mq/QueueManager.java    | 17 +++---
 .../apache/usergrid/mq/QueueManagerFactory.java | 17 +++---
 .../org/apache/usergrid/mq/QueuePosition.java   | 17 +++---
 .../java/org/apache/usergrid/mq/QueueQuery.java | 17 +++---
 .../org/apache/usergrid/mq/QueueResults.java    | 17 +++---
 .../java/org/apache/usergrid/mq/QueueSet.java   | 17 +++---
 .../usergrid/mq/cassandra/CassandraMQUtils.java | 17 +++---
 .../mq/cassandra/MessageIndexUpdate.java        | 17 +++---
 .../usergrid/mq/cassandra/QueueIndexUpdate.java | 17 +++---
 .../mq/cassandra/QueueManagerFactoryImpl.java   | 17 +++---
 .../usergrid/mq/cassandra/QueueManagerImpl.java | 17 +++---
 .../apache/usergrid/mq/cassandra/QueuesCF.java  | 17 +++---
 .../mq/cassandra/io/AbstractSearch.java         | 17 +++---
 .../mq/cassandra/io/ConsumerTransaction.java    | 17 +++---
 .../usergrid/mq/cassandra/io/EndSearch.java     | 17 +++---
 .../usergrid/mq/cassandra/io/FilterSearch.java  | 17 +++---
 .../mq/cassandra/io/NoTransactionSearch.java    | 17 +++---
 .../usergrid/mq/cassandra/io/QueueBounds.java   | 16 ++++++
 .../usergrid/mq/cassandra/io/QueueSearch.java   | 17 +++---
 .../usergrid/mq/cassandra/io/StartSearch.java   | 17 +++---
 .../usergrid/persistence/AbstractEntity.java    | 17 +++---
 .../usergrid/persistence/AggregateCounter.java  | 17 +++---
 .../persistence/AggregateCounterSet.java        | 17 +++---
 .../persistence/AssociatedEntityRef.java        | 17 +++---
 .../usergrid/persistence/CollectionRef.java     | 17 +++---
 .../persistence/ConnectedEntityRef.java         | 17 +++---
 .../usergrid/persistence/ConnectionRef.java     | 17 +++---
 .../usergrid/persistence/CounterQuery.java      | 17 +++---
 .../usergrid/persistence/CounterResolution.java | 17 +++---
 .../usergrid/persistence/CredentialsInfo.java   | 17 +++---
 .../usergrid/persistence/DynamicEntity.java     | 17 +++---
 .../org/apache/usergrid/persistence/Entity.java | 17 +++---
 .../usergrid/persistence/EntityFactory.java     | 17 +++---
 .../usergrid/persistence/EntityManager.java     | 17 +++---
 .../persistence/EntityManagerFactory.java       | 17 +++---
 .../persistence/EntityPropertyComparator.java   | 17 +++---
 .../apache/usergrid/persistence/EntityRef.java  | 17 +++---
 .../usergrid/persistence/EntityUtils.java       | 17 +++---
 .../apache/usergrid/persistence/Identifier.java | 17 +++---
 .../persistence/IndexBucketLocator.java         | 17 +++---
 .../persistence/MultiQueryIterator.java         | 16 ++++++
 .../persistence/PagingResultsIterator.java      | 16 ++++++
 .../apache/usergrid/persistence/PathQuery.java  | 16 ++++++
 .../org/apache/usergrid/persistence/Query.java  | 17 +++---
 .../apache/usergrid/persistence/QueryUtils.java | 16 ++++++
 .../usergrid/persistence/RelationManager.java   | 17 +++---
 .../apache/usergrid/persistence/Results.java    | 17 +++---
 .../apache/usergrid/persistence/RoleRef.java    | 17 +++---
 .../org/apache/usergrid/persistence/Schema.java | 17 +++---
 .../persistence/SimpleCollectionRef.java        | 17 +++---
 .../usergrid/persistence/SimpleEntityRef.java   | 17 +++---
 .../usergrid/persistence/SimpleRoleRef.java     | 17 +++---
 .../usergrid/persistence/TypedEntity.java       | 17 +++---
 .../org/apache/usergrid/persistence/Update.java | 17 +++---
 .../annotations/EntityCollection.java           | 17 +++---
 .../annotations/EntityDictionary.java           | 17 +++---
 .../persistence/annotations/EntityProperty.java | 17 +++---
 .../persistence/cassandra/ApplicationCF.java    | 17 +++---
 .../usergrid/persistence/cassandra/CFEnum.java  | 17 +++---
 .../cassandra/CassandraPersistenceUtils.java    | 17 +++---
 .../persistence/cassandra/CassandraService.java | 17 +++---
 .../cassandra/ConnectedEntityRefImpl.java       | 17 +++---
 .../cassandra/ConnectionRefImpl.java            | 17 +++---
 .../persistence/cassandra/CounterUtils.java     | 17 +++---
 .../persistence/cassandra/CursorCache.java      | 16 ++++++
 .../cassandra/EntityManagerFactoryImpl.java     | 17 +++---
 .../cassandra/EntityManagerImpl.java            | 17 +++---
 .../cassandra/EntityValueSerializer.java        | 17 +++---
 .../persistence/cassandra/GeoIndexManager.java  | 17 +++---
 .../persistence/cassandra/IndexUpdate.java      | 17 +++---
 .../persistence/cassandra/QueryProcessor.java   | 17 +++---
 .../cassandra/RelationManagerImpl.java          | 17 +++---
 .../usergrid/persistence/cassandra/Setup.java   | 17 +++---
 .../cassandra/SimpleIndexBucketLocatorImpl.java | 17 +++---
 .../cassandra/index/ConnectedIndexScanner.java  | 17 +++---
 .../cassandra/index/IndexBucketScanner.java     | 17 +++---
 .../index/IndexMultiBucketSetLoader.java        | 17 +++---
 .../cassandra/index/IndexScanner.java           | 17 +++---
 .../cassandra/index/NoOpIndexScanner.java       | 17 +++---
 .../cassandra/util/Slf4jTraceTagReporter.java   | 16 ++++++
 .../cassandra/util/TaggedOpTimer.java           | 16 ++++++
 .../persistence/cassandra/util/TimedOpTag.java  | 16 ++++++
 .../cassandra/util/TraceParticipant.java        | 16 ++++++
 .../persistence/cassandra/util/TraceTag.java    | 16 ++++++
 .../cassandra/util/TraceTagAspect.java          | 16 ++++++
 .../cassandra/util/TraceTagManager.java         | 16 ++++++
 .../cassandra/util/TraceTagReporter.java        | 16 ++++++
 .../usergrid/persistence/entities/Activity.java | 17 +++---
 .../persistence/entities/Application.java       | 17 +++---
 .../usergrid/persistence/entities/Asset.java    | 17 +++---
 .../usergrid/persistence/entities/Device.java   | 17 +++---
 .../usergrid/persistence/entities/Event.java    | 17 +++---
 .../usergrid/persistence/entities/Folder.java   | 17 +++---
 .../usergrid/persistence/entities/Group.java    | 17 +++---
 .../usergrid/persistence/entities/JobData.java  | 17 +++---
 .../usergrid/persistence/entities/JobStat.java  | 17 +++---
 .../usergrid/persistence/entities/Message.java  | 17 +++---
 .../usergrid/persistence/entities/Role.java     | 17 +++---
 .../usergrid/persistence/entities/User.java     | 17 +++---
 .../ApplicationAlreadyExistsException.java      | 17 +++---
 .../DuplicateUniquePropertyExistsException.java | 17 +++---
 .../exceptions/EntityNotFoundException.java     | 17 +++---
 .../exceptions/LockingException.java            | 18 +++----
 .../exceptions/NoFullTextIndexException.java    | 17 +++---
 .../exceptions/NoIndexException.java            | 17 +++---
 .../exceptions/PersistenceException.java        | 17 +++---
 .../PropertyTypeConversionException.java        | 17 +++---
 .../exceptions/QueryIterationException.java     | 16 ++++++
 .../exceptions/QueryParseException.java         | 17 +++---
 .../exceptions/QueryTokenException.java         | 17 +++---
 .../persistence/exceptions/QueueException.java  | 18 +++----
 .../RequiredPropertyNotFoundException.java      | 17 +++---
 .../TransactionNotFoundException.java           | 17 +++---
 .../UnexpectedEntityTypeException.java          | 17 +++---
 .../persistence/geo/CollectionGeoSearch.java    | 16 ++++++
 .../persistence/geo/ConnectionGeoSearch.java    | 16 ++++++
 .../persistence/geo/EntityLocationRef.java      | 16 ++++++
 .../EntityLocationRefDistanceComparator.java    | 17 +++---
 .../persistence/geo/GeoIndexSearcher.java       | 16 ++++++
 .../persistence/geo/GeocellManager.java         | 16 ++++++
 .../usergrid/persistence/geo/GeocellUtils.java  | 24 +++++----
 .../geo/comparator/DoubleTupleComparator.java   | 16 ++++++
 .../persistence/geo/model/BoundingBox.java      | 27 +++++-----
 .../persistence/geo/model/CostFunction.java     | 27 +++++-----
 .../geo/model/DefaultCostFunction.java          | 27 +++++-----
 .../usergrid/persistence/geo/model/Point.java   | 27 +++++-----
 .../usergrid/persistence/geo/model/Tuple.java   | 16 ++++++
 .../usergrid/persistence/query/ir/AllNode.java  | 16 ++++++
 .../usergrid/persistence/query/ir/AndNode.java  | 17 +++---
 .../persistence/query/ir/BooleanNode.java       | 17 +++---
 .../query/ir/EmailIdentifierNode.java           | 16 ++++++
 .../query/ir/NameIdentifierNode.java            | 16 ++++++
 .../persistence/query/ir/NodeVisitor.java       | 17 +++---
 .../usergrid/persistence/query/ir/NotNode.java  | 17 +++---
 .../usergrid/persistence/query/ir/OrNode.java   | 17 +++---
 .../persistence/query/ir/OrderByNode.java       | 17 +++---
 .../persistence/query/ir/QueryNode.java         | 17 +++---
 .../persistence/query/ir/QuerySlice.java        | 17 +++---
 .../persistence/query/ir/SearchVisitor.java     | 16 ++++++
 .../persistence/query/ir/SliceNode.java         | 17 +++---
 .../query/ir/UuidIdentifierNode.java            | 16 ++++++
 .../persistence/query/ir/WithinNode.java        | 17 +++---
 .../query/ir/result/AbstractScanColumn.java     | 16 ++++++
 .../result/CollectionResultsLoaderFactory.java  | 16 ++++++
 .../ir/result/ConnectionIndexSliceParser.java   | 17 +++---
 .../query/ir/result/ConnectionRefLoader.java    | 16 ++++++
 .../result/ConnectionResultsLoaderFactory.java  | 16 ++++++
 .../ir/result/ConnectionTypesIterator.java      | 16 ++++++
 .../query/ir/result/EmptyIterator.java          | 16 ++++++
 .../query/ir/result/EntityRefLoader.java        | 17 +++---
 .../query/ir/result/EntityResultsLoader.java    | 17 +++---
 .../query/ir/result/GeoIterator.java            | 17 +++---
 .../persistence/query/ir/result/IDLoader.java   | 16 ++++++
 .../query/ir/result/IntersectionIterator.java   | 17 +++---
 .../query/ir/result/MergeIterator.java          | 17 +++---
 .../query/ir/result/MultiIterator.java          | 17 +++---
 .../query/ir/result/OrderByIterator.java        | 17 +++---
 .../query/ir/result/ResultIterator.java         | 17 +++---
 .../query/ir/result/ResultsLoader.java          | 17 +++---
 .../query/ir/result/ResultsLoaderFactory.java   | 16 ++++++
 .../persistence/query/ir/result/ScanColumn.java | 16 ++++++
 .../query/ir/result/ScanColumnTransformer.java  | 16 ++++++
 .../ir/result/SecondaryIndexSliceParser.java    | 17 +++---
 .../query/ir/result/SliceIterator.java          | 17 +++---
 .../query/ir/result/SliceParser.java            | 17 +++---
 .../query/ir/result/StaticIdIterator.java       | 16 ++++++
 .../query/ir/result/SubtractionIterator.java    | 17 +++---
 .../query/ir/result/UUIDIndexSliceParser.java   | 17 +++---
 .../query/ir/result/UnionIterator.java          | 17 +++---
 .../persistence/query/tree/AndOperand.java      | 17 +++---
 .../persistence/query/tree/BooleanLiteral.java  | 17 +++---
 .../persistence/query/tree/BooleanOperand.java  | 17 +++---
 .../persistence/query/tree/ContainsOperand.java | 17 +++---
 .../query/tree/ContainsProperty.java            | 17 +++---
 .../usergrid/persistence/query/tree/Equal.java  | 17 +++---
 .../persistence/query/tree/EqualityOperand.java | 17 +++---
 .../persistence/query/tree/FloatLiteral.java    | 17 +++---
 .../persistence/query/tree/GreaterThan.java     | 17 +++---
 .../query/tree/GreaterThanEqual.java            | 17 +++---
 .../persistence/query/tree/LessThan.java        | 17 +++---
 .../persistence/query/tree/LessThanEqual.java   | 17 +++---
 .../persistence/query/tree/Literal.java         | 17 +++---
 .../persistence/query/tree/LiteralFactory.java  | 17 +++---
 .../persistence/query/tree/LongLiteral.java     | 17 +++---
 .../persistence/query/tree/NotOperand.java      | 17 +++---
 .../persistence/query/tree/NumericLiteral.java  | 17 +++---
 .../persistence/query/tree/Operand.java         | 17 +++---
 .../persistence/query/tree/OrOperand.java       | 17 +++---
 .../persistence/query/tree/Property.java        | 17 +++---
 .../persistence/query/tree/QueryVisitor.java    | 17 +++---
 .../persistence/query/tree/StringLiteral.java   | 17 +++---
 .../persistence/query/tree/UUIDLiteral.java     | 17 +++---
 .../persistence/query/tree/WithinOperand.java   | 17 +++---
 .../persistence/query/tree/WithinProperty.java  | 17 +++---
 .../persistence/schema/CollectionInfo.java      | 17 +++---
 .../persistence/schema/DictionaryInfo.java      | 17 +++---
 .../usergrid/persistence/schema/EntityInfo.java | 17 +++---
 .../persistence/schema/PropertyInfo.java        | 17 +++---
 .../usergrid/system/UsergridSystemMonitor.java  | 16 ++++++
 .../org/apache/usergrid/utils/AESUtils.java     |  1 -
 .../org/apache/usergrid/utils/DateUtils.java    | 15 ------
 .../org/apache/usergrid/utils/Inflector.java    | 25 ---------
 .../org/apache/usergrid/utils/package-info.java |  1 -
 .../main/resources/usergrid-core-context.xml    | 16 ++++++
 .../resources/usergrid-scheduler-context.xml    | 17 ++++++
 stack/core/src/site/apt/format.apt              | 17 +++++-
 stack/core/src/site/apt/index.apt               | 16 ++++++
 stack/core/src/site/fml/faq.fml                 | 17 ++++++
 stack/core/src/site/site.xml                    | 16 ++++++
 stack/core/src/site/xdoc/xdoc.xml               | 18 ++++++-
 stack/core/src/test/java/io/baas/Simple.java    | 19 -------
 .../org/apache/usergrid/AbstractCoreIT.java     | 17 +++---
 .../java/org/apache/usergrid/Application.java   | 16 ++++++
 .../apache/usergrid/ConcurrentCoreITSuite.java  | 17 +++---
 .../usergrid/ConcurrentCoreIteratorITSuite.java | 16 ++++++
 .../usergrid/ConcurrentCoreTestSuite.java       | 16 ++++++
 .../org/apache/usergrid/CoreApplication.java    | 17 +++---
 .../java/org/apache/usergrid/CoreITSetup.java   | 17 +++---
 .../org/apache/usergrid/CoreITSetupImpl.java    | 16 ++++++
 .../java/org/apache/usergrid/CoreITSuite.java   | 16 ++++++
 .../java/org/apache/usergrid/CoreTestSuite.java | 17 +++---
 .../org/apache/usergrid/batch/AppArgsTest.java  | 16 ++++++
 .../batch/BulkJobExecutionUnitTest.java         | 16 ++++++
 .../apache/usergrid/batch/BulkTestUtils.java    | 16 ++++++
 .../batch/ConcurrentSchedulerITSuite.java       | 16 ++++++
 .../batch/ConcurrentSchedulerTestSuite.java     | 16 ++++++
 .../apache/usergrid/batch/SchedulerITSuite.java | 16 ++++++
 .../usergrid/batch/SchedulerTestSuite.java      | 16 ++++++
 .../usergrid/batch/UsergridJobFactoryTest.java  | 16 ++++++
 .../usergrid/batch/job/TestJobListener.java     |  1 -
 .../usergrid/batch/job/TestJobListenerTest.java |  1 -
 .../apache/usergrid/batch/job/package-info.java |  1 -
 .../clustering/hazelcast/HazelcastTest.java     | 17 +++---
 .../count/BatchCountParallelismTest.java        | 16 ++++++
 .../usergrid/count/SimpleBatcherTest.java       | 17 +++---
 .../count/common/CountSerDeUtilsTest.java       | 17 +++---
 .../apache/usergrid/count/common/CountTest.java | 17 +++---
 .../locking/cassandra/HectorLockManagerIT.java  | 17 +++---
 .../SingleNodeLockTestSingleNode.java           | 17 +++---
 .../zookeeper/AbstractZooKeeperTest.java        | 17 +++---
 .../usergrid/locking/zookeeper/ZooPut.java      | 17 +++---
 .../zookeeper/ZookeeperLockManagerTest.java     | 17 +++---
 .../java/org/apache/usergrid/mq/MessagesIT.java | 17 +++---
 .../org/apache/usergrid/mq/QueuePathsTest.java  | 17 +++---
 .../usergrid/persistence/CollectionIT.java      | 17 +++---
 .../usergrid/persistence/CoreSchemaManager.java | 16 ++++++
 .../apache/usergrid/persistence/CounterIT.java  | 17 +++---
 .../persistence/EntityConnectionsIT.java        | 17 +++---
 .../persistence/EntityDictionaryIT.java         | 17 +++---
 .../usergrid/persistence/EntityManagerIT.java   | 17 +++---
 .../EntityPropertyComparatorTest.java           | 16 ++++++
 .../apache/usergrid/persistence/EntityTest.java | 17 +++---
 .../org/apache/usergrid/persistence/GeoIT.java  | 17 +++---
 .../apache/usergrid/persistence/IndexIT.java    | 17 +++---
 .../usergrid/persistence/PathQueryIT.java       | 16 ++++++
 .../usergrid/persistence/PermissionsIT.java     | 17 +++---
 .../apache/usergrid/persistence/QueryTest.java  | 17 +++---
 .../usergrid/persistence/QueryUtilsTest.java    | 16 ++++++
 .../apache/usergrid/persistence/SchemaTest.java | 21 ++++----
 .../apache/usergrid/persistence/UtilsTest.java  | 17 +++---
 .../cassandra/EntityManagerFactoryImplIT.java   | 17 +++---
 .../cassandra/QueryProcessorTest.java           | 17 +++---
 .../SimpleIndexBucketLocatorImplTest.java       | 17 +++---
 .../cassandra/util/TraceTagUnitTest.java        | 16 ++++++
 .../persistence/entities/SampleEntity.java      | 17 +++---
 ...EntityLocationRefDistanceComparatorTest.java | 17 +++---
 .../query/AbstractIteratingQueryIT.java         | 17 +++---
 .../persistence/query/AllInCollectionIT.java    | 17 +++---
 .../persistence/query/AllInConnectionIT.java    | 17 +++---
 .../query/AllInConnectionNoTypeIT.java          | 17 +++---
 .../query/IntersectionUnionPagingIT.java        | 17 +++---
 .../query/MultiOrderByCollectionIT.java         | 17 +++---
 .../MultiOrderByComplexUnionCollectionIT.java   | 17 +++---
 .../MultiOrderByComplexUnionConnectionIT.java   | 17 +++---
 .../query/MultiOrderByConnectionIT.java         | 17 +++---
 .../query/NotOrderByCollectionIT.java           | 17 +++---
 .../query/NotOrderByConnectionIT.java           | 17 +++---
 ...gleOrderByBoundRangeScanAscCollectionIT.java | 17 +++---
 ...gleOrderByBoundRangeScanAscConnectionIT.java | 17 +++---
 ...leOrderByBoundRangeScanDescCollectionIT.java | 17 +++---
 ...leOrderByBoundRangeScanDescConnectionIT.java | 17 +++---
 ...eOrderByComplexIntersectionCollectionIT.java | 17 +++---
 ...eOrderByComplexIntersectionConnectionIT.java | 17 +++---
 .../SingleOrderByComplexUnionCollectionIT.java  | 17 +++---
 .../SingleOrderByComplexUnionConnectionIT.java  | 17 +++---
 .../SingleOrderByIntersectionCollectionIT.java  | 17 +++---
 .../SingleOrderByIntersectionConnectionIT.java  | 17 +++---
 .../SingleOrderByLessThanLimitCollectionIT.java | 17 +++---
 .../SingleOrderByLessThanLimitConnectionIT.java | 17 +++---
 .../SingleOrderByMaxLimitCollectionIT.java      | 17 +++---
 .../SingleOrderByMaxLimitConnectionIT.java      | 17 +++---
 ...SingleOrderByNoIntersectionCollectionIT.java | 17 +++---
 ...SingleOrderByNoIntersectionConnectionIT.java | 17 +++---
 .../query/SingleOrderByNotCollectionIT.java     | 17 +++---
 .../query/SingleOrderByNotConnectionIT.java     | 17 +++---
 ...OrderBySameRangeScanGreaterCollectionIT.java | 17 +++---
 ...OrderBySameRangeScanGreaterConnectionIT.java | 17 +++---
 ...meRangeScanGreaterThanEqualCollectionIT.java | 17 +++---
 ...gleOrderBySameRangeScanLessCollectionIT.java | 17 +++---
 ...gleOrderBySameRangeScanLessConnectionIT.java | 17 +++---
 ...ySameRangeScanLessThanEqualCollectionIT.java | 17 +++---
 ...ySameRangeScanLessThanEqualConnectionIT.java | 17 +++---
 .../query/ir/result/AbstractScanColumnTest.java | 16 ++++++
 .../query/ir/result/InOrderIterator.java        | 16 ++++++
 .../ir/result/IntersectionIteratorTest.java     | 17 +++---
 .../query/ir/result/IteratorHelper.java         | 16 ++++++
 .../ir/result/SubtractionIteratorTest.java      | 17 +++---
 .../query/ir/result/UnionIteratorTest.java      | 17 +++---
 .../persistence/query/tree/GrammarTreeTest.java | 17 +++---
 .../persistence/query/tree/LongLiteralTest.java | 17 +++---
 .../query/tree/StringLiteralTest.java           | 17 +++---
 .../system/UsergridSystemMonitorIT.java         | 16 ++++++
 .../apache/usergrid/utils/TimeUtilsTest.java    |  1 -
 .../org/apache/usergrid/utils/package-info.java |  1 -
 .../core/src/test/java/org/usergrid/Simple.java | 36 +++++++++++++
 stack/launcher/launch                           | 18 ++++++-
 stack/launcher/pom.xml                          | 16 ++++++
 .../java/org/apache/usergrid/launcher/App.java  | 17 +++---
 .../apache/usergrid/launcher/AppleUtils.java    | 17 +++---
 .../org/apache/usergrid/launcher/JarMain.java   |  1 -
 .../apache/usergrid/launcher/LauncherFrame.java | 17 +++---
 .../usergrid/launcher/LogViewerFrame.java       | 17 +++---
 .../apache/usergrid/launcher/package-info.java  |  1 -
 .../launcher/src/main/resources/cassandra.yaml  | 14 ++++-
 .../resources/usergrid-standalone-context.xml   | 16 ++++++
 .../resources/usergrid-standalone.properties    | 23 ++++++++
 stack/mongo-emulator/pom.xml                    | 16 ++++++
 .../usergrid/mongo/MongoChannelHandler.java     | 17 +++---
 .../usergrid/mongo/MongoMessageDecoder.java     | 17 +++---
 .../usergrid/mongo/MongoMessageEncoder.java     | 17 +++---
 .../org/apache/usergrid/mongo/MongoQuery.java   | 17 +++---
 .../org/apache/usergrid/mongo/MongoServer.java  | 17 +++---
 .../mongo/MongoServerPipelineFactory.java       | 17 +++---
 .../usergrid/mongo/commands/Buildinfo.java      | 17 +++---
 .../usergrid/mongo/commands/Collstats.java      | 17 +++---
 .../apache/usergrid/mongo/commands/Count.java   | 17 +++---
 .../apache/usergrid/mongo/commands/Dbstats.java | 17 +++---
 .../usergrid/mongo/commands/Getlasterror.java   | 17 +++---
 .../usergrid/mongo/commands/ListDatabases.java  | 17 +++---
 .../usergrid/mongo/commands/MongoCommand.java   | 17 +++---
 .../mongo/commands/ReplSetGetStatus.java        | 17 +++---
 .../usergrid/mongo/commands/ServerStatus.java   | 17 +++---
 .../usergrid/mongo/commands/Whatsmyuri.java     | 17 +++---
 .../apache/usergrid/mongo/protocol/Message.java | 17 +++---
 .../apache/usergrid/mongo/protocol/OpCrud.java  | 17 +++---
 .../usergrid/mongo/protocol/OpDelete.java       | 17 +++---
 .../usergrid/mongo/protocol/OpGetMore.java      | 17 +++---
 .../usergrid/mongo/protocol/OpInsert.java       | 17 +++---
 .../usergrid/mongo/protocol/OpKillCursors.java  | 17 +++---
 .../apache/usergrid/mongo/protocol/OpMsg.java   | 17 +++---
 .../apache/usergrid/mongo/protocol/OpQuery.java | 17 +++---
 .../apache/usergrid/mongo/protocol/OpReply.java | 17 +++---
 .../usergrid/mongo/protocol/OpUpdate.java       | 17 +++---
 .../usergrid/mongo/query/MongoQueryParser.java  | 17 +++---
 .../mongo/testproxy/MongoMessageFrame.java      | 17 +++---
 .../testproxy/MongoProxyInboundHandler.java     | 17 +++---
 .../testproxy/MongoProxyPipelineFactory.java    | 17 +++---
 .../mongo/testproxy/MongoProxyServer.java       | 17 +++---
 .../testproxy/MongoProxyServerHandler.java      | 17 +++---
 .../apache/usergrid/mongo/utils/BSONUtils.java  | 17 +++---
 .../usergrid/mongo/AbstractMongoTest.java       | 17 +++---
 .../apache/usergrid/mongo/BasicMongoTest.java   | 16 ++++++
 .../usergrid/mongo/DatabaseInitializer.java     | 17 +++---
 .../apache/usergrid/mongo/MongoQueryTest.java   | 16 ++++++
 stack/pom.xml                                   | 57 ++++++++++++++++++++
 stack/query-validator/pom.xml                   | 16 ++++++
 .../query/validator/ApiServerRunner.java        | 17 +++---
 .../validator/DefaultQueryResultsMatcher.java   | 17 +++---
 .../usergrid/query/validator/QueryEntity.java   | 17 +++---
 .../usergrid/query/validator/QueryRequest.java  | 17 +++---
 .../usergrid/query/validator/QueryResponse.java | 17 +++---
 .../query/validator/QueryResultsMatcher.java    | 17 +++---
 .../usergrid/query/validator/QueryRunner.java   | 17 +++---
 .../validator/QueryValidationConfiguration.java | 17 +++---
 .../query/validator/QueryValidator.java         | 17 +++---
 .../usergrid/query/validator/SqliteRunner.java  | 17 +++---
 .../usergrid-query-validator-context.xml        | 16 ++++++
 .../query/validator/AbstractQueryIT.java        | 17 +++---
 .../usergrid/query/validator/QueryITSuite.java  | 17 +++---
 .../query/validator/users/UserQueryIT.java      | 17 +++---
 .../src/test/resources/project.properties       | 16 ++++++
 .../resources/usergrid-custom-test.properties   | 16 ++++++
 .../test/resources/usergrid-test-context.xml    | 16 ++++++
 stack/rest/pom.xml                              | 17 ++++++
 .../usergrid/rest/AbstractContextResource.java  | 17 +++---
 .../org/apache/usergrid/rest/ApiResponse.java   | 17 +++---
 .../rest/JacksonCustomMapperProvider.java       | 17 +++---
 .../org/apache/usergrid/rest/RootResource.java  | 17 +++---
 .../rest/ServerEnvironmentProperties.java       | 16 ++++++
 .../apache/usergrid/rest/SwaggerServlet.java    | 17 +++---
 .../apache/usergrid/rest/SystemResource.java    | 17 +++---
 .../usergrid/rest/TextToJsonSwapWriter.java     | 16 ++++++
 .../rest/applications/ApplicationResource.java  | 17 +++---
 .../rest/applications/AuthResource.java         | 17 +++---
 .../rest/applications/ServiceResource.java      | 17 +++---
 .../applications/assets/AssetsResource.java     | 16 ++++++
 .../applications/events/EventsResource.java     | 17 +++---
 .../rest/applications/queues/QueueResource.java | 17 +++---
 .../queues/QueueSubscriberResource.java         | 17 +++---
 .../queues/QueueSubscriptionResource.java       | 17 +++---
 .../queues/QueueTransactionsResource.java       | 17 +++---
 .../users/AbstractUserExtensionResource.java    | 17 +++---
 .../rest/applications/users/UserResource.java   | 17 +++---
 .../rest/applications/users/UsersResource.java  | 17 +++---
 .../exceptions/AbstractExceptionMapper.java     | 17 +++---
 .../usergrid/rest/exceptions/AuthErrorInfo.java | 17 +++---
 .../AuthorizationExceptionMapper.java           | 17 +++---
 ...cateUniquePropertyExistsExceptionMapper.java | 17 +++---
 .../EntityNotFoundExceptionMapper.java          | 17 +++---
 ...orbiddenServiceOperationExceptionMapper.java | 17 +++---
 .../IllegalArgumentExceptionMapper.java         | 17 +++---
 .../exceptions/JsonReadExceptionMapper.java     | 12 ++---
 .../exceptions/JsonWriteExceptionMapper.java    | 12 ++---
 .../exceptions/ManagementExceptionMapper.java   | 17 +++---
 .../usergrid/rest/exceptions/NoOpException.java | 17 +++---
 .../rest/exceptions/NoOpExceptionMapper.java    | 17 +++---
 .../NotImplementedExceptionMapper.java          | 17 +++---
 .../exceptions/OAuthProblemExceptionMapper.java | 17 +++---
 ...rganizationApplicationNotFoundException.java | 16 ++++++
 ...ationApplicationNotFoundExceptionMapper.java | 16 ++++++
 .../exceptions/PersistenceExceptionMapper.java  | 17 +++---
 .../exceptions/QueryParseExceptionMapper.java   | 17 +++---
 .../exceptions/QueryTokenExceptionMapper.java   | 17 +++---
 .../RecentlyUsedPasswordExceptionMapper.java    | 16 ++++++
 .../rest/exceptions/RedirectionException.java   | 16 ++++++
 .../exceptions/RedirectionExceptionMapper.java  | 17 +++---
 ...RequiredPropertyNotFoundExceptionMapper.java | 17 +++---
 .../rest/exceptions/SecurityException.java      | 17 +++---
 .../exceptions/SecurityExceptionMapper.java     | 17 +++---
 .../rest/exceptions/ServiceExceptionMapper.java | 17 +++---
 .../ServiceResourceNotFoundExceptionMapper.java | 17 +++---
 .../rest/exceptions/ThrowableMapper.java        | 17 +++---
 .../TransactionNotFoundExceptionMapper.java     | 17 +++---
 .../rest/filters/ContentTypeFilter.java         | 17 +++---
 .../rest/filters/JSONPCallbackFilter.java       | 17 +++---
 .../usergrid/rest/filters/MeteringFilter.java   | 17 +++---
 .../usergrid/rest/filters/TracingFilter.java    | 16 ++++++
 .../rest/management/ManagementResource.java     | 17 +++---
 .../management/metrics/MetricsResource.java     | 16 ++++++
 .../organizations/OrganizationResource.java     | 17 +++---
 .../organizations/OrganizationsResource.java    | 17 +++---
 .../applications/ApplicationResource.java       | 17 +++---
 .../applications/ApplicationsResource.java      | 17 +++---
 .../organizations/users/UsersResource.java      | 17 +++---
 .../rest/management/users/UserResource.java     | 17 +++---
 .../rest/management/users/UsersResource.java    | 17 +++---
 .../organizations/OrganizationsResource.java    | 17 +++---
 .../organizations/OrganizationResource.java     | 16 ++++++
 .../rest/security/CrossOriginRequestFilter.java | 17 +++---
 .../security/SecuredResourceFilterFactory.java  | 17 +++---
 .../annotations/RequireAdminUserAccess.java     | 17 +++---
 .../annotations/RequireApplicationAccess.java   | 17 +++---
 .../annotations/RequireOrganizationAccess.java  | 17 +++---
 .../annotations/RequireSystemAccess.java        | 17 +++---
 .../security/shiro/RestSecurityManager.java     | 17 +++---
 .../ShiroAuthenticationExceptionMapper.java     | 17 +++---
 .../shiro/filters/BasicAuthSecurityFilter.java  | 17 +++---
 .../ClientCredentialsSecurityFilter.java        | 17 +++---
 .../OAuth2AccessTokenSecurityFilter.java        | 17 +++---
 .../security/shiro/filters/SecurityFilter.java  | 17 +++---
 .../session/HttpRequestSessionManager.java      | 17 +++---
 .../session/HttpServletRequestSession.java      | 17 +++---
 .../usergrid/rest/test/PropertiesResource.java  | 11 ++--
 .../apache/usergrid/rest/utils/CORSUtils.java   | 17 +++---
 .../apache/usergrid/rest/utils/JSONPUtils.java  | 17 +++---
 .../usergrid/rest/utils/PathingUtils.java       | 16 ++++++
 .../main/resources/swagger/applications.json    | 16 ++++++
 .../src/main/resources/swagger/management.json  | 16 ++++++
 .../src/main/resources/swagger/resources.json   | 16 ++++++
 .../main/resources/usergrid-rest-context.xml    | 16 ++++++
 .../resources/usergrid-rest-deploy-context.xml  | 16 ++++++
 stack/rest/src/main/webapp/WEB-INF/c.tld        | 17 +++++-
 .../apache/usergrid/rest/TestResource/error.jsp | 16 ++++++
 .../apache/usergrid/rest/TestResource/test.jsp  | 16 ++++++
 .../ApplicationResource/authorize_form.jsp      | 16 ++++++
 .../applications/ApplicationResource/error.jsp  | 16 ++++++
 .../users/UserResource/activate.jsp             | 16 ++++++
 .../applications/users/UserResource/confirm.jsp | 16 ++++++
 .../applications/users/UserResource/error.jsp   | 16 ++++++
 .../users/UserResource/resetpw_email_form.jsp   | 16 ++++++
 .../UserResource/resetpw_email_success.jsp      | 16 ++++++
 .../users/UserResource/resetpw_set_form.jsp     | 16 ++++++
 .../users/UserResource/resetpw_set_success.jsp  | 16 ++++++
 .../applications/users/UsersResource/error.jsp  | 16 ++++++
 .../users/UsersResource/resetpw_email_form.jsp  | 16 ++++++
 .../UsersResource/resetpw_email_success.jsp     | 16 ++++++
 .../ManagementResource/authorize_form.jsp       | 16 ++++++
 .../management/ManagementResource/error.jsp     | 16 ++++++
 .../OrganizationResource/activate.jsp           | 16 ++++++
 .../OrganizationResource/confirm.jsp            | 16 ++++++
 .../OrganizationResource/error.jsp              | 16 ++++++
 .../management/users/UserResource/activate.jsp  | 16 ++++++
 .../management/users/UserResource/confirm.jsp   | 16 ++++++
 .../management/users/UserResource/error.jsp     | 16 ++++++
 .../users/UserResource/resetpw_email_form.jsp   | 16 ++++++
 .../UserResource/resetpw_email_success.jsp      | 16 ++++++
 .../users/UserResource/resetpw_set_form.jsp     | 16 ++++++
 .../users/UserResource/resetpw_set_success.jsp  | 16 ++++++
 .../management/users/UsersResource/error.jsp    | 16 ++++++
 .../users/UsersResource/resetpw_email_form.jsp  | 16 ++++++
 .../UsersResource/resetpw_email_success.jsp     | 16 ++++++
 stack/rest/src/main/webapp/WEB-INF/web.xml      | 16 ++++++
 stack/rest/src/main/webapp/css/styles.css       | 17 +++++-
 .../apache/usergrid/rest/AbstractRestIT.java    | 17 +++---
 .../java/org/apache/usergrid/rest/BasicIT.java  | 17 +++---
 .../usergrid/rest/ConcurrentRestITSuite.java    | 16 ++++++
 .../usergrid/rest/DatabaseInitializer.java      | 17 +++---
 .../java/org/apache/usergrid/rest/ITSetup.java  | 26 ++++-----
 .../org/apache/usergrid/rest/RestITSuite.java   | 26 ++++-----
 .../apache/usergrid/rest/TestContextSetup.java  | 16 ++++++
 .../apache/usergrid/rest/TomcatResource.java    | 16 ++++++
 .../ApplicationRequestCounterIT.java            | 24 +++++----
 .../applications/ApplicationResourceIT.java     | 16 +++---
 .../rest/applications/DevicesResourceIT.java    | 16 ++++++
 .../applications/assets/AssetResourceIT.java    | 16 ++++++
 .../collection/BadGrammarQueryTest.java         | 16 ++++++
 .../collection/BrowserCompatibilityTest.java    | 17 +++---
 .../collection/PagingResourceIT.java            | 17 +++---
 .../collection/activities/AndOrQueryTest.java   | 16 ++++++
 .../collection/activities/OrderByTest.java      | 16 ++++++
 .../activities/PagingEntitiesTest.java          | 16 ++++++
 .../collection/activities/PutTest.java          | 16 ++++++
 .../collection/groups/GeoPagingTest.java        | 26 ++++-----
 .../collection/groups/UpdateGroupIT.java        | 26 ++++-----
 .../applications/events/EventsResourceIT.java   | 16 ++++++
 .../queues/AbstractQueueResourceIT.java         | 16 ++++++
 .../queues/QueueResourceLong1IT.java            | 16 ++++++
 .../queues/QueueResourceLong2IT.java            | 16 ++++++
 .../queues/QueueResourceLong3IT.java            | 16 ++++++
 .../queues/QueueResourceShortIT.java            | 16 ++++++
 .../applications/users/ActivityResourceIT.java  | 17 +++---
 .../users/CollectionsResourceIT.java            | 17 +++---
 .../users/ConnectionResourceTest.java           | 16 ++++++
 .../applications/users/GroupResourceIT.java     | 17 +++---
 .../applications/users/OwnershipResourceIT.java | 17 +++---
 .../users/PermissionsResourceIT.java            | 17 +++---
 .../applications/users/RetrieveUsersTest.java   | 16 ++++++
 .../rest/applications/users/UserResourceIT.java | 17 +++---
 .../users/extensions/TestResource.java          | 17 +++---
 .../rest/applications/utils/TestUtils.java      | 17 +++---
 .../rest/applications/utils/UserRepo.java       | 16 ++++++
 .../rest/filters/ContentTypeResourceIT.java     | 17 +++---
 .../rest/management/ManagementResourceIT.java   | 17 +++---
 .../rest/management/RegistrationIT.java         | 25 +++++----
 .../organizations/AdminEmailEncodingIT.java     | 16 ++++++
 .../organizations/OrganizationResourceIT.java   | 16 ++++++
 .../organizations/OrganizationsResourceIT.java  | 16 ++++++
 .../rest/management/users/MUUserResourceIT.java | 25 +++++----
 .../UsersOrganizationsResourceIT.java           | 16 ++++++
 .../rest/test/PropertiesResourceIT.java         | 12 ++---
 .../rest/test/resource/CollectionResource.java  | 17 +++---
 .../usergrid/rest/test/resource/Connection.java | 17 +++---
 .../rest/test/resource/CustomCollection.java    | 17 +++---
 .../rest/test/resource/EntityResource.java      | 17 +++---
 .../apache/usergrid/rest/test/resource/Me.java  | 17 +++---
 .../rest/test/resource/NamedResource.java       | 17 +++---
 .../rest/test/resource/ResultsParser.java       | 17 +++---
 .../rest/test/resource/RootResource.java        | 17 +++---
 .../rest/test/resource/SetResource.java         | 17 +++---
 .../rest/test/resource/TestContext.java         | 26 ++++-----
 .../rest/test/resource/ValueResource.java       | 17 +++---
 .../rest/test/resource/app/Application.java     | 17 +++---
 .../usergrid/rest/test/resource/app/Device.java | 17 +++---
 .../usergrid/rest/test/resource/app/User.java   | 17 +++---
 .../rest/test/resource/app/UsersCollection.java | 17 +++---
 .../resource/app/queue/DevicesCollection.java   | 17 +++---
 .../rest/test/resource/app/queue/Queue.java     | 17 +++---
 .../resource/app/queue/QueuesCollection.java    | 17 +++---
 .../app/queue/SubscribersCollection.java        | 17 +++---
 .../test/resource/app/queue/Transaction.java    | 17 +++---
 .../app/queue/TransactionsCollection.java       | 17 +++---
 .../rest/test/resource/mgmt/Application.java    | 17 +++---
 .../resource/mgmt/ApplicationsCollection.java   | 17 +++---
 .../rest/test/resource/mgmt/Management.java     | 17 +++---
 .../rest/test/resource/mgmt/Organization.java   | 17 +++---
 .../resource/mgmt/OrganizationsCollection.java  | 17 +++---
 .../rest/test/security/TestAdminUser.java       | 17 +++---
 .../rest/test/security/TestAppUser.java         | 17 +++---
 .../usergrid/rest/test/security/TestUser.java   | 17 +++---
 stack/services/pom.xml                          | 16 ++++++
 .../management/AccountCreationProps.java        | 17 +++---
 .../usergrid/management/ActivationState.java    | 16 ++++++
 .../usergrid/management/ApplicationCreator.java | 16 ++++++
 .../usergrid/management/ApplicationInfo.java    | 17 +++---
 .../usergrid/management/ManagementService.java  | 17 +++---
 .../usergrid/management/OrganizationInfo.java   | 17 +++---
 .../management/OrganizationOwnerInfo.java       | 17 +++---
 .../management/OrganizationProfile.java         | 17 +++---
 .../apache/usergrid/management/UserInfo.java    | 17 +++---
 .../cassandra/AccountCreationPropsImpl.java     | 17 +++---
 .../cassandra/ApplicationCreatorImpl.java       | 16 ++++++
 .../cassandra/ManagementServiceImpl.java        | 18 +++----
 .../ApplicationCreationException.java           | 16 ++++++
 .../exceptions/DisabledAdminUserException.java  | 17 +++---
 .../exceptions/DisabledAppUserException.java    | 17 +++---
 .../exceptions/IncorrectPasswordException.java  | 17 +++---
 .../exceptions/ManagementException.java         | 17 +++---
 .../RecentlyUsedPasswordException.java          | 16 ++++++
 .../UnableToLeaveOrganizationException.java     | 17 +++---
 .../UnactivatedAdminUserException.java          | 17 +++---
 .../exceptions/UnactivatedAppUserException.java | 17 +++---
 .../UnactivatedOrganizationException.java       | 17 +++---
 .../UnconfirmedAdminUserException.java          | 17 +++---
 .../usergrid/management/utils/AccountUtils.java | 17 +++---
 .../usergrid/security/AuthPrincipalInfo.java    | 17 +++---
 .../usergrid/security/AuthPrincipalType.java    | 17 +++---
 .../security/crypto/EncryptionService.java      | 17 +++---
 .../security/crypto/EncryptionServiceImpl.java  | 17 +++---
 .../security/crypto/command/BcryptCommand.java  | 17 +++---
 .../crypto/command/EncryptionCommand.java       | 17 +++---
 .../security/crypto/command/Md5HashCommand.java | 17 +++---
 .../crypto/command/PlainTextCommand.java        | 17 +++---
 .../crypto/command/SaltedHasherCommand.java     | 17 +++---
 .../crypto/command/Sha1HashCommand.java         | 17 +++---
 .../usergrid/security/oauth/AccessInfo.java     | 17 +++---
 .../security/oauth/ClientCredentialsInfo.java   | 17 +++---
 .../usergrid/security/oauth/OAuthProxy.java     | 17 +++---
 .../security/oauth/OAuthProxyFactory.java       | 17 +++---
 .../security/providers/AbstractProvider.java    | 16 ++++++
 .../security/providers/FacebookProvider.java    | 16 ++++++
 .../security/providers/FoursquareProvider.java  | 16 ++++++
 .../providers/PingIdentityProvider.java         | 16 ++++++
 .../security/providers/SignInAsProvider.java    | 16 ++++++
 .../providers/SignInProviderFactory.java        | 16 ++++++
 .../security/salt/NoOpSaltProvider.java         | 17 +++---
 .../security/salt/PropertiesSaltProvider.java   | 17 +++---
 .../usergrid/security/salt/SaltProvider.java    | 17 +++---
 .../security/shiro/CustomPermission.java        | 17 +++---
 .../shiro/CustomPermissionResolver.java         | 17 +++---
 .../shiro/PrincipalCredentialsToken.java        | 17 +++---
 .../apache/usergrid/security/shiro/Realm.java   | 17 +++---
 .../AbstractAccessTokenCredentials.java         | 17 +++---
 .../credentials/AbstractClientCredentials.java  | 17 +++---
 .../AbstractPasswordCredentials.java            | 17 +++---
 .../credentials/AccessTokenCredentials.java     | 17 +++---
 .../shiro/credentials/AdminUserAccessToken.java | 17 +++---
 .../shiro/credentials/AdminUserCredentials.java | 17 +++---
 .../shiro/credentials/AdminUserPassword.java    | 17 +++---
 .../credentials/ApplicationAccessToken.java     | 17 +++---
 .../ApplicationClientCredentials.java           | 17 +++---
 .../credentials/ApplicationCredentials.java     | 17 +++---
 .../shiro/credentials/ApplicationGuest.java     | 17 +++---
 .../credentials/ApplicationUserAccessToken.java | 17 +++---
 .../credentials/ApplicationUserCredentials.java | 17 +++---
 .../credentials/ApplicationUserPassword.java    | 17 +++---
 .../shiro/credentials/ClientCredentials.java    | 17 +++---
 .../credentials/OrganizationAccessToken.java    | 17 +++---
 .../OrganizationClientCredentials.java          | 17 +++---
 .../credentials/OrganizationCredentials.java    | 17 +++---
 .../shiro/credentials/PasswordCredentials.java  | 17 +++---
 .../shiro/credentials/PrincipalCredentials.java | 17 +++---
 .../shiro/principals/AdminUserPrincipal.java    | 17 +++---
 .../principals/ApplicationGuestPrincipal.java   | 17 +++---
 .../shiro/principals/ApplicationPrincipal.java  | 17 +++---
 .../principals/ApplicationUserPrincipal.java    | 17 +++---
 .../shiro/principals/OrganizationPrincipal.java | 17 +++---
 .../shiro/principals/PrincipalIdentifier.java   | 17 +++---
 .../shiro/principals/UserPrincipal.java         | 17 +++---
 .../security/shiro/utils/SubjectUtils.java      | 17 +++---
 .../usergrid/security/tokens/TokenCategory.java | 17 +++---
 .../usergrid/security/tokens/TokenInfo.java     | 16 ++++++
 .../usergrid/security/tokens/TokenService.java  | 16 ++++++
 .../tokens/cassandra/TokenServiceImpl.java      | 16 ++++++
 .../tokens/exceptions/BadTokenException.java    | 17 +++---
 .../exceptions/ExpiredTokenException.java       | 17 +++---
 .../exceptions/InvalidTokenException.java       | 17 +++---
 .../tokens/exceptions/TokenException.java       | 17 +++---
 .../services/AbstractCollectionService.java     | 17 +++---
 .../services/AbstractConnectionsService.java    | 17 +++---
 .../AbstractPathBasedColllectionService.java    | 17 +++---
 .../usergrid/services/AbstractService.java      | 17 +++---
 .../org/apache/usergrid/services/Service.java   | 17 +++---
 .../apache/usergrid/services/ServiceAction.java | 17 +++---
 .../ServiceCollectionEventListener.java         | 17 +++---
 .../usergrid/services/ServiceContext.java       | 17 +++---
 .../services/ServiceExecutionEvent.java         | 17 +++---
 .../services/ServiceExecutionEventListener.java | 17 +++---
 .../apache/usergrid/services/ServiceInfo.java   | 17 +++---
 .../usergrid/services/ServiceManager.java       | 17 +++---
 .../services/ServiceManagerFactory.java         | 17 +++---
 .../usergrid/services/ServiceParameter.java     | 17 +++---
 .../usergrid/services/ServicePayload.java       | 17 +++---
 .../usergrid/services/ServiceRequest.java       | 17 +++---
 .../usergrid/services/ServiceResults.java       | 17 +++---
 .../apache/usergrid/services/ServiceUtils.java  | 17 +++---
 .../services/activities/ActivitiesService.java  | 17 +++---
 .../applications/ApplicationsService.java       | 17 +++---
 .../usergrid/services/assets/AssetsService.java | 17 +++---
 .../services/assets/data/AssetMimeHandler.java  | 16 ++++++
 .../services/assets/data/AssetUtils.java        | 16 ++++++
 .../services/assets/data/BinaryStore.java       | 16 ++++++
 .../assets/data/LocalFileBinaryStore.java       | 16 ++++++
 .../services/assets/data/S3BinaryStore.java     | 16 ++++++
 .../services/devices/DevicesService.java        | 17 +++---
 .../services/devices/users/UsersService.java    | 17 +++---
 .../ForbiddenServiceOperationException.java     | 17 +++---
 .../services/exceptions/ServiceException.java   | 17 +++---
 .../exceptions/ServiceInvocationException.java  | 17 +++---
 .../ServiceResourceNotFoundException.java       | 17 +++---
 .../UndefinedServiceEntityTypeException.java    | 17 +++---
 .../UnsupportedServiceOperationException.java   | 17 +++---
 .../generic/GenericCollectionService.java       | 17 +++---
 .../generic/GenericConnectionsService.java      | 17 +++---
 .../services/generic/RootCollectionService.java | 17 +++---
 .../usergrid/services/groups/GroupsService.java | 17 +++---
 .../groups/activities/ActivitiesService.java    | 17 +++---
 .../services/groups/roles/RolesService.java     | 17 +++---
 .../services/groups/users/UsersService.java     | 17 +++---
 .../users/activities/ActivitiesService.java     | 17 +++---
 .../groups/users/devices/DevicesService.java    | 17 +++---
 .../services/messages/MessagesService.java      | 17 +++---
 .../usergrid/services/roles/RolesService.java   | 17 +++---
 .../services/roles/groups/GroupsService.java    | 17 +++---
 .../services/roles/users/UsersService.java      | 17 +++---
 .../usergrid/services/users/UsersService.java   | 17 +++---
 .../users/activities/ActivitiesService.java     | 17 +++---
 .../services/users/devices/DevicesService.java  | 17 +++---
 .../users/following/FollowingService.java       | 16 ++++++
 .../services/users/groups/GroupsService.java    | 17 +++---
 .../services/users/roles/RolesService.java      | 17 +++---
 .../org/apache/usergrid/utils/PythonUtils.java  | 17 +++---
 .../src/main/python/pyusergrid/__init__.py      | 15 ++++++
 .../main/python/pyusergrid/services/__init__.py | 15 ++++++
 .../pyusergrid/services/pytest/PytestService.py | 16 ++++++
 .../pyusergrid/services/pytest/__init__.py      | 15 ++++++
 .../python/pyusergrid/services/pytest/test.py   | 16 ++++++
 stack/services/src/main/python/test/__init__.py | 15 ++++++
 stack/services/src/main/python/test/test.py     | 16 ++++++
 .../resources/usergrid-services-context.xml     | 16 ++++++
 .../test/java/baas/io/simple/SimpleService.java | 18 -------
 .../usergrid/ConcurrentServiceITSuite.java      | 16 ++++++
 .../org/apache/usergrid/ServiceApplication.java | 16 ++++++
 .../org/apache/usergrid/ServiceITSetup.java     | 16 ++++++
 .../org/apache/usergrid/ServiceITSetupImpl.java | 16 ++++++
 .../org/apache/usergrid/ServiceITSuite.java     | 16 ++++++
 .../apache/usergrid/management/EmailFlowIT.java | 17 +++---
 .../management/ManagementTestHelper.java        | 17 +++---
 .../usergrid/management/MockImapClient.java     | 16 ++++++
 .../usergrid/management/OrganizationIT.java     | 25 ++++-----
 .../org/apache/usergrid/management/RoleIT.java  | 17 +++---
 .../cassandra/ApplicationCreatorIT.java         | 16 ++++++
 .../cassandra/ManagementServiceIT.java          | 16 ++++++
 .../cassandra/ManagementTestHelperImpl.java     | 17 +++---
 .../org/apache/usergrid/python/JythonTest.java  | 17 +++---
 .../usergrid/security/CustomResolverTest.java   | 17 +++---
 .../crypto/EncryptionServiceImplTest.java       | 17 +++---
 .../crypto/command/BcryptCommandTest.java       | 17 +++---
 .../crypto/command/Md5HashCommandTest.java      | 17 +++---
 .../crypto/command/Sha1HashCommandTest.java     | 17 +++---
 .../security/providers/FacebookProviderIT.java  | 16 ++++++
 .../providers/PingIdentityProviderIT.java       | 16 ++++++
 .../security/tokens/TokenServiceIT.java         | 16 ++++++
 .../usergrid/services/AbstractServiceIT.java    | 17 +++---
 .../usergrid/services/ActivitiesServiceIT.java  | 17 +++---
 .../services/ApplicationsServiceIT.java         | 17 +++---
 .../usergrid/services/CollectionServiceIT.java  | 17 +++---
 .../usergrid/services/ConnectionsServiceIT.java | 17 +++---
 .../usergrid/services/GroupServiceIT.java       | 17 +++---
 .../usergrid/services/RolesServiceIT.java       | 17 +++---
 .../usergrid/services/ServiceFactoryIT.java     | 19 +++----
 .../usergrid/services/ServiceInfoTest.java      | 17 +++---
 .../usergrid/services/ServiceInvocationIT.java  | 17 +++---
 .../usergrid/services/ServiceRequestIT.java     | 17 +++---
 .../usergrid/services/UsersServiceIT.java       | 17 +++---
 .../services/assets/data/AssetUtilsTest.java    | 16 ++++++
 .../java/org/usergrid/simple/SimpleService.java | 33 ++++++++++++
 .../src/test/resources/project.properties       | 16 ++++++
 .../test/resources/usergrid-test-context.xml    | 16 ++++++
 stack/test-utils/pom.xml                        | 16 ++++++
 .../apache/usergrid/NoExitSecurityManager.java  | 16 ++++++
 .../usergrid/cassandra/AvailablePortFinder.java | 27 +++++-----
 .../usergrid/cassandra/CassandraResource.java   | 16 ++++++
 .../usergrid/cassandra/ClearShiroSubject.java   | 16 ++++++
 .../apache/usergrid/cassandra/Concurrent.java   | 16 ++++++
 .../cassandra/ConcurrentJunitRunner.java        | 16 ++++++
 .../usergrid/cassandra/ConcurrentSuite.java     | 16 ++++++
 .../apache/usergrid/cassandra/DataControl.java  | 16 ++++++
 .../apache/usergrid/cassandra/DataLoader.java   | 16 ++++++
 .../usergrid/cassandra/SchemaManager.java       | 16 ++++++
 .../src/main/resources/cassandra.yaml           | 12 +++++
 .../src/main/resources/log4j.properties         | 12 +++++
 .../cassandra/AnotherCassandraResourceIT.java   | 16 ++++++
 .../cassandra/CassandraResourceITSuite.java     | 16 ++++++
 .../cassandra/CassandraResourceTest.java        | 16 ++++++
 .../usergrid/cassandra/FakeSchemaManager.java   | 16 ++++++
 .../usergrid/cassandra/OkThisIsTheLastIT.java   | 16 ++++++
 .../YetAnotherCassandraResourceIT.java          | 16 ++++++
 .../src/test/resources/project.properties       | 12 +++++
 .../test/resources/usergrid-test-context.xml    | 16 ++++++
 stack/tools/impoexpo.sh                         | 16 ++++++
 stack/tools/pom.xml                             | 16 ++++++
 stack/tools/src/main/assembly/release.xml       | 16 ++++++
 .../main/dist/usergrid-custom-tools.properties  | 16 ++++++
 stack/tools/src/main/dist/usergrid-export.sh    | 16 ++++++
 .../java/org/apache/usergrid/tools/ApiDoc.java  | 17 +++---
 .../org/apache/usergrid/tools/AppAudit.java     | 17 +++---
 .../org/apache/usergrid/tools/AppNameFix.java   | 17 +++---
 .../java/org/apache/usergrid/tools/Cli.java     | 17 +++---
 .../java/org/apache/usergrid/tools/Command.java | 17 +++---
 .../org/apache/usergrid/tools/CredExport.java   | 17 +++---
 .../apache/usergrid/tools/DupAdminRepair.java   | 17 +++---
 .../org/apache/usergrid/tools/DupOrgRepair.java | 17 +++---
 .../apache/usergrid/tools/EntityCleanup.java    | 17 +++---
 .../usergrid/tools/EntityInsertBenchMark.java   | 17 +++---
 .../usergrid/tools/EntityReadBenchMark.java     | 17 +++---
 .../org/apache/usergrid/tools/EntityUpdate.java | 16 ++++++
 .../java/org/apache/usergrid/tools/Export.java  | 17 +++---
 .../usergrid/tools/ExportDataCreator.java       | 17 +++---
 .../usergrid/tools/ExportingToolBase.java       | 23 ++++----
 .../java/org/apache/usergrid/tools/Import.java  | 17 +++---
 .../org/apache/usergrid/tools/ImportFB.java     | 17 +++---
 .../org/apache/usergrid/tools/IndexRebuild.java | 17 +++---
 .../java/org/apache/usergrid/tools/Metrics.java | 16 ++++++
 .../usergrid/tools/OrganizationExport.java      | 16 ++++++
 .../apache/usergrid/tools/PopulateSample.java   | 17 +++---
 .../apache/usergrid/tools/ResetSuperUser.java   | 17 +++---
 .../java/org/apache/usergrid/tools/SetupDB.java | 17 +++---
 .../java/org/apache/usergrid/tools/Test.java    | 17 +++---
 .../org/apache/usergrid/tools/ToolBase.java     | 16 +++---
 .../usergrid/tools/UniqueIndexCleanup.java      | 17 +++---
 .../org/apache/usergrid/tools/UserManager.java  | 16 ++++++
 .../apache/usergrid/tools/WarehouseExport.java  | 16 +++---
 .../apache/usergrid/tools/WarehouseUpsert.java  | 23 ++++----
 .../usergrid/tools/apidoc/swagger/Api.java      | 17 +++---
 .../tools/apidoc/swagger/ApiListing.java        | 17 +++---
 .../tools/apidoc/swagger/ApiOperation.java      | 17 +++---
 .../tools/apidoc/swagger/ApiOperationError.java | 17 +++---
 .../usergrid/tools/apidoc/swagger/ApiParam.java | 17 +++---
 .../apidoc/swagger/ApiParamAllowableValues.java | 17 +++---
 .../apache/usergrid/tools/bean/AppScore.java    | 16 ++++++
 .../apache/usergrid/tools/bean/ExportOrg.java   | 17 +++---
 .../apache/usergrid/tools/bean/MetricLine.java  | 16 ++++++
 .../apache/usergrid/tools/bean/MetricQuery.java | 16 ++++++
 .../apache/usergrid/tools/bean/MetricSort.java  | 16 ++++++
 .../apache/usergrid/tools/bean/OrgScore.java    | 16 ++++++
 .../src/main/resources/apidoc/applications.yaml | 11 ++++
 .../src/main/resources/apidoc/management.yaml   | 11 ++++
 stack/tools/src/main/resources/log4j.xml        | 16 ++++++
 .../main/resources/toolsApplicationContext.xml  | 16 ++++++
 .../src/main/resources/warehouse-schema.sql     | 18 ++++++-
 stack/websocket/pom.xml                         | 16 ++++++
 .../websocket/WebSocketChannelHandler.java      | 17 +++---
 .../usergrid/websocket/WebSocketKeyStore.java   | 17 +++---
 .../usergrid/websocket/WebSocketServer.java     | 30 +++--------
 .../websocket/WebSocketServerIndexPage.java     | 30 +++--------
 .../WebSocketServerPipelineFactory.java         | 17 +++---
 .../websocket/WebSocketSslContextFactory.java   | 17 +++---
 .../usergrid/websocket/ExampleListener.java     | 17 +++---
 .../websocket/SimpleMessageProducer.java        | 17 +++---
 .../usergrid/websocket/WebSocketServerTest.java | 17 +++---
 .../src/test/resources/test-activemq.xml        | 27 ++++++----
 .../test/resources/testApplicationContext.xml   | 16 ++++++
 918 files changed, 10075 insertions(+), 5285 deletions(-)
----------------------------------------------------------------------