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 2016/12/08 16:40:51 UTC
[4/6] usergrid git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/usergrid
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/09f7231f
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/09f7231f
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/09f7231f
Branch: refs/heads/master
Commit: 09f7231fc169ef84eea1b99b5787a55e5c9944fa
Parents: 65303a6 a616075
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Oct 25 17:27:50 2015 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Oct 25 17:27:50 2015 -0400
----------------------------------------------------------------------
stack/Coverage.md | 36 ++
.../main/resources/usergrid-default.properties | 6 +
stack/core/pom.xml | 11 +-
.../usergrid/corepersistence/CoreModule.java | 2 +
.../corepersistence/CpEntityManager.java | 53 +-
.../corepersistence/CpEntityManagerFactory.java | 3 +-
.../corepersistence/CpRelationManager.java | 22 +-
.../asyncevents/AmazonAsyncEventService.java | 440 +++++++++----
.../asyncevents/AsyncEventService.java | 1 +
.../asyncevents/AsyncIndexProvider.java | 22 +-
.../asyncevents/EventBuilderImpl.java | 13 +-
.../asyncevents/InMemoryAsyncEventService.java | 148 -----
.../asyncevents/model/AsyncEvent.java | 22 +-
.../asyncevents/model/EdgeDeleteEvent.java | 6 +-
.../asyncevents/model/EdgeIndexEvent.java | 9 +-
.../model/ElasticsearchIndexEvent.java | 51 ++
.../asyncevents/model/EntityDeleteEvent.java | 8 +-
.../asyncevents/model/EntityIndexEvent.java | 6 +-
.../model/InitializeApplicationIndexEvent.java | 4 +-
.../index/IndexProcessorFig.java | 42 +-
.../corepersistence/index/IndexServiceImpl.java | 12 +-
.../index/ReIndexServiceImpl.java | 2 +-
.../migration/DeDupConnectionDataMigration.java | 2 +-
.../read/search/CandidateEntityFilter.java | 3 +-
.../pipeline/read/search/CandidateIdFilter.java | 2 +-
.../util/ObjectJsonSerializer.java | 92 +++
.../usergrid/persistence/EntityManager.java | 5 +-
.../persistence/EntityManagerFactory.java | 4 +-
.../org/apache/usergrid/CoreApplication.java | 11 +-
.../corepersistence/StaleIndexCleanupTest.java | 42 +-
.../index/AmazonAsyncEventServiceTest.java | 10 +-
.../index/AsyncIndexServiceTest.java | 2 +-
.../index/InMemoryAsycIndexServiceTest.java | 68 --
.../corepersistence/index/PublishRxTest.java | 95 ---
.../usergrid/corepersistence/index/RxTest.java | 108 ++++
.../persistence/ApplicationServiceIT.java | 9 +-
.../query/IntersectionTransitivePagingIT.java | 1 +
.../persistence/query/IteratingQueryIT.java | 5 +-
stack/corepersistence/cache/pom.xml | 69 ++
.../persistence/cache/CacheFactory.java | 27 +
.../usergrid/persistence/cache/CacheScope.java | 38 ++
.../usergrid/persistence/cache/ScopedCache.java | 39 ++
.../persistence/cache/guice/CacheModule.java | 51 ++
.../cache/impl/CacheFactoryImpl.java | 61 ++
.../persistence/cache/impl/ScopedCacheImpl.java | 57 ++
.../cache/impl/ScopedCacheSerialization.java | 37 ++
.../impl/ScopedCacheSerializationImpl.java | 310 +++++++++
.../persistence/cache/CacheTestModule.java | 48 ++
.../persistence/cache/ScopedCacheTest.java | 173 +++++
stack/corepersistence/collection/pom.xml | 63 +-
.../cache/CachedEntityCollectionManager.java | 147 -----
.../EntityCollectionManagerFactoryImpl.java | 6 -
stack/corepersistence/common/pom.xml | 16 +
.../core/astyanax/CassandraConfig.java | 8 +-
.../core/astyanax/CassandraConfigImpl.java | 1 +
.../persistence/core/astyanax/CassandraFig.java | 6 +-
.../core/rx/ExceptionBehaviorTest.java | 197 ++++++
stack/corepersistence/graph/pom.xml | 87 +--
stack/corepersistence/map/pom.xml | 16 +
.../usergrid/persistence/map/MapManager.java | 25 +-
.../persistence/map/impl/MapManagerImpl.java | 6 +
.../persistence/map/impl/MapSerialization.java | 27 +-
.../map/impl/MapSerializationImpl.java | 244 ++++----
.../persistence/map/guice/TestMapModule.java | 18 +
stack/corepersistence/model/pom.xml | 16 +
stack/corepersistence/pom.xml | 88 ++-
stack/corepersistence/queryindex/pom.xml | 33 +-
.../usergrid/persistence/index/EntityIndex.java | 20 +-
.../usergrid/persistence/index/IndexFig.java | 3 +
.../persistence/index/IndexRefreshCommand.java | 50 --
.../persistence/index/guice/IndexModule.java | 1 -
.../index/impl/DeIndexOperation.java | 4 +
.../index/impl/EsEntityIndexFactoryImpl.java | 6 +-
.../index/impl/EsEntityIndexImpl.java | 38 +-
.../index/impl/EsIndexProducerImpl.java | 28 +-
.../persistence/index/impl/IndexOperation.java | 4 +
.../index/impl/IndexOperationMessage.java | 5 +
.../index/impl/IndexRefreshCommandImpl.java | 202 ------
.../EsIndexMappingMigrationPlugin.java | 2 +-
.../persistence/index/impl/EntityIndexTest.java | 2 +-
stack/corepersistence/queue/pom.xml | 16 +
.../persistence/queue/DefaultQueueManager.java | 80 ---
.../persistence/queue/LocalQueueManager.java | 108 ++++
.../usergrid/persistence/queue/QueueFig.java | 14 +-
.../persistence/queue/QueueManager.java | 10 +-
.../persistence/queue/QueueMessage.java | 10 +
.../persistence/queue/guice/QueueModule.java | 1 -
.../queue/impl/QueueManagerFactoryImpl.java | 4 +-
.../queue/impl/SNSQueueManagerImpl.java | 625 +++++++++++--------
.../queue/impl/SQSQueueManagerImpl.java | 351 -----------
.../queue/util/AmazonNotificationUtils.java | 3 +
.../persistence/queue/QueueManagerTest.java | 10 +-
.../runAuditVerifyCollectionEntities.sh | 11 +-
stack/loadtests/runDeleteEntities.sh | 13 +-
stack/loadtests/runLoadEntitiesUnlimited.sh | 103 +++
.../datagenerators/FeederGenerator.scala | 9 +-
.../usergrid/enums/ConfigProperties.scala | 15 +-
.../apache/usergrid/helpers/Extractors.scala | 24 +-
.../org/apache/usergrid/helpers/Headers.scala | 7 +
.../usergrid/scenarios/AuditScenarios.scala | 121 +++-
.../scenarios/EntityCollectionScenarios.scala | 38 +-
.../org/apache/usergrid/settings/Settings.scala | 150 ++++-
stack/loadtests/testConfig.sh | 3 +
stack/pom.xml | 103 ++-
stack/rest/pom.xml | 8 +-
.../applications/ApplicationsResource.java | 2 +
.../security/SecuredResourceFilterFactory.java | 1 +
.../rest/system/ApplicationsResource.java | 28 +-
.../main/resources/usergrid-rest-context.xml | 2 -
.../applications/ApplicationResourceIT.java | 1 -
.../users/ConnectionResourceTest.java | 42 +-
.../collection/users/PermissionsResourceIT.java | 65 +-
.../rest/test/resource/ClientSetup.java | 3 -
stack/rest/src/test/resources/log4j.properties | 9 +-
stack/rest_integration_tests/README.md | 19 -
stack/rest_integration_tests/config/default.js | 38 --
stack/rest_integration_tests/config/index.js | 25 -
stack/rest_integration_tests/index.js | 20 -
stack/rest_integration_tests/lib/connections.js | 137 ----
stack/rest_integration_tests/lib/entities.js | 166 -----
.../rest_integration_tests/lib/notifications.js | 68 --
stack/rest_integration_tests/lib/random.js | 74 ---
stack/rest_integration_tests/lib/response.js | 30 -
stack/rest_integration_tests/lib/token.js | 49 --
stack/rest_integration_tests/lib/urls.js | 37 --
stack/rest_integration_tests/lib/users.js | 82 ---
stack/rest_integration_tests/package.json | 18 -
.../test/authentication/management.js | 38 --
.../test/authentication/org.js | 37 --
.../test/authentication/resetPassword.js | 78 ---
.../test/authentication/user.js | 40 --
.../test/connections/create.js | 49 --
.../test/connections/delete.js | 77 ---
.../test/connections/get.js | 82 ---
.../test/entities/create.js | 60 --
.../test/entities/deleteAll.js | 37 --
.../rest_integration_tests/test/entities/get.js | 51 --
.../test/entities/update.js | 43 --
stack/rest_integration_tests/test/main.js | 72 ---
stack/rest_integration_tests/test/mocha.opts | 3 -
.../test/notifications/create.js | 36 --
.../test/queries/comparison.js | 58 --
.../test/queries/contains.js | 116 ----
.../test/queries/equals.js | 54 --
.../test/queries/location.js | 42 --
.../test/queries/order.js | 82 ---
stack/rest_integration_tests/test/setup.js | 103 ---
stack/rest_integration_tests/test/teardown.js | 65 --
.../rest_integration_tests/test/users/create.js | 45 --
stack/services/pom.xml | 4 +-
.../management/AppInfoMigrationPlugin.java | 2 +-
.../usergrid/management/ApplicationInfo.java | 6 +-
.../apache/usergrid/management/UserInfo.java | 25 +-
.../cassandra/ManagementServiceImpl.java | 13 +-
.../security/oauth/ClientCredentialsInfo.java | 6 +-
.../apache/usergrid/security/shiro/Realm.java | 444 ++-----------
.../usergrid/security/shiro/ShiroCache.java | 171 +++++
.../security/shiro/ShiroCacheManager.java | 114 ++++
.../shiro/UsergridAuthenticationInfo.java | 283 +++++++++
.../shiro/UsergridAuthorizationInfo.java | 103 +++
.../AbstractAccessTokenCredentials.java | 9 +-
.../credentials/AbstractClientCredentials.java | 5 +
.../shiro/credentials/AdminUserAccessToken.java | 2 +
.../credentials/ApplicationUserAccessToken.java | 3 +
.../OrganizationClientCredentials.java | 5 +
.../shiro/principals/AdminUserPrincipal.java | 143 ++++-
.../principals/ApplicationGuestPrincipal.java | 65 +-
.../shiro/principals/ApplicationPrincipal.java | 39 +-
.../principals/ApplicationUserPrincipal.java | 133 ++++
.../shiro/principals/OrganizationPrincipal.java | 61 +-
.../shiro/principals/PrincipalIdentifier.java | 88 +++
.../shiro/principals/UserPrincipal.java | 6 +-
.../security/shiro/utils/SubjectUtils.java | 13 +-
.../services/AbstractConnectionsService.java | 5 +-
.../usergrid/services/AbstractService.java | 4 +
.../usergrid/services/groups/GroupsService.java | 10 +
.../services/guice/ServiceModuleImpl.java | 51 +-
.../services/notifications/QueueListener.java | 2 +-
.../services/queues/ImportQueueManager.java | 14 +-
.../usergrid/services/queues/QueueListener.java | 3 +-
.../usergrid/services/roles/RolesService.java | 8 +-
.../usergrid/services/users/UsersService.java | 7 +
.../services/users/roles/RolesService.java | 10 +
.../resources/usergrid-services-context.xml | 11 +-
.../org/apache/usergrid/ServiceApplication.java | 2 +
.../org/apache/usergrid/management/RoleIT.java | 7 +-
.../apns/NotificationsServiceIT.java | 4 +-
.../gcm/NotificationsServiceIT.java | 2 -
.../resources/usergrid-custom-test.properties | 3 +
stack/test-utils/pom.xml | 10 +-
stack/tools/pom.xml | 2 +-
stack/websocket/pom.xml | 2 +-
website/content/community/index.html | 2 +-
website/content/img/mike_d.JPG | Bin 36443 -> 0 bytes
website/content/img/miked.jpg | Bin 0 -> 36443 bytes
195 files changed, 4977 insertions(+), 4603 deletions(-)
----------------------------------------------------------------------