From b5deb52fba3faa8b5aba06f037b1f5f41e41158c Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelveny@gmail.com>
Date: Mon, 28 Jan 2013 17:45:16 -0800
Subject: [PATCH] Put a tempoary fix to awsapi to workaround an issue with
 jetty/Spring integration limitation

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

diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index 52b8f8c3306..c040379d293 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>
diff --git a/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java b/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
index e6f1f1b3d85..e76daaeceea 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);