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 2014/04/08 01:21:08 UTC
[7/7] git commit: Merge 131c3cab55ed7f29e7b11a7b8b83d5e98c4fb593 into
778511b710df15b53a21db98b6a0f6aa0b393883
Merge 131c3cab55ed7f29e7b11a7b8b83d5e98c4fb593 into 778511b710df15b53a21db98b6a0f6aa0b393883
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/416f0a55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/416f0a55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/416f0a55
Branch: refs/pull/92/merge
Commit: 416f0a55af4706e63c63c4a59b3b77c15e374e34
Parents: 778511b 131c3ca
Author: GERey <gr...@apigee.com>
Authored: Mon Apr 7 23:10:16 2014 +0000
Committer: GERey <gr...@apigee.com>
Committed: Mon Apr 7 23:10:16 2014 +0000
----------------------------------------------------------------------
.../usergrid/persistence/entities/Export.java | 70 --
.../organizations/OrganizationResource.java | 108 ++
.../applications/ApplicationResource.java | 27 -
.../rest/management/ExportResourceIT.java | 651 ++++++++++++
.../rest/management/ManagementResourceIT.java | 734 +++----------
.../usergrid/management/export/ExportJob.java | 1 +
.../management/export/ExportService.java | 5 +-
.../management/export/ExportServiceImpl.java | 348 +++---
.../usergrid/management/export/S3Export.java | 6 +-
.../management/export/S3ExportImpl.java | 8 +-
.../resources/usergrid-services-context.xml | 2 -
.../usergrid/ConcurrentServiceITSuite.java | 3 +-
.../management/cassandra/ExportServiceIT.java | 1004 ++++++++++++++++++
.../cassandra/ManagementServiceIT.java | 946 +----------------
.../management/cassandra/MockS3ExportImpl.java | 33 +-
.../security/tokens/TokenServiceIT.java | 3 +-
16 files changed, 2141 insertions(+), 1808 deletions(-)
----------------------------------------------------------------------