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 22:22:06 UTC
[39/40] git commit: Merge pull request #92 from
GERey/Export_Persistance_Integration
Merge pull request #92 from GERey/Export_Persistance_Integration
Export persistance integration
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/52a110b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/52a110b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/52a110b6
Branch: refs/heads/master
Commit: 52a110b6ddba02be43ee62b286593e148a565ddf
Parents: 778511b 131c3ca
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Apr 8 13:57:21 2014 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Apr 8 13:57:21 2014 -0600
----------------------------------------------------------------------
.../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(-)
----------------------------------------------------------------------