You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2015/02/13 22:14:37 UTC
[2/2] incubator-usergrid git commit: Merge branch 'two-dot-o-import'
of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
apache_usergrid/two-dot-o-import
Merge branch 'two-dot-o-import' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into apache_usergrid/two-dot-o-import
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6a2f92c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6a2f92c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6a2f92c1
Branch: refs/heads/two-dot-o-import
Commit: 6a2f92c1b6d1222e3a56494299d8cefa546eb063
Parents: 97fe63b e57e5e5
Author: Rod Simpson <ro...@apigee.com>
Authored: Fri Feb 13 14:14:16 2015 -0700
Committer: Rod Simpson <ro...@apigee.com>
Committed: Fri Feb 13 14:14:16 2015 -0700
----------------------------------------------------------------------
.gitignore | 3 -
portal/js/global/ug-service.js | 5 +-
.../Usergrid.Notifications/Client/PushClient.cs | 12 +-
.../Usergrid.Notifications/Client/Usergrid.cs | 10 +-
.../Usergrid.Notifications/MainPage.xaml.cs | 15 +-
stack/awscluster/src/main/cql/update_locks.cql | 2 +-
.../awscluster/src/main/cql/update_usergrid.cql | 2 +-
.../main/cql/update_usergrid_applications.cql | 2 +-
.../main/dist/init_instance/init_rest_server.sh | 23 +-
.../main/dist/init_instance/install_collectd.sh | 350 +++++
.../dist/init_instance/install_elasticsearch.sh | 12 +-
.../main/dist/init_instance/update_keyspaces.sh | 9 +
.../src/main/groovy/NodeRegistry.groovy | 26 +
.../src/main/groovy/configure_usergrid.groovy | 29 +-
.../src/main/groovy/create_dashboard.groovy | 79 ++
.../src/main/groovy/wait_for_instances.groovy | 20 +-
stack/awscluster/ugcluster-cf.json | 25 +-
.../apache/usergrid/batch/JobExecutionImpl.java | 10 +
.../persistence/entities/FailedImport.java | 64 +
.../entities/FailedImportConnection.java | 41 +
.../entities/FailedImportEntity.java | 44 +
.../persistence/entities/FileImport.java | 104 +-
.../usergrid/persistence/entities/Import.java | 20 +-
.../exceptions/PersistenceException.java | 2 +-
.../usergrid/batch/job/SchedulerRuntime1IT.java | 22 +-
.../usergrid/batch/job/TestJobListenerTest.java | 1 +
.../persistence/EntityConnectionsIT.java | 121 +-
.../resources/usergrid-custom-test.properties | 7 +-
.../index/impl/EsEntityIndexImpl.java | 5 +-
.../usergrid/persistence/index/query/Query.java | 47 +-
.../queue/impl/QueueScopeFactoryImpl.java | 1 +
.../queue/impl/SQSQueueManagerImpl.java | 51 -
.../queue/impl/UsergridAwsCredentials.java | 75 +
.../impl/UsergridAwsCredentialsProvider.java | 59 +
stack/pom.xml | 11 +-
.../usergrid/rest/AbstractContextResource.java | 40 +-
.../org/apache/usergrid/rest/ApiResponse.java | 16 +
.../usergrid/rest/JobServiceBoostrap.java | 72 +
.../rest/applications/ServiceResource.java | 28 +-
.../exceptions/NullArgumentExceptionMapper.java | 42 +
.../organizations/OrganizationResource.java | 125 +-
.../applications/ApplicationResource.java | 174 +--
.../imports/FileErrorsResource.java | 143 ++
.../imports/FileIncludesResource.java | 158 +++
.../applications/imports/ImportsResource.java | 220 +++
.../main/resources/usergrid-rest-context.xml | 6 +-
.../rest/management/ExportResourceIT.java | 11 +-
.../rest/management/ImportResourceIT.java | 1044 ++++++++------
.../endpoints/mgmt/ApplicationResource.java | 2 +-
.../rest/test/resource2point0/model/Entity.java | 4 +
.../resources/corepersistence-UNIT.properties | 2 +
.../resources/testImportCorrect.testCol.1.json | 18 +
...testImportInvalidJson.testApplication.3.json | 153 ++
stack/services/pom.xml | 3 +-
.../usergrid/management/export/ExportJob.java | 6 +-
.../management/export/ExportServiceImpl.java | 37 +-
.../usergrid/management/export/S3Export.java | 7 -
.../management/export/S3ExportImpl.java | 62 +-
.../management/importer/FileImportJob.java | 40 +-
.../management/importer/FileImportTracker.java | 319 +++++
.../usergrid/management/importer/ImportJob.java | 54 +-
.../management/importer/ImportService.java | 90 +-
.../management/importer/ImportServiceImpl.java | 1337 +++++++++++-------
.../usergrid/management/importer/S3Import.java | 16 +-
.../management/importer/S3ImportImpl.java | 179 +--
.../notifications/NotificationsService.java | 2 +-
.../services/queues/ImportQueueListener.java | 29 +-
.../services/queues/ImportQueueManager.java | 65 +
.../services/queues/ImportQueueMessage.java | 43 +
.../usergrid/services/queues/QueueListener.java | 4 +-
.../resources/usergrid-services-context.xml | 27 +-
.../management/cassandra/ExportServiceIT.java | 1048 --------------
.../management/cassandra/ImportServiceIT.java | 741 ----------
.../management/cassandra/MockS3ExportImpl.java | 56 -
.../management/cassandra/MockS3ImportImpl.java | 47 -
.../management/export/ExportServiceIT.java | 1075 ++++++++++++++
.../management/export/MockS3ExportImpl.java | 56 +
.../importer/FileImportTrackerTest.java | 410 ++++++
.../management/importer/ImportCollectionIT.java | 634 +++++++++
.../importer/ImportConnectionsTest.java | 183 +++
.../management/importer/ImportServiceIT.java | 672 +++++++++
.../management/importer/MockS3ImportImpl.java | 42 +
.../usergrid/management/importer/S3Upload.java | 105 ++
.../src/test/resources/log4j.properties | 10 +-
.../resources/testImport.testApplication.2.json | 56 +
.../resources/testImport.testCollection.1.json | 13 +
...testImportInvalidJson.testApplication.3.json | 139 ++
.../resources/testimport-bad-connection.json | 18 +
.../src/test/resources/testimport-bad-json.json | 67 +
.../src/test/resources/testimport-qtmagics.json | 66 +
.../resources/testimport-with-connections.json | 155 ++
.../resources/usergrid-custom-test.properties | 5 +-
92 files changed, 7927 insertions(+), 3558 deletions(-)
----------------------------------------------------------------------