From 9dcaf508c9bea022d1704ba545f935df84af782c Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelveny@gmail.com>
Date: Wed, 27 Mar 2013 14:51:58 -0700
Subject: [PATCH] CLOUDSTACK-1825: Update AWSAPI server's XML configuration

---
 awsapi/conf/applicationContext.xml.in | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/awsapi/conf/applicationContext.xml.in b/awsapi/conf/applicationContext.xml.in
index 0a24df214af..8b3a0222262 100644
--- a/awsapi/conf/applicationContext.xml.in
+++ b/awsapi/conf/applicationContext.xml.in
@@ -37,17 +37,19 @@
   <!--
     @DB support
   -->
-  <aop:config proxy-target-class="true">
-    <aop:aspect id="dbContextBuilder" ref="transactionContextBuilder">
-        <aop:pointcut id="captureAnyMethod"
-            expression="execution(* *(..))" 
-        />
-        
-        <aop:around pointcut-ref="captureAnyMethod" method="AroundAnyMethod"/> 
-    </aop:aspect>
-
-  </aop:config>
   
+   <!--
+    @DB support
+  -->
+  <bean id="componentContext" class="com.cloud.utils.component.ComponentContext" />
   <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" />
-
+ 
+  <bean id="instantiatePostProcessor" class="com.cloud.utils.component.ComponentInstantiationPostProcessor">
+    <property name="Interceptors">
+        <list>
+            <ref bean="transactionContextBuilder" />
+        </list>
+    </property>
+  </bean>
+ 
 </beans>