You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/02/16 20:05:57 UTC
[06/50] incubator-usergrid git commit: Use correct property names.
Use correct property names.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/151d8cc6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/151d8cc6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/151d8cc6
Branch: refs/heads/USERGRID-273
Commit: 151d8cc6ccd428b6d05caa87c62a299c653489b2
Parents: 33002b6
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Feb 11 11:16:53 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Feb 11 11:16:53 2015 -0500
----------------------------------------------------------------------
.../management/importer/ImportCollectionIT.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/151d8cc6/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
index f0a3510..9662e0c 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
@@ -424,10 +424,10 @@ public class ImportCollectionIT {
put( "properties", new HashMap<String, Object>() {{
put( "storage_provider", "s3" );
put( "storage_info", new HashMap<String, Object>() {{
- put( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR,
+ put( "s3_access_id",
+ System.getProperty( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR) );
+ put( "s3_key",
System.getProperty( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR ) );
- put( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR,
- System.getProperty( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR ) );
put( "bucket_location", bucketName );
}} );
}} );
@@ -467,10 +467,10 @@ public class ImportCollectionIT {
put( "properties", new HashMap<String, Object>() {{
put( "storage_provider", "s3" );
put( "storage_info", new HashMap<String, Object>() {{
- put( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR,
- System.getProperty( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR ) );
- put( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR,
- System.getProperty( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR ) );
+ put( "s3_access_id",
+ System.getProperty( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR) );
+ put("s3_key",
+ System.getProperty(SDKGlobalConfiguration.SECRET_KEY_ENV_VAR));
put( "bucket_location", bucketName );
}});
}});