From a9224ba3fe3bffaa90b2bcc8be5fa1a2e1df48d2 Mon Sep 17 00:00:00 2001
From: jmaupoux <jmaupoux@ITEM-57623.dhcp.matt.fr.sopra>
Date: Tue, 17 Jul 2012 21:28:41 +0200
Subject: [PATCH] #6 Adding property to mail.properties + AOP class Remain IHM
 adjustment

---
 .../src/main/resources/mail.properties        |  2 +
 .../main/resources/conf-embedded.properties   |  1 +
 ultimate-breakfast-domain/pom.xml             | 37 +++++++++++++++++++
 .../domain/aop/mail/MailEnableAspect.java     | 24 ++++++++++++
 .../main/resources/applicationContext-aop.xml | 14 +++++++
 .../resources/applicationContext-domain.xml   |  2 +
 6 files changed, 80 insertions(+)
 create mode 100644 ultimate-breakfast-domain/src/main/java/fr/ultimate/breakfast/domain/aop/mail/MailEnableAspect.java
 create mode 100644 ultimate-breakfast-domain/src/main/resources/applicationContext-aop.xml

diff --git a/ultimate-breakfast-classpath/src/main/resources/mail.properties b/ultimate-breakfast-classpath/src/main/resources/mail.properties
index 1bce415..01cfb05 100644
--- a/ultimate-breakfast-classpath/src/main/resources/mail.properties
+++ b/ultimate-breakfast-classpath/src/main/resources/mail.properties
@@ -2,6 +2,8 @@
 ### Mail configuration ###
 ##########################
 
+#Should mail feature be enabled ?
+mail.enabled=true
 # The mail server host
 mail.server.host=localhost
 # The mail server port
diff --git a/ultimate-breakfast-common/src/main/resources/conf-embedded.properties b/ultimate-breakfast-common/src/main/resources/conf-embedded.properties
index 6fc8973..9d3c479 100644
--- a/ultimate-breakfast-common/src/main/resources/conf-embedded.properties
+++ b/ultimate-breakfast-common/src/main/resources/conf-embedded.properties
@@ -17,6 +17,7 @@ application-log-level=ERROR
 log-home=./
 
 # Mail configuration
+mail.enabled=false
 mail.server.host=localhost
 mail.server.port=25
 mail.from=noreply@ultimate-breakfast.fr
diff --git a/ultimate-breakfast-domain/pom.xml b/ultimate-breakfast-domain/pom.xml
index f986783..35eeafc 100644
--- a/ultimate-breakfast-domain/pom.xml
+++ b/ultimate-breakfast-domain/pom.xml
@@ -27,6 +27,43 @@
 			<artifactId>spring-security-core</artifactId>
 			<version>${spring-security-version}</version>
 		</dependency>
+    
+        <!-- AOP -->
+        <dependency>
+          <groupId>org.springframework</groupId>
+          <artifactId>org.springframework.asm</artifactId>
+          <version>${spring-version}</version>
+        </dependency>
+        
+        <dependency>
+          <groupId>org.springframework</groupId>
+          <artifactId>org.springframework.aop</artifactId>
+          <version>${spring-version}</version>
+        </dependency>
+        
+        <dependency>
+          <groupId>org.springframework</groupId>
+          <artifactId>org.springframework.aspects</artifactId>
+          <version>${spring-version}</version>
+        </dependency>
+        
+        <dependency>
+          <groupId>org.springframework</groupId>
+          <artifactId>org.springframework.expression</artifactId>
+          <version>${spring-version}</version>
+        </dependency>
+        
+        <dependency>
+          <groupId>org.aspectj</groupId>
+          <artifactId>aspectjrt</artifactId>
+          <version>1.6.11</version>
+        </dependency>
+     
+        <dependency>
+          <groupId>org.aspectj</groupId>
+          <artifactId>aspectjweaver</artifactId>
+          <version>1.6.11</version>
+        </dependency>
 
 		<!-- Dependances pour Unitils -->
 		<dependency>
diff --git a/ultimate-breakfast-domain/src/main/java/fr/ultimate/breakfast/domain/aop/mail/MailEnableAspect.java b/ultimate-breakfast-domain/src/main/java/fr/ultimate/breakfast/domain/aop/mail/MailEnableAspect.java
new file mode 100644
index 0000000..e065ed5
--- /dev/null
+++ b/ultimate-breakfast-domain/src/main/java/fr/ultimate/breakfast/domain/aop/mail/MailEnableAspect.java
@@ -0,0 +1,24 @@
+package fr.ultimate.breakfast.domain.aop.mail;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Aspect
+@Component
+public class MailEnableAspect
+{
+    @Value("${mail.enabled}")
+    private boolean mailEnabled;
+
+    // @Around("execution(* *(..))")
+    @Around("execution(* fr.ultimate.breakfast.mail.service.UltimateBreakfastMailService.*(..))")
+    public Object logAround(ProceedingJoinPoint joinPoint) throws Throwable
+    {
+        if (mailEnabled) { return joinPoint.proceed(); }
+        return null;
+    }
+
+}
diff --git a/ultimate-breakfast-domain/src/main/resources/applicationContext-aop.xml b/ultimate-breakfast-domain/src/main/resources/applicationContext-aop.xml
new file mode 100644
index 0000000..d5018cd
--- /dev/null
+++ b/ultimate-breakfast-domain/src/main/resources/applicationContext-aop.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:util="http://www.springframework.org/schema/util" xmlns:tx="http://www.springframework.org/schema/tx"
+    xmlns:aop="http://www.springframework.org/schema/aop" 
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
+        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd">
+
+  <aop:aspectj-autoproxy/>
+
+</beans>
diff --git a/ultimate-breakfast-domain/src/main/resources/applicationContext-domain.xml b/ultimate-breakfast-domain/src/main/resources/applicationContext-domain.xml
index ae33fec..3355503 100644
--- a/ultimate-breakfast-domain/src/main/resources/applicationContext-domain.xml
+++ b/ultimate-breakfast-domain/src/main/resources/applicationContext-domain.xml
@@ -23,4 +23,6 @@
 	
 	<!-- End Security beans -->
 
+    <import resource="classpath*:applicationContext-aop.xml"/>
+    
 </beans>