From 1fb4d29c863c56010c3835719a113dfa6995bf49 Mon Sep 17 00:00:00 2001
From: stvort <stvort@mail.ru>
Date: Sat, 7 Mar 2020 00:33:10 +0400
Subject: [PATCH] Spring-2020-02 spring-03-aop examples has been modifyed

---
 .../.gitignore                                            | 0
 .../pom.xml                                               | 2 +-
 .../spring-03-exercise/pom.xml                            | 0
 .../src/main/java/ru/otus/spring/Main.java                | 0
 .../src/main/java/ru/otus/spring/dao/PersonDao.java       | 0
 .../src/main/java/ru/otus/spring/dao/PersonDaoSimple.java | 0
 .../src/main/java/ru/otus/spring/domain/Person.java       | 0
 .../main/java/ru/otus/spring/logging/LoggingAspect.java   | 2 +-
 .../main/java/ru/otus/spring/service/PersonService.java   | 0
 .../java/ru/otus/spring/service/PersonServiceImpl.java    | 0
 .../spring-03-solution/pom.xml                            | 0
 .../src/main/java/ru/otus/spring/Main.java                | 0
 .../src/main/java/ru/otus/spring/dao/PersonDao.java       | 0
 .../src/main/java/ru/otus/spring/dao/PersonDaoSimple.java | 0
 .../src/main/java/ru/otus/spring/domain/Person.java       | 0
 .../main/java/ru/otus/spring/logging/LoggingAspect.java   | 0
 .../main/java/ru/otus/spring/service/PersonService.java   | 0
 .../java/ru/otus/spring/service/PersonServiceImpl.java    | 0
 2020-02/spring-03-aop/spring-03-aop-demo/pom.xml          | 8 ++++----
 .../{spring-03-ctw => spring-03-aop-ctw}/pom.xml          | 2 +-
 .../src/main/java/ru/otus/spring/Main.java                | 0
 .../src/main/java/ru/otus/spring/dao/PersonDao.java       | 0
 .../src/main/java/ru/otus/spring/dao/PersonDaoSimple.java | 0
 .../src/main/java/ru/otus/spring/domain/Person.java       | 0
 .../main/java/ru/otus/spring/logging/LoggingAspect.java   | 0
 .../main/java/ru/otus/spring/service/PersonService.java   | 0
 .../java/ru/otus/spring/service/PersonServiceImpl.java    | 0
 .../{spring-03-ltw => spring-03-aop-ltw}/pom.xml          | 2 +-
 .../src/main/java/ru/otus/spring/Main.java                | 4 ----
 .../src/main/java/ru/otus/spring/dao/PersonDao.java       | 0
 .../src/main/java/ru/otus/spring/dao/PersonDaoSimple.java | 0
 .../src/main/java/ru/otus/spring/domain/Person.java       | 0
 .../main/java/ru/otus/spring/logging/LoggingAspect.java   | 1 -
 .../main/java/ru/otus/spring/service/PersonService.java   | 0
 .../java/ru/otus/spring/service/PersonServiceImpl.java    | 0
 .../src/main/resources/META-INF/aop.xml                   | 0
 .../pom.xml                                               | 2 +-
 .../src/main/java/ru/otus/spring/Main.java                | 0
 .../java/ru/otus/spring/config/CommonNativeAopConfig.java | 0
 .../java/ru/otus/spring/config/LoggingAspectConfig.java   | 0
 .../src/main/java/ru/otus/spring/dao/PersonDao.java       | 0
 .../src/main/java/ru/otus/spring/dao/PersonDaoSimple.java | 0
 .../src/main/java/ru/otus/spring/domain/Person.java       | 0
 .../main/java/ru/otus/spring/service/PersonService.java   | 0
 .../java/ru/otus/spring/service/PersonServiceImpl.java    | 0
 45 files changed, 9 insertions(+), 14 deletions(-)
 rename 2020-02/spring-03-aop/{spring-aop-classwork => spring-03-aop-classwork}/.gitignore (100%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork => spring-03-aop-classwork}/pom.xml (90%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork => spring-03-aop-classwork}/spring-03-exercise/pom.xml (100%)
 rename 2020-02/spring-03-aop/{spring-03-aop-demo/spring-03-native-aop => spring-03-aop-classwork/spring-03-exercise}/src/main/java/ru/otus/spring/Main.java (100%)
 rename 2020-02/spring-03-aop/{spring-03-aop-demo/spring-03-ctw => spring-03-aop-classwork/spring-03-exercise}/src/main/java/ru/otus/spring/dao/PersonDao.java (100%)
 rename 2020-02/spring-03-aop/{spring-03-aop-demo/spring-03-ctw => spring-03-aop-classwork/spring-03-exercise}/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java (100%)
 rename 2020-02/spring-03-aop/{spring-03-aop-demo/spring-03-ctw => spring-03-aop-classwork/spring-03-exercise}/src/main/java/ru/otus/spring/domain/Person.java (100%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork => spring-03-aop-classwork}/spring-03-exercise/src/main/java/ru/otus/spring/logging/LoggingAspect.java (79%)
 rename 2020-02/spring-03-aop/{spring-03-aop-demo/spring-03-ctw => spring-03-aop-classwork/spring-03-exercise}/src/main/java/ru/otus/spring/service/PersonService.java (100%)
 rename 2020-02/spring-03-aop/{spring-03-aop-demo/spring-03-ctw => spring-03-aop-classwork/spring-03-exercise}/src/main/java/ru/otus/spring/service/PersonServiceImpl.java (100%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork => spring-03-aop-classwork}/spring-03-solution/pom.xml (100%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork => spring-03-aop-classwork}/spring-03-solution/src/main/java/ru/otus/spring/Main.java (100%)
 rename 2020-02/spring-03-aop/{spring-03-aop-demo/spring-03-ltw => spring-03-aop-classwork/spring-03-solution}/src/main/java/ru/otus/spring/dao/PersonDao.java (100%)
 rename 2020-02/spring-03-aop/{spring-03-aop-demo/spring-03-native-aop => spring-03-aop-classwork/spring-03-solution}/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java (100%)
 rename 2020-02/spring-03-aop/{spring-03-aop-demo/spring-03-ltw => spring-03-aop-classwork/spring-03-solution}/src/main/java/ru/otus/spring/domain/Person.java (100%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork => spring-03-aop-classwork}/spring-03-solution/src/main/java/ru/otus/spring/logging/LoggingAspect.java (100%)
 rename 2020-02/spring-03-aop/{spring-03-aop-demo/spring-03-ltw => spring-03-aop-classwork/spring-03-solution}/src/main/java/ru/otus/spring/service/PersonService.java (100%)
 rename 2020-02/spring-03-aop/{spring-03-aop-demo/spring-03-ltw => spring-03-aop-classwork/spring-03-solution}/src/main/java/ru/otus/spring/service/PersonServiceImpl.java (100%)
 rename 2020-02/spring-03-aop/spring-03-aop-demo/{spring-03-ctw => spring-03-aop-ctw}/pom.xml (98%)
 rename 2020-02/spring-03-aop/spring-03-aop-demo/{spring-03-ctw => spring-03-aop-ctw}/src/main/java/ru/otus/spring/Main.java (100%)
 rename 2020-02/spring-03-aop/spring-03-aop-demo/{spring-03-native-aop => spring-03-aop-ctw}/src/main/java/ru/otus/spring/dao/PersonDao.java (100%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork/spring-03-exercise => spring-03-aop-demo/spring-03-aop-ctw}/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java (100%)
 rename 2020-02/spring-03-aop/spring-03-aop-demo/{spring-03-native-aop => spring-03-aop-ctw}/src/main/java/ru/otus/spring/domain/Person.java (100%)
 rename 2020-02/spring-03-aop/spring-03-aop-demo/{spring-03-ctw => spring-03-aop-ctw}/src/main/java/ru/otus/spring/logging/LoggingAspect.java (100%)
 rename 2020-02/spring-03-aop/spring-03-aop-demo/{spring-03-native-aop => spring-03-aop-ctw}/src/main/java/ru/otus/spring/service/PersonService.java (100%)
 rename 2020-02/spring-03-aop/spring-03-aop-demo/{spring-03-native-aop => spring-03-aop-ctw}/src/main/java/ru/otus/spring/service/PersonServiceImpl.java (100%)
 rename 2020-02/spring-03-aop/spring-03-aop-demo/{spring-03-ltw => spring-03-aop-ltw}/pom.xml (97%)
 rename 2020-02/spring-03-aop/spring-03-aop-demo/{spring-03-ltw => spring-03-aop-ltw}/src/main/java/ru/otus/spring/Main.java (83%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork/spring-03-exercise => spring-03-aop-demo/spring-03-aop-ltw}/src/main/java/ru/otus/spring/dao/PersonDao.java (100%)
 rename 2020-02/spring-03-aop/spring-03-aop-demo/{spring-03-ltw => spring-03-aop-ltw}/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java (100%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork/spring-03-exercise => spring-03-aop-demo/spring-03-aop-ltw}/src/main/java/ru/otus/spring/domain/Person.java (100%)
 rename 2020-02/spring-03-aop/spring-03-aop-demo/{spring-03-ltw => spring-03-aop-ltw}/src/main/java/ru/otus/spring/logging/LoggingAspect.java (98%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork/spring-03-exercise => spring-03-aop-demo/spring-03-aop-ltw}/src/main/java/ru/otus/spring/service/PersonService.java (100%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork/spring-03-exercise => spring-03-aop-demo/spring-03-aop-ltw}/src/main/java/ru/otus/spring/service/PersonServiceImpl.java (100%)
 rename 2020-02/spring-03-aop/spring-03-aop-demo/{spring-03-ltw => spring-03-aop-ltw}/src/main/resources/META-INF/aop.xml (100%)
 rename 2020-02/spring-03-aop/spring-03-aop-demo/{spring-03-native-aop => spring-03-aop-native}/pom.xml (96%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork/spring-03-exercise => spring-03-aop-demo/spring-03-aop-native}/src/main/java/ru/otus/spring/Main.java (100%)
 rename 2020-02/spring-03-aop/spring-03-aop-demo/{spring-03-native-aop => spring-03-aop-native}/src/main/java/ru/otus/spring/config/CommonNativeAopConfig.java (100%)
 rename 2020-02/spring-03-aop/spring-03-aop-demo/{spring-03-native-aop => spring-03-aop-native}/src/main/java/ru/otus/spring/config/LoggingAspectConfig.java (100%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork/spring-03-solution => spring-03-aop-demo/spring-03-aop-native}/src/main/java/ru/otus/spring/dao/PersonDao.java (100%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork/spring-03-solution => spring-03-aop-demo/spring-03-aop-native}/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java (100%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork/spring-03-solution => spring-03-aop-demo/spring-03-aop-native}/src/main/java/ru/otus/spring/domain/Person.java (100%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork/spring-03-solution => spring-03-aop-demo/spring-03-aop-native}/src/main/java/ru/otus/spring/service/PersonService.java (100%)
 rename 2020-02/spring-03-aop/{spring-aop-classwork/spring-03-solution => spring-03-aop-demo/spring-03-aop-native}/src/main/java/ru/otus/spring/service/PersonServiceImpl.java (100%)

diff --git a/2020-02/spring-03-aop/spring-aop-classwork/.gitignore b/2020-02/spring-03-aop/spring-03-aop-classwork/.gitignore
similarity index 100%
rename from 2020-02/spring-03-aop/spring-aop-classwork/.gitignore
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/.gitignore
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/pom.xml b/2020-02/spring-03-aop/spring-03-aop-classwork/pom.xml
similarity index 90%
rename from 2020-02/spring-03-aop/spring-aop-classwork/pom.xml
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/pom.xml
index 330c239d..af92b287 100644
--- a/2020-02/spring-03-aop/spring-aop-classwork/pom.xml
+++ b/2020-02/spring-03-aop/spring-03-aop-classwork/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>ru.otus</groupId>
-    <artifactId>spring-aop-classwork</artifactId>
+    <artifactId>spring-03-aop-classwork</artifactId>
     <version>1.0</version>
 
     <packaging>pom</packaging>
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/pom.xml b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/pom.xml
similarity index 100%
rename from 2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/pom.xml
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/pom.xml
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/src/main/java/ru/otus/spring/Main.java b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/Main.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/src/main/java/ru/otus/spring/Main.java
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/Main.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/src/main/java/ru/otus/spring/dao/PersonDao.java b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/dao/PersonDao.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/src/main/java/ru/otus/spring/dao/PersonDao.java
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/dao/PersonDao.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/src/main/java/ru/otus/spring/domain/Person.java b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/domain/Person.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/src/main/java/ru/otus/spring/domain/Person.java
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/domain/Person.java
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/logging/LoggingAspect.java b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/logging/LoggingAspect.java
similarity index 79%
rename from 2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/logging/LoggingAspect.java
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/logging/LoggingAspect.java
index 550eb211..4f12dc0c 100644
--- a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/logging/LoggingAspect.java
+++ b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/logging/LoggingAspect.java
@@ -6,7 +6,7 @@ public class LoggingAspect {
 
     public void logBefore(JoinPoint joinPoint) {
         System.out.println("Прокси : " + joinPoint.getThis().getClass().getName());
-        System.out.println("Класс : " + joinPoint.getThis().getClass().getName());
+        System.out.println("Класс : " + joinPoint.getTarget().getClass().getName());
 
         System.out.println("Вызов метода : " + joinPoint.getSignature().getName());
     }
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/src/main/java/ru/otus/spring/service/PersonService.java b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/service/PersonService.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/src/main/java/ru/otus/spring/service/PersonService.java
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/service/PersonService.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/src/main/java/ru/otus/spring/service/PersonServiceImpl.java b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/service/PersonServiceImpl.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/src/main/java/ru/otus/spring/service/PersonServiceImpl.java
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/service/PersonServiceImpl.java
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-solution/pom.xml b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-solution/pom.xml
similarity index 100%
rename from 2020-02/spring-03-aop/spring-aop-classwork/spring-03-solution/pom.xml
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-solution/pom.xml
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/Main.java b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/Main.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/Main.java
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/Main.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/java/ru/otus/spring/dao/PersonDao.java b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/dao/PersonDao.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/java/ru/otus/spring/dao/PersonDao.java
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/dao/PersonDao.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/java/ru/otus/spring/domain/Person.java b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/domain/Person.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/java/ru/otus/spring/domain/Person.java
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/domain/Person.java
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/logging/LoggingAspect.java b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/logging/LoggingAspect.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/logging/LoggingAspect.java
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/logging/LoggingAspect.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/java/ru/otus/spring/service/PersonService.java b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/service/PersonService.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/java/ru/otus/spring/service/PersonService.java
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/service/PersonService.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/java/ru/otus/spring/service/PersonServiceImpl.java b/2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/service/PersonServiceImpl.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/java/ru/otus/spring/service/PersonServiceImpl.java
rename to 2020-02/spring-03-aop/spring-03-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/service/PersonServiceImpl.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/pom.xml b/2020-02/spring-03-aop/spring-03-aop-demo/pom.xml
index 69b5f5a5..7d522882 100644
--- a/2020-02/spring-03-aop/spring-03-aop-demo/pom.xml
+++ b/2020-02/spring-03-aop/spring-03-aop-demo/pom.xml
@@ -5,14 +5,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>ru.otus</groupId>
-    <artifactId>spring-03—aop-demo</artifactId>
+    <artifactId>spring-03-aop-demo</artifactId>
     <version>1.0</version>
 
     <packaging>pom</packaging>
 
     <modules>
-        <module>spring-03-ctw</module>
-        <module>spring-03-ltw</module>
-		<module>spring-03-native-aop</module>
+        <module>spring-03-aop-ctw</module>
+        <module>spring-03-aop-ltw</module>
+		<module>spring-03-aop-native</module>
     </modules>
 </project>
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/pom.xml b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/pom.xml
similarity index 98%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/pom.xml
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/pom.xml
index f46fc17e..03bf0ff3 100644
--- a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/pom.xml
+++ b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>ru.otus</groupId>
-    <artifactId>spring-03-ctw</artifactId>
+    <artifactId>spring-03-aop-ctw</artifactId>
     <version>1.0</version>
 
     <properties>
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/src/main/java/ru/otus/spring/Main.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/src/main/java/ru/otus/spring/Main.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/src/main/java/ru/otus/spring/Main.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/src/main/java/ru/otus/spring/Main.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/src/main/java/ru/otus/spring/dao/PersonDao.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/src/main/java/ru/otus/spring/dao/PersonDao.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/src/main/java/ru/otus/spring/dao/PersonDao.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/src/main/java/ru/otus/spring/dao/PersonDao.java
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/src/main/java/ru/otus/spring/domain/Person.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/src/main/java/ru/otus/spring/domain/Person.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/src/main/java/ru/otus/spring/domain/Person.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/src/main/java/ru/otus/spring/domain/Person.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/src/main/java/ru/otus/spring/logging/LoggingAspect.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/src/main/java/ru/otus/spring/logging/LoggingAspect.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ctw/src/main/java/ru/otus/spring/logging/LoggingAspect.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/src/main/java/ru/otus/spring/logging/LoggingAspect.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/src/main/java/ru/otus/spring/service/PersonService.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/src/main/java/ru/otus/spring/service/PersonService.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/src/main/java/ru/otus/spring/service/PersonService.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/src/main/java/ru/otus/spring/service/PersonService.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/src/main/java/ru/otus/spring/service/PersonServiceImpl.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/src/main/java/ru/otus/spring/service/PersonServiceImpl.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/src/main/java/ru/otus/spring/service/PersonServiceImpl.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ctw/src/main/java/ru/otus/spring/service/PersonServiceImpl.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/pom.xml b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/pom.xml
similarity index 97%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/pom.xml
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/pom.xml
index 3912d97e..48a9353e 100644
--- a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/pom.xml
+++ b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>ru.otus</groupId>
-    <artifactId>spring-03-ltw</artifactId>
+    <artifactId>spring-03-aop-ltw</artifactId>
     <version>1.0</version>
 
     <properties>
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/java/ru/otus/spring/Main.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/java/ru/otus/spring/Main.java
similarity index 83%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/java/ru/otus/spring/Main.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/java/ru/otus/spring/Main.java
index 33bc63b8..0a81e71e 100644
--- a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/java/ru/otus/spring/Main.java
+++ b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/java/ru/otus/spring/Main.java
@@ -14,12 +14,8 @@ import ru.otus.spring.service.PersonService;
        Пример: "-javaagent:c:\Users\MyUserName\.m2\repository\org\aspectj\aspectjweaver\1.9.5\aspectjweaver-1.9.5.jar".
        Кавычки не вносим)
     3. Запускаем Main
-
-    -javaagent:c:\Users\StVort\.m2\repository\org\aspectj\aspectjweaver\1.9.5\aspectjweaver-1.9.5.jar
-    -javaagent:c:\Users\StVort\.m2\repository\org\springframework\spring-instrument\5.2.1.RELEASE\spring-instrument-5.2.1.RELEASE.jar
 */
 
-//@EnableLoadTimeWeaving
 @Configuration
 @ComponentScan
 public class Main {
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/dao/PersonDao.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/java/ru/otus/spring/dao/PersonDao.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/dao/PersonDao.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/java/ru/otus/spring/dao/PersonDao.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/domain/Person.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/java/ru/otus/spring/domain/Person.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/domain/Person.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/java/ru/otus/spring/domain/Person.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/java/ru/otus/spring/logging/LoggingAspect.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/java/ru/otus/spring/logging/LoggingAspect.java
similarity index 98%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/java/ru/otus/spring/logging/LoggingAspect.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/java/ru/otus/spring/logging/LoggingAspect.java
index 130c9932..17a56801 100644
--- a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/java/ru/otus/spring/logging/LoggingAspect.java
+++ b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/java/ru/otus/spring/logging/LoggingAspect.java
@@ -5,7 +5,6 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.springframework.stereotype.Component;
 
-@Component
 @Aspect
 public class LoggingAspect {
 
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/service/PersonService.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/java/ru/otus/spring/service/PersonService.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/service/PersonService.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/java/ru/otus/spring/service/PersonService.java
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/service/PersonServiceImpl.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/java/ru/otus/spring/service/PersonServiceImpl.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/service/PersonServiceImpl.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/java/ru/otus/spring/service/PersonServiceImpl.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/resources/META-INF/aop.xml b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/resources/META-INF/aop.xml
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-ltw/src/main/resources/META-INF/aop.xml
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-ltw/src/main/resources/META-INF/aop.xml
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/pom.xml b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/pom.xml
similarity index 96%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/pom.xml
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/pom.xml
index 47a5a17c..c13beca2 100644
--- a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/pom.xml
+++ b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>ru.otus</groupId>
-    <artifactId>spring-03-native-aop</artifactId>
+    <artifactId>spring-03-aop-native</artifactId>
     <version>1.0</version>
 
     <properties>
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/Main.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/src/main/java/ru/otus/spring/Main.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-aop-classwork/spring-03-exercise/src/main/java/ru/otus/spring/Main.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/src/main/java/ru/otus/spring/Main.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/src/main/java/ru/otus/spring/config/CommonNativeAopConfig.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/src/main/java/ru/otus/spring/config/CommonNativeAopConfig.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/src/main/java/ru/otus/spring/config/CommonNativeAopConfig.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/src/main/java/ru/otus/spring/config/CommonNativeAopConfig.java
diff --git a/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/src/main/java/ru/otus/spring/config/LoggingAspectConfig.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/src/main/java/ru/otus/spring/config/LoggingAspectConfig.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-native-aop/src/main/java/ru/otus/spring/config/LoggingAspectConfig.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/src/main/java/ru/otus/spring/config/LoggingAspectConfig.java
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/dao/PersonDao.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/src/main/java/ru/otus/spring/dao/PersonDao.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/dao/PersonDao.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/src/main/java/ru/otus/spring/dao/PersonDao.java
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/domain/Person.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/src/main/java/ru/otus/spring/domain/Person.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/domain/Person.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/src/main/java/ru/otus/spring/domain/Person.java
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/service/PersonService.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/src/main/java/ru/otus/spring/service/PersonService.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/service/PersonService.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/src/main/java/ru/otus/spring/service/PersonService.java
diff --git a/2020-02/spring-03-aop/spring-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/service/PersonServiceImpl.java b/2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/src/main/java/ru/otus/spring/service/PersonServiceImpl.java
similarity index 100%
rename from 2020-02/spring-03-aop/spring-aop-classwork/spring-03-solution/src/main/java/ru/otus/spring/service/PersonServiceImpl.java
rename to 2020-02/spring-03-aop/spring-03-aop-demo/spring-03-aop-native/src/main/java/ru/otus/spring/service/PersonServiceImpl.java