[jboss-cvs] JBossAS SVN: r64340 - projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins.

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

Author: stalep
Date: 2007-07-29 18:11:12 -0400 (Sun, 29 Jul 2007)
New Revision: 64340

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:
added a "include" tag. works (almost) like it did with ant

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-29 20:36:49 UTC (rev 64339)
+++ projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java	2007-07-29 22:11:12 UTC (rev 64340)
@@ -51,9 +51,10 @@
  *  - suppress (default false)
  *  - noopt (default false)
  *  - report (default false)
+ *  - includes 
  *  
  * 
- * @author <a href="mailto:stalep at gmail.com">Stale W. Pedersen</a>
+ * @author <a href="mailto:spederse at redhat.com">Stale W. Pedersen</a>
  * @goal compile
  * @phase process-classes
  * @requiresDependencyResolution
@@ -132,7 +133,7 @@
     * @required
     * @readonly
     */
-   private Set dependencies;
+   private Set<String> dependencies;
 
    /**
     * @parameter default-value="${project.compileDependencies}"
@@ -148,6 +149,11 @@
     */
    private Dependency pDependency;
    
+   /**
+    * @parameter
+    */
+   private String[] includes;
+   
    private boolean test;
 
    /**
@@ -171,6 +177,23 @@
          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);
+            }
+         }
+      }
+      System.err.println("CLASSPATH: "+sb.toString());
       return sb.toString();
    }
 
@@ -182,7 +205,6 @@
       cl.setExecutable("java");
       cl.addArguments(new String[] { "-cp", createClassPathList(project.getArtifacts())});
       cl.addArguments(new String[] { "org.jboss.aop.standalone.Compiler"});
-      cl.addArguments(new String[] { "-classpath", createClassPathList(project.getArtifacts())});
       if(isVerbose())
          cl.addArguments(new String[] { "-verbose"});
       if(isSuppress())
@@ -198,6 +220,11 @@
          cl.addArguments(new String[] { project.getBuild().getTestOutputDirectory()});
       else
          cl.addArguments(new String[] { "target/classes"});
+      
+      if(includes != null && includes.length > 0)
+      {
+         cl.addArguments(includes);
+      }
 
       return cl;
    }
@@ -261,7 +288,7 @@
       return compileSourcepath;
    }
 
-   private Set getDependencies()
+   private Set<String> getDependencies()
    {
       return dependencies;
    }

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-29 20:36:49 UTC (rev 64339)
+++ projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossTestAOPCMojo.java	2007-07-29 22:11:12 UTC (rev 64340)
@@ -38,7 +38,7 @@
  *  - report (default false)
  *  
  * 
- * @author <a href="mailto:stalep at gmail.com">Stale W. Pedersen</a>
+ * @author <a href="mailto:spederse at redhat.com">Stale W. Pedersen</a>
  * @goal compile-test
  * @phase process-classes
  * @requiresDependencyResolution