Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 283AF10084 for ; Mon, 22 Jul 2013 05:37:36 +0000 (UTC) Received: (qmail 71855 invoked by uid 500); 22 Jul 2013 05:37:13 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 71743 invoked by uid 500); 22 Jul 2013 05:37:12 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 71663 invoked by uid 99); 22 Jul 2013 05:37:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jul 2013 05:37:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5BB2C8B03EC; Mon, 22 Jul 2013 05:37:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yasker@apache.org To: commits@cloudstack.apache.org Date: Mon, 22 Jul 2013 05:37:11 -0000 Message-Id: In-Reply-To: <9e4d970aa53f475ab41429fafa5de378@git.apache.org> References: <9e4d970aa53f475ab41429fafa5de378@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/50] [abbrv] git commit: updated refs/heads/pvlan to ce299da CLOUDSTACK-2552. Modify AWSAPI to decrypt db values using the decrypted database_key and not management_server_key Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/046580fc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/046580fc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/046580fc Branch: refs/heads/pvlan Commit: 046580fcf117aadf77179011ecfb5dfffdcca65f Parents: adbebc1 Author: Likitha Shetty Authored: Fri May 17 13:12:36 2013 +0530 Committer: Likitha Shetty Committed: Fri May 17 13:16:04 2013 +0530 ---------------------------------------------------------------------- .../cloud/bridge/persist/dao/CloudStackUserDaoImpl.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/046580fc/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java index f108a20..5aac396 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java @@ -19,15 +19,14 @@ package com.cloud.bridge.persist.dao; import javax.ejb.Local; import org.apache.log4j.Logger; -import org.jasypt.encryption.pbe.StandardPBEStringEncryptor; import org.springframework.stereotype.Component; import com.cloud.bridge.model.CloudStackUserVO; -import com.cloud.bridge.util.EncryptionSecretKeyCheckerUtil; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +import com.cloud.utils.crypt.DBEncryptionUtil; @Component @Local(value={CloudStackUserDao.class}) @@ -51,13 +50,8 @@ public class CloudStackUserDaoImpl extends GenericDaoBase