usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [23/23] git commit: Merge 2e35e4901b60388235b9f15701e9b2e5659e879f into 1150e47da5e1094ef26cb051cade57591b925fc6
Date Sun, 19 Jan 2014 10:21:10 GMT
Merge 2e35e4901b60388235b9f15701e9b2e5659e879f into 1150e47da5e1094ef26cb051cade57591b925fc6


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

Branch: refs/pull/30/merge
Commit: 77046b0408cca383852f94b6fb97396477f26669
Parents: 1150e47 2e35e49
Author: Strong Liu <stliu@hibernate.org>
Authored: Sun Jan 19 02:00:25 2014 -0800
Committer: Strong Liu <stliu@hibernate.org>
Committed: Sun Jan 19 02:00:25 2014 -0800

----------------------------------------------------------------------
 .../src/main/java/org/usergrid/batch/Job.java   |   2 +-
 .../java/org/usergrid/batch/JobExecution.java   |   4 +-
 .../org/usergrid/batch/JobExecutionImpl.java    |   5 +-
 .../java/org/usergrid/batch/JobFactory.java     |   4 +-
 .../org/usergrid/batch/UsergridJobFactory.java  |   6 +-
 .../org/usergrid/batch/job/OnlyOnceJob.java     |   4 +-
 .../usergrid/batch/repository/JobAccessor.java  |   4 +-
 .../batch/repository/JobDescriptor.java         |   5 +-
 .../java/org/usergrid/batch/service/App.java    |   3 +-
 .../batch/service/JobSchedulerService.java      |  33 ++--
 .../batch/service/SchedulerService.java         |   4 +-
 .../batch/service/SchedulerServiceImpl.java     |  29 ++-
 .../hazelcast/HazelcastLifecycleMonitor.java    |   8 +-
 .../org/usergrid/count/AbstractBatcher.java     |  12 +-
 .../java/org/usergrid/count/BatchSubmitter.java |   4 +-
 .../usergrid/count/CassandraCounterStore.java   |  20 +--
 .../org/usergrid/count/CassandraSubmitter.java  |  17 +-
 .../java/org/usergrid/count/CounterStore.java   |   4 +-
 .../java/org/usergrid/count/SimpleBatcher.java  |   1 -
 .../org/usergrid/count/Slf4JBatchSubmitter.java |  17 +-
 .../java/org/usergrid/count/common/Count.java   |  14 +-
 .../usergrid/count/common/CountSerDeUtils.java  |   4 +-
 .../main/java/org/usergrid/locking/Lock.java    |   4 +-
 .../java/org/usergrid/locking/LockHelper.java   |   5 +-
 .../java/org/usergrid/locking/LockManager.java  |   4 +-
 .../locking/cassandra/HectorLockImpl.java       |  11 +-
 .../cassandra/HectorLockManagerImpl.java        |   8 +-
 .../org/usergrid/locking/noop/NoOpLockImpl.java |   4 +-
 .../locking/noop/NoOpLockManagerImpl.java       |   4 +-
 .../locking/singlenode/SingleNodeLockImpl.java  |   6 +-
 .../singlenode/SingleNodeLockManagerImpl.java   |  15 +-
 .../zookeeper/ZooKeeperLockManagerImpl.java     |  16 +-
 .../locking/zookeeper/ZookeeperLockImpl.java    |   5 +-
 .../main/java/org/usergrid/mq/CounterQuery.java |  13 +-
 .../src/main/java/org/usergrid/mq/Message.java  |  36 +---
 .../src/main/java/org/usergrid/mq/Query.java    |  35 +---
 .../java/org/usergrid/mq/QueryFilterLexer.java  |  13 +-
 .../java/org/usergrid/mq/QueryFilterParser.java |  37 +---
 .../java/org/usergrid/mq/QueryProcessor.java    |  19 +-
 .../src/main/java/org/usergrid/mq/Queue.java    |  19 +-
 .../main/java/org/usergrid/mq/QueueManager.java |   8 +-
 .../main/java/org/usergrid/mq/QueueQuery.java   |   5 +-
 .../main/java/org/usergrid/mq/QueueResults.java |   9 +-
 .../src/main/java/org/usergrid/mq/QueueSet.java |  11 +-
 .../usergrid/mq/cassandra/CassandraMQUtils.java |  36 ++--
 .../mq/cassandra/MessageIndexUpdate.java        |  20 +--
 .../usergrid/mq/cassandra/QueueIndexUpdate.java |  21 +--
 .../mq/cassandra/QueueManagerFactoryImpl.java   |  10 +-
 .../usergrid/mq/cassandra/QueueManagerImpl.java | 103 +++--------
 .../org/usergrid/mq/cassandra/QueuesCF.java     |   5 +-
 .../mq/cassandra/io/AbstractSearch.java         |  46 ++---
 .../mq/cassandra/io/ConsumerTransaction.java    |  29 ++-
 .../org/usergrid/mq/cassandra/io/EndSearch.java |   5 +-
 .../usergrid/mq/cassandra/io/FilterSearch.java  |  20 +--
 .../mq/cassandra/io/NoTransactionSearch.java    |   7 +-
 .../usergrid/mq/cassandra/io/StartSearch.java   |   5 +-
 .../usergrid/persistence/AbstractEntity.java    |  14 +-
 .../persistence/AggregateCounterSet.java        |   6 +-
 .../org/usergrid/persistence/CounterQuery.java  |  13 +-
 .../usergrid/persistence/CredentialsInfo.java   |  11 +-
 .../org/usergrid/persistence/DynamicEntity.java |   9 +-
 .../java/org/usergrid/persistence/Entity.java   |  16 +-
 .../org/usergrid/persistence/EntityFactory.java |   4 +-
 .../org/usergrid/persistence/EntityManager.java |   8 +-
 .../org/usergrid/persistence/Identifier.java    |  11 +-
 .../java/org/usergrid/persistence/Query.java    |  44 +----
 .../org/usergrid/persistence/QueryUtils.java    |   4 +-
 .../usergrid/persistence/RelationManager.java   |   4 +-
 .../java/org/usergrid/persistence/Results.java  |  19 +-
 .../java/org/usergrid/persistence/Schema.java   | 176 ++++++-------------
 .../persistence/SimpleCollectionRef.java        |   4 +-
 .../org/usergrid/persistence/SimpleRoleRef.java |   4 +-
 .../java/org/usergrid/persistence/Update.java   |   2 +-
 .../persistence/cassandra/ApplicationCF.java    |   4 +-
 .../usergrid/persistence/cassandra/CFEnum.java  |   4 +-
 .../cassandra/CassandraPersistenceUtils.java    |  46 ++---
 .../persistence/cassandra/CassandraService.java |  72 ++------
 .../cassandra/ConnectedEntityRefImpl.java       |   4 +-
 .../cassandra/ConnectionRefImpl.java            |  25 ++-
 .../persistence/cassandra/CounterUtils.java     |  33 ++--
 .../persistence/cassandra/CursorCache.java      |   1 -
 .../cassandra/EntityManagerFactoryImpl.java     |  55 ++----
 .../cassandra/EntityManagerImpl.java            | 149 +++-------------
 .../cassandra/EntityValueSerializer.java        |   6 +-
 .../persistence/cassandra/GeoIndexManager.java  |  22 +--
 .../persistence/cassandra/IndexUpdate.java      |  23 +--
 .../persistence/cassandra/QueryProcessor.java   |  47 +----
 .../cassandra/RelationManagerImpl.java          | 115 +++---------
 .../usergrid/persistence/cassandra/Setup.java   |  19 +-
 .../cassandra/SimpleIndexBucketLocatorImpl.java |   4 +-
 .../cassandra/index/ConnectedIndexScanner.java  |  14 +-
 .../cassandra/index/IndexBucketScanner.java     |  16 +-
 .../index/IndexMultiBucketSetLoader.java        |  16 +-
 .../cassandra/index/IndexScanner.java           |   4 +-
 .../cassandra/index/NoOpIndexScanner.java       |   4 +-
 .../cassandra/util/Slf4jTraceTagReporter.java   |   4 +-
 .../persistence/cassandra/util/TimedOpTag.java  |   5 +-
 .../cassandra/util/TraceTagAspect.java          |   4 +-
 .../cassandra/util/TraceTagManager.java         |   5 +-
 .../usergrid/persistence/entities/Activity.java |  12 +-
 .../persistence/entities/Application.java       |  13 +-
 .../usergrid/persistence/entities/Asset.java    |   9 +-
 .../usergrid/persistence/entities/Device.java   |   9 +-
 .../usergrid/persistence/entities/Event.java    |  13 +-
 .../usergrid/persistence/entities/Folder.java   |   9 +-
 .../usergrid/persistence/entities/Group.java    |  13 +-
 .../usergrid/persistence/entities/JobStat.java  |  11 +-
 .../usergrid/persistence/entities/Message.java  |   9 +-
 .../org/usergrid/persistence/entities/Role.java |  11 +-
 .../org/usergrid/persistence/entities/User.java |  13 +-
 .../persistence/geo/CollectionGeoSearch.java    |  11 +-
 .../persistence/geo/ConnectionGeoSearch.java    |  11 +-
 .../persistence/geo/EntityLocationRef.java      |   5 +-
 .../EntityLocationRefDistanceComparator.java    |   4 +-
 .../persistence/geo/GeoIndexSearcher.java       |  41 ++---
 .../persistence/geo/GeocellManager.java         |   8 +-
 .../usergrid/persistence/geo/GeocellUtils.java  |  12 +-
 .../geo/comparator/DoubleTupleComparator.java   |   4 +-
 .../persistence/query/ir/OrderByNode.java       |   4 +-
 .../persistence/query/ir/QuerySlice.java        |   7 +-
 .../persistence/query/ir/SearchVisitor.java     |  14 +-
 .../persistence/query/ir/SliceNode.java         |   4 +-
 .../query/ir/result/AbstractScanColumn.java     |   8 +-
 .../ir/result/ConnectionIndexSliceParser.java   |   7 +-
 .../query/ir/result/ConnectionRefLoader.java    |   8 +-
 .../ir/result/ConnectionTypesIterator.java      |  13 +-
 .../query/ir/result/EmptyIterator.java          |   4 +-
 .../query/ir/result/EntityRefLoader.java        |   6 +-
 .../query/ir/result/EntityResultsLoader.java    |   4 +-
 .../query/ir/result/GeoIterator.java            |  24 +--
 .../persistence/query/ir/result/IDLoader.java   |   4 +-
 .../query/ir/result/IntersectionIterator.java   |   7 +-
 .../query/ir/result/OrderByIterator.java        |  20 +--
 .../query/ir/result/ResultIterator.java         |   4 +-
 .../query/ir/result/ResultsLoader.java          |   4 +-
 .../ir/result/SecondaryIndexSliceParser.java    |   4 +-
 .../query/ir/result/SliceIterator.java          |  11 +-
 .../query/ir/result/StaticIdIterator.java       |   4 +-
 .../query/ir/result/SubtractionIterator.java    |   7 +-
 .../query/ir/result/UUIDIndexSliceParser.java   |   4 +-
 .../query/ir/result/UnionIterator.java          |  14 +-
 .../persistence/query/tree/BooleanOperand.java  |   5 -
 .../persistence/query/tree/ContainsOperand.java |  16 --
 .../persistence/query/tree/EqualityOperand.java |   4 -
 .../persistence/query/tree/UUIDLiteral.java     |   4 +-
 .../persistence/schema/CollectionInfo.java      |   6 +-
 .../persistence/schema/DictionaryInfo.java      |   1 -
 .../usergrid/persistence/schema/EntityInfo.java |  20 +--
 .../usergrid/system/UsergridSystemMonitor.java  |   7 +-
 .../main/java/org/usergrid/utils/AESUtils.java  |   9 +-
 .../java/org/usergrid/utils/CodecUtils.java     |   4 +-
 .../java/org/usergrid/utils/CompositeUtils.java |   6 +-
 .../org/usergrid/utils/ConversionUtils.java     |  16 +-
 .../main/java/org/usergrid/utils/HttpUtils.java |   6 +-
 .../java/org/usergrid/utils/IndexUtils.java     |  29 ++-
 .../main/java/org/usergrid/utils/JsonUtils.java |  22 +--
 .../main/java/org/usergrid/utils/ListUtils.java |   9 +-
 .../main/java/org/usergrid/utils/MailUtils.java |  18 +-
 .../main/java/org/usergrid/utils/MapUtils.java  |  12 +-
 .../java/org/usergrid/utils/StringUtils.java    |   5 +-
 .../main/java/org/usergrid/utils/UUIDUtils.java |  18 +-
 .../main/java/org/usergrid/utils/Version.java   |   4 +-
 .../src/test/java/org/usergrid/Application.java |   6 +-
 .../org/usergrid/ConcurrentCoreITSuite.java     |  10 +-
 .../usergrid/ConcurrentCoreIteratorITSuite.java |  30 +---
 .../org/usergrid/ConcurrentCoreTestSuite.java   |   6 +-
 .../test/java/org/usergrid/CoreApplication.java |   8 +-
 .../src/test/java/org/usergrid/CoreITSetup.java |   4 +-
 .../test/java/org/usergrid/CoreITSetupImpl.java |   4 +-
 .../src/test/java/org/usergrid/CoreITSuite.java |  10 +-
 .../test/java/org/usergrid/CoreTestSuite.java   |   6 +-
 .../java/org/usergrid/batch/AppArgsTest.java    |   3 +-
 .../batch/BulkJobExecutionUnitTest.java         |   4 +-
 .../java/org/usergrid/batch/BulkTestUtils.java  |   6 +-
 .../batch/ConcurrentSchedulerITSuite.java       |   9 +-
 .../batch/ConcurrentSchedulerTestSuite.java     |   5 +-
 .../org/usergrid/batch/SchedulerITSuite.java    |   9 +-
 .../org/usergrid/batch/SchedulerTestSuite.java  |   5 +-
 .../usergrid/batch/UsergridJobFactoryTest.java  |   6 +-
 .../batch/job/AbstractSchedulerRuntimeIT.java   |   8 +-
 .../usergrid/batch/job/CountdownLatchJob.java   |   6 +-
 .../org/usergrid/batch/job/DelayExecution.java  |   6 +-
 .../org/usergrid/batch/job/DelayHeartbeat.java  |   6 +-
 .../batch/job/FailureJobExceuction.java         |   6 +-
 .../usergrid/batch/job/OnlyOnceExceution.java   |   6 +-
 .../job/OnlyOnceUnlockOnFailExceution.java      |   6 +-
 .../usergrid/batch/job/SchedulerRuntime1IT.java |  10 +-
 .../usergrid/batch/job/SchedulerRuntime2IT.java |  10 +-
 .../usergrid/batch/job/SchedulerRuntime3IT.java |   3 +-
 .../usergrid/batch/job/SchedulerRuntime4IT.java |   3 +-
 .../usergrid/batch/job/SchedulerRuntime5IT.java |   3 +-
 .../usergrid/batch/job/SchedulerRuntime6IT.java |  10 +-
 .../usergrid/batch/job/SchedulerRuntime7IT.java |   3 +-
 .../usergrid/batch/job/SchedulerRuntime8IT.java |   5 +-
 .../org/usergrid/batch/job/TestJobListener.java |   4 +-
 .../usergrid/batch/job/TestJobListenerTest.java |   7 +-
 .../clustering/hazelcast/HazelcastTest.java     |  13 +-
 .../count/BatchCountParallelismTest.java        |  21 +--
 .../org/usergrid/count/SimpleBatcherTest.java   |   1 -
 .../locking/cassandra/HectorLockManagerIT.java  |  12 +-
 .../SingleNodeLockTestSingleNode.java           |  11 +-
 .../zookeeper/AbstractZooKeeperTest.java        |   9 +-
 .../org/usergrid/locking/zookeeper/ZooPut.java  |  13 +-
 .../zookeeper/ZookeeperLockManagerTest.java     |  17 +-
 .../test/java/org/usergrid/mq/MessagesIT.java   |  13 +-
 .../org/usergrid/persistence/CollectionIT.java  |  15 +-
 .../usergrid/persistence/CoreSchemaManager.java |   3 +-
 .../org/usergrid/persistence/CounterIT.java     |  11 +-
 .../persistence/EntityConnectionsIT.java        |  13 +-
 .../persistence/EntityDictionaryIT.java         |  12 +-
 .../usergrid/persistence/EntityManagerIT.java   |  23 +--
 .../org/usergrid/persistence/EntityTest.java    |   8 +-
 .../java/org/usergrid/persistence/GeoIT.java    |   9 +-
 .../java/org/usergrid/persistence/IndexIT.java  |  19 +-
 .../org/usergrid/persistence/PathQueryIT.java   |  10 +-
 .../org/usergrid/persistence/PermissionsIT.java |  12 +-
 .../org/usergrid/persistence/QueryTest.java     |  27 +--
 .../usergrid/persistence/QueryUtilsTest.java    |   6 +-
 .../org/usergrid/persistence/SchemaTest.java    |   5 +-
 .../cassandra/EntityManagerFactoryImplIT.java   |  19 +-
 .../cassandra/QueryProcessorTest.java           |  20 +--
 .../SimpleIndexBucketLocatorImplTest.java       |  15 +-
 .../persistence/entities/SampleEntity.java      |   9 +-
 ...EntityLocationRefDistanceComparatorTest.java |   4 +-
 .../query/AbstractIteratingQueryIT.java         |  11 +-
 .../query/IntersectionUnionPagingIT.java        |   8 +-
 .../query/ir/result/InOrderIterator.java        |  11 +-
 .../ir/result/IntersectionIteratorTest.java     |  12 +-
 .../ir/result/SubtractionIteratorTest.java      |  10 +-
 .../query/ir/result/UnionIteratorTest.java      |  11 +-
 .../persistence/query/tree/GrammarTreeTest.java |  14 +-
 .../system/UsergridSystemMonitorIT.java         |   5 +-
 .../org/usergrid/utils/ConversionUtilsTest.java |   4 +-
 .../java/org/usergrid/utils/IndexUtilsTest.java |  11 +-
 .../java/org/usergrid/utils/JsonUtilsTest.java  |  10 +-
 .../java/org/usergrid/utils/ListUtilsTest.java  |   6 +-
 .../java/org/usergrid/utils/MailUtilsTest.java  |   9 +-
 .../java/org/usergrid/utils/MapUtilsTest.java   |   4 +-
 .../java/org/usergrid/utils/UUIDUtilsTest.java  |  24 +--
 .../main/java/org/usergrid/launcher/App.java    |  20 +--
 .../java/org/usergrid/launcher/AppleUtils.java  |   3 +-
 .../launcher/ClasspathStaticHttpHandler.java    |   9 +-
 .../launcher/CustomJSPTemplateProcessor.java    |   2 +-
 .../org/usergrid/launcher/LauncherFrame.java    |  36 +---
 .../org/usergrid/launcher/LogViewerFrame.java   |  13 +-
 .../main/java/org/usergrid/launcher/Server.java |   1 +
 .../org/usergrid/mongo/MongoChannelHandler.java |   9 +-
 .../org/usergrid/mongo/MongoMessageDecoder.java |  10 +-
 .../java/org/usergrid/mongo/MongoServer.java    |  15 +-
 .../mongo/MongoServerPipelineFactory.java       |   3 +-
 .../usergrid/mongo/commands/ListDatabases.java  |  10 +-
 .../usergrid/mongo/commands/MongoCommand.java   |   4 +-
 .../org/usergrid/mongo/commands/Whatsmyuri.java |   4 +-
 .../org/usergrid/mongo/protocol/Message.java    |  12 +-
 .../org/usergrid/mongo/protocol/OpDelete.java   |  16 +-
 .../org/usergrid/mongo/protocol/OpGetMore.java  |   6 +-
 .../org/usergrid/mongo/protocol/OpInsert.java   |  12 +-
 .../usergrid/mongo/protocol/OpKillCursors.java  |   4 +-
 .../java/org/usergrid/mongo/protocol/OpMsg.java |   4 +-
 .../org/usergrid/mongo/protocol/OpQuery.java    |  28 ++-
 .../org/usergrid/mongo/protocol/OpReply.java    |  12 +-
 .../org/usergrid/mongo/protocol/OpUpdate.java   |  14 +-
 .../usergrid/mongo/query/MongoQueryParser.java  |  29 ++-
 .../testproxy/MongoProxyInboundHandler.java     |  15 +-
 .../mongo/testproxy/MongoProxyServer.java       |  10 +-
 .../org/usergrid/mongo/AbstractMongoTest.java   |  13 +-
 .../java/org/usergrid/mongo/BasicMongoTest.java |  32 +---
 .../org/usergrid/mongo/DatabaseInitializer.java |   6 +-
 .../java/org/usergrid/mongo/MongoQueryTest.java |  20 +--
 stack/pom.xml                                   |   2 +-
 .../query/validator/ApiServerRunner.java        |   5 +-
 .../usergrid/query/validator/QueryRunner.java   |   3 +-
 .../query/validator/QueryValidationTest.java    |   2 +-
 .../usergrid/rest/AbstractContextResource.java  |  25 +--
 .../java/org/usergrid/rest/ApiResponse.java     |  17 +-
 .../rest/JacksonCustomMapperProvider.java       |  10 +-
 .../java/org/usergrid/rest/RootResource.java    |  73 ++++----
 .../java/org/usergrid/rest/SwaggerServlet.java  |  27 +--
 .../java/org/usergrid/rest/SystemResource.java  |  15 +-
 .../org/usergrid/rest/TextToJsonSwapWriter.java |  23 +--
 .../rest/applications/ApplicationResource.java  |  47 ++---
 .../rest/applications/AuthResource.java         |  29 +--
 .../rest/applications/ServiceResource.java      |  64 ++-----
 .../applications/assets/AssetsResource.java     |  32 +---
 .../applications/events/EventsResource.java     |  17 +-
 .../rest/applications/queues/QueueResource.java |  32 ++--
 .../queues/QueueSubscriberResource.java         |  30 +---
 .../queues/QueueSubscriptionResource.java       |  30 +---
 .../queues/QueueTransactionsResource.java       |  20 +--
 .../rest/applications/users/UserResource.java   |  48 ++---
 .../rest/applications/users/UsersResource.java  |  41 ++---
 .../exceptions/AbstractExceptionMapper.java     |   9 +-
 .../AuthorizationExceptionMapper.java           |   4 +-
 ...cateUniquePropertyExistsExceptionMapper.java |   4 +-
 .../EntityNotFoundExceptionMapper.java          |   4 +-
 ...orbiddenServiceOperationExceptionMapper.java |   4 +-
 .../exceptions/JsonReadExceptionMapper.java     |   4 +-
 .../exceptions/JsonWriteExceptionMapper.java    |   4 +-
 .../exceptions/ManagementExceptionMapper.java   |   4 +-
 .../NotImplementedExceptionMapper.java          |   4 +-
 .../exceptions/OAuthProblemExceptionMapper.java |   8 +-
 ...rganizationApplicationNotFoundException.java |   4 +-
 .../exceptions/PersistenceExceptionMapper.java  |   4 +-
 .../exceptions/QueryParseExceptionMapper.java   |   5 +-
 .../exceptions/QueryTokenExceptionMapper.java   |   7 +-
 .../RecentlyUsedPasswordExceptionMapper.java    |   4 +-
 ...RequiredPropertyNotFoundExceptionMapper.java |   4 +-
 .../rest/exceptions/SecurityException.java      |   3 +-
 .../rest/exceptions/ServiceExceptionMapper.java |   4 +-
 .../ServiceResourceNotFoundExceptionMapper.java |   6 +-
 .../TransactionNotFoundExceptionMapper.java     |   4 +-
 .../rest/filters/ContentTypeFilter.java         |  30 +---
 .../rest/filters/JSONPCallbackFilter.java       |   9 +-
 .../usergrid/rest/filters/MeteringFilter.java   |  36 ++--
 .../usergrid/rest/filters/TracingFilter.java    |  13 +-
 .../rest/management/ManagementResource.java     |  48 ++---
 .../management/metrics/MetricsResource.java     |  13 +-
 .../organizations/OrganizationResource.java     |  23 +--
 .../organizations/OrganizationsResource.java    |  31 ++--
 .../applications/ApplicationResource.java       |  28 +--
 .../applications/ApplicationsResource.java      |  33 ++--
 .../organizations/users/UsersResource.java      |  39 ++--
 .../rest/management/users/UserResource.java     |  31 ++--
 .../rest/management/users/UsersResource.java    |  38 ++--
 .../organizations/OrganizationsResource.java    |  33 ++--
 .../organizations/OrganizationResource.java     |  33 ++--
 .../rest/security/CrossOriginRequestFilter.java |   7 +-
 .../security/SecuredResourceFilterFactory.java  |  29 ++-
 .../security/shiro/RestSecurityManager.java     |   9 +-
 .../ShiroAuthenticationExceptionMapper.java     |  11 +-
 .../shiro/filters/BasicAuthSecurityFilter.java  |  13 +-
 .../ClientCredentialsSecurityFilter.java        |  10 +-
 .../OAuth2AccessTokenSecurityFilter.java        |  27 ++-
 .../security/shiro/filters/SecurityFilter.java  |  23 ++-
 .../session/HttpRequestSessionManager.java      |   6 +-
 .../session/HttpServletRequestSession.java      |  11 +-
 .../usergrid/rest/test/PropertiesResource.java  |  21 ++-
 .../java/org/usergrid/rest/utils/CORSUtils.java |   7 +-
 .../org/usergrid/rest/utils/JSONPUtils.java     |  19 +-
 .../org/usergrid/rest/utils/PathingUtils.java   |   2 +-
 .../java/org/usergrid/rest/AbstractRestIT.java  |  36 ++--
 .../test/java/org/usergrid/rest/BasicIT.java    |  16 +-
 .../usergrid/rest/ConcurrentRestITSuite.java    |   7 +-
 .../org/usergrid/rest/DatabaseInitializer.java  |   6 +-
 .../test/java/org/usergrid/rest/ITSetup.java    |   9 +-
 .../java/org/usergrid/rest/RestITSuite.java     |   7 +-
 .../org/usergrid/rest/TestContextSetup.java     |   3 +-
 .../java/org/usergrid/rest/TomcatResource.java  |  10 +-
 .../ApplicationRequestCounterIT.java            |  13 +-
 .../applications/ApplicationResourceIT.java     |  21 +--
 .../rest/applications/DevicesResourceIT.java    |  13 +-
 .../applications/assets/AssetResourceIT.java    |  17 +-
 .../collection/BadGrammarQueryTest.java         |   9 +-
 .../collection/BrowserCompatibilityTest.java    |   6 +-
 .../collection/PagingResourceIT.java            |  13 +-
 .../collection/activities/AndOrQueryTest.java   |  13 +-
 .../collection/activities/OrderByTest.java      |  10 +-
 .../activities/PagingEntitiesTest.java          |   7 +-
 .../collection/activities/PutTest.java          |   6 +-
 .../collection/groups/GeoPagingTest.java        |   6 +-
 .../collection/groups/UpdateGroupIT.java        |  20 +--
 .../applications/events/EventsResourceIT.java   |   9 +-
 .../queues/AbstractQueueResourceIT.java         |  20 +--
 .../queues/QueueResourceLong1IT.java            |   9 +-
 .../queues/QueueResourceLong2IT.java            |  15 +-
 .../queues/QueueResourceLong3IT.java            |  14 +-
 .../queues/QueueResourceShortIT.java            |  23 ++-
 .../users/CollectionsResourceIT.java            |  16 +-
 .../users/ConnectionResourceTest.java           |  15 +-
 .../applications/users/GroupResourceIT.java     |  12 +-
 .../applications/users/OwnershipResourceIT.java |   6 +-
 .../users/PermissionsResourceIT.java            |  21 +--
 .../applications/users/RetrieveUsersTest.java   |   6 +-
 .../rest/applications/users/UserResourceIT.java |  22 +--
 .../users/extensions/TestResource.java          |   8 +-
 .../rest/applications/utils/TestUtils.java      |   4 +-
 .../rest/applications/utils/UserRepo.java       |  12 +-
 .../rest/filters/ContentTypeResourceIT.java     |  37 ++--
 .../rest/management/ManagementResourceIT.java   |  22 +--
 .../rest/management/RegistrationIT.java         |  50 ++----
 .../organizations/OrganizationResourceIT.java   |  10 +-
 .../organizations/OrganizationsResourceIT.java  |  34 ++--
 .../rest/management/users/MUUserResourceIT.java |  45 ++---
 .../UsersOrganizationsResourceIT.java           |   7 +-
 .../rest/test/PropertiesResourceIT.java         |   9 +-
 .../usergrid/rest/test/resource/Connection.java |   4 +-
 .../rest/test/resource/EntityResource.java      |   9 +-
 .../rest/test/resource/NamedResource.java       |  12 +-
 .../rest/test/resource/SetResource.java         |   4 +-
 .../rest/test/resource/TestContext.java         |   5 +-
 .../rest/test/resource/ValueResource.java       |   7 +-
 .../rest/test/resource/app/Application.java     |   4 +-
 .../usergrid/rest/test/resource/app/Device.java |   4 +-
 .../usergrid/rest/test/resource/app/User.java   |   4 +-
 .../rest/test/resource/app/UsersCollection.java |   6 +-
 .../rest/test/resource/app/queue/Queue.java     |   7 +-
 .../test/resource/app/queue/Transaction.java    |   3 +-
 .../rest/test/resource/mgmt/Application.java    |   4 +-
 .../resource/mgmt/ApplicationsCollection.java   |   4 +-
 .../rest/test/resource/mgmt/Management.java     |   7 +-
 .../rest/test/resource/mgmt/Organization.java   |   4 +-
 .../resource/mgmt/OrganizationsCollection.java  |   4 +-
 .../usergrid/rest/test/security/TestUser.java   |   4 +-
 .../usergrid/management/ActivationState.java    |   2 +-
 .../usergrid/management/ApplicationInfo.java    |   6 +-
 .../usergrid/management/ManagementService.java  |   9 +-
 .../usergrid/management/OrganizationInfo.java   |   6 +-
 .../java/org/usergrid/management/UserInfo.java  |  15 +-
 .../cassandra/AccountCreationPropsImpl.java     |   7 +-
 .../cassandra/ApplicationCreatorImpl.java       |   7 +-
 .../cassandra/ManagementServiceImpl.java        | 140 +++------------
 .../usergrid/security/AuthPrincipalType.java    |   6 +-
 .../security/crypto/EncryptionService.java      |   4 +-
 .../security/crypto/EncryptionServiceImpl.java  |  15 +-
 .../security/crypto/command/BcryptCommand.java  |   6 +-
 .../crypto/command/EncryptionCommand.java       |   4 +-
 .../security/crypto/command/Md5HashCommand.java |   5 +-
 .../crypto/command/PlainTextCommand.java        |   4 +-
 .../crypto/command/SaltedHasherCommand.java     |   6 +-
 .../crypto/command/Sha1HashCommand.java         |   6 +-
 .../org/usergrid/security/oauth/AccessInfo.java |   9 +-
 .../security/oauth/ClientCredentialsInfo.java   |   4 +-
 .../security/providers/AbstractProvider.java    |   9 +-
 .../security/providers/FacebookProvider.java    |   9 +-
 .../security/providers/FoursquareProvider.java  |  22 ++-
 .../providers/PingIdentityProvider.java         |  15 +-
 .../security/providers/SignInAsProvider.java    |   4 +-
 .../security/shiro/CustomPermission.java        |  16 +-
 .../shiro/PrincipalCredentialsToken.java        |  19 +-
 .../java/org/usergrid/security/shiro/Realm.java |  72 +++-----
 .../principals/ApplicationGuestPrincipal.java   |   4 +-
 .../shiro/principals/ApplicationPrincipal.java  |   4 +-
 .../principals/ApplicationUserPrincipal.java    |   4 +-
 .../shiro/principals/OrganizationPrincipal.java |   4 +-
 .../shiro/principals/UserPrincipal.java         |   4 +-
 .../security/shiro/utils/SubjectUtils.java      |  29 ++-
 .../org/usergrid/security/tokens/TokenInfo.java |   4 +-
 .../usergrid/security/tokens/TokenService.java  |   4 +-
 .../tokens/cassandra/TokenServiceImpl.java      |  61 +++----
 .../services/AbstractCollectionService.java     |  14 +-
 .../services/AbstractConnectionsService.java    |  16 +-
 .../AbstractPathBasedColllectionService.java    |  10 +-
 .../org/usergrid/services/AbstractService.java  |  20 +--
 .../java/org/usergrid/services/Service.java     |   4 +-
 .../org/usergrid/services/ServiceAction.java    |   2 +-
 .../org/usergrid/services/ServiceContext.java   |   8 +-
 .../java/org/usergrid/services/ServiceInfo.java |  19 +-
 .../org/usergrid/services/ServiceManager.java   |  25 +--
 .../services/ServiceManagerFactory.java         |   8 +-
 .../org/usergrid/services/ServiceParameter.java |  15 +-
 .../org/usergrid/services/ServicePayload.java   |  12 +-
 .../org/usergrid/services/ServiceRequest.java   |  19 +-
 .../org/usergrid/services/ServiceResults.java   |  12 +-
 .../applications/ApplicationsService.java       |  20 +--
 .../usergrid/services/assets/AssetsService.java |   4 +-
 .../services/assets/data/AssetMimeHandler.java  |  18 +-
 .../services/assets/data/AssetUtils.java        |  16 +-
 .../services/assets/data/BinaryStore.java       |   4 +-
 .../assets/data/LocalFileBinaryStore.java       |   7 +-
 .../services/assets/data/S3BinaryStore.java     |  30 ++--
 .../services/devices/DevicesService.java        |   4 +-
 .../usergrid/services/groups/GroupsService.java |  11 +-
 .../groups/activities/ActivitiesService.java    |   6 +-
 .../users/activities/ActivitiesService.java     |   6 +-
 .../usergrid/services/roles/RolesService.java   |   8 +-
 .../services/roles/users/UsersService.java      |   4 +-
 .../usergrid/services/users/UsersService.java   |  22 +--
 .../users/activities/ActivitiesService.java     |  10 +-
 .../services/users/roles/RolesService.java      |   4 +-
 .../org/usergrid/ConcurrentServiceITSuite.java  |  11 +-
 .../java/org/usergrid/ServiceApplication.java   |  10 +-
 .../test/java/org/usergrid/ServiceITSetup.java  |   4 +-
 .../java/org/usergrid/ServiceITSetupImpl.java   |   4 +-
 .../test/java/org/usergrid/ServiceITSuite.java  |  11 +-
 .../org/usergrid/management/EmailFlowIT.java    |  48 +----
 .../management/ManagementTestHelper.java        |   4 +-
 .../org/usergrid/management/MockImapClient.java |  13 +-
 .../org/usergrid/management/OrganizationIT.java |  15 +-
 .../java/org/usergrid/management/RoleIT.java    |   9 +-
 .../cassandra/ApplicationCreatorIT.java         |   8 +-
 .../cassandra/ManagementServiceIT.java          |  17 +-
 .../cassandra/ManagementTestHelperImpl.java     |   4 +-
 .../usergrid/security/CustomResolverTest.java   |  19 +-
 .../crypto/EncryptionServiceImplTest.java       |   8 +-
 .../crypto/command/BcryptCommandTest.java       |  11 +-
 .../crypto/command/Md5HashCommandTest.java      |   5 +-
 .../crypto/command/Sha1HashCommandTest.java     |   6 +-
 .../security/providers/FacebookProviderIT.java  |  12 +-
 .../providers/PingIdentityProviderIT.java       |  12 +-
 .../security/tokens/TokenServiceIT.java         |  11 +-
 .../usergrid/services/CollectionServiceIT.java  |   4 +-
 .../usergrid/services/ConnectionsServiceIT.java |   8 +-
 .../org/usergrid/services/RolesServiceIT.java   |  14 +-
 .../org/usergrid/services/ServiceFactoryIT.java |   5 +-
 .../org/usergrid/services/ServiceInfoTest.java  |   4 +-
 .../usergrid/services/ServiceInvocationIT.java  |   8 +-
 .../org/usergrid/services/ServiceRequestIT.java |   8 +-
 .../services/assets/data/AssetUtilsTest.java    |   4 +-
 .../org/usergrid/NoExitSecurityManager.java     |   6 +-
 .../usergrid/cassandra/AvailablePortFinder.java |   8 +-
 .../usergrid/cassandra/CassandraResource.java   |  43 ++---
 .../usergrid/cassandra/ClearShiroSubject.java   |   7 +-
 .../cassandra/ConcurrentJunitRunner.java        |  15 +-
 .../org/usergrid/cassandra/ConcurrentSuite.java |  19 +-
 .../cassandra/CassandraResourceTest.java        |   4 +-
 .../main/java/org/usergrid/tools/ApiDoc.java    |  30 ++--
 .../main/java/org/usergrid/tools/AppAudit.java  |  35 ++--
 .../java/org/usergrid/tools/AppNameFix.java     |  13 +-
 .../src/main/java/org/usergrid/tools/Cli.java   |  30 ++--
 .../main/java/org/usergrid/tools/Command.java   |   7 +-
 .../java/org/usergrid/tools/CredExport.java     |  11 +-
 .../java/org/usergrid/tools/DupAdminRepair.java |  29 +--
 .../java/org/usergrid/tools/DupOrgRepair.java   |  30 ++--
 .../java/org/usergrid/tools/EntityCleanup.java  |  26 ++-
 .../usergrid/tools/EntityInsertBenchMark.java   |  32 ++--
 .../org/usergrid/tools/EntityReadBenchMark.java |  41 ++---
 .../java/org/usergrid/tools/EntityUpdate.java   |  24 +--
 .../main/java/org/usergrid/tools/Export.java    |  24 +--
 .../org/usergrid/tools/ExportDataCreator.java   |   4 +-
 .../org/usergrid/tools/ExportingToolBase.java   |  17 +-
 .../main/java/org/usergrid/tools/Import.java    |  21 +--
 .../main/java/org/usergrid/tools/ImportFB.java  |  17 +-
 .../java/org/usergrid/tools/IndexRebuild.java   |  20 +--
 .../main/java/org/usergrid/tools/Metrics.java   |  29 ++-
 .../org/usergrid/tools/OrganizationExport.java  |  20 +--
 .../java/org/usergrid/tools/PopulateSample.java |  15 +-
 .../java/org/usergrid/tools/ResetSuperUser.java |  17 +-
 .../main/java/org/usergrid/tools/SetupDB.java   |   5 +-
 .../src/main/java/org/usergrid/tools/Test.java  |   5 +-
 .../main/java/org/usergrid/tools/ToolBase.java  |  17 +-
 .../org/usergrid/tools/UniqueIndexCleanup.java  |  40 ++---
 .../java/org/usergrid/tools/UserManager.java    |   3 +-
 .../org/usergrid/tools/WarehouseExport.java     |  57 ++----
 .../org/usergrid/tools/WarehouseUpsert.java     |  11 +-
 .../org/usergrid/tools/apidoc/swagger/Api.java  |   4 +-
 .../tools/apidoc/swagger/ApiListing.java        |  13 +-
 .../tools/apidoc/swagger/ApiOperation.java      |   4 +-
 .../apidoc/swagger/ApiParamAllowableValues.java |   4 +-
 .../java/org/usergrid/tools/bean/ExportOrg.java |   4 +-
 .../org/usergrid/tools/bean/MetricLine.java     |   9 +-
 .../org/usergrid/tools/bean/MetricQuery.java    |  12 +-
 .../websocket/WebSocketChannelHandler.java      |  44 +----
 .../org/usergrid/websocket/WebSocketServer.java |  13 +-
 .../WebSocketServerPipelineFactory.java         |   5 +-
 .../websocket/WebSocketSslContextFactory.java   |   5 +-
 .../websocket/SimpleMessageProducer.java        |  13 +-
 546 files changed, 2647 insertions(+), 5082 deletions(-)
----------------------------------------------------------------------



Mime
View raw message