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/11 03:06:21 UTC
[1/2] incubator-usergrid git commit: Use correct key names for AWS
reds.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-import 58f482836 -> a4270d8a1
Use correct key names for AWS reds.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bf6acf5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bf6acf5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bf6acf5e
Branch: refs/heads/two-dot-o-import
Commit: bf6acf5e4ed62486d00ab85ca09af9d2f1cb9575
Parents: 450ba09
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Feb 10 20:51:05 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Feb 10 20:51:05 2015 -0500
----------------------------------------------------------------------
.../queue/impl/UsergridAwsCredentials.java | 16 ++++++++++++++++
.../applications/ApplicationResource.java | 4 ++--
.../management/importer/ImportServiceImpl.java | 8 ++++----
3 files changed, 22 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf6acf5e/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/UsergridAwsCredentials.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/UsergridAwsCredentials.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/UsergridAwsCredentials.java
index 214f5f5..b078291 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/UsergridAwsCredentials.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/UsergridAwsCredentials.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.usergrid.persistence.queue.impl;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf6acf5e/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
index ca83271..76a21b9 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
@@ -398,8 +398,8 @@ public class ApplicationResource extends AbstractContextResource {
String bucketName = ( String ) storage_info.get( "bucket_location" );
//check to make sure that access key and secret key are there.
- uac.getAWSAccessKeyIdJson( storage_info );
- uac.getAWSSecretKeyJson( storage_info );
+// uac.getAWSAccessKeyIdJson( storage_info );
+// uac.getAWSSecretKeyJson( storage_info );
if ( bucketName == null ) {
throw new NullPointerException( "Could not find field 'bucketName'" );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf6acf5e/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 448edb7..79c9e72 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
@@ -376,8 +376,8 @@ public class ImportServiceImpl implements ImportService {
(Map<String, Object>) properties.get("storage_info");
String bucketName = (String) storage_info.get("bucket_location");
- String accessId = (String) storage_info.get( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR);
- String secretKey = (String) storage_info.get( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR);
+ String accessId = (String) storage_info.get( "s3_access_id" );
+ String secretKey = (String) storage_info.get( "s3_key" );
// get Import Entity from the management app, update it to show that job has started
@@ -511,8 +511,8 @@ public class ImportServiceImpl implements ImportService {
(Map<String, Object>) properties.get("storage_info");
String bucketName = (String) storage_info.get("bucket_location");
- String accessId = (String) storage_info.get( SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR);
- String secretKey = (String) storage_info.get( SDKGlobalConfiguration.SECRET_KEY_ENV_VAR);
+ String accessId = (String) storage_info.get( "s3_access_id");
+ String secretKey = (String) storage_info.get( "s3_key" );
FileImport fileImport = getFileImportEntity(jobExecution);
String fileName = jobExecution.getJobData().getProperty("File").toString();
[2/2] incubator-usergrid git commit: Merge branch 'two-dot-o-import'
of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-import
Posted by sn...@apache.org.
Merge branch 'two-dot-o-import' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-import
Conflicts:
stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a4270d8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a4270d8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a4270d8a
Branch: refs/heads/two-dot-o-import
Commit: a4270d8a1149eed242da96109f5d8377b62940d7
Parents: bf6acf5 58f4828
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Feb 10 21:06:11 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Feb 10 21:06:11 2015 -0500
----------------------------------------------------------------------
.../rest/applications/ServiceResource.java | 5 +
.../applications/ApplicationResource.java | 123 +----------
.../applications/imports/ImportResource.java | 108 +++++++++
.../applications/imports/ImportsResource.java | 217 +++++++++++++++++++
.../rest/management/ImportResourceIT.java | 102 ++++++++-
.../resources/corepersistence-UNIT.properties | 2 +
.../management/importer/ImportService.java | 43 +++-
.../management/importer/ImportServiceImpl.java | 32 ++-
.../management/importer/ImportCollectionIT.java | 25 +--
.../management/importer/ImportServiceIT.java | 24 +-
.../usergrid/management/importer/S3Upload.java | 2 +-
11 files changed, 532 insertions(+), 151 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a4270d8a/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
----------------------------------------------------------------------