[jboss-cvs] JBossAS SVN: r64370 - in projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss: maven/plugins and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: stalep
Date: 2007-07-31 09:53:46 -0400 (Tue, 31 Jul 2007)
New Revision: 64370

Removed:
   projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/aop/
Modified:
   projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java
   projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossTestAOPCMojo.java
Log:
[JBAOP-448] Chanced the include to exclude default outputDirectory. Now it works like an override. - and it will only work within the specified classpath.

Modified: projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java
===================================================================
--- projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java	2007-07-31 13:07:19 UTC (rev 64369)
+++ projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java	2007-07-31 13:53:46 UTC (rev 64370)
@@ -117,25 +117,11 @@
 
    /** 
     * 
-    * @parameter expression="${aopClassPath}" default-value=""
+    * @parameter expression="${compilerClassPath}" default-value=""
     */
    private String compilerClasspath;
 
-   /** 
-    * 
-    * @parameter expression="${aopClassPath}" default-value="${project.build.outputDirectory}"
-    */
-   private String compileSourcepath;
-
-
    /**
-    * @parameter default-value="${project.artifacts}"
-    * @required
-    * @readonly
-    */
-   private Set<String> dependencies;
-
-   /**
     * @parameter default-value="${project.compileDependencies}"
     * @required
     * @readonly
@@ -173,27 +159,12 @@
       {
          sb.append(a.getFile().toString()).append(File.pathSeparator);
       }
+
       if(isTest())
          sb.append(project.getBuild().getTestOutputDirectory());
       else
-      sb.append(getCompileSourcepath());
-      
-      if(includes != null)
-      {
-         for(String inc : includes)
-         {
-            File f = new File(inc);
-            if(f.isFile())
-            {
-               sb.append(File.pathSeparator).append(f.getParent());
-            }
-            else if(f.isDirectory())
-            {
-               sb.append(File.pathSeparator).append(inc);
-            }
-         }
-      }
-      
+         sb.append(project.getBuild().getOutputDirectory());
+
       return sb.toString();
    }
 
@@ -216,15 +187,27 @@
       
       cl.addArguments(new String[] { "-aoppath", getAoppath()});
       
-      if(isTest())
-         cl.addArguments(new String[] { project.getBuild().getTestOutputDirectory()});
-      else
-         cl.addArguments(new String[] { project.getBuild().getOutputDirectory()});
-      
       if(includes != null && includes.length > 0)
       {
-         cl.addArguments(includes);
+         for(String include : includes)
+         {
+            File f = null;
+            if(isTest())
+               f = new File(project.getBuild().getTestOutputDirectory(), include);
+            else
+               f = new File(project.getBuild().getOutputDirectory(), include);
+            
+            cl.addArguments(new String[] {f.getAbsolutePath()});
+         }
+         
       }
+      else
+      {
+         if(isTest())
+            cl.addArguments(new String[] { project.getBuild().getTestOutputDirectory()});
+         else
+            cl.addArguments(new String[] { project.getBuild().getOutputDirectory()});
+      }
 
       return cl;
    }
@@ -283,16 +266,6 @@
       return compilerClasspath;
    }
 
-   private String getCompileSourcepath()
-   {
-      return compileSourcepath;
-   }
-
-   private Set<String> getDependencies()
-   {
-      return dependencies;
-   }
-
    private boolean isVerbose()
    {
       return verbose;

Modified: projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossTestAOPCMojo.java
===================================================================
--- projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossTestAOPCMojo.java	2007-07-31 13:07:19 UTC (rev 64369)
+++ projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossTestAOPCMojo.java	2007-07-31 13:53:46 UTC (rev 64370)
@@ -40,7 +40,7 @@
  * 
  * @author <a href="mailto:spederse at redhat.com">Stale W. Pedersen</a>
  * @goal compile-test
- * @phase process-classes
+ * @phase process-test-classes
  * @requiresDependencyResolution
  */
 public class JBossTestAOPCMojo extends JBossAOPCMojo