Updated Branches: refs/heads/internallb 20beb7a16 -> 3f2a62c7f
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/a0b5ebcc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a0b5ebcc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a0b5ebcc Branch: refs/heads/internallb Commit: a0b5ebccb814cbb12c5f40aa0c8894ebb3b322d6 Parents: f66b9b5 Author: Likitha Shetty <[email protected]> Authored: Thu Apr 11 04:25:31 2013 +0530 Committer: Likitha Shetty <[email protected]> Committed: Thu Apr 11 04:33:14 2013 +0530 ---------------------------------------------------------------------- .../com/cloud/bridge/service/EC2RestServlet.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0b5ebcc/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 ); } }
