Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/aspectj/plugin.jelly,v
retrieving revision 1.23
diff -u -r1.23 plugin.jelly
--- plugin.jelly	3 Oct 2004 19:30:14 -0000	1.23
+++ plugin.jelly	7 Dec 2004 23:21:33 -0000
@@ -82,10 +82,12 @@
         </j:if>
 
         <ant:sourceroots>
-          <ant:path refid="${sourcePathRefid}"/>
-            <j:if test="${aspectSourcesPresent and weaveAspectSources}">
-              <ant:pathelement location="${pom.build.aspectSourceDirectory}"/>
-            </j:if>
+          <j:if test="${context.getVariable('maven.aspectj.src.argfilesOnly') != 'true'}">
+            <ant:path refid="${sourcePathRefid}"/>
+          </j:if>
+          <j:if test="${aspectSourcesPresent and weaveAspectSources}">
+            <ant:pathelement location="${pom.build.aspectSourceDirectory}"/>
+          </j:if>
         </ant:sourceroots>
 
         <ant:classpath>
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/aspectj/plugin.properties,v
retrieving revision 1.8
diff -u -r1.8 plugin.properties
--- plugin.properties	3 Oct 2004 19:30:14 -0000	1.8
+++ plugin.properties	7 Dec 2004 23:21:34 -0000
@@ -24,6 +24,11 @@
 # another argfile by reference.
 #maven.aspectj.argfiles=
 
+# If true then only sources that defined in argument files will be weaved.
+# By default wave sources from argument files and from build sources path
+# or test sources path.
+#maven.aspectj.src.argfilesOnly=false
+
 # If true weave aspect sources in pom.build.aspectSourceDirectory
 #maven.aspectj.weaveAspectSources=true
 
Index: src/plugin-test/argfile.lst
===================================================================
RCS file: /home/cvs/maven-plugins/aspectj/src/plugin-test/argfile.lst,v
retrieving revision 1.1
diff -u -r1.1 argfile.lst
--- src/plugin-test/argfile.lst	3 Oct 2004 19:30:14 -0000	1.1
+++ src/plugin-test/argfile.lst	7 Dec 2004 23:21:34 -0000
@@ -1,2 +1,3 @@
 src\aspect\org\apache\maven\aspectj\Sample.aj
-src\aspect\org\apache\maven\aspectj\TestA.aj
\ No newline at end of file
+src\aspect\org\apache\maven\aspectj\TestA.aj
+src\aspect\org\apache\maven\aspectj\BOTest.aj
\ No newline at end of file
Index: src/plugin-test/maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/aspectj/src/plugin-test/maven.xml,v
retrieving revision 1.3
diff -u -r1.3 maven.xml
--- src/plugin-test/maven.xml	3 Oct 2004 19:30:14 -0000	1.3
+++ src/plugin-test/maven.xml	7 Dec 2004 23:21:34 -0000
@@ -17,7 +17,7 @@
  -->
 <project xmlns:util="jelly:util" xmlns:j="jelly:core">
 
-  <goal name="testPlugin" prereqs="clean,test-aspectj-compile,test-optional-aspectj-compile">
+  <goal name="testPlugin" prereqs="clean,test-aspectj-compile,test-optional-aspectj-compile,test-mix-aspectj-compile">
   </goal>
 
   <goal name="test-aspectj-compile">
@@ -30,6 +30,16 @@
     <j:set var="maven.junit.sysproperties" value="maven.aspectj.argfiles" />
     <j:set var="maven.aspectj.argfiles" value="argfile.lst" />
     <attainGoal name="test-aspectj-compile"/>
+  </goal>
+
+  <goal name="test-mix-aspectj-compile">
+    <j:set var="maven.aspectj.argfiles" value="argfilemix.lst" />
+    <j:set var="maven.aspectj.src.argfilesOnly" value="true"/>
+    <j:set var="testcase" value="org.apache.maven.aspectj.AspectBOTest"/>
+
+    <attainGoal name="aspectj:compile"/>
+    <attainGoal name="test:single"/>
+    <attainGoal name="clean"/>
   </goal>
 
 </project>
Index: src/plugin-test/argfilemix.lst
===================================================================
RCS file: src/plugin-test/argfilemix.lst
diff -N src/plugin-test/argfilemix.lst
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/plugin-test/argfilemix.lst	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,2 @@
+src\aspect\org\apache\maven\aspectj\BOTest.aj
+src\main\org\apache\maven\aspectj\BO.java
Index: src/plugin-test/src/aspect/org/apache/maven/aspectj/BOTest.aj
===================================================================
RCS file: src/plugin-test/src/aspect/org/apache/maven/aspectj/BOTest.aj
diff -N src/plugin-test/src/aspect/org/apache/maven/aspectj/BOTest.aj
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/plugin-test/src/aspect/org/apache/maven/aspectj/BOTest.aj	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,29 @@
+package org.apache.maven.aspectj;
+
+/* ====================================================================
+ *   Copyright 2004 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.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ * ====================================================================
+ */
+
+public aspect BOTest
+{
+    pointcut mockupPointcut() :
+        execution(public * org.apache.maven.aspectj.BO.findByKey(..));
+
+    BO around() : mockupPointcut()
+    {
+       return new BO("dummy");
+    }
+}
Index: src/plugin-test/src/main/org/apache/maven/aspectj/BO.java
===================================================================
RCS file: src/plugin-test/src/main/org/apache/maven/aspectj/BO.java
diff -N src/plugin-test/src/main/org/apache/maven/aspectj/BO.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/plugin-test/src/main/org/apache/maven/aspectj/BO.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,38 @@
+package org.apache.maven.aspectj;
+
+/* ====================================================================
+ *   Copyright 2004 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.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ * ====================================================================
+ */
+
+public class BO
+{
+
+    private String id;
+
+    public BO(String id){
+        this.id = id;
+    }
+
+    public static BO findByKey(String id)
+    {
+        //some code with connection to database
+        return null;
+    }
+
+    public String getId(){
+        return this.id;
+    }
+}
Index: src/plugin-test/src/test/org/apache/maven/aspectj/AspectBOTest.java
===================================================================
RCS file: src/plugin-test/src/test/org/apache/maven/aspectj/AspectBOTest.java
diff -N src/plugin-test/src/test/org/apache/maven/aspectj/AspectBOTest.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/plugin-test/src/test/org/apache/maven/aspectj/AspectBOTest.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,32 @@
+package org.apache.maven.aspectj;
+
+/* ====================================================================
+ *   Copyright 2004 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.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ * ====================================================================
+ */
+import junit.framework.TestCase;
+
+public class AspectBOTest extends TestCase
+{
+
+    public void testSourceIsCorrectlyWeaved()
+    {
+        BO bo = BO.findByKey("test");
+        assertNotNull(bo);
+        assertEquals("dummy", bo.getId());
+
+    }
+
+}