Updated Branches: refs/heads/4.1 625eb3c49 -> ac221262c
CLOUDSTACK-1988. Attempting to register a AWS API user fails with error code 401. Fix the code to refer to /usr/share/cloudstack-management/webapps7080/awsapi/WEB-INF/classes. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ac221262 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ac221262 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ac221262 Branch: refs/heads/4.1 Commit: ac221262c3168d61aec2020c0c4df89f2dbf9509 Parents: 625eb3c Author: Likitha Shetty <likitha.she...@citrix.com> Authored: Thu Apr 11 04:25:31 2013 +0530 Committer: Chip Childers <chip.child...@gmail.com> Committed: Thu Apr 11 18:41:08 2013 +0100 ---------------------------------------------------------------------- .../com/cloud/bridge/service/EC2RestServlet.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ac221262/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java index 29a002c..630e16f 100644 --- a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java +++ b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java @@ -209,7 +209,7 @@ public class EC2RestServlet extends HttpServlet { if (installedPath == null) installedPath = System.getProperty("catalina.home"); String webappPath = config.getServletContext().getRealPath("/"); //pathToKeystore = new String( installedPath + File.separator + "webapps" + File.separator + webappName + File.separator + "WEB-INF" + File.separator + "classes" + File.separator + keystore ); - pathToKeystore = new String( webappPath + File.separator + "\\WEB-INF" + File.separator + "classes" + File.separator + keystore ); + pathToKeystore = new String( webappPath + File.separator + "WEB-INF" + File.separator + "classes" + File.separator + keystore ); } }
