You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/08/03 22:30:56 UTC
[12/21] incubator-usergrid git commit: Merge remote-tracking branch
'upstream/two-dot-o-dev' into two-dot-o-dev
Merge remote-tracking branch 'upstream/two-dot-o-dev' into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/eec8175b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/eec8175b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/eec8175b
Branch: refs/heads/two-dot-o-dev
Commit: eec8175b45e1945df4983e91a627c0deb1a1fcf9
Parents: 5d202d9 54fccac
Author: Mike Dunker <md...@apigee.com>
Authored: Thu Jul 23 12:29:47 2015 -0700
Committer: Mike Dunker <md...@apigee.com>
Committed: Thu Jul 23 12:29:47 2015 -0700
----------------------------------------------------------------------
.gitignore | 4 +
CHANGELOG | 3 -
LICENSE | 10 +
stack/LICENSE-2.0.txt | 202 -------
.../main/resources/usergrid-default.properties | 4 +
.../corepersistence/CpEntityManager.java | 122 +++--
.../corepersistence/CpEntityManagerFactory.java | 6 +-
.../index/ApplicationIndexLocationStrategy.java | 2 +-
.../index/ReplicatedIndexLocationStrategy.java | 2 +-
.../usergrid/persistence/EntityManager.java | 5 +
.../apache/usergrid/persistence/Results.java | 4 +
.../usergrid/persistence/CollectionIT.java | 84 ++-
.../MvccEntitySerializationStrategyV2Impl.java | 21 +-
.../MvccEntitySerializationStrategyV3Impl.java | 47 +-
.../core/astyanax/AstyanaxKeyspaceProvider.java | 1 +
.../persistence/core/astyanax/CassandraFig.java | 3 +
.../persistence/core/rx/RxSchedulerFig.java | 9 +
.../index/impl/EsEntityIndexImpl.java | 2 +
.../persistence/query/tree/GrammarTreeTest.java | 32 ++
stack/pom.xml | 3 +-
.../apache/usergrid/rest/AbstractRestIT.java | 509 ------------------
.../java/org/apache/usergrid/rest/BasicIT.java | 6 +-
.../apache/usergrid/rest/IndexResourceIT.java | 15 +-
.../apache/usergrid/rest/NotificationsIT.java | 10 +-
.../apache/usergrid/rest/PartialUpdateTest.java | 4 +-
.../apache/usergrid/rest/SystemResourceIT.java | 8 +-
.../apache/usergrid/rest/TestContextSetup.java | 81 ---
.../rest/applications/ApplicationCreateIT.java | 12 +-
.../rest/applications/ApplicationDeleteIT.java | 12 +-
.../applications/ApplicationResourceIT.java | 6 +-
.../applications/assets/AssetResourceIT.java | 8 +-
.../collection/BrowserCompatibilityTest.java | 11 +-
.../collection/CollectionsResourceIT.java | 43 +-
.../collection/DuplicateNameIT.java | 4 +-
.../activities/ActivityResourceIT.java | 6 +-
.../collection/activities/PutTest.java | 11 +-
.../collection/devices/DevicesResourceIT.java | 8 +-
.../collection/groups/GroupResourceIT.java | 6 +-
.../collection/paging/PagingResourceIT.java | 12 +-
.../users/ConnectionResourceTest.java | 8 +-
.../collection/users/OwnershipResourceIT.java | 6 +-
.../collection/users/PermissionsResourceIT.java | 4 +-
.../collection/users/RetrieveUsersTest.java | 10 +-
.../collection/users/UserResourceIT.java | 6 +-
.../events/ApplicationRequestCounterIT.java | 8 +-
.../applications/events/EventsResourceIT.java | 96 ++--
.../applications/queries/AndOrQueryTest.java | 37 +-
.../queries/BadGrammarQueryTest.java | 6 +-
.../applications/queries/BasicGeoTests.java | 38 +-
.../applications/queries/GeoPagingTest.java | 8 +-
.../applications/queries/MatrixQueryTests.java | 10 +-
.../rest/applications/queries/OrderByTest.java | 18 +-
.../applications/queries/QueryTestBase.java | 6 +-
.../rest/applications/utils/TestUtils.java | 4 +-
.../rest/applications/utils/UserRepo.java | 4 +-
.../rest/filters/ContentTypeResourceIT.java | 8 +-
.../usergrid/rest/management/AccessTokenIT.java | 10 +-
.../usergrid/rest/management/AdminUsersIT.java | 59 +-
.../rest/management/ExportResourceIT.java | 7 +-
.../rest/management/ImportResourceIT.java | 12 +-
.../rest/management/ManagementResourceIT.java | 16 +-
.../rest/management/OrganizationsIT.java | 6 +-
.../rest/management/RegistrationIT.java | 19 +-
.../organizations/AdminEmailEncodingIT.java | 10 +-
.../applications/ApplicationsIT.java | 91 ----
.../rest/test/PropertiesResourceIT.java | 80 ---
.../rest/test/resource/AbstractRestIT.java | 184 +++++++
.../rest/test/resource/ClientSetup.java | 172 ++++++
.../rest/test/resource/CollectionResource.java | 27 -
.../usergrid/rest/test/resource/Connection.java | 61 ---
.../rest/test/resource/CustomCollection.java | 32 --
.../usergrid/rest/test/resource/DumbClient.java | 58 ++
.../rest/test/resource/EntityResource.java | 110 ----
.../rest/test/resource/MatrixResource.java | 64 ---
.../apache/usergrid/rest/test/resource/Me.java | 36 --
.../rest/test/resource/NamedResource.java | 195 -------
.../usergrid/rest/test/resource/README.md | 110 ++++
.../usergrid/rest/test/resource/RestClient.java | 134 +++++
.../rest/test/resource/RootResource.java | 65 ---
.../rest/test/resource/SetResource.java | 96 ----
.../rest/test/resource/TestContext.java | 256 ---------
.../rest/test/resource/TestOrganization.java | 55 --
.../test/resource/TestPropertiesResource.java | 47 ++
.../rest/test/resource/ValueResource.java | 328 ------------
.../rest/test/resource/app/Application.java | 86 ---
.../rest/test/resource/app/Collection.java | 81 ---
.../usergrid/rest/test/resource/app/Device.java | 49 --
.../usergrid/rest/test/resource/app/Group.java | 56 --
.../test/resource/app/GroupsCollection.java | 66 ---
.../usergrid/rest/test/resource/app/Role.java | 56 --
.../rest/test/resource/app/RolesCollection.java | 64 ---
.../usergrid/rest/test/resource/app/User.java | 55 --
.../rest/test/resource/app/UsersCollection.java | 86 ---
.../resource/app/queue/DevicesCollection.java | 37 --
.../rest/test/resource/app/queue/Queue.java | 193 -------
.../resource/app/queue/QueuesCollection.java | 36 --
.../app/queue/SubscribersCollection.java | 61 ---
.../test/resource/app/queue/Transaction.java | 84 ---
.../app/queue/TransactionsCollection.java | 36 --
.../endpoints/ApplicationsResource.java | 73 +++
.../resource/endpoints/CollectionEndpoint.java | 356 ++++++++++++
.../resource/endpoints/DatabaseResource.java | 39 ++
.../test/resource/endpoints/EntityEndpoint.java | 174 ++++++
.../test/resource/endpoints/NamedResource.java | 358 +++++++++++++
.../endpoints/OrganizationResource.java | 49 ++
.../test/resource/endpoints/RootResource.java | 86 +++
.../test/resource/endpoints/SetupResource.java | 52 ++
.../test/resource/endpoints/SystemResource.java | 57 ++
.../test/resource/endpoints/TokenResource.java | 89 +++
.../test/resource/endpoints/UrlResource.java | 44 ++
.../endpoints/mgmt/ApplicationResource.java | 105 ++++
.../endpoints/mgmt/ApplicationsResource.java | 65 +++
.../endpoints/mgmt/AuthorizeResource.java | 59 ++
.../endpoints/mgmt/ConfirmResource.java | 46 ++
.../endpoints/mgmt/CredentialsResource.java | 53 ++
.../resource/endpoints/mgmt/FeedResource.java | 49 ++
.../endpoints/mgmt/ManagementResource.java | 60 +++
.../endpoints/mgmt/ManagementResponse.java | 72 +++
.../resource/endpoints/mgmt/MeResource.java | 36 ++
.../resource/endpoints/mgmt/OrgResource.java | 167 ++++++
.../mgmt/OrganizationApplicationResponse.java | 60 +++
.../endpoints/mgmt/OrganizationResource.java | 80 +++
.../endpoints/mgmt/PasswordResource.java | 45 ++
.../endpoints/mgmt/ReactivateResource.java | 46 ++
.../resource/endpoints/mgmt/ResetResource.java | 42 ++
.../endpoints/mgmt/RevokeTokenResource.java | 32 ++
.../endpoints/mgmt/RevokeTokensResource.java | 33 ++
.../resource/endpoints/mgmt/TokenResource.java | 71 +++
.../resource/endpoints/mgmt/UserResource.java | 88 +++
.../resource/endpoints/mgmt/UsersResource.java | 57 ++
.../rest/test/resource/mgmt/Application.java | 49 --
.../resource/mgmt/ApplicationsCollection.java | 53 --
.../rest/test/resource/mgmt/Management.java | 98 ----
.../rest/test/resource/mgmt/Organization.java | 60 ---
.../resource/mgmt/OrganizationsCollection.java | 74 ---
.../test/resource/model/ActivityEntity.java | 49 ++
.../rest/test/resource/model/ApiResponse.java | 223 ++++++++
.../rest/test/resource/model/Application.java | 39 ++
.../resource/model/ChangePasswordEntity.java | 33 ++
.../rest/test/resource/model/Collection.java | 98 ++++
.../rest/test/resource/model/Credentials.java | 47 ++
.../rest/test/resource/model/Entity.java | 213 ++++++++
.../rest/test/resource/model/Organization.java | 119 ++++
.../test/resource/model/QueryParameters.java | 93 ++++
.../rest/test/resource/model/Token.java | 81 +++
.../usergrid/rest/test/resource/model/User.java | 101 ++++
.../rest/test/resource/state/ClientContext.java | 39 ++
.../test/resource2point0/AbstractRestIT.java | 184 -------
.../rest/test/resource2point0/ClientSetup.java | 172 ------
.../rest/test/resource2point0/DumbClient.java | 58 --
.../rest/test/resource2point0/README.md | 111 ----
.../rest/test/resource2point0/RestClient.java | 134 -----
.../resource2point0/TestPropertiesResource.java | 47 --
.../endpoints/ApplicationsResource.java | 77 ---
.../endpoints/CollectionEndpoint.java | 357 ------------
.../endpoints/DatabaseResource.java | 39 --
.../endpoints/EntityEndpoint.java | 174 ------
.../endpoints/NamedResource.java | 356 ------------
.../endpoints/OrganizationResource.java | 49 --
.../resource2point0/endpoints/RootResource.java | 86 ---
.../endpoints/SetupResource.java | 52 --
.../endpoints/SystemResource.java | 57 --
.../endpoints/TokenResource.java | 89 ---
.../resource2point0/endpoints/UrlResource.java | 44 --
.../endpoints/mgmt/ApplicationResource.java | 105 ----
.../endpoints/mgmt/ApplicationsResource.java | 65 ---
.../endpoints/mgmt/AuthorizeResource.java | 59 --
.../endpoints/mgmt/ConfirmResource.java | 46 --
.../endpoints/mgmt/CredentialsResource.java | 53 --
.../endpoints/mgmt/FeedResource.java | 49 --
.../endpoints/mgmt/ManagementResource.java | 60 ---
.../endpoints/mgmt/ManagementResponse.java | 72 ---
.../endpoints/mgmt/MeResource.java | 36 --
.../endpoints/mgmt/OrgResource.java | 167 ------
.../mgmt/OrganizationApplicationResponse.java | 60 ---
.../endpoints/mgmt/OrganizationResource.java | 80 ---
.../endpoints/mgmt/PasswordResource.java | 45 --
.../endpoints/mgmt/ReactivateResource.java | 46 --
.../endpoints/mgmt/ResetResource.java | 42 --
.../endpoints/mgmt/RevokeTokenResource.java | 32 --
.../endpoints/mgmt/RevokeTokensResource.java | 33 --
.../endpoints/mgmt/TokenResource.java | 71 ---
.../endpoints/mgmt/UserResource.java | 88 ---
.../endpoints/mgmt/UsersResource.java | 57 --
.../resource2point0/model/ActivityEntity.java | 49 --
.../test/resource2point0/model/ApiResponse.java | 219 --------
.../test/resource2point0/model/Application.java | 39 --
.../model/ChangePasswordEntity.java | 33 --
.../test/resource2point0/model/Collection.java | 98 ----
.../test/resource2point0/model/Credentials.java | 47 --
.../rest/test/resource2point0/model/Entity.java | 212 --------
.../resource2point0/model/Organization.java | 119 ----
.../resource2point0/model/QueryParameters.java | 93 ----
.../rest/test/resource2point0/model/Token.java | 81 ---
.../rest/test/resource2point0/model/User.java | 101 ----
.../resource2point0/state/ClientContext.java | 39 --
.../rest/test/security/TestAdminUser.java | 63 ---
.../rest/test/security/TestAppUser.java | 63 ---
.../usergrid/rest/test/security/TestUser.java | 132 -----
.../src/test/resources/cat-larger-than-6mb.jpg | Bin 9799257 -> 0 bytes
.../src/test/resources/ship-larger-than-6mb.gif | Bin 0 -> 7407487 bytes
stack/rest_integration_tests/README.md | 19 +
stack/rest_integration_tests/config/default.js | 37 ++
stack/rest_integration_tests/config/index.js | 25 +
stack/rest_integration_tests/index.js | 20 +
stack/rest_integration_tests/lib/connections.js | 132 +++++
stack/rest_integration_tests/lib/entities.js | 125 +++++
.../rest_integration_tests/lib/notifications.js | 48 ++
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 | 17 +
.../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 | 38 ++
.../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 ++
.../management/AccountCreationProps.java | 6 +-
.../cassandra/ManagementServiceImpl.java | 158 ++----
.../usergrid/services/AbstractService.java | 281 ++++++----
.../apache/usergrid/management/EmailFlowIT.java | 73 +--
stack/tools/pom.xml | 6 +
.../org/apache/usergrid/tools/AppAudit.java | 30 +-
.../java/org/apache/usergrid/tools/Cli.java | 6 +-
.../apache/usergrid/tools/DupAdminRepair.java | 34 +-
.../org/apache/usergrid/tools/DupOrgRepair.java | 36 +-
.../apache/usergrid/tools/EntityCleanup.java | 178 ------
.../org/apache/usergrid/tools/EntityUpdate.java | 25 +-
.../org/apache/usergrid/tools/ExportAdmins.java | 164 +++---
.../org/apache/usergrid/tools/ExportApp.java | 536 +++++++++++++++++++
.../usergrid/tools/ExportDataCreator.java | 244 +++++++--
.../usergrid/tools/ExportingToolBase.java | 2 +-
.../org/apache/usergrid/tools/ImportAdmins.java | 278 +++++++---
.../org/apache/usergrid/tools/ToolBase.java | 6 +-
.../org/apache/usergrid/tools/UserManager.java | 22 +
stack/tools/src/main/resources/log4j.properties | 6 +
.../apache/usergrid/tools/ExportAppTest.java | 118 ++++
.../usergrid/tools/ExportImportAdminsTest.java | 71 ++-
...adata.usergrid-management.1433331614293.json | 52 ++
...users.usergrid-management.1433331614293.json | 12 +
259 files changed, 8615 insertions(+), 9523 deletions(-)
----------------------------------------------------------------------