cvs commit: maven-plugins/aspectj/src/plugin-test/src/main/org/apache/maven/aspectj Dummy.java
carlos 2004/10/03 12:30:14
Modified:aspectj/xdocs changes.xml properties.xml
aspectj/src/plugin-test/src/aspect/org/apache/maven/aspectj
Sample.aj
aspectj plugin.jelly plugin.properties
aspectj/src/plugin-test/src/test/org/apache/maven/aspectj
AspectTest.java
aspectj/src/plugin-test maven.xml
aspectj/src/plugin-test/src/main/org/apache/maven/aspectj
Dummy.java
Added: aspectj/src/plugin-test/src/aspect/org/apache/maven/aspectj
TestB.aj TestA.aj
aspectj/src/plugin-test argfile.lst
Log:
MPASPECTJ-12 Added maven.aspectj.argfiles and maven.aspectj.weaveAspectSources
properties.
Revision ChangesPath
1.26 +5 -2 maven-plugins/aspectj/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/maven-plugins/aspectj/xdocs/changes.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- changes.xml 5 Sep 2004 20:00:25 - 1.25
+++ changes.xml 3 Oct 2004 19:30:14 - 1.26
@@ -28,12 +28,15 @@
/properties
body
release version=3.2-SNAPSHOT date=in CVS
+ action dev=carlos type=add issue=MPASPECTJ-12 due-to=Mark
ProctorAdded
+codemaven.aspectj.argfiles/code and
+codemaven.aspectj.weaveAspectSources/code properties./action
action dev=felipeal type=add issue=MPASPECTJ-13Added
codemaven.aspectj.noweave/code and
-codemaven.aspectj.lint/codeproperties./action
+codemaven.aspectj.lint/code properties./action
action dev=carlos type=fixAdded
codemaven.aspectj.source/code and
-codemaven.aspectj.time/codeproperties that where incorrectly
removed./action
+codemaven.aspectj.time/code properties that where incorrectly
removed./action
/release
release version=3.1.1 date=2004-07-09
action dev=carlos type=fix issue=MPASPECTJ-11Check that
unitTestSourceDirectory is defined in pom/action
1.11 +24 -0 maven-plugins/aspectj/xdocs/properties.xml
Index: properties.xml
===
RCS file: /home/cvs/maven-plugins/aspectj/xdocs/properties.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- properties.xml5 Sep 2004 20:00:25 - 1.10
+++ properties.xml3 Oct 2004 19:30:14 - 1.11
@@ -38,6 +38,30 @@
/tr
tr
+ tdmaven.aspectj.argfiles/td
+ tdYes/td
+ td
+List of argument files separated by commas.
+An argument file contains a list of arguments read by the
+compiler. Each line is read into one element of the argument
+array and may include another argfile by reference.
+If specified, codemaven.aspectj.weaveAspectSources/code
+is set to a default codefalse/code value.
+ /td
+/tr
+
+tr
+ tdmaven.aspectj.weaveAspectSources/td
+ tdYes/td
+ td
+If true weave aspect sources in
+codepom.build.aspectSourceDirectory/code.
+Default codetrue/code, codefalse/code if
+codemaven.aspectj.argfiles/code is specified.
+ /td
+/tr
+
+tr
tdmaven.aspectj.sourceRootCopyFilter/td
tdYes/td
td
1.3 +10 -10
maven-plugins/aspectj/src/plugin-test/src/aspect/org/apache/maven/aspectj/Sample.aj
Index: Sample.aj
===
RCS file:
/home/cvs/maven-plugins/aspectj/src/plugin-test/src/aspect/org/apache/maven/aspectj/Sample.aj,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Sample.aj 8 Jul 2004 11:27:58 - 1.2
+++ Sample.aj 3 Oct 2004 19:30:14 - 1.3
@@ -20,17 +20,17 @@
public aspect Sample
{
pointcut srcPointcut() :
- execution(public * org.apache.maven.aspectj.Dummy.someMethod());
+execution(public * org.apache.maven.aspectj.Dummy.someMethod());
pointcut testPointcut() :
- execution(public * org.apache.maven.aspectj.AspectTest.someMethod());
+execution(public * org.apache.maven.aspectj.AspectTest.someMethod());
- before() : srcPointcut()
- {
- throw new RuntimeException(test exception voluntarily raised and that
should be caught in the test case);
- }
+before() : srcPointcut()
+{
+throw new RuntimeException(test exception voluntarily raised and that
should be caught in the test case);
+}
-
cvs commit: maven-plugins/aspectj/src/plugin-test/src/main/org/apache/maven/aspectj Dummy.java
vmassol 2004/05/07 16:09:22
Added: aspectj/src/plugin-test/src/aspect/org/apache/maven/aspectj
Sample.aj
aspectj/src/plugin-test/src/test/org/apache/maven/aspectj
AspectTest.java
aspectj/src/plugin-test project.xml maven.xml
project.properties
aspectj/src/plugin-test/src/main/org/apache/maven/aspectj
Dummy.java
Log:
added unit tests
Revision ChangesPath
1.1
maven-plugins/aspectj/src/plugin-test/src/aspect/org/apache/maven/aspectj/Sample.aj
Index: Sample.aj
===
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 Sample
{
pointcut testPointcut() :
execution(public * org.apache.maven.aspectj.Dummy.someMethod());
before() : testPointcut()
{
throw new RuntimeException(test exception voluntarily raised and that
should caught in the test case);
}
}
1.1
maven-plugins/aspectj/src/plugin-test/src/test/org/apache/maven/aspectj/AspectTest.java
Index: AspectTest.java
===
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 AspectTest extends TestCase
{
public void testAspectIsCorrectlyWeaved()
{
Dummy dummy = new Dummy();
try
{
dummy.someMethod();
fail(The Aspect should have thrown an exception);
} catch (Exception expected)
{
assertEquals(test exception voluntarily raised and that should
+ caught in the test case, expected.getMessage());
}
}
}
1.1 maven-plugins/aspectj/src/plugin-test/project.xml
Index: project.xml
===
?xml version=1.0 encoding=UTF-8?
!--
/*
* 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.
*/
--
project
pomVersion3/pomVersion
idtest-maven-aspectj-plugin/id
nameTest project for Maven AspectJ Plugin/name
groupIdmaven/groupId
currentVersion1.0-SNAPSHOT/currentVersion
organization
nameApache Software Foundation/name
urlhttp://www.apache.org//url
logohttp://maven.apache.org/images/jakarta-logo-blue.gif/logo
/organization
inceptionYear2001/inceptionYear
packageorg.apache.maven/package
logohttp://maven.apache.org/images/maven.jpg/logo
descriptionTest for Maven AspectJ plugin/description
shortDescriptionTest for Maven AspectJ plugin/shortDescription
