incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelv...@apache.org
Subject git commit: Put a tempoary fix to awsapi to workaround an issue with jetty/Spring integration limitation
Date Tue, 29 Jan 2013 01:45:42 GMT
Updated Branches:
  refs/heads/javelin 8887f01b3 -> b5deb52fb


Put a tempoary fix to awsapi to workaround an issue with jetty/Spring integration limitation


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b5deb52f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b5deb52f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b5deb52f

Branch: refs/heads/javelin
Commit: b5deb52fba3faa8b5aba06f037b1f5f41e41158c
Parents: 8887f01
Author: Kelven Yang <kelveny@gmail.com>
Authored: Mon Jan 28 17:45:16 2013 -0800
Committer: Kelven Yang <kelveny@gmail.com>
Committed: Mon Jan 28 17:45:16 2013 -0800

----------------------------------------------------------------------
 awsapi/pom.xml                                     |    2 +-
 .../com/cloud/bridge/service/EC2MainServlet.java   |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b5deb52f/awsapi/pom.xml
----------------------------------------------------------------------
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index 52b8f8c..c040379 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -326,7 +326,7 @@
           </connectors>
           <contextPath>/awsapi</contextPath>
           <webXml>${basedir}/web/web.xml</webXml>
-          <webAppSourceDirectory>${basedir}/target/cloud-awsapi-${project.version}</webAppSourceDirectory>
+          <webAppSourceDirectory>${basedir}/target/generated-webapp</webAppSourceDirectory>
         </configuration>
       </plugin>
       <plugin>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b5deb52f/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java b/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
index e6f1f1b..e76daae 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
@@ -74,6 +74,7 @@ public class EC2MainServlet extends HttpServlet{
     @DB
     public void init( ServletConfig config ) throws ServletException {
         try{
+        	initComponent();
             ConfigurationHelper.preConfigureConfigPathFromServletContext(config.getServletContext());
             // check if API is enabled
             String value = csDao.getConfigValue(ENABLE_EC2_API);


Mime
View raw message