From efcf58672ed20c60ba85e1d58c84968857e4d3fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Tue, 16 Mar 2010 12:30:21 +0100
Subject: [PATCH] ItEr51S04ValidacionEProbasFuncionaisItEr50S04: Adding AspectJ
 support.

Using Spring AOP runtime support. This means aspects are only applied on
spring beans.
---
 navalplanner-business/pom.xml                       | 10 ++++++++++
 .../navalplanner-business-spring-config.xml         |  4 ++++
 pom.xml                                             | 13 +++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/navalplanner-business/pom.xml b/navalplanner-business/pom.xml
index ad56e0233..8a0c4d961 100644
--- a/navalplanner-business/pom.xml
+++ b/navalplanner-business/pom.xml
@@ -41,6 +41,16 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
         </dependency>
+        <!-- Spring AOP support -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjtools</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
diff --git a/navalplanner-business/src/main/resources/navalplanner-business-spring-config.xml b/navalplanner-business/src/main/resources/navalplanner-business-spring-config.xml
index a4167794f..2c4f74c55 100644
--- a/navalplanner-business/src/main/resources/navalplanner-business-spring-config.xml
+++ b/navalplanner-business/src/main/resources/navalplanner-business-spring-config.xml
@@ -2,12 +2,16 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+    xmlns:aop="http://www.springframework.org/schema/aop"
     xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="
     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
+    <aop:aspectj-autoproxy/>
+
     <!--  Data source. -->
     <bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean"
         p:jndiName="${dataSource.jndiName}" p:resourceRef="true" />
diff --git a/pom.xml b/pom.xml
index 9713bc416..c06f74759 100644
--- a/pom.xml
+++ b/pom.xml
@@ -328,6 +328,19 @@
                 <artifactId>spring-security-core-tiger</artifactId>
                 <version>2.0.5.RELEASE</version>
             </dependency>
+            <!--  AspectJ -->
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-aop</artifactId>
+                <version>2.5.6</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.aspectj</groupId>
+                <artifactId>aspectjtools</artifactId>
+                <version>1.5.4</version>
+            </dependency>
+
             <!--  AspectJ (required by Spring Security) -->
             <dependency>
                 <groupId>org.aspectj</groupId>