You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/07/24 17:22:18 UTC
[50/50] [abbrv] incubator-usergrid git commit: Merge branch
'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
into USERGRID-869
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-869
# By Dave Johnson (25) and others
# Via Dave Johnson (11) and others
* 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (36 commits)
Organize imports. This closes #318.
fix index init logic
USERGRID-771
add serialization timers
add single timer
add invoke timer
add get by name timers
Added data creator to generate data for ExportApp testing.
USERGRID-870 - Expose a config for the local datacenter name configured in Cassandra and make it available to the Astyanax client.
rat file fix
add integration tests
Don't ignore broken user accounts (i.e. no creds or orgs), export everything.
More consistency in logging about admin users, using username : email : uuid format.
Ignore users with no orgs or creds, log total orgs exported and better logging.
Duplicate user merge.
Better checks for missing creds.
Make flatmap max observables match write thread count and use Schedulers.io() instead of a custom readScheduler.
Minor test fixes.
Less test data and code to compare 1 read and 1 write thread vs. 100 read and 100 write threads.
Some reformatting. Also eliminating use of subscriber.unsubscribe(). All observables need to wrap up with onCompleted().
...
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d46c0400
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d46c0400
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d46c0400
Branch: refs/heads/USERGRID-869
Commit: d46c0400e3d16d6312ba60cad359f1446fa39a76
Parents: 63f76f4 54fccac
Author: GERey <gr...@apigee.com>
Authored: Fri Jul 24 08:21:06 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Fri Jul 24 08:21:06 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 +
.../MvccEntitySerializationStrategyV2Impl.java | 21 +-
.../MvccEntitySerializationStrategyV3Impl.java | 47 +-
.../core/astyanax/AstyanaxKeyspaceProvider.java | 1 +
.../persistence/core/astyanax/CassandraFig.java | 3 +
.../index/impl/EsEntityIndexImpl.java | 2 +
stack/pom.xml | 3 +-
.../applications/assets/AssetResourceIT.java | 2 +-
.../usergrid/rest/management/AdminUsersIT.java | 57 +-
.../rest/management/RegistrationIT.java | 17 +-
.../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 | 240 +++++----
.../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 +
79 files changed, 3673 insertions(+), 1084 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d46c0400/stack/config/src/main/resources/usergrid-default.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d46c0400/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d46c0400/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d46c0400/stack/services/src/main/java/org/apache/usergrid/management/AccountCreationProps.java
----------------------------------------------------------------------