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/337c94c5 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/337c94c5 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/337c94c5 Branch: refs/heads/master Commit: 337c94c58368cb949ed1c6aa2613386111d0a8b4 Parents: 3737356 886e837 Author: Dave Johnson <[email protected]> Authored: Mon May 23 10:05:34 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Mon May 23 10:05:34 2016 -0400 ---------------------------------------------------------------------- UsergridSDK.podspec | 18 + content/docs/README.html | 8 +- .../file-storage-configuration.html | 8 +- content/docs/assets-and-files/folders.html | 8 +- .../assets-and-files/legacy-asset-support.html | 8 +- .../assets-and-files/retrieving-assets.html | 8 +- .../docs/assets-and-files/uploading-assets.html | 8 +- .../creating-and-incrementing-counters.html | 8 +- .../events-and-counters.html | 8 +- .../retrieving-counters.html | 8 +- .../docs/data-queries/advanced-query-usage.html | 8 +- .../docs/data-queries/operators-and-types.html | 8 +- content/docs/data-queries/query-parameters.html | 8 +- .../docs/data-queries/querying-your-data.html | 8 +- content/docs/data-storage/collections.html | 8 +- content/docs/data-storage/data-store-dbms.html | 8 +- content/docs/data-storage/entities.html | 8 +- .../docs/data-storage/optimizing-access.html | 8 +- .../entity-connections/connecting-entities.html | 8 +- .../disconnecting-entities.html | 8 +- .../entity-connections/retrieving-entities.html | 8 +- content/docs/genindex.html | 8 +- content/docs/geolocation/geolocation.html | 8 +- content/docs/index.html | 8 +- content/docs/installation/deployment-guide.html | 8 +- .../docs/installation/ug1-deploy-to-tomcat.html | 8 +- .../installation/ug1-launcher-quick-start.html | 8 +- .../docs/installation/ug2-deploy-to-tomcat.html | 8 +- content/docs/introduction/async-vs-sync.html | 8 +- content/docs/introduction/data-model.html | 8 +- content/docs/introduction/overview.html | 8 +- .../docs/introduction/usergrid-features.html | 8 +- content/docs/jersey2skeleton/README.html | 8 +- content/docs/objects.inv | Bin 686 -> 686 bytes content/docs/orgs-and-apps/admin-user.html | 8 +- content/docs/orgs-and-apps/application.html | 8 +- content/docs/orgs-and-apps/managing.html | 8 +- content/docs/orgs-and-apps/organization.html | 8 +- .../push-notifications/adding-push-support.html | 8 +- .../creating-and-managing-notifications.html | 8 +- .../push-notifications/creating-notifiers.html | 8 +- .../push-notifications/getting-started.html | 8 +- .../managing-users-and-devices.html | 8 +- content/docs/push-notifications/overview.html | 8 +- .../docs/push-notifications/registering.html | 8 +- content/docs/push-notifications/tbd.html | 8 +- .../push-notifications/troubleshooting.html | 8 +- content/docs/push-notifications/tutorial.html | 8 +- .../docs/push-notifications/users-devices.html | 8 +- content/docs/reference/contribute-code.html | 8 +- content/docs/reference/presos-and-videos.html | 8 +- content/docs/rest-endpoints/api-docs.html | 8 +- content/docs/sdks/ios-new.html | 8 +- content/docs/sdks/sdk-outline.html | 8 +- content/docs/sdks/tbd.html | 8 +- content/docs/search.html | 8 +- .../docs/security-and-auth/app-security.html | 8 +- .../authenticating-api-requests.html | 8 +- ...nticating-users-and-application-clients.html | 8 +- .../changing-token-time-live-ttl.html | 8 +- .../docs/security-and-auth/facebook-sign.html | 8 +- .../revoking-tokens-logout.html | 8 +- .../security-and-auth/securing-your-app.html | 8 +- .../user-authentication-types.html | 8 +- .../security-and-auth/using-permissions.html | 8 +- content/docs/security-and-auth/using-roles.html | 8 +- content/docs/user-management/activity.html | 8 +- content/docs/user-management/group.html | 8 +- content/docs/user-management/groups.html | 8 +- .../docs/user-management/messagee-example.html | 8 +- .../docs/user-management/user-connections.html | 8 +- .../docs/user-management/user-management.html | 8 +- .../docs/user-management/working-user-data.html | 8 +- .../creating-a-new-application.html | 8 +- .../docs/using-usergrid/creating-account.html | 8 +- .../using-usergrid/using-a-sandbox-app.html | 8 +- content/docs/using-usergrid/using-the-api.html | 8 +- docs/conf.py | 4 +- sdks/java/README.md | 598 +++++- sdks/java/pom.xml | 73 +- .../org/apache/usergrid/java/client/Client.java | 1292 ------------- .../apache/usergrid/java/client/Usergrid.java | 285 +++ .../usergrid/java/client/UsergridClient.java | 427 +++++ .../java/client/UsergridClientConfig.java | 60 + .../usergrid/java/client/UsergridEnums.java | 170 ++ .../usergrid/java/client/UsergridRequest.java | 205 +++ .../java/client/UsergridRequestManager.java | 86 + .../java/client/auth/UsergridAppAuth.java | 55 + .../usergrid/java/client/auth/UsergridAuth.java | 75 + .../java/client/auth/UsergridUserAuth.java | 56 + .../usergrid/java/client/entities/Activity.java | 625 ------- .../usergrid/java/client/entities/Device.java | 68 - .../usergrid/java/client/entities/Entity.java | 191 -- .../usergrid/java/client/entities/Group.java | 79 - .../usergrid/java/client/entities/Message.java | 148 -- .../usergrid/java/client/entities/User.java | 158 -- .../java/client/exception/ClientException.java | 41 - .../client/exception/UsergridException.java | 50 + .../java/client/model/UsergridDevice.java | 60 + .../java/client/model/UsergridEntity.java | 487 +++++ .../java/client/model/UsergridUser.java | 198 ++ .../java/client/query/UsergridQuery.java | 434 +++++ .../java/client/response/AggregateCounter.java | 52 - .../client/response/AggregateCounterSet.java | 111 -- .../java/client/response/ApiResponse.java | 421 ----- .../client/response/ClientCredentialsInfo.java | 58 - .../java/client/response/QueueInfo.java | 44 - .../java/client/response/UsergridResponse.java | 230 +++ .../client/response/UsergridResponseError.java | 98 + .../usergrid/java/client/utils/JsonUtils.java | 262 ++- .../usergrid/java/client/utils/MapUtils.java | 27 +- .../usergrid/java/client/utils/ObjectUtils.java | 28 +- .../usergrid/java/client/utils/UrlUtils.java | 124 -- .../utils/UsergridEntityDeserializer.java | 41 + .../client/ClientAuthFallBackTestCase.java | 72 + .../usergrid/client/ClientAuthTestCase.java | 85 + .../client/ClientConnectionsTestCase.java | 171 ++ .../usergrid/client/ClientRestTestCase.java | 90 + .../apache/usergrid/client/EntityTestCase.java | 676 +++++++ .../apache/usergrid/client/QueryTestCase.java | 194 ++ .../usergrid/client/SDKTestConfiguration.java | 38 + .../apache/usergrid/client/SDKTestUtils.java | 108 ++ .../client/UsergridClientAuthTestCase.java | 73 + .../usergrid/client/UsergridInitTestCase.java | 48 + .../client/UsergridResponseErrorTestCase.java | 62 + .../client/UsergridResponseTestCase.java | 85 + .../usergrid/client/UsergridTestCase.java | 30 + sdks/java/usergrid-java-client-2.1.0.jar | Bin 0 -> 1992232 bytes sdks/swift/README.md | 2 +- .../Source/Base.lproj/Main.storyboard | 26 +- .../ActivityFeed/Source/FormTextField.swift | 2 +- .../Source/MessageViewController.swift | 26 +- .../Samples/Push/Source/UsergridManager.swift | 2 +- sdks/swift/Source/Usergrid.swift | 32 +- sdks/swift/Source/UsergridAsset.swift | 18 +- sdks/swift/Source/UsergridAuth.swift | 6 +- sdks/swift/Source/UsergridClient.swift | 89 +- sdks/swift/Source/UsergridClientConfig.swift | 14 +- sdks/swift/Source/UsergridDevice.swift | 41 +- sdks/swift/Source/UsergridEntity.swift | 104 +- sdks/swift/Source/UsergridEnums.swift | 22 +- sdks/swift/Source/UsergridExtensions.swift | 82 +- sdks/swift/Source/UsergridFileMetaData.swift | 4 +- sdks/swift/Source/UsergridQuery.swift | 3 +- sdks/swift/Source/UsergridRequest.swift | 2 +- sdks/swift/Source/UsergridRequestManager.swift | 72 +- sdks/swift/Source/UsergridResponse.swift | 6 +- sdks/swift/Source/UsergridUser.swift | 62 +- sdks/swift/Tests/ASSET_Tests.swift | 218 ++- sdks/swift/Tests/AUTH_Tests.swift | 92 +- sdks/swift/Tests/CONNECTION_Tests.swift | 42 +- sdks/swift/Tests/ClientCreationTests.swift | 44 +- sdks/swift/Tests/GET_Tests.swift | 38 +- sdks/swift/Tests/PUT_Tests.swift | 38 +- sdks/swift/Tests/TestAssets/UsergridGuy.jpg | Bin 0 -> 12981 bytes sdks/swift/Tests/User_Tests.swift | 310 +++- sdks/swift/UsergridSDK.podspec | 18 - .../swift/UsergridSDK.xcodeproj/project.pbxproj | 4 +- sdks/swift/docs/Classes.html | 16 +- sdks/swift/docs/Classes/Usergrid.html | 290 ++- sdks/swift/docs/Classes/UsergridAppAuth.html | 30 +- sdks/swift/docs/Classes/UsergridAsset.html | 44 +- .../Classes/UsergridAssetUploadRequest.html | 20 +- sdks/swift/docs/Classes/UsergridAuth.html | 34 +- sdks/swift/docs/Classes/UsergridClient.html | 275 ++- .../docs/Classes/UsergridClientConfig.html | 54 +- sdks/swift/docs/Classes/UsergridDevice.html | 205 ++- sdks/swift/docs/Classes/UsergridEntity.html | 215 ++- .../docs/Classes/UsergridFileMetaData.html | 30 +- sdks/swift/docs/Classes/UsergridQuery.html | 156 +- sdks/swift/docs/Classes/UsergridRequest.html | 36 +- sdks/swift/docs/Classes/UsergridResponse.html | 42 +- .../docs/Classes/UsergridResponseError.html | 24 +- sdks/swift/docs/Classes/UsergridUser.html | 231 ++- sdks/swift/docs/Classes/UsergridUserAuth.html | 30 +- sdks/swift/docs/Enums.html | 28 +- sdks/swift/docs/Enums/UsergridAuthMode.html | 283 +++ .../docs/Enums/UsergridDeviceProperties.html | 20 +- sdks/swift/docs/Enums/UsergridDirection.html | 16 +- .../docs/Enums/UsergridEntityProperties.html | 24 +- sdks/swift/docs/Enums/UsergridHttpMethod.html | 16 +- .../docs/Enums/UsergridImageContentType.html | 16 +- .../swift/docs/Enums/UsergridQueryOperator.html | 20 +- .../docs/Enums/UsergridQuerySortOrder.html | 20 +- .../docs/Enums/UsergridUserProperties.html | 20 +- sdks/swift/docs/Extensions.html | 72 +- sdks/swift/docs/Extensions/NSDate.html | 448 +++++ sdks/swift/docs/Global Variables.html | 18 +- sdks/swift/docs/Typealiases.html | 36 +- .../Contents/Resources/Documents/Classes.html | 209 ++- .../Resources/Documents/Classes/Usergrid.html | 1086 ++++++++--- .../Documents/Classes/UsergridAppAuth.html | 183 +- .../Documents/Classes/UsergridAsset.html | 265 ++- .../Classes/UsergridAssetUploadRequest.html | 356 ++++ .../Documents/Classes/UsergridAuth.html | 274 ++- .../Documents/Classes/UsergridClient.html | 1310 +++++++++---- .../Documents/Classes/UsergridClientConfig.html | 345 +++- .../Documents/Classes/UsergridDevice.html | 519 +++++- .../Documents/Classes/UsergridEntity.html | 809 +++++--- .../Documents/Classes/UsergridFileMetaData.html | 217 ++- .../Documents/Classes/UsergridQuery.html | 540 ++++-- .../Documents/Classes/UsergridRequest.html | 619 +++++++ .../Documents/Classes/UsergridResponse.html | 309 ++-- .../Classes/UsergridResponseError.html | 473 +++++ .../Documents/Classes/UsergridUser.html | 1734 ++++++++++++++++-- .../Documents/Classes/UsergridUserAuth.html | 169 +- .../Contents/Resources/Documents/Enums.html | 115 +- .../Documents/Enums/UsergridAuthFallback.html | 53 +- .../Documents/Enums/UsergridAuthMode.html | 283 +++ .../Enums/UsergridDeviceProperties.html | 83 +- .../Documents/Enums/UsergridDirection.html | 71 +- .../Enums/UsergridEntityProperties.html | 101 +- .../Documents/Enums/UsergridHttpMethod.html | 341 ++++ .../Enums/UsergridImageContentType.html | 73 +- .../Documents/Enums/UsergridQueryOperator.html | 89 +- .../Documents/Enums/UsergridQuerySortOrder.html | 83 +- .../Documents/Enums/UsergridUserProperties.html | 95 +- .../Resources/Documents/Extensions.html | 72 +- .../Resources/Documents/Extensions/NSDate.html | 448 +++++ .../Resources/Documents/Global Variables.html | 210 +++ .../Resources/Documents/Typealiases.html | 159 +- .../Resources/Documents/css/highlight.css | 6 +- .../Contents/Resources/Documents/css/jazzy.css | 65 +- .../Contents/Resources/Documents/index.html | 741 +++++++- .../Contents/Resources/Documents/js/jazzy.js | 11 +- .../Resources/Documents/undocumented.txt | 11 - .../.docset/Contents/Resources/docSet.dsidx | Bin 114688 -> 147456 bytes sdks/swift/docs/docsets/.tgz | Bin 111866 -> 148251 bytes sdks/swift/docs/index.html | 24 +- .../main/resources/usergrid-default.properties | 32 + .../apache/usergrid/batch/job/OnlyOnceJob.java | 22 +- .../corepersistence/ApplicationIdCache.java | 6 +- .../corepersistence/ApplicationIdCacheImpl.java | 71 +- .../usergrid/corepersistence/CoreModule.java | 6 + .../corepersistence/CpEntityManager.java | 235 ++- .../corepersistence/CpEntityManagerFactory.java | 49 +- .../corepersistence/CpManagerCache.java | 2 +- .../corepersistence/CpRelationManager.java | 149 +- .../usergrid/corepersistence/CpSetup.java | 100 +- .../corepersistence/EntityManagerFig.java | 4 + .../usergrid/corepersistence/ManagerCache.java | 2 +- .../asyncevents/AsyncEventService.java | 7 + .../asyncevents/AsyncEventServiceImpl.java | 153 +- .../asyncevents/EventBuilder.java | 12 +- .../asyncevents/EventBuilderImpl.java | 37 +- .../asyncevents/model/AsyncEvent.java | 7 +- .../model/DeIndexOldVersionsEvent.java | 50 + .../asyncevents/model/EdgeDeleteEvent.java | 4 +- .../asyncevents/model/EdgeIndexEvent.java | 70 + .../model/ElasticsearchIndexEvent.java | 2 +- .../asyncevents/model/EntityDeleteEvent.java | 3 + .../asyncevents/model/EntityIndexEvent.java | 54 + .../model/InitializeApplicationIndexEvent.java | 2 +- .../index/IndexProcessorFig.java | 13 +- .../corepersistence/index/IndexSchemaCache.java | 50 + .../index/IndexSchemaCacheFactory.java | 44 + .../index/IndexSchemaCacheFig.java | 39 + .../index/IndexSchemaCacheImpl.java | 120 ++ .../corepersistence/index/IndexServiceImpl.java | 99 +- .../index/ReIndexRequestBuilder.java | 7 + .../index/ReIndexRequestBuilderImpl.java | 32 + .../index/ReIndexServiceImpl.java | 49 +- .../pipeline/builder/IdBuilder.java | 6 + .../pipeline/read/FilterFactory.java | 8 +- .../read/traverse/AbstractReadGraphFilter.java | 18 +- .../pipeline/read/traverse/IdFilter.java | 52 + .../results/IdQueryExecutor.java | 66 + .../service/ApplicationServiceImpl.java | 37 +- .../service/CollectionSearch.java | 9 + .../service/CollectionService.java | 5 + .../service/CollectionServiceImpl.java | 23 + .../service/ServiceSchedulerFig.java | 2 +- .../usergrid/persistence/EntityManager.java | 7 + .../persistence/EntityManagerFactory.java | 6 +- .../persistence/MultiQueryIterator.java | 2 +- .../persistence/NotificationGraphIterator.java | 163 ++ .../persistence/PagingResultsIterator.java | 25 +- .../apache/usergrid/persistence/PathQuery.java | 67 +- .../org/apache/usergrid/persistence/Query.java | 2 + .../apache/usergrid/persistence/Results.java | 20 + .../persistence/cassandra/ApplicationCF.java | 2 +- .../persistence/cassandra/CassandraService.java | 2 - .../usergrid/persistence/cassandra/Setup.java | 28 +- .../persistence/entities/Notification.java | 106 +- .../org/apache/usergrid/utils/StringUtils.java | 8 + .../main/resources/usergrid-core-context.xml | 6 + .../corepersistence/StaleIndexCleanupTest.java | 184 +- .../index/AsyncEventServiceImplTest.java | 23 +- .../usergrid/corepersistence/index/RxTest.java | 129 ++ .../usergrid/persistence/CoreSchemaManager.java | 14 +- .../cassandra/EntityManagerFactoryImplIT.java | 8 +- .../impl/ScopedCacheSerializationImpl.java | 9 +- .../impl/EntityCollectionManagerImpl.java | 2 +- .../mvcc/stage/write/WriteUniqueVerify.java | 9 +- .../serialization/SerializationFig.java | 3 + .../core/astyanax/CassandraClusterImpl.java | 4 +- .../persistence/core/astyanax/ColumnSearch.java | 7 +- .../core/astyanax/MultiRowColumnIterator.java | 37 +- .../astyanax/MultiRowShardColumnIterator.java | 462 +++++ .../core/consistency/TimeServiceImpl.java | 5 +- .../core/executor/TaskExecutorFactory.java | 10 +- .../persistence/core/shard/SmartShard.java | 61 + .../astyanax/MultiRowColumnIteratorTest.java | 14 +- .../usergrid/persistence/graph/GraphFig.java | 17 + .../graph/impl/GraphManagerImpl.java | 2 +- .../impl/EdgeMetadataSerializationV2Impl.java | 4 +- .../impl/shard/NodeShardCache.java | 7 +- .../graph/serialization/impl/shard/Shard.java | 33 +- .../impl/shard/impl/EdgeSearcher.java | 113 +- .../shard/impl/EdgeShardSerializationImpl.java | 56 +- .../shard/impl/NodeShardAllocationImpl.java | 41 +- .../impl/shard/impl/NodeShardCacheImpl.java | 29 +- .../shard/impl/ShardEntryGroupIterator.java | 12 + .../shard/impl/ShardGroupCompactionImpl.java | 183 +- .../impl/ShardedEdgeSerializationImpl.java | 51 +- .../impl/shard/impl/ShardsColumnIterator.java | 64 +- .../shard/impl/serialize/ShardSerializer.java | 86 + .../graph/GraphManagerShardConsistencyIT.java | 215 ++- .../impl/shard/EdgeShardSerializationTest.java | 12 +- .../impl/shard/NodeShardAllocationTest.java | 44 +- .../impl/shard/ShardGroupCompactionTest.java | 4 +- .../graph/src/test/resources/log4j.properties | 6 + .../persistence/map/impl/MapManagerImpl.java | 6 + stack/corepersistence/pom.xml | 2 +- .../persistence/index/EntityIndexBatch.java | 13 +- .../usergrid/persistence/index/IndexFig.java | 2 +- .../index/impl/EntityToMapConverter.java | 93 +- .../index/impl/EsEntityIndexBatchImpl.java | 21 +- .../index/impl/EsEntityIndexImpl.java | 25 +- .../index/impl/FailureMonitorImpl.java | 2 +- .../persistence/index/impl/IndexOperation.java | 9 +- .../index/impl/IndexOperationMessage.java | 2 +- .../persistence/index/impl/EntityIndexTest.java | 2 +- .../usergrid/persistence/queue/QueueFig.java | 8 +- .../queue/impl/QueueManagerFactoryImpl.java | 27 +- .../apache/usergrid/mongo/BasicMongoTest.java | 8 +- .../apache/usergrid/mongo/MongoQueryTest.java | 18 +- stack/pom.xml | 2 +- .../org/apache/usergrid/rest/ApiResponse.java | 7 +- .../org/apache/usergrid/rest/RootResource.java | 25 + .../rest/applications/ApplicationResource.java | 2 +- .../rest/applications/CollectionResource.java | 229 +++ .../rest/applications/ServiceResource.java | 140 +- .../notifiers/NotifierResource.java | 3 +- .../notifiers/NotifiersResource.java | 3 +- .../rest/applications/users/UserResource.java | 26 +- .../rest/applications/users/UsersResource.java | 3 +- .../IllegalArgumentExceptionMapper.java | 4 +- .../ServiceResourceNotFoundExceptionMapper.java | 9 +- .../organizations/OrganizationResource.java | 8 +- .../security/SecuredResourceFilterFactory.java | 29 +- .../OAuth2AccessTokenSecurityFilter.java | 3 +- .../usergrid/rest/system/DatabaseResource.java | 4 +- .../usergrid/rest/system/IndexResource.java | 6 + .../apache/usergrid/rest/NotificationsIT.java | 11 + .../rest/applications/ApplicationCreateIT.java | 3 +- .../applications/ApplicationResourceIT.java | 2 +- .../collection/CollectionsResourceIT.java | 823 ++++++++- .../collection/paging/PagingResourceIT.java | 70 +- .../collection/users/PermissionsResourceIT.java | 6 +- .../events/ApplicationRequestCounterIT.java | 48 + .../rest/test/resource/AbstractRestIT.java | 1 + .../rest/test/resource/ClientSetup.java | 10 + .../test/resource/endpoints/NamedResource.java | 22 + .../resources/usergrid-custom-test.properties | 4 + .../cassandra/ManagementServiceImpl.java | 110 +- .../usergrid/security/shiro/ShiroCache.java | 41 +- .../security/shiro/ShiroCacheManager.java | 15 +- .../shiro/credentials/AdminUserAccessToken.java | 3 + .../ApplicationClientCredentials.java | 5 + .../shiro/principals/AdminUserPrincipal.java | 3 + .../principals/ApplicationGuestPrincipal.java | 4 +- .../shiro/principals/ApplicationPrincipal.java | 4 +- .../principals/ApplicationUserPrincipal.java | 3 + .../shiro/principals/OrganizationPrincipal.java | 4 +- .../security/shiro/utils/LocalShiroCache.java | 80 + .../usergrid/security/tokens/TokenService.java | 3 + .../tokens/cassandra/TokenServiceImpl.java | 40 +- .../services/AbstractCollectionService.java | 56 + .../services/AbstractConnectionsService.java | 13 + .../usergrid/services/AbstractService.java | 14 +- .../org/apache/usergrid/services/Service.java | 3 + .../usergrid/services/ServiceManager.java | 1 - .../usergrid/services/ServiceRequest.java | 5 + .../applications/ApplicationsService.java | 14 + .../usergrid/services/groups/GroupsService.java | 4 + .../ApplicationQueueManagerCache.java | 143 ++ .../notifications/NotificationDeviceFilter.java | 45 + .../notifications/NotificationsService.java | 41 +- .../services/notifications/QueueListener.java | 97 +- .../services/notifications/TaskManager.java | 128 +- .../services/notifications/gcm/GCMAdapter.java | 7 +- .../impl/ApplicationQueueManagerImpl.java | 382 +++- .../services/notifiers/NotifiersService.java | 6 + .../usergrid/services/queues/QueueListener.java | 2 +- .../usergrid/services/roles/RolesService.java | 2 + .../usergrid/services/users/UsersService.java | 2 + .../services/users/roles/RolesService.java | 4 + .../resources/usergrid-services-context.xml | 11 +- .../migration/AppInfoMigrationPluginTest.java | 8 +- .../apns/NotificationsServiceIT.java | 32 +- .../gcm/NotificationsServiceIT.java | 135 +- .../resources/usergrid-custom-test.properties | 1 + .../usergrid/cassandra/SchemaManager.java | 3 - .../usergrid/cassandra/FakeSchemaManager.java | 8 +- .../test/notifications/notifications.js | 5 - tests/performance/runLoadNestedEntities.sh | 98 + .../datagenerators/EntityDataGenerator.scala | 40 + .../org/apache/usergrid/enums/EntityType.scala | 3 +- 409 files changed, 25793 insertions(+), 8248 deletions(-) ----------------------------------------------------------------------
