From 94d66009c38ceca60fc5b6328e6cd537f547866c Mon Sep 17 00:00:00 2001
From: ltheussl <ltheussl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 31 Mar 2006 01:22:16 +0000
Subject: [PATCH] PR: MPASPECTJ-15 Submitted by: Alexey Dashkevich New property
 maven.aspectj.dest to define output folder for aspectj:compile goal.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@390295 13f79535-47bb-0310-9956-ffa450edef68
---
 aspectj/plugin.jelly                          | 16 +++++++++++--
 aspectj/plugin.properties                     |  4 +++-
 aspectj/src/plugin-test/maven.xml             |  6 ++++-
 aspectj/src/plugin-test/project.properties    |  3 ++-
 .../org/apache/maven/aspectj/AspectTest.java  | 24 +++++++++++++++++--
 aspectj/xdocs/changes.xml                     |  3 ++-
 aspectj/xdocs/properties.xml                  | 11 ++++++++-
 7 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/aspectj/plugin.jelly b/aspectj/plugin.jelly
index f286ee73..6ba09c79 100644
--- a/aspectj/plugin.jelly
+++ b/aspectj/plugin.jelly
@@ -2,7 +2,7 @@
 
 <!-- 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -243,6 +243,18 @@
 
     <j:if test="${(shouldWeave == 'true') and (pom.build.unitTestSourceDirectory != '')}">
 
+      <j:choose>
+        <j:when test="${context.getVariable('maven.aspectj.dest') == null}">
+          <j:set var="maven.aspectj.dest" value="${maven.build.dest}"/>
+        </j:when>
+        <j:otherwise>
+          <attainGoal name="java:compile"/>
+          <ant:path id="build.dest" location="${maven.build.dest}"/>
+          <maven:addPath id="maven.dependency.classpath" refid="build.dest"/>
+        </j:otherwise>
+      </j:choose>
+
+
       <maven:get var="maven.test.compile.src.set"
         plugin="maven-test-plugin"
         property="maven.test.compile.src.set"/>
@@ -256,7 +268,7 @@
       <aspectj:compile
         sourcePathRefid="maven.test.compile.src.set"
         classpathRefid="testClasspath"
-        destDir="${maven.test.dest}"/>
+        destDir="${maven.aspectj.dest}"/>
 
     </j:if>
 
diff --git a/aspectj/plugin.properties b/aspectj/plugin.properties
index cfe6eb48..c7eb6625 100644
--- a/aspectj/plugin.properties
+++ b/aspectj/plugin.properties
@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 The Apache Software Foundation.
+# Copyright 2001-2006 The Apache Software Foundation.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -67,6 +67,8 @@ maven.aspectj.source = 1.3
 # If true, display speed information during weaving.
 maven.aspectj.time = false
 
+# The directory for compiled classes. By default maven.build.dest used.
+#maven.aspectj.dest=
 
 # If true, produce binaries that can only be used as input for the -injars or -inpath option
 maven.aspectj.noweave=false
diff --git a/aspectj/src/plugin-test/maven.xml b/aspectj/src/plugin-test/maven.xml
index d4795f17..538a5772 100644
--- a/aspectj/src/plugin-test/maven.xml
+++ b/aspectj/src/plugin-test/maven.xml
@@ -1,6 +1,6 @@
 <!-- 
 /*
- * Copyright 2004 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,4 +42,8 @@
     <attainGoal name="clean"/>
   </goal>
 
+  <preGoal name="test:compile">
+    <attainGoal name="aspectj"/>
+  </preGoal>
+
 </project>
\ No newline at end of file
diff --git a/aspectj/src/plugin-test/project.properties b/aspectj/src/plugin-test/project.properties
index b15420fd..f1bcafe8 100644
--- a/aspectj/src/plugin-test/project.properties
+++ b/aspectj/src/plugin-test/project.properties
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # -------------------------------------------------------------------
-maven.junit.fork=true
\ No newline at end of file
+maven.junit.fork=true
+maven.aspectj.dest=target/test-classes
\ No newline at end of file
diff --git a/aspectj/src/plugin-test/src/test/org/apache/maven/aspectj/AspectTest.java b/aspectj/src/plugin-test/src/test/org/apache/maven/aspectj/AspectTest.java
index e6e0d973..c9e5c7d1 100644
--- a/aspectj/src/plugin-test/src/test/org/apache/maven/aspectj/AspectTest.java
+++ b/aspectj/src/plugin-test/src/test/org/apache/maven/aspectj/AspectTest.java
@@ -1,7 +1,7 @@
 package org.apache.maven.aspectj;
 
 /* ====================================================================
- *   Copyright 2004 The Apache Software Foundation.
+ *   Copyright 2004-2006 The Apache Software Foundation.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -18,6 +18,9 @@ package org.apache.maven.aspectj;
  */
 import junit.framework.TestCase;
 
+import java.util.Enumeration;
+import java.net.URL;
+
 public class AspectTest extends TestCase
 {
 
@@ -59,7 +62,24 @@ public class AspectTest extends TestCase
             assertEquals(EXCEPTION_MESSAGE, expected.getMessage());
         }
     }
-    
+
+    public void testTestDest() throws Exception
+    {
+         Enumeration enum = getClass().getClassLoader().getResources("org/apache/maven/aspectj/AspectTest.class" );
+         String testFile = getClass().getClassLoader().getResource( "org/apache/maven/aspectj/TestA.class" ).getFile();
+
+         int count = 0;
+        //check that aspect TestA placed only in the same folder that AspectTest
+         while ( enum.hasMoreElements() )
+         {
+             URL aspectURL = (URL) enum.nextElement();
+             assertEquals( aspectURL.getFile().substring( 0, aspectURL.getFile().indexOf( "/AspectTest.class" ) ),
+                     testFile.substring( 0, testFile.indexOf( "/TestA.class" ) ) );
+             count++;
+         }
+         assertEquals( 1, count );
+    }
+
     public void someMethod()
     {
     }
diff --git a/aspectj/xdocs/changes.xml b/aspectj/xdocs/changes.xml
index ada8c19d..4900285b 100644
--- a/aspectj/xdocs/changes.xml
+++ b/aspectj/xdocs/changes.xml
@@ -2,7 +2,7 @@
 
 <!-- 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
   </properties>
   <body>
     <release version="4.0-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="add" issue="MPASPECTJ-15" due-to="Alexey Dashkevich">New property <code>maven.aspectj.dest</code> to define output folder for <code>aspectj:compile</code> goal.</action>
       <action dev="ltheussl" type="fix" issue="MPASPECTJ-14" due-to="Alexey Dashkevich">Unable to weave only sources defined in argument files. New property <code>maven.aspectj.src.argfilesOnly</code>.</action>
       <action dev="ltheussl" type="add" issue="MPASPECTJ-23" due-to="Shinobu Kawai Yoshida">Add a report for the plugin.</action>
       <action dev="carlos" type="update" issue="MPASPECTJ-21">Upgraded to AspectJ 1.5.0</action>
diff --git a/aspectj/xdocs/properties.xml b/aspectj/xdocs/properties.xml
index 0f35e51e..182f437c 100644
--- a/aspectj/xdocs/properties.xml
+++ b/aspectj/xdocs/properties.xml
@@ -2,7 +2,7 @@
 
 <!-- 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,6 +71,15 @@
           </td>
         </tr>
 
+        <tr>
+          <td>maven.aspectj.dest</td>
+          <td>Yes</td>
+          <td>
+            The directory for compiled classes.
+            Defaults to <code>maven.build.dest</code>.
+          </td>
+        </tr>
+
         <tr>
           <td>maven.aspectj.sourceRootCopyFilter</td>
           <td>Yes</td>