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 BF79310E4B for ; Tue, 9 Jul 2013 20:45:50 +0000 (UTC) Received: (qmail 4938 invoked by uid 500); 9 Jul 2013 20:45:44 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 4871 invoked by uid 500); 9 Jul 2013 20:45:44 -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 4248 invoked by uid 99); 9 Jul 2013 20:45:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jul 2013 20:45:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CE0F3889DFD; Tue, 9 Jul 2013 20:45:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Tue, 09 Jul 2013 20:46:06 -0000 Message-Id: <55e4d667207a40f68825ea04a0d2afd4@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [24/50] [abbrv] git commit: updated refs/heads/ui-ucs to 9334dab CLOUDSTACK-3112. UserCredentials that is injected in AuthenticationHandler is not picked up Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24e97978 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24e97978 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24e97978 Branch: refs/heads/ui-ucs Commit: 24e9797807a1cad684592ce47a75475752f8e2bb Parents: 814630c Author: Likitha Shetty Authored: Mon Jul 8 15:35:29 2013 +0530 Committer: Likitha Shetty Committed: Mon Jul 8 15:37:57 2013 +0530 ---------------------------------------------------------------------- .../src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24e97978/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java index 0406084..41aacb3 100644 --- a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java +++ b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java @@ -39,13 +39,13 @@ import org.w3c.dom.NodeList; import com.cloud.bridge.model.UserCredentialsVO; import com.cloud.bridge.persist.dao.UserCredentialsDao; +import com.cloud.bridge.persist.dao.UserCredentialsDaoImpl; import com.cloud.bridge.service.UserContext; import com.cloud.bridge.util.AuthenticationUtils; public class AuthenticationHandler implements Handler { protected final static Logger logger = Logger.getLogger(AuthenticationHandler.class); - @Inject protected UserCredentialsDao ucDao; private DocumentBuilderFactory dbf = null; protected HandlerDescription handlerDesc = new HandlerDescription( "EC2AuthenticationHandler" ); @@ -117,9 +117,7 @@ public class AuthenticationHandler implements Handler { logger.debug( "X509 cert's uniqueId: " + uniqueId ); // -> find the Cloud API key and the secret key from the cert's uniqueId - /* UserCredentialsDao credentialDao = new UserCredentialsDao(); - UserCredentials cloudKeys = credentialDao.getByCertUniqueId( uniqueId ); - */ + UserCredentialsDao ucDao = new UserCredentialsDaoImpl(); UserCredentialsVO cloudKeys = ucDao.getByCertUniqueId(uniqueId); if ( null == cloudKeys ) { logger.error( "Cert does not map to Cloud API keys: " + uniqueId );