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 2015/02/03 20:22:21 UTC
incubator-usergrid git commit: Fix error message,
uncomment important line.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-import b19670ef3 -> 21c7b177f
Fix error message, uncomment important line.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/21c7b177
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/21c7b177
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/21c7b177
Branch: refs/heads/two-dot-o-import
Commit: 21c7b177f06cdb424132e279599cbcd5afeae152
Parents: b19670e
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Feb 3 14:21:23 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Feb 3 14:21:23 2015 -0500
----------------------------------------------------------------------
.../usergrid/management/importer/ImportServiceImpl.java | 8 +++++---
.../apache/usergrid/management/importer/ImportServiceIT.java | 8 ++++++--
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/21c7b177/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
index 1357ccb..e122917 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
@@ -214,14 +214,13 @@ public class ImportServiceImpl implements ImportService {
// TODO SQS: Tear this part out and set the new job to be taken in here
// schedule file import job
- //sch.createJob(FILE_IMPORT_JOB_NAME, soonestPossible, jobData);
+ sch.createJob(FILE_IMPORT_JOB_NAME, soonestPossible, jobData);
+
//probably how it should work
ImportQueueMessage message = new ImportQueueMessage( fileImport.getUuid(),
(UUID) config.get( "applicationId" ) ,file );
qm.sendMessage( message );
-
-
//update state of the job to Scheduled
fileImport.setState(FileImport.State.SCHEDULED);
rootEm.update(fileImport);
@@ -1046,7 +1045,10 @@ public class ImportServiceImpl implements ImportService {
try {
boolean done = false;
+
+ // TODO: replace stack with counter or some other mechanism
Stack tokenStack = new Stack();
+
EntityRef lastEntity = null;
while (!done) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/21c7b177/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
index 760b8c2..eb709dd 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportServiceIT.java
@@ -113,8 +113,12 @@ public class ImportServiceIT {
&& !StringUtils.isEmpty(System.getProperty("bucketName"));
if ( !configured ) {
- logger.warn("Skipping test because accessKey, secretKey and bucketName not " +
- "specified as system properties, e.g. in your Maven settings.xml file.");
+ logger.warn("Skipping test because {}, {} and bucketName not " +
+ "specified as system properties, e.g. in your Maven settings.xml file.",
+ new Object[] {
+ SDKGlobalConfiguration.SECRET_KEY_ENV_VAR,
+ SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR
+ });
}
Assume.assumeTrue( configured );